From 6e50c9e36c98b400543d602f674ec5a4899398e6 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 15:14:55 +0000 Subject: e-wm cvs need to call autopoint for gettext support --- packages/e17/e-wm_cvs.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb index e7af400a1c..4dbacffe1b 100644 --- a/packages/e17/e-wm_cvs.bb +++ b/packages/e17/e-wm_cvs.bb @@ -21,9 +21,7 @@ EXTRA_OECONF = "\ " do_configure_prepend() { - install -m 0644 ${WORKDIR}/Makefile.in.in po/ - echo "install -d $*" >./mkinstalldirs - chmod a+rx ./mkinstalldirs + autopoint } do_stage() { -- cgit v1.2.3 From d69d798924c7d9e543f7078e611ee8c410f2fad6 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 15:18:31 +0000 Subject: libpng[-native] 1.2.19 remove buggy version --- packages/libpng/libpng-native_1.2.19.bb | 14 --------- packages/libpng/libpng_1.2.19.bb | 50 --------------------------------- 2 files changed, 64 deletions(-) delete mode 100644 packages/libpng/libpng-native_1.2.19.bb delete mode 100644 packages/libpng/libpng_1.2.19.bb diff --git a/packages/libpng/libpng-native_1.2.19.bb b/packages/libpng/libpng-native_1.2.19.bb deleted file mode 100644 index 231b956678..0000000000 --- a/packages/libpng/libpng-native_1.2.19.bb +++ /dev/null @@ -1,14 +0,0 @@ -require libpng_${PV}.bb -inherit native -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}" -DEPENDS = "zlib-native" - -INHIBIT_NATIVE_STAGE_INSTALL = "1" - -do_stage_append() { - cp libpng.pc libpng12.pc - install -m 644 png.h ${STAGING_INCDIR}/png.h - install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h - oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ - ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so -} diff --git a/packages/libpng/libpng_1.2.19.bb b/packages/libpng/libpng_1.2.19.bb deleted file mode 100644 index 3730f3d727..0000000000 --- a/packages/libpng/libpng_1.2.19.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "PNG Library" -HOMEPAGE = "http://www.libpng.org/" -LICENSE = "libpng" -SECTION = "libs" -DEPENDS = "zlib" -PRIORITY = "required" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2" -S = "${WORKDIR}/libpng-${PV}" - -inherit autotools binconfig pkgconfig - -do_stage() { - cp libpng.pc libpng12.pc - install -m 644 png.h ${STAGING_INCDIR}/png.h - install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h - oe_libinstall -so libpng ${STAGING_LIBDIR}/ - oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ - ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so -} - -do_install() { - install -d ${D}${bindir} - install -d ${D}${mandir} - install -d ${D}${libdir} - install -d ${D}${includedir} - unset LDFLAGS - oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \ - 'DB=${D}${bindir}' 'DI=${D}${includedir}' \ - 'DL=${D}${libdir}' 'DM=${D}${mandir}' \ - install -} - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_${PN}', 'libpng12', d) - bb.build.exec_func('package_do_package', d) -} - -PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" - -FILES_${PN}12-dbg += "${libdir}/libpng12*.dbg" -FILES_${PN}12 = "${libdir}/libpng12.so.*" -FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir}" - -- cgit v1.2.3 From 18bae0d61ca9ad3cb8970bbeedef55ad328bb422 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 16:00:47 +0000 Subject: add fbvncserver2. closes #2126 --- packages/vnc/fbvncserver2_cvs.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/vnc/fbvncserver2_cvs.bb diff --git a/packages/vnc/fbvncserver2_cvs.bb b/packages/vnc/fbvncserver2_cvs.bb new file mode 100644 index 0000000000..29ce53274b --- /dev/null +++ b/packages/vnc/fbvncserver2_cvs.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "A Framebuffer VNC Server for PDA" +AUTHOR = "Patrik Gfeller " +HOMEPAGE = "http://fbvncserver.sourceforge.net/" +SECTION = "console/utils" +PRIORITY = "optional" +LICENSE = "GPLv2" +DEPENDS = "libvncserver jpeg zlib gmp tslib" +RRECOMMENDS = "kernel-modules-uinput kernel-module-keybdev" +RCONFLICTS = "fbvncserver, fbvncserver-kmodule" +PV = "0.0.0+cvs${SRCDATE}" +PR = "r0" + +SRC_URI = "cvs://anonymous@fbvncserver.cvs.sourceforge.net/cvsroot/fbvncserver;method=pserver;module=ipkg" +S = "${WORKDIR}/ipkg/src/" + +inherit autotools + +EXTRA_OECONF = "--enable-debug" + +FILES_${PN} += "${datadir}" + -- cgit v1.2.3 From d943db59fb909d40ad1dbeea2a3f74f94c372132 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 16:16:14 +0000 Subject: gammu 1.17.0 remove bogus pc file so it doesn't conflict with the real one --- packages/gammu/gammu_1.17.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/gammu/gammu_1.17.0.bb b/packages/gammu/gammu_1.17.0.bb index fc7adb1b79..65ab877495 100644 --- a/packages/gammu/gammu_1.17.0.bb +++ b/packages/gammu/gammu_1.17.0.bb @@ -3,6 +3,7 @@ SECTION = "console/network" DEPENDS = "bluez-libs cmake-native" LICENSE = "GPL" HOMEPAGE = "http://www.gammu.org/" +PR = "r1" SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 " @@ -25,6 +26,7 @@ do_stage() { install -m 0644 build-configure/include/*.h ${STAGING_INCDIR}/gammu/ oe_libinstall -so -C build-configure/common libGammu ${STAGING_LIBDIR} + rm -f ./build-configure/pkgconfig/gammu.pc } PACKAGES =+ "libgammu" -- cgit v1.2.3 From df5fbc51fd3d8c823626e4f375019bab9dd64a8b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 17:45:38 +0000 Subject: libsdl-* consolidate using a .inc file, enable fbcon, closes #35 (yes, this one has been open since 2005-05-24 *cough*) --- packages/libsdl/files/explicit-extern-C.patch | 22 ++ packages/libsdl/files/fixlibs-1.2.9.patch | 27 ++ packages/libsdl/files/kill-stdc++-1.2.9.patch | 422 +++++++++++++++++++++ packages/libsdl/files/pagesize.patch | 15 + packages/libsdl/files/pygame-1.2.9.patch | 191 ++++++++++ packages/libsdl/libsdl-directfb_1.2.9.bb | 68 +--- .../libsdl-qpe-1.2.9/explicit-extern-C.patch | 22 -- .../libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch | 27 -- .../libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch | 422 --------------------- .../libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch | 191 ---------- packages/libsdl/libsdl-qpe_1.2.9.bb | 64 +--- packages/libsdl/libsdl-x11_1.2.7.bb | 57 --- packages/libsdl/libsdl-x11_1.2.9.bb | 49 +-- packages/libsdl/libsdl.inc | 50 +++ 14 files changed, 750 insertions(+), 877 deletions(-) create mode 100644 packages/libsdl/files/explicit-extern-C.patch create mode 100644 packages/libsdl/files/fixlibs-1.2.9.patch create mode 100644 packages/libsdl/files/kill-stdc++-1.2.9.patch create mode 100644 packages/libsdl/files/pagesize.patch create mode 100644 packages/libsdl/files/pygame-1.2.9.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch delete mode 100644 packages/libsdl/libsdl-x11_1.2.7.bb create mode 100644 packages/libsdl/libsdl.inc diff --git a/packages/libsdl/files/explicit-extern-C.patch b/packages/libsdl/files/explicit-extern-C.patch new file mode 100644 index 0000000000..3dd44bea27 --- /dev/null +++ b/packages/libsdl/files/explicit-extern-C.patch @@ -0,0 +1,22 @@ +--- SDL-1.2.9-orig/src/video/SDL_sysvideo.h.org 2005-04-17 10:40:41.000000000 +0000 ++++ SDL-1.2.9-orig/src/video/SDL_sysvideo.h 2007-05-25 07:34:38.000000000 +0000 +@@ -332,6 +332,9 @@ + SDL_VideoDevice *(*create)(int devindex); + } VideoBootStrap; + ++#ifdef __cplusplus ++extern "C" { ++#endif + #ifdef ENABLE_X11 + extern VideoBootStrap X11_bootstrap; + #endif +@@ -417,6 +420,9 @@ + #ifdef ENABLE_RISCOS + extern VideoBootStrap RISCOS_bootstrap; + #endif ++#ifdef __cplusplus ++}; ++#endif + /* This is the current video device */ + extern SDL_VideoDevice *current_video; + diff --git a/packages/libsdl/files/fixlibs-1.2.9.patch b/packages/libsdl/files/fixlibs-1.2.9.patch new file mode 100644 index 0000000000..ebc6ec7769 --- /dev/null +++ b/packages/libsdl/files/fixlibs-1.2.9.patch @@ -0,0 +1,27 @@ +diff -Naur SDL-1.2.9-orig/configure.in SDL-1.2.9/configure.in +--- SDL-1.2.9-orig/configure.in 2007-03-12 20:56:23.000000000 +0100 ++++ SDL-1.2.9/configure.in 2007-03-12 20:59:28.000000000 +0100 +@@ -1593,8 +1593,8 @@ + AC_MSG_RESULT($video_qtopia) + if test x$video_qtopia = xyes; then + CFLAGS="$CFLAGS -DENABLE_QTOPIA -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -I${QPEDIR}/include -I${QTDIR}/include/ -DNO_DEBUG -fno-rtti -fno-exceptions" +- SDL_LIBS="$SDL_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte" +- SDL_CFLAGS="$SDL_CFLAGS -DQWS" ++ SDL_LIBS="$SDL_LIBS -Wl,-rpath-link -Wl,${QPEDIR}/lib -Wl,-rpath-link -Wl,${QTDIR}/lib" ++ SYSTEM_LIBS="$SYSTEM_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte-mt" + VIDEO_SUBDIRS="$VIDEO_SUBDIRS qtopia" + VIDEO_DRIVERS="$VIDEO_DRIVERS qtopia/libvideo_qtopia.la" + else +@@ -1908,12 +1908,6 @@ + CheckAltivec + CheckLinuxVersion + CheckRPATH +- +- # Set up files for the main() stub +- if test "x$video_qtopia" = "xyes"; then +- SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" +- +- fi + # Set up files for the audio library + # We use the OSS and ALSA API's, not the Sun audio API + #if test x$enable_audio = xyes; then diff --git a/packages/libsdl/files/kill-stdc++-1.2.9.patch b/packages/libsdl/files/kill-stdc++-1.2.9.patch new file mode 100644 index 0000000000..884cb2191c --- /dev/null +++ b/packages/libsdl/files/kill-stdc++-1.2.9.patch @@ -0,0 +1,422 @@ +diff -Naur SDL-1.2.9-orig/acinclude.m4 SDL-1.2.9/acinclude.m4 +--- SDL-1.2.9-orig/acinclude.m4 2004-08-24 08:32:50.000000000 +0200 ++++ SDL-1.2.9/acinclude.m4 2007-03-12 20:57:08.000000000 +0100 +@@ -1473,11 +1473,11 @@ + case $host_os in + aix3*) + version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ library_names_spec='${libname}${release}${shrext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' ++ soname_spec='${libname}${release}${shrext}$major' + ;; + + aix4* | aix5*) +@@ -1487,7 +1487,7 @@ + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ library_names_spec='${libname}${release}${shrext}$major ${libname}${release}${shrext}$versuffix $libname${shrext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file +@@ -1513,12 +1513,12 @@ + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' ++ soname_spec='${libname}${release}${shrext}$major' + fi + shlibpath_var=LIBPATH + fi +@@ -1531,7 +1531,7 @@ + ;; + + beos*) +- library_names_spec='${libname}${shared_ext}' ++ library_names_spec='${libname}${shrext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; +@@ -1539,8 +1539,8 @@ + bsdi[[45]]*) + version_type=linux + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +@@ -1573,14 +1573,14 @@ + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- #soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shared_ext}' ++ #soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shrext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix +- #soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shared_ext}' ++ #soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shrext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH printed by +@@ -1596,13 +1596,13 @@ + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shrext}' + ;; + esac + ;; + + *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' +@@ -1615,8 +1615,8 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' ++ library_names_spec='${libname}${release}${versuffix}$shrext ${libname}${release}${major}$shrext ${libname}$shrext' ++ soname_spec='${libname}${release}${major}$shrext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' +@@ -1633,8 +1633,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname$shrext' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +@@ -1646,8 +1646,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +@@ -1659,12 +1659,12 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext} $libname${shrext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shrext}$versuffix $libname${shrext}$versuffix' + need_version=yes + ;; + esac +@@ -1688,8 +1688,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}${major} ${libname}${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; +@@ -1707,8 +1707,8 @@ + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else +@@ -1722,8 +1722,8 @@ + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +@@ -1732,8 +1732,8 @@ + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. +@@ -1752,8 +1752,8 @@ + esac + need_lib_prefix=no + need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shrext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${release}${shrext} $libname${shrext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= +@@ -1787,8 +1787,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +@@ -1816,8 +1816,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +@@ -1829,12 +1829,12 @@ + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH +@@ -1844,7 +1844,7 @@ + + newsos6) + version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; +@@ -1853,8 +1853,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; +@@ -1863,7 +1863,7 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +@@ -1884,7 +1884,7 @@ + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' ++ library_names_spec='$libname${shrext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; +@@ -1893,8 +1893,8 @@ + version_type=osf + need_lib_prefix=no + need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shrext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +@@ -1902,8 +1902,8 @@ + + sco3.2v5*) + version_type=osf +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shrext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + +@@ -1911,8 +1911,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes +@@ -1922,7 +1922,7 @@ + + sunos4*) + version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes +@@ -1934,8 +1934,8 @@ + + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) +@@ -1959,16 +1959,16 @@ + sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' ++ library_names_spec='$libname${shrext}.$versuffix $libname${shrext}.$major $libname${shrext}' ++ soname_spec='$libname${shrext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + + uts4*) + version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +@@ -3471,8 +3471,8 @@ + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +@@ -3481,7 +3481,7 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shrext 2>&1 | grep "ld"`; rm -f libconftest$shrext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +@@ -3585,7 +3585,7 @@ + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3645,7 +3645,7 @@ + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -4596,7 +4596,7 @@ + # Whether we need a single -rpath flag with a separated argument. + hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) + +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++# Set to yes if using DIR/libNAME${shrext} during linking hardcodes DIR into the + # resulting binary. + hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) + +diff -Naur SDL-1.2.9-orig/src/main/Makefile.am SDL-1.2.9/src/main/Makefile.am +--- SDL-1.2.9-orig/src/main/Makefile.am 2007-03-12 20:56:23.000000000 +0100 ++++ SDL-1.2.9/src/main/Makefile.am 2007-03-12 20:57:08.000000000 +0100 +@@ -46,3 +46,9 @@ + (cd $(distdir) && rm -f $(BUILT_SOURCES)) + cp -rp $(ARCH_SUBDIRS) $(distdir) + (cd $(distdir) && rm -rf `find . -name CVS`) ++ ++# overwrite USER variables ++CXXLD = $(CC) ++CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ +diff -Naur SDL-1.2.9-orig/src/video/qtopia/Makefile.am SDL-1.2.9/src/video/qtopia/Makefile.am +--- SDL-1.2.9-orig/src/video/qtopia/Makefile.am 2007-03-12 20:56:23.000000000 +0100 ++++ SDL-1.2.9/src/video/qtopia/Makefile.am 2007-03-12 20:57:08.000000000 +0100 +@@ -17,3 +17,9 @@ + SDL_sysevents.cc \ + SDL_sysevents_c.h \ + SDL_qmain.cc ++ ++ ++# overwrite USER variables ++CXXLD = $(CC) ++CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ diff --git a/packages/libsdl/files/pagesize.patch b/packages/libsdl/files/pagesize.patch new file mode 100644 index 0000000000..ea9ea9849b --- /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/files/pygame-1.2.9.patch b/packages/libsdl/files/pygame-1.2.9.patch new file mode 100644 index 0000000000..4073de25bf --- /dev/null +++ b/packages/libsdl/files/pygame-1.2.9.patch @@ -0,0 +1,191 @@ +diff -Naur SDL-1.2.9-orig/configure.in SDL-1.2.9/configure.in +--- SDL-1.2.9-orig/configure.in 2005-08-28 08:31:18.000000000 +0200 ++++ SDL-1.2.9/configure.in 2007-03-12 20:55:18.000000000 +0100 +@@ -1912,7 +1912,7 @@ + # Set up files for the main() stub + if test "x$video_qtopia" = "xyes"; then + SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" +- SDL_LIBS="-lSDLmain $SDL_LIBS" ++ + fi + # Set up files for the audio library + # We use the OSS and ALSA API's, not the Sun audio API +diff -Naur SDL-1.2.9-orig/src/main/Makefile.am SDL-1.2.9/src/main/Makefile.am +--- SDL-1.2.9-orig/src/main/Makefile.am 2004-02-12 07:21:13.000000000 +0100 ++++ SDL-1.2.9/src/main/Makefile.am 2007-03-12 20:55:18.000000000 +0100 +@@ -21,11 +21,7 @@ + if TARGET_MACOSX + MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h + else +-if TARGET_QTOPIA +-MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc +-else + MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c +-endif # !TARGET_QTOPIA + endif # !TARGET_MACOSX + endif # !TARGET_WIN32 + libSDLmain_a_SOURCES = $(MAINLIB_ARCH_SRCS) +diff -Naur SDL-1.2.9-orig/src/main/qtopia/SDL_qtopia_main.cc SDL-1.2.9/src/main/qtopia/SDL_qtopia_main.cc +--- SDL-1.2.9-orig/src/main/qtopia/SDL_qtopia_main.cc 2003-12-14 07:25:53.000000000 +0100 ++++ SDL-1.2.9/src/main/qtopia/SDL_qtopia_main.cc 1970-01-01 01:00:00.000000000 +0100 +@@ -1,47 +0,0 @@ +- +-/* Include the SDL main definition header */ +-#include "SDL_main.h" +-#include +-#include +-#ifdef main +-#undef main +-#endif +-#ifdef QWS +-#include +-#include +-#include +-#include +- +-// Workaround for OPIE to remove taskbar icon. Also fixes +-// some issues in Qtopia where there are left-over qcop files in /tmp/. +-// I'm guessing this will also clean up the taskbar in the Sharp version +-// of Qtopia. +-static inline void cleanupQCop() { +- QString appname(qApp->argv()[0]); +- int slash = appname.findRev("/"); +- if(slash != -1) { appname = appname.mid(slash+1); } +- QString cmd = QPEApplication::qpeDir() + "bin/qcop QPE/System 'closing(QString)' '"+appname+"'"; +- system(cmd.latin1()); +- cmd = "/tmp/qcop-msg-"+appname; +- unlink(cmd.latin1()); +-} +- +-static QPEApplication *app; +-#endif +- +-extern int SDL_main(int argc, char *argv[]); +- +-int main(int argc, char *argv[]) +-{ +-#ifdef QWS +- // This initializes the Qtopia application. It needs to be done here +- // because it parses command line options. +- app = new QPEApplication(argc, argv); +- QWidget dummy; +- app->showMainWidget(&dummy); +- atexit(cleanupQCop); +-#endif +- // Exit here because if return is used, the application +- // doesn't seem to quit correctly. +- exit(SDL_main(argc, argv)); +-} +diff -Naur SDL-1.2.9-orig/src/video/qtopia/Makefile.am SDL-1.2.9/src/video/qtopia/Makefile.am +--- SDL-1.2.9-orig/src/video/qtopia/Makefile.am 2002-05-28 21:24:11.000000000 +0200 ++++ SDL-1.2.9/src/video/qtopia/Makefile.am 2007-03-12 20:55:18.000000000 +0100 +@@ -15,4 +15,5 @@ + SDL_syswm.cc \ + SDL_syswm_c.h \ + SDL_sysevents.cc \ +- SDL_sysevents_c.h ++ SDL_sysevents_c.h \ ++ SDL_qmain.cc +diff -Naur SDL-1.2.9-orig/src/video/qtopia/SDL_qmain.cc SDL-1.2.9/src/video/qtopia/SDL_qmain.cc +--- SDL-1.2.9-orig/src/video/qtopia/SDL_qmain.cc 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.9/src/video/qtopia/SDL_qmain.cc 2007-03-12 20:55:18.000000000 +0100 +@@ -0,0 +1,99 @@ ++/* Include the SDL main definition header */ ++#include "SDL_main.h" ++#include ++ ++#include ++#include ++#include ++ ++ ++#ifdef QWS ++#include ++#include ++#include ++ ++ ++ ++static QWidget *dummyW = 0; ++static QPEApplication *theApp = 0; ++static char **cmdline= 0; ++static int size = 0; ++ ++static void parse_cmd_line() { ++ /* ++ * find the number ++ */ ++ char buf[1024]; ++ int available = 0; ++ char *string_start = 0; ++ int fd = ::open( "/proc/self/cmdline", O_RDONLY ); ++ if ( fd < 0 ) { ++ qWarning( "Error getting the cmdline, can't be" ); ++ goto error_out; ++ } ++ ++ available = ::read( fd, &buf, sizeof(buf) ); ++ if ( available <= 0 ) ++ goto error_out; ++ ++ /* ++ * find out the number of arguments ++ */ ++ size = 0; ++ for (int i = 0; i < available; ++i ) ++ if ( buf[i] == '\0' ) ++ ++size; ++ ++ /* now create a the cmdline */ ++ cmdline = new char*[size+1]; ++ cmdline[size] = '\0'; // parnoid... ++ ++ string_start = &buf[0]; ++ for ( int i = 0; i < size; ++i ) { ++ /* ++ * find the end of the string ++ */ ++ size_t sz = ::strlen(string_start); ++ cmdline[i] = new char[sz+1]; ++ memcpy( cmdline[i], string_start, sz+1 ); ++ string_start += (sz+1); // +1 for '\0' +1 to set it beyond ++ } ++ ++ ::close(fd); ++ ++ return; ++ ++/* error code */ ++error_out: ++ cmdline = new char*[2]; ++ cmdline[0] = "unknown_app"; ++ cmdline[1] = '\0'; ++ size = 1; ++} ++ ++static void free_cmd_line() { ++ /* ++ * free each string and then free the array ++ */ ++ for ( int i = 0; i < size; ++i ) ++ delete [] cmdline[i]; ++ ++ delete [] cmdline; ++} ++ ++static void __attribute__((constructor)) initialize_qpe_app() { ++ parse_cmd_line(); ++ ++ theApp = new QPEApplication( size, cmdline ); ++ dummyW = new QWidget; ++ theApp->showMainWidget(dummyW); ++} ++ ++static void __attribute__((destructor)) deinitialize_qpe_app() { ++ free_cmd_line(); ++ delete dummyW; ++ delete theApp; ++} ++ ++ ++#endif diff --git a/packages/libsdl/libsdl-directfb_1.2.9.bb b/packages/libsdl/libsdl-directfb_1.2.9.bb index 73e94e9d22..7a9bd88ee2 100644 --- 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/explicit-extern-C.patch b/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch deleted file mode 100644 index 3dd44bea27..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- SDL-1.2.9-orig/src/video/SDL_sysvideo.h.org 2005-04-17 10:40:41.000000000 +0000 -+++ SDL-1.2.9-orig/src/video/SDL_sysvideo.h 2007-05-25 07:34:38.000000000 +0000 -@@ -332,6 +332,9 @@ - SDL_VideoDevice *(*create)(int devindex); - } VideoBootStrap; - -+#ifdef __cplusplus -+extern "C" { -+#endif - #ifdef ENABLE_X11 - extern VideoBootStrap X11_bootstrap; - #endif -@@ -417,6 +420,9 @@ - #ifdef ENABLE_RISCOS - extern VideoBootStrap RISCOS_bootstrap; - #endif -+#ifdef __cplusplus -+}; -+#endif - /* This is the current video device */ - extern SDL_VideoDevice *current_video; - diff --git a/packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch b/packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch deleted file mode 100644 index ebc6ec7769..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur SDL-1.2.9-orig/configure.in SDL-1.2.9/configure.in ---- SDL-1.2.9-orig/configure.in 2007-03-12 20:56:23.000000000 +0100 -+++ SDL-1.2.9/configure.in 2007-03-12 20:59:28.000000000 +0100 -@@ -1593,8 +1593,8 @@ - AC_MSG_RESULT($video_qtopia) - if test x$video_qtopia = xyes; then - CFLAGS="$CFLAGS -DENABLE_QTOPIA -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -I${QPEDIR}/include -I${QTDIR}/include/ -DNO_DEBUG -fno-rtti -fno-exceptions" -- SDL_LIBS="$SDL_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte" -- SDL_CFLAGS="$SDL_CFLAGS -DQWS" -+ SDL_LIBS="$SDL_LIBS -Wl,-rpath-link -Wl,${QPEDIR}/lib -Wl,-rpath-link -Wl,${QTDIR}/lib" -+ SYSTEM_LIBS="$SYSTEM_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte-mt" - VIDEO_SUBDIRS="$VIDEO_SUBDIRS qtopia" - VIDEO_DRIVERS="$VIDEO_DRIVERS qtopia/libvideo_qtopia.la" - else -@@ -1908,12 +1908,6 @@ - CheckAltivec - CheckLinuxVersion - CheckRPATH -- -- # Set up files for the main() stub -- if test "x$video_qtopia" = "xyes"; then -- SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" -- -- fi - # Set up files for the audio library - # We use the OSS and ALSA API's, not the Sun audio API - #if test x$enable_audio = xyes; then diff --git a/packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch b/packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch deleted file mode 100644 index 884cb2191c..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch +++ /dev/null @@ -1,422 +0,0 @@ -diff -Naur SDL-1.2.9-orig/acinclude.m4 SDL-1.2.9/acinclude.m4 ---- SDL-1.2.9-orig/acinclude.m4 2004-08-24 08:32:50.000000000 +0200 -+++ SDL-1.2.9/acinclude.m4 2007-03-12 20:57:08.000000000 +0100 -@@ -1473,11 +1473,11 @@ - case $host_os in - aix3*) - version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ library_names_spec='${libname}${release}${shrext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shrext}$major' - ;; - - aix4* | aix5*) -@@ -1487,7 +1487,7 @@ - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 -- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shrext}$major ${libname}${release}${shrext}$versuffix $libname${shrext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file -@@ -1513,12 +1513,12 @@ - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shrext}$major' - fi - shlibpath_var=LIBPATH - fi -@@ -1531,7 +1531,7 @@ - ;; - - beos*) -- library_names_spec='${libname}${shared_ext}' -+ library_names_spec='${libname}${shrext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; -@@ -1539,8 +1539,8 @@ - bsdi[[45]]*) - version_type=linux - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -@@ -1573,14 +1573,14 @@ - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' -- #soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shared_ext}' -+ #soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext}' -+ soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shrext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix -- #soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shared_ext}' -+ #soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext}' -+ soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shrext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by -@@ -1596,13 +1596,13 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shrext}' - ;; - esac - ;; - - *) -- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' -@@ -1615,8 +1615,8 @@ - version_type=darwin - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -- soname_spec='${libname}${release}${major}$shared_ext' -+ library_names_spec='${libname}${release}${versuffix}$shrext ${libname}${release}${major}$shrext ${libname}$shrext' -+ soname_spec='${libname}${release}${major}$shrext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' -@@ -1633,8 +1633,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname$shrext' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -1646,8 +1646,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes -@@ -1659,12 +1659,12 @@ - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext} $libname${shrext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ library_names_spec='${libname}${release}${shrext}$versuffix $libname${shrext}$versuffix' - need_version=yes - ;; - esac -@@ -1688,8 +1688,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}${major} ${libname}${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -@@ -1707,8 +1707,8 @@ - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else -@@ -1722,8 +1722,8 @@ - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; -@@ -1732,8 +1732,8 @@ - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. -@@ -1752,8 +1752,8 @@ - esac - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shrext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${release}${shrext} $libname${shrext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= -@@ -1787,8 +1787,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -1816,8 +1816,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes -@@ -1829,12 +1829,12 @@ - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH -@@ -1844,7 +1844,7 @@ - - newsos6) - version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -@@ -1853,8 +1853,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -@@ -1863,7 +1863,7 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -1884,7 +1884,7 @@ - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -+ library_names_spec='$libname${shrext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; -@@ -1893,8 +1893,8 @@ - version_type=osf - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shrext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -@@ -1902,8 +1902,8 @@ - - sco3.2v5*) - version_type=osf -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shrext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -1911,8 +1911,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -@@ -1922,7 +1922,7 @@ - - sunos4*) - version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -@@ -1934,8 +1934,8 @@ - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) -@@ -1959,16 +1959,16 @@ - sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -+ library_names_spec='$libname${shrext}.$versuffix $libname${shrext}.$major $libname${shrext}' -+ soname_spec='$libname${shrext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - - uts4*) - version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -3471,8 +3471,8 @@ - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -@@ -3481,7 +3481,7 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shrext 2>&1 | grep "ld"`; rm -f libconftest$shrext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -@@ -3585,7 +3585,7 @@ - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -3645,7 +3645,7 @@ - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -4596,7 +4596,7 @@ - # Whether we need a single -rpath flag with a separated argument. - hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - --# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# Set to yes if using DIR/libNAME${shrext} during linking hardcodes DIR into the - # resulting binary. - hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) - -diff -Naur SDL-1.2.9-orig/src/main/Makefile.am SDL-1.2.9/src/main/Makefile.am ---- SDL-1.2.9-orig/src/main/Makefile.am 2007-03-12 20:56:23.000000000 +0100 -+++ SDL-1.2.9/src/main/Makefile.am 2007-03-12 20:57:08.000000000 +0100 -@@ -46,3 +46,9 @@ - (cd $(distdir) && rm -f $(BUILT_SOURCES)) - cp -rp $(ARCH_SUBDIRS) $(distdir) - (cd $(distdir) && rm -rf `find . -name CVS`) -+ -+# overwrite USER variables -+CXXLD = $(CC) -+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ -diff -Naur SDL-1.2.9-orig/src/video/qtopia/Makefile.am SDL-1.2.9/src/video/qtopia/Makefile.am ---- SDL-1.2.9-orig/src/video/qtopia/Makefile.am 2007-03-12 20:56:23.000000000 +0100 -+++ SDL-1.2.9/src/video/qtopia/Makefile.am 2007-03-12 20:57:08.000000000 +0100 -@@ -17,3 +17,9 @@ - SDL_sysevents.cc \ - SDL_sysevents_c.h \ - SDL_qmain.cc -+ -+ -+# overwrite USER variables -+CXXLD = $(CC) -+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ diff --git a/packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch b/packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch deleted file mode 100644 index 4073de25bf..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch +++ /dev/null @@ -1,191 +0,0 @@ -diff -Naur SDL-1.2.9-orig/configure.in SDL-1.2.9/configure.in ---- SDL-1.2.9-orig/configure.in 2005-08-28 08:31:18.000000000 +0200 -+++ SDL-1.2.9/configure.in 2007-03-12 20:55:18.000000000 +0100 -@@ -1912,7 +1912,7 @@ - # Set up files for the main() stub - if test "x$video_qtopia" = "xyes"; then - SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" -- SDL_LIBS="-lSDLmain $SDL_LIBS" -+ - fi - # Set up files for the audio library - # We use the OSS and ALSA API's, not the Sun audio API -diff -Naur SDL-1.2.9-orig/src/main/Makefile.am SDL-1.2.9/src/main/Makefile.am ---- SDL-1.2.9-orig/src/main/Makefile.am 2004-02-12 07:21:13.000000000 +0100 -+++ SDL-1.2.9/src/main/Makefile.am 2007-03-12 20:55:18.000000000 +0100 -@@ -21,11 +21,7 @@ - if TARGET_MACOSX - MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h - else --if TARGET_QTOPIA --MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc --else - MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c --endif # !TARGET_QTOPIA - endif # !TARGET_MACOSX - endif # !TARGET_WIN32 - libSDLmain_a_SOURCES = $(MAINLIB_ARCH_SRCS) -diff -Naur SDL-1.2.9-orig/src/main/qtopia/SDL_qtopia_main.cc SDL-1.2.9/src/main/qtopia/SDL_qtopia_main.cc ---- SDL-1.2.9-orig/src/main/qtopia/SDL_qtopia_main.cc 2003-12-14 07:25:53.000000000 +0100 -+++ SDL-1.2.9/src/main/qtopia/SDL_qtopia_main.cc 1970-01-01 01:00:00.000000000 +0100 -@@ -1,47 +0,0 @@ -- --/* Include the SDL main definition header */ --#include "SDL_main.h" --#include --#include --#ifdef main --#undef main --#endif --#ifdef QWS --#include --#include --#include --#include -- --// Workaround for OPIE to remove taskbar icon. Also fixes --// some issues in Qtopia where there are left-over qcop files in /tmp/. --// I'm guessing this will also clean up the taskbar in the Sharp version --// of Qtopia. --static inline void cleanupQCop() { -- QString appname(qApp->argv()[0]); -- int slash = appname.findRev("/"); -- if(slash != -1) { appname = appname.mid(slash+1); } -- QString cmd = QPEApplication::qpeDir() + "bin/qcop QPE/System 'closing(QString)' '"+appname+"'"; -- system(cmd.latin1()); -- cmd = "/tmp/qcop-msg-"+appname; -- unlink(cmd.latin1()); --} -- --static QPEApplication *app; --#endif -- --extern int SDL_main(int argc, char *argv[]); -- --int main(int argc, char *argv[]) --{ --#ifdef QWS -- // This initializes the Qtopia application. It needs to be done here -- // because it parses command line options. -- app = new QPEApplication(argc, argv); -- QWidget dummy; -- app->showMainWidget(&dummy); -- atexit(cleanupQCop); --#endif -- // Exit here because if return is used, the application -- // doesn't seem to quit correctly. -- exit(SDL_main(argc, argv)); --} -diff -Naur SDL-1.2.9-orig/src/video/qtopia/Makefile.am SDL-1.2.9/src/video/qtopia/Makefile.am ---- SDL-1.2.9-orig/src/video/qtopia/Makefile.am 2002-05-28 21:24:11.000000000 +0200 -+++ SDL-1.2.9/src/video/qtopia/Makefile.am 2007-03-12 20:55:18.000000000 +0100 -@@ -15,4 +15,5 @@ - SDL_syswm.cc \ - SDL_syswm_c.h \ - SDL_sysevents.cc \ -- SDL_sysevents_c.h -+ SDL_sysevents_c.h \ -+ SDL_qmain.cc -diff -Naur SDL-1.2.9-orig/src/video/qtopia/SDL_qmain.cc SDL-1.2.9/src/video/qtopia/SDL_qmain.cc ---- SDL-1.2.9-orig/src/video/qtopia/SDL_qmain.cc 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.9/src/video/qtopia/SDL_qmain.cc 2007-03-12 20:55:18.000000000 +0100 -@@ -0,0 +1,99 @@ -+/* Include the SDL main definition header */ -+#include "SDL_main.h" -+#include -+ -+#include -+#include -+#include -+ -+ -+#ifdef QWS -+#include -+#include -+#include -+ -+ -+ -+static QWidget *dummyW = 0; -+static QPEApplication *theApp = 0; -+static char **cmdline= 0; -+static int size = 0; -+ -+static void parse_cmd_line() { -+ /* -+ * find the number -+ */ -+ char buf[1024]; -+ int available = 0; -+ char *string_start = 0; -+ int fd = ::open( "/proc/self/cmdline", O_RDONLY ); -+ if ( fd < 0 ) { -+ qWarning( "Error getting the cmdline, can't be" ); -+ goto error_out; -+ } -+ -+ available = ::read( fd, &buf, sizeof(buf) ); -+ if ( available <= 0 ) -+ goto error_out; -+ -+ /* -+ * find out the number of arguments -+ */ -+ size = 0; -+ for (int i = 0; i < available; ++i ) -+ if ( buf[i] == '\0' ) -+ ++size; -+ -+ /* now create a the cmdline */ -+ cmdline = new char*[size+1]; -+ cmdline[size] = '\0'; // parnoid... -+ -+ string_start = &buf[0]; -+ for ( int i = 0; i < size; ++i ) { -+ /* -+ * find the end of the string -+ */ -+ size_t sz = ::strlen(string_start); -+ cmdline[i] = new char[sz+1]; -+ memcpy( cmdline[i], string_start, sz+1 ); -+ string_start += (sz+1); // +1 for '\0' +1 to set it beyond -+ } -+ -+ ::close(fd); -+ -+ return; -+ -+/* error code */ -+error_out: -+ cmdline = new char*[2]; -+ cmdline[0] = "unknown_app"; -+ cmdline[1] = '\0'; -+ size = 1; -+} -+ -+static void free_cmd_line() { -+ /* -+ * free each string and then free the array -+ */ -+ for ( int i = 0; i < size; ++i ) -+ delete [] cmdline[i]; -+ -+ delete [] cmdline; -+} -+ -+static void __attribute__((constructor)) initialize_qpe_app() { -+ parse_cmd_line(); -+ -+ theApp = new QPEApplication( size, cmdline ); -+ dummyW = new QWidget; -+ theApp->showMainWidget(dummyW); -+} -+ -+static void __attribute__((destructor)) deinitialize_qpe_app() { -+ free_cmd_line(); -+ delete dummyW; -+ delete theApp; -+} -+ -+ -+#endif diff --git a/packages/libsdl/libsdl-qpe_1.2.9.bb b/packages/libsdl/libsdl-qpe_1.2.9.bb index 2fbf66b5d8..3583f20cf0 100644 --- 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.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb deleted file mode 100644 index 125aec5f36..0000000000 --- a/packages/libsdl/libsdl-x11_1.2.7.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "Simple DirectMedia Layer - X11 Edition" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "virtual/libx11 libxext" -PROVIDES = "virtual/libsdl" -LICENSE = "LGPL" - -# 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" -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" - -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.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb index 42c0ad3579..43148d4b00 100644 --- 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.inc b/packages/libsdl/libsdl.inc new file mode 100644 index 0000000000..a65efb51be --- /dev/null +++ b/packages/libsdl/libsdl.inc @@ -0,0 +1,50 @@ +DESCRIPTION = "Simple DirectMedia Layer - X11 Edition" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "alsa-lib mesa virtual/libx11 libxext" +PROVIDES = "virtual/libsdl" +LICENSE = "LGPL" +PR = "r3" + +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 = "" + +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/ +} -- cgit v1.2.3 From 63d69e64884df1dc0e7919b641d2afb2fd1782d3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 18:08:57 +0000 Subject: nylon|colinuxoe.conf: add TARGET_OS. closes #348 --- conf/distro/colinuxoe.conf | 2 ++ conf/distro/nylon.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/conf/distro/colinuxoe.conf b/conf/distro/colinuxoe.conf index 7454c0167f..25ea04a1f5 100644 --- a/conf/distro/colinuxoe.conf +++ b/conf/distro/colinuxoe.conf @@ -2,6 +2,8 @@ #@NAME: coLinuxoe #@DESCRIPTION: Generic OE built distro for the coLinux MACHINE +TARGET_OS = "linux" + INHERIT += "package_ipk debian" # MACHINE decides that linux-colinux is the correct kernel. diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 334c8bba9b..0623ce6dd0 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -11,6 +11,8 @@ # # Bruno Randolf +TARGET_OS = "linux" + INHERIT += "package_ipk debian nylon-mirrors" INHERIT += "linux-kernel-base" -- cgit v1.2.3 From 261df5a8c72d69c27acc60224c6562d2e6153a09 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 18:34:28 +0000 Subject: busybox 1.9.1 add fix for lineedit on arm, remove our own version of run_parts.c which is identical with upstream nowadays --- packages/busybox/busybox_1.9.1.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.1.bb index b41f1779b0..1626b1c6d2 100644 --- a/packages/busybox/busybox_1.9.1.bb +++ b/packages/busybox/busybox_1.9.1.bb @@ -1,7 +1,10 @@ require busybox.inc -PR = "r1" +PR = "r2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \ + file://udhcpscript.patch;patch=1 \ + file://adduser-longops.patch;patch=1 \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \ @@ -10,16 +13,12 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://mount.busybox \ file://syslog \ file://syslog.conf \ - file://udhcpscript.patch;patch=1 \ - file://adduser-longops.patch;patch=1 \ file://umount.busybox \ - file://run_parts.c \ file://defconfig" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" do_configure () { - cp ${WORKDIR}/run_parts.c ${S}/debianutils/ install -m 0644 ${WORKDIR}/defconfig ${S}/.config cml1_do_configure } -- cgit v1.2.3 From fd1d123937127920b69822040996b42f1e26aace Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 18:59:57 +0000 Subject: generic-uclibc.conf: prefer uclibc 0.9.29 --- conf/distro/generic-uclibc.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf index 26e78f89c1..805cfe7955 100644 --- a/conf/distro/generic-uclibc.conf +++ b/conf/distro/generic-uclibc.conf @@ -27,3 +27,10 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/libiconv = "libiconv" PREFERRED_PROVIDER_virtual/libintl = "libintl" + +USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" + +PREFERRED_VERSION_uclibc = "0.9.29" +PREFERRED_VERSION_uclibc-initial = "0.9.29" + -- cgit v1.2.3 From abd6308d57c2262b0d56250c920e5d331efbbfd5 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 19:02:19 +0000 Subject: dbus 1.1.4 ship necessary files and directories for system bus activation --- packages/dbus/dbus.inc | 13 ++++++++++++- packages/dbus/dbus_1.1.4.bb | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index bbe7cb4fe4..b2ced23d99 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -25,7 +25,18 @@ DEBIANNAME_${PN} = "dbus-1" PACKAGES += "${PN}-lib" -FILES_${PN} = "${bindir}/dbus-daemon* ${bindir}/dbus-uuidgen ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services" +FILES_${PN} = "\ +${bindir}/dbus-daemon* \ +${bindir}/dbus-uuidgen \ +${bindir}/dbus-launch \ +${bindir}/dbus-cleanup-sockets \ +${bindir}/dbus-send \ +${bindir}/dbus-monitor \ +${libexecdir}/dbus* \ +${sysconfdir} \ +${datadir}/dbus-1/services \ +${datadir}/dbus-1/system-services \ +" FILES_${PN}-lib = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" diff --git a/packages/dbus/dbus_1.1.4.bb b/packages/dbus/dbus_1.1.4.bb index f331b140aa..8e3e329fde 100644 --- a/packages/dbus/dbus_1.1.4.bb +++ b/packages/dbus/dbus_1.1.4.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r0" +PR = "r1" -- cgit v1.2.3 From 3b7ea13cbd6916d7a0855411573598c52afb4290 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 19:11:42 +0000 Subject: add libjson, a library to create and parse json files --- packages/libjson/.mtn2git_empty | 0 packages/libjson/libjson_0.6.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 packages/libjson/.mtn2git_empty create mode 100644 packages/libjson/libjson_0.6.bb diff --git a/packages/libjson/.mtn2git_empty b/packages/libjson/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libjson/libjson_0.6.bb b/packages/libjson/libjson_0.6.bb new file mode 100644 index 0000000000..4c93e82a0b --- /dev/null +++ b/packages/libjson/libjson_0.6.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A library for parsing and creating JSON files" +HOMEPAGE = "http://oss.metaparadigm.com/json-c/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz" +S = "${WORKDIR}/json-c-${PV}" + +inherit autotools + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 0bf5a6a8d22ab206b36b2bc7a54ef30c83a9e8d8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 19:26:01 +0000 Subject: repair openmoko-python-devel-image --- packages/images/openmoko-python-devel-image.bb | 3 ++- packages/tasks/task-python-efl-examples.bb | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/images/openmoko-python-devel-image.bb b/packages/images/openmoko-python-devel-image.bb index 9d2a8db2c6..615042f3b8 100644 --- a/packages/images/openmoko-python-devel-image.bb +++ b/packages/images/openmoko-python-devel-image.bb @@ -2,5 +2,6 @@ require openmoko-image.bb IMAGE_INSTALL += "\ task-openmoko-python-devel \ + task-python-efl-examples \ + edje-viewer \ " - diff --git a/packages/tasks/task-python-efl-examples.bb b/packages/tasks/task-python-efl-examples.bb index 0a4e32097f..e78a4cabae 100644 --- a/packages/tasks/task-python-efl-examples.bb +++ b/packages/tasks/task-python-efl-examples.bb @@ -2,9 +2,13 @@ DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" RDEPENDS = "\ - python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples \ + task-python-efl \ + python-ecore-examples \ + python-emotion-examples \ + python-edje-examples \ + python-epsilon-examples \ python-math python-textutils \ " -PR = "ml2" +PR = "ml3" ALLOW_EMPTY = "1" -- cgit v1.2.3 From c29453d85e7236aaef0ed5b5b20de2b18b1a8381 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 19 Feb 2008 19:34:46 +0000 Subject: ipkg-utils: ipkg-make-index-track-stamps.patch: Remove hunk with whitespace-only changes. --- .../ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch b/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch index 9f9b9359ce..ad6df4f2e9 100644 --- a/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch +++ b/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch @@ -86,12 +86,3 @@ Index: ipkg-utils/ipkg-make-index if opt_s: sys.exit(0) -@@ -154,7 +177,7 @@ if packages_filename: - os.rename(tmp_packages_filename, packages_filename) - os.rename(tmp_gzip_filename, gzip_filename) - --if verbose: -+if verbose: - sys.stderr.write("Generate Packages.filelist file\n") - files = {} - names = packages.packages.keys() -- cgit v1.2.3 From f14f0d3bfd9ebd96079700cf30b5c4ebffc9b6c4 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 19 Feb 2008 21:15:37 +0000 Subject: ipkg-utils*: Re-add support for openwrt-style .ipk's. * There're two .ipk formats: one with ar top-level wrapping (essentially, .deb format, native OE format) and with tar.gz top-level wrap, used by OpenWRT and some tiny distros. When I did performance optimization work on ipkg-make-index, I just blocked support of tar.gz-style ipk's, as it was unclear if those are used in OE at all. Now support is readded, with the old code to handle them (i.e. not as optimal as ar-style ones). * This makes DISTRO=openwrt-sdk usable for producing compatible packages and deploy-feed for them. But there're still some issues to resolve before OE can be said to provide seamless support for building packages for OpenWRT. --- .../ipkg-utils-native_1.6+cvs20050404.bb | 2 +- .../ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch | 105 +++++++++++---------- packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb | 2 +- 3 files changed, 56 insertions(+), 53 deletions(-) diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index 3101ecb3be..ba3c8ecd0c 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -1,7 +1,7 @@ require ipkg-utils_${PV}.bb RDEPENDS = "" -PR = "r15" +PR = "r16" inherit native diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch index 25eb2cce6f..389a86018b 100644 --- a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch +++ b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch @@ -1,13 +1,6 @@ ---- - arfile.py | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - ipkg.py | 106 ++++++++++++++++++++++++++--------------------------- - setup.py | 2 - - 3 files changed, 177 insertions(+), 55 deletions(-) - -Index: ipkg-utils/arfile.py -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ipkg-utils/arfile.py 2007-05-26 23:46:59.000000000 +0100 +diff -r 720080c24d2f arfile.py +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/arfile.py Sun Jan 27 23:26:35 2008 +0200 @@ -0,0 +1,124 @@ +""" +arfile - A module to parse GNU ar archives. @@ -133,23 +126,10 @@ Index: ipkg-utils/arfile.py + + f2 = tarf.extractfile("control") + print f2.read() -Index: ipkg-utils/setup.py -=================================================================== ---- ipkg-utils.orig/setup.py 2007-05-26 23:45:55.000000000 +0100 -+++ ipkg-utils/setup.py 2007-05-26 23:46:59.000000000 +0100 -@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils - platforms = 'POSIX', - keywords = 'ipkg familiar', - url = 'http://www.handhelds.org/sources.html/', -- py_modules = [ 'ipkg' ], -+ py_modules = [ 'ipkg', 'arfile' ], - scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload'] - ) -Index: ipkg-utils/ipkg.py -=================================================================== ---- ipkg-utils.orig/ipkg.py 2007-05-26 23:46:55.000000000 +0100 -+++ ipkg-utils/ipkg.py 2007-05-26 23:45:20.000000000 +0100 -@@ -41,6 +41,8 @@ import re +diff -r 720080c24d2f ipkg.py +--- a/ipkg.py Sun Jan 27 23:13:26 2008 +0200 ++++ b/ipkg.py Sun Jan 27 23:26:35 2008 +0200 +@@ -41,6 +41,8 @@ import string import string import commands from stat import ST_SIZE @@ -158,7 +138,7 @@ Index: ipkg-utils/ipkg.py class Version: """A class for holding parsed package version information.""" -@@ -131,78 +133,61 @@ class Package: +@@ -131,77 +133,61 @@ class Package: self.section = None self.filename_header = None self.file_list = [] @@ -198,8 +178,6 @@ Index: ipkg-utils/ipkg.py - self.size = stat[ST_SIZE] + self.filename = os.path.basename(fn) -+ assert self.isdeb == 1, "Old ipk format (non-deb) is unsupported" -+ ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) - if self.isdeb: - control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r") @@ -227,15 +205,18 @@ Index: ipkg-utils/ipkg.py - self.__dict__[name] = value - else: - line = control.readline() ++ if self.isdeb: ++ ar = arfile.ArFile(f) ++ tarStream = ar.open("control.tar.gz") ++ tarf = tarfile.open("control.tar.gz", "r", tarStream) ++ ++ try: ++ control = tarf.extractfile("control") ++ except KeyError: ++ control = tarf.extractfile("./control") ++ else: ++ control = os.popen("tar --wildcards -xzO -f " + fn + " '*control.tar.gz' | tar xfzO - './control'", "r") + -+ ar = arfile.ArFile(f) -+ tarStream = ar.open("control.tar.gz") -+ tarf = tarfile.open("control.tar.gz", "r", tarStream) -+ -+ try: -+ control = tarf.extractfile("control") -+ except KeyError: -+ control = tarf.extractfile("./control") + self.read_control(control) control.close() - if self.isdeb: @@ -251,7 +232,7 @@ Index: ipkg-utils/ipkg.py self.scratch_dir = None self.file_dir = None self.meta_dir = None - ++ + def __getattr__(self, name): + if name == "md5": + self._computeFileMD5() @@ -269,11 +250,10 @@ Index: ipkg-utils/ipkg.py + sum.update(data) + f.close() + self.md5 = sum.hexdigest() -+ + def read_control(self, control): import os - -@@ -221,9 +203,15 @@ class Package: +@@ -221,9 +207,15 @@ class Package: value = value + '\n' + line if name == 'size': self.size = int(value) @@ -290,20 +270,43 @@ Index: ipkg-utils/ipkg.py return # consumes one blank line at end of package descriptoin else: line = control.readline() -@@ -314,6 +302,16 @@ class Package: +@@ -314,7 +306,27 @@ class Package: return self.section def get_file_list(self): +- return self.file_list + if not self.fn: + return [] -+ f = open(self.fn, "rb") -+ ar = arfile.ArFile(f) -+ tarStream = ar.open("data.tar.gz") -+ tarf = tarfile.open("data.tar.gz", "r", tarStream) -+ self.file_list = tarf.getnames() ++ ++ if self.isdeb: ++ f = open(self.fn, "rb") ++ ar = arfile.ArFile(f) ++ tarStream = ar.open("data.tar.gz") ++ tarf = tarfile.open("data.tar.gz", "r", tarStream) ++ self.file_list = tarf.getnames() ++ f.close() ++ else: ++ f = os.popen("tar xfzO " + self.fn + " '*data.tar.gz' | tar tfz -","r") ++ while 1: ++ line = f.readline() ++ if not line: break ++ self.file_list.append(string.rstrip(line)) ++ f.close() ++ ++ # Make sure that filelist has consistent format regardless of tar version + self.file_list = map(lambda a: ["./", ""][a.startswith("./")] + a, self.file_list) -+ -+ f.close() - return self.file_list ++ return self.file_list def write_package(self, dirname): + buf = self.render_control() +diff -r 720080c24d2f setup.py +--- a/setup.py Sun Jan 27 23:13:26 2008 +0200 ++++ b/setup.py Sun Jan 27 23:26:35 2008 +0200 +@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils + platforms = 'POSIX', + keywords = 'ipkg familiar', + url = 'http://www.handhelds.org/sources.html/', +- py_modules = [ 'ipkg' ], ++ py_modules = [ 'ipkg', 'arfile' ], + scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload'] + ) diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index c089796ccb..febecb0085 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r17" +PR = "r18" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch;patch=1 \ -- cgit v1.2.3