[oe-commits] org.oe.dev merge of 'e2f4456d565b95939ea1c515808e7c16c52b591a'

[mickeyl commit]

merge of 'e2f4456d565b95939ea1c515808e7c16c52b591a'
     and 'eefe1e616b9d0ad9b002797464d94b99b92213fb'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 935d29b7406fa7e6a054b0bd861565fa83af9635
ViewMTN: http://monotone.openembedded.org/revision/info/935d29b7406fa7e6a054b0bd861565fa83af9635
Files:
1
packages/frodo/frodo-4.2/m4.patch
packages/prboom/files/m4.patch
packages/libsdl/files/remove_path.patch
packages/frodo/frodo_4.2.bb
packages/libsdl/libsdl.inc
packages/prboom/prboom_2.2.6.bb
packages/prboom/prboom_2.3.1.bb
site/common-glibc
packages/pax-utils/pax-utils-native_0.1.13.bb
Diffs:

#
# mt diff -re2f4456d565b95939ea1c515808e7c16c52b591a -r935d29b7406fa7e6a054b0bd861565fa83af9635
#
# 
# 
# delete "packages/frodo/frodo-4.2/m4.patch"
# 
# delete "packages/prboom/files/m4.patch"
# 
# add_file "packages/libsdl/files/remove_path.patch"
#  content [dcce0ab5c0b4be705c72b5aea227bda9466517e5]
# 
# patch "packages/frodo/frodo_4.2.bb"
#  from [d14cc7d19c86d9c53c3ec432450c36b3195b2ccb]
#    to [2b9305a5739d91dc0f2d8d12c23c74ca83f27274]
# 
# patch "packages/libsdl/libsdl.inc"
#  from [50d941276aa6e48d473b59355b178be3c185f8c5]
#    to [73a8a92adcaa61e6c3b7b512c43388a36533129a]
# 
# patch "packages/prboom/prboom_2.2.6.bb"
#  from [4a496d1c31a04d292d9b770fa02888caf12dd561]
#    to [510cf4b3c3008bccda1c2eaa84b4e4b7b4804a0f]
# 
# patch "packages/prboom/prboom_2.3.1.bb"
#  from [043f6c3906b0f5b997c5e097baab1e50e69eba2d]
#    to [4a6e8bc7c60e57911ec291edfb89e22c4cca2878]
# 
# patch "site/common-glibc"
#  from [4405815e133a050b155173bd66db32480d6feae1]
#    to [7f0d2943abc2c25936ffe4edbd4bf5e532022ab2]
# 
============================================================
--- packages/libsdl/files/remove_path.patch	dcce0ab5c0b4be705c72b5aea227bda9466517e5
+++ packages/libsdl/files/remove_path.patch	dcce0ab5c0b4be705c72b5aea227bda9466517e5
@@ -0,0 +1,18 @@
+OE goes to great lengths to set PATH correctly and this just breaks
+things since local sdl-config binaries will suddenly be preferred
+rather than those in staging.
+
+RP - 27/02/2008
+
+Index: SDL-1.2.9/sdl.m4
+===================================================================
+--- SDL-1.2.9.orig/sdl.m4	2008-02-27 10:08:38.000000000 +0000
++++ SDL-1.2.9/sdl.m4	2008-02-27 10:08:51.000000000 +0000
+@@ -33,7 +33,6 @@
+   fi
+ 
+   AC_REQUIRE([AC_CANONICAL_TARGET])
+-  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+   min_sdl_version=ifelse([$1], ,0.11.0,$1)
+   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
============================================================
--- packages/frodo/frodo_4.2.bb	d14cc7d19c86d9c53c3ec432450c36b3195b2ccb
+++ packages/frodo/frodo_4.2.bb	2b9305a5739d91dc0f2d8d12c23c74ca83f27274
@@ -1,13 +1,12 @@ SRCDATE = "20040801"
 DESCRIPTION = "C64 Emulator based on SDL"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 DEPENDS = "libsdl-qpe"
 LICENSE = "GPL"
 SRCDATE = "20040801"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cebix.net/home/cvs/cebix;module=Frodo4 \
