From ec330f46c2f76fe09fe6bc41ee6c42e0c45cf4c4 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 19 Oct 2016 14:26:54 +0200 Subject: [PATCH 1/5] SDL2: rename pkg sdl to sdl2 SDL 1.2 is still needed by e.g. ffmpeg. So rename the pkg, so that sdl 1.2 and 2.0 can be installed in parallel. --- sdl.be0 => sdl2.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sdl.be0 => sdl2.be0 (92%) diff --git a/sdl.be0 b/sdl2.be0 similarity index 92% rename from sdl.be0 rename to sdl2.be0 index c972a0867..4b9fd626d 100755 --- a/sdl.be0 +++ b/sdl2.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION sdl-2.0.4-0 +#BEE_VERSION sdl2-2.0.4-0 SRCURL[0]="http://www.libsdl.org/release/SDL2-${PKGVERSION}.tar.gz" From a7e4d9cc646eb1c441afcea821b5e2a4cd195db0 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 19 Oct 2016 15:34:37 +0200 Subject: [PATCH 2/5] SDL: add version 1.2.14 back wird immer noch von einigen programmen benutzt z.B. ffmpeg fuer ffplay --- sdl.be0 | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 sdl.be0 diff --git a/sdl.be0 b/sdl.be0 new file mode 100755 index 000000000..a55a3eb15 --- /dev/null +++ b/sdl.be0 @@ -0,0 +1,32 @@ +#!/bin/env beesh + +# BEE_VERSION sdl-1.2.14-0 + +SRCURL[0]="http://www.libsdl.org/release/SDL-1.2.14.tar.gz" + +PATCHURL[0]="" + +PGRP=( uncategorized ) + + + +# BEE_CONFIGURE=compat + +# EXCLUDE="" + +mee_patch() { + bee_patch +} + +mee_configure() { + bee_configure +} + +mee_build() { + bee_build +} + +mee_install() { + bee_install +} + From 9d24cc6bf766f89b2e4047a90eb3bbc439ca1bf2 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 19 Oct 2016 15:36:52 +0200 Subject: [PATCH 3/5] SDL: use bee variable PKGVERSION --- sdl.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdl.be0 b/sdl.be0 index a55a3eb15..898683526 100755 --- a/sdl.be0 +++ b/sdl.be0 @@ -2,7 +2,7 @@ # BEE_VERSION sdl-1.2.14-0 -SRCURL[0]="http://www.libsdl.org/release/SDL-1.2.14.tar.gz" +SRCURL[0]="http://www.libsdl.org/release/SDL-${PKGVERSION}.tar.gz" PATCHURL[0]="" From 543aec7cae1fb37c6202c37df6ebe4464b822fa3 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 19 Oct 2016 14:23:36 +0200 Subject: [PATCH 4/5] SDL: update from 1.2.14 to 1.2.15 --- sdl.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdl.be0 b/sdl.be0 index 898683526..41021b14d 100755 --- a/sdl.be0 +++ b/sdl.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION sdl-1.2.14-0 +# BEE_VERSION sdl-1.2.15-0 SRCURL[0]="http://www.libsdl.org/release/SDL-${PKGVERSION}.tar.gz" From 2f6198f73eac26c0bb3b794835f6f9ec7011df2e Mon Sep 17 00:00:00 2001 From: david Date: Wed, 19 Oct 2016 15:41:25 +0200 Subject: [PATCH 5/5] SDL: clean up pkg file --- sdl.be0 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sdl.be0 b/sdl.be0 index 41021b14d..e7b70aadc 100755 --- a/sdl.be0 +++ b/sdl.be0 @@ -8,18 +8,14 @@ PATCHURL[0]="" PGRP=( uncategorized ) - - -# BEE_CONFIGURE=compat - -# EXCLUDE="" - mee_patch() { bee_patch } mee_configure() { - bee_configure + sed -e '/_XData32/s:register long:register _Xconst long:' \ + -i ${S}/src/video/x11/SDL_x11sym.h + bee_configure --disable-static } mee_build() {