libsdl-* consolidate using a .inc file, enable fbcon, closes #35

(yes, this one has been open since 2005-05-24 *cough*)

diff --git a/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch b/packages/libsdl/files/explicit-extern-C.patch
similarity index 100%
rename from packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch
rename to packages/libsdl/files/explicit-extern-C.patch

diff --git a/packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch b/packages/libsdl/files/fixlibs-1.2.9.patch
similarity index 100%
rename from packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch
rename to packages/libsdl/files/fixlibs-1.2.9.patch

diff --git a/packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch b/packages/libsdl/files/kill-stdc++-1.2.9.patch
similarity index 100%
rename from packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch
rename to packages/libsdl/files/kill-stdc++-1.2.9.patch

diff --git a/packages/libsdl/files/pagesize.patch b/packages/libsdl/files/pagesize.patch
new file mode 100644 (file)
index 0000000..ea9ea98
--- /dev/null
+++ b/packages/libsdl/files/pagesize.patch
@@ -0,0 +1,15 @@
+Remove obsolete non-portable macro.
+
+Index: SDL-1.2.9/src/video/fbcon/SDL_fbvideo.c
+===================================================================
+--- SDL-1.2.9.orig/src/video/fbcon/SDL_fbvideo.c
++++ SDL-1.2.9/src/video/fbcon/SDL_fbvideo.c
+@@ -405,7 +405,7 @@ static int FB_VideoInit(_THIS, SDL_Pixel
+ 
+       /* Memory map the device, compensating for buggy PPC mmap() */
+       mapped_offset = (((long)finfo.smem_start) -
+-                      (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
++                      (((long)finfo.smem_start)&~(getpagesize()-1)));
+       mapped_memlen = finfo.smem_len+mapped_offset;
+       mapped_mem = mmap(NULL, mapped_memlen,
+                         PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);

diff --git a/packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch b/packages/libsdl/files/pygame-1.2.9.patch
similarity index 100%
rename from packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch
rename to packages/libsdl/files/pygame-1.2.9.patch

diff --git a/packages/libsdl/libsdl-directfb_1.2.9.bb b/packages/libsdl/libsdl-directfb_1.2.9.bb
index 73e94e9..7a9bd88 100644 (file)
--- a/packages/libsdl/libsdl-directfb_1.2.9.bb
+++ b/packages/libsdl/libsdl-directfb_1.2.9.bb
@@ -1,28 +1,13 @@
-DESCRIPTION = "Simple DirectMedia Layer - DirectFB Edition"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "alsa-lib directfb"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
+require libsdl.inc
 
-PR = "r3"
+DEPENDS = "alsa-lib directfb"
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-           file://agawa-piro-mickey-1.2.9.patch;patch=1 \
-           file://pygame-1.2.9.patch;patch=1 \
-           file://mouse-1.2.9.patch;patch=1 \
-          file://kill-stdc++-1.2.9.patch;patch=1 \
-          file://ipaq-1.2.9.patch;patch=1 \
-          file://SDL-Akita-1.2.9.patch;patch=1 \
-          file://fixlibs-1.2.9.patch;patch=1 \
-          file://no-PAGE_SIZE.patch;patch=1 \
-          file://explicit-extern-C.patch;patch=1 \
-          file://acinclude.m4 \
-          file://directfb_obsolete_calls.patch;patch=1"
-S = "${WORKDIR}/SDL-${PV}"
-
-inherit autotools binconfig
+SRC_URI += "\
+  file://explicit-extern-C.patch;patch=1 \
+  file://acinclude.m4 \
+  file://directfb_obsolete_calls.patch;patch=1 \
+"
 
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb -I${STAGING_INCDIR}/directfb-internal"
 
@@ -30,44 +15,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
                 --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
                 --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --enable-video-directfb --disable-video-ps2gs \
+                --enable-video-fbcon --enable-video-directfb --disable-video-ps2gs \
                 --disable-video-xbios --disable-video-gem --disable-video-dummy \
                 --disable-video-opengl --enable-input-events --enable-pthreads \
                 --disable-video-picogui --disable-video-qtopia --enable-dlopen"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/*config"
-
-do_configure_prepend() {
-       rm -f ${S}/acinclude.m4
-        cp ${WORKDIR}/acinclude.m4 ${S}/
-       if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ]
-       then
-               sed -i s,-lqte,-lqte-mt, src/Makefile
-       fi      
-}
-do_configure_append () {
-       cd ${S}
-
-       # prevent libtool from linking libs against libstdc++, libgcc, ...
-       cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-       mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-       find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
-
-}
-
-do_stage() {
-       oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
-       rm ${STAGING_LIBDIR}/libSDL.la
-       ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
-       #oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
-       install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
-
-       install -d ${STAGING_INCDIR}/SDL
-       for f in include/*.h
-       do
-               install -m 0644 $f ${STAGING_INCDIR}/SDL/
-       done
-
-       install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/
-}

diff --git a/packages/libsdl/libsdl-qpe_1.2.9.bb b/packages/libsdl/libsdl-qpe_1.2.9.bb
index 2fbf66b..3583f20 100644 (file)
--- a/packages/libsdl/libsdl-qpe_1.2.9.bb
+++ b/packages/libsdl/libsdl-qpe_1.2.9.bb
@@ -1,69 +1,31 @@
-DESCRIPTION = "Simple DirectMedia Layer - QtE-based Palmtop Environments Edition"
+require libsdl.inc
+
 SECTION = "opie/libs"
-PRIORITY = "optional"
 DEPENDS = "virtual/libqpe1 libopie2"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
-
-# NOTE: make sure to keep PR in sync with libsdl-x11
-PR = "r1"
-
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-           file://agawa-piro-mickey-1.2.9.patch;patch=1 \
-           file://pygame-1.2.9.patch;patch=1 \
-           file://mouse-1.2.9.patch;patch=1 \
-          file://kill-stdc++-1.2.9.patch;patch=1 \
-          file://ipaq-1.2.9.patch;patch=1 \
-          file://SDL-Akita-1.2.9.patch;patch=1 \
-          file://fixlibs-1.2.9.patch;patch=1 \
-          file://no-PAGE_SIZE.patch;patch=1 \
-          file://explicit-extern-C.patch;patch=1 \
-          file://acinclude.m4"
-S = "${WORKDIR}/SDL-${PV}"
 
-inherit autotools binconfig
+SRC_URI += "\
+  file://agawa-piro-mickey-1.2.9.patch;patch=1 \
+  file://pygame-1.2.9.patch;patch=1 \
+  file://mouse-1.2.9.patch;patch=1 \
+  file://kill-stdc++-1.2.9.patch;patch=1 \
+  file://ipaq-1.2.9.patch;patch=1 \
+  file://SDL-Akita-1.2.9.patch;patch=1 \
+  file://fixlibs-1.2.9.patch;patch=1 \
+  file://explicit-extern-C.patch;patch=1 \
+"
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --enable-oss --disable-alsa --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
                 --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
+                --enable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
                 --disable-video-xbios --disable-video-gem --disable-video-dummy \
                 --disable-video-opengl --enable-input-events --enable-pthreads \
                 --disable-video-picogui --enable-video-qtopia --enable-dlopen"
 
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/*config"
-
 do_compile_prepend() {
-        rm -f ${S}/acinclude.m4
-        cp ${WORKDIR}/acinclude.m4 ${S}/
        if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ]
        then
                sed -i s,-lqte,-lqte-mt, src/Makefile
        fi
 }
-
-do_configure_append () {
-        cd ${S}
-
-        # prevent libtool from linking libs against libstdc++, libgcc, ...
-        cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-        mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
-do_stage() {
-       oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
-       rm ${STAGING_LIBDIR}/libSDL.la
-       ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
-       install -m 0655 src/main/libSDLmain.a src/main/.libs/
-       oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
-
-       install -d ${STAGING_INCDIR}/SDL
-       for f in include/*.h
-       do
-               install -m 0644 $f ${STAGING_INCDIR}/SDL/
-       done
-
-       install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/
-}

diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb
index 42c0ad3..43148d4 100644 (file)
--- a/packages/libsdl/libsdl-x11_1.2.9.bb
+++ b/packages/libsdl/libsdl-x11_1.2.9.bb
@@ -1,56 +1,11 @@
-DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
-
-PR = "r2"
-
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-          file://extra-keys.patch;patch=1 \
-          file://acinclude.m4"
-S = "${WORKDIR}/SDL-${PV}"
-
-inherit autotools binconfig
+require libsdl.inc
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
                 --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
+                --enable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
                 --disable-video-xbios --disable-video-gem --disable-video-dummy \
                 --enable-video-opengl --enable-input-events --enable-pthreads \
                 --disable-video-picogui --disable-video-qtopia --enable-dlopen"
 
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/*config"
-
-do_configure_prepend() {
-       rm -f ${S}/acinclude.m4
-       cp ${WORKDIR}/acinclude.m4 ${S}/
-}
-
-do_configure_append () {
-       cd ${S}
-
-       # prevent libtool from linking libs against libstdc++, libgcc, ...
-       cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-       mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
-do_stage() {
-       oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
-       rm ${STAGING_LIBDIR}/libSDL.la
-       ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
-       #oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
-       install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
-
-       install -d ${STAGING_INCDIR}/SDL
-       for f in include/*.h
-       do
-               install -m 0644 $f ${STAGING_INCDIR}/SDL/
-       done
-
-       install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/
-}

diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl.inc
similarity index 52%
rename from packages/libsdl/libsdl-x11_1.2.7.bb
rename to packages/libsdl/libsdl.inc
index 125aec5..a65efb5 100644 (file)
--- a/packages/libsdl/libsdl-x11_1.2.7.bb
+++ b/packages/libsdl/libsdl.inc
@@ -1,28 +1,21 @@
 DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libxext"
+DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
 PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
+PR = "r3"
 
-# NOTE: make sure to keep PR in sync with libsdl-qpe
-PR = "r9"
-
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-          file://extra-keys.patch;patch=1 \
-          file://acinclude.m4"
+SRC_URI = "\
+  http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+  file://extra-keys.patch;patch=1 \
+  file://pagesize.patch;patch=1 \
+  file://acinclude.m4"
 S = "${WORKDIR}/SDL-${PV}"
 
 inherit autotools binconfig
 
-EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
-                --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
-                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
-                --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
-                --disable-video-xbios --disable-video-gem --disable-video-dummy \
-                --disable-video-opengl --enable-input-events --enable-pthreads \
-                --disable-video-picogui --disable-video-qtopia --enable-dlopen"
+EXTRA_OECONF = "<overwrite me>"
 
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir}/*config"