-           file://m4.patch;patch=1 \
            file://configure.patch;patch=1 \
            file://frodorc \
            file://Frodo.png \
@@ -17,7 +16,7 @@ inherit autotools
 
 inherit autotools
 
-EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF = "--disable-sdltest --enable-qtopia"
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \
============================================================
--- packages/libsdl/libsdl.inc	50d941276aa6e48d473b59355b178be3c185f8c5
+++ packages/libsdl/libsdl.inc	73a8a92adcaa61e6c3b7b512c43388a36533129a
@@ -1,15 +1,16 @@ LICENSE = "LGPL"
 DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
 PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
   file://extra-keys.patch;patch=1 \
   file://pagesize.patch;patch=1 \
+  file://remove_path.patch;patch=1 \
   file://acinclude.m4"
 S = "${WORKDIR}/SDL-${PV}"
 
============================================================
--- packages/prboom/prboom_2.2.6.bb	4a496d1c31a04d292d9b770fa02888caf12dd561
+++ packages/prboom/prboom_2.2.6.bb	510cf4b3c3008bccda1c2eaa84b4e4b7b4804a0f
@@ -6,18 +6,12 @@ PR = "r1"
 
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
-           file://m4.patch;patch=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz"
 
 inherit autotools
 
-EXTRA_OECONF = "--without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF = "--without-x --disable-sdltest"
 
-do_configure() {
-	gnu-configize
-	oe_runconf
-}
-
 do_install() {
         install -d ${D}${bindir} \
 		   ${D}${datadir}/games/doom
============================================================
--- packages/prboom/prboom_2.3.1.bb	043f6c3906b0f5b997c5e097baab1e50e69eba2d
+++ packages/prboom/prboom_2.3.1.bb	4a6e8bc7c60e57911ec291edfb89e22c4cca2878
@@ -10,19 +10,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
-           file://m4.patch;patch=1 \
            file://prboom.png \
            file://prboom.desktop"
 
 inherit autotools
 
-EXTRA_OECONF = "--without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF = "--without-x --disable-sdltest"
 
-do_configure() {
-	gnu-configize
-	oe_runconf
-}
-
 do_install() {
         install -d ${D}${palmtopdir}/bin \
         	   ${D}${palmtopdir}/apps/Games \
============================================================
--- site/common-glibc	4405815e133a050b155173bd66db32480d6feae1
+++ site/common-glibc	7f0d2943abc2c25936ffe4edbd4bf5e532022ab2
@@ -1,7 +1,8 @@ ac_cv_func_memcmp_working=${ac_cv_func_m
 # general
 ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes}
 ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
 ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes}
+ac_cv_type_uid_t={ac_cv_type_uid_t=yes}
 
 # bash
 bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes}
@@ -44,3 +45,4 @@ ac_cv_epoll_works=${ac_cv_epoll_works=ye
 ac_cv_func_va_copy=${ac_cv_func_va_copy=yes}
 ac_cv_func___va_copy=${ac_cv_func___va_copy=yes}
 ac_cv_epoll_works=${ac_cv_epoll_works=yes}
+


#
# mt diff -reefe1e616b9d0ad9b002797464d94b99b92213fb -r935d29b7406fa7e6a054b0bd861565fa83af9635
#
# 
# 
# patch "packages/pax-utils/pax-utils-native_0.1.13.bb"
#  from [a11fde6a5baa23d73e3d9b90652a0bb85bdb4c07]
#    to [d6f85d4805d38c1ecc0f4a1974444380619ed152]
# 
============================================================
--- packages/pax-utils/pax-utils-native_0.1.13.bb	a11fde6a5baa23d73e3d9b90652a0bb85bdb4c07
+++ packages/pax-utils/pax-utils-native_0.1.13.bb	d6f85d4805d38c1ecc0f4a1974444380619ed152
@@ -5,3 +5,8 @@ do_stage() {
 do_stage() {
     oe_runmake PREFIX=${STAGING_DIR}/${HOST_SYS} install
 }
+
+do_install() {
+	:
+}
+