[oe-commits] org.oe.dev merge of '2e363cde1e696e4fd40b45167cf73e5a7dd0109c'

[hrw commit]

merge of '2e363cde1e696e4fd40b45167cf73e5a7dd0109c'
     and '7c0754d01145df6906c2cfc824da2da420a2fe22'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 51181b2162a577bd188446458dc9adf512663dbb
ViewMTN: http://monotone.openembedded.org/revision/info/51181b2162a577bd188446458dc9adf512663dbb
Files:
1
packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch
packages/xscreensaver/xscreensaver_4.22.bb
packages/gammu/gammu_1.13.0.bb
packages/gammu/gammu_1.17.0.bb
packages/python/python-gammu_0.21.bb
packages/python/python-gammu_0.24.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
Diffs:

#
# mt diff -r2e363cde1e696e4fd40b45167cf73e5a7dd0109c -r51181b2162a577bd188446458dc9adf512663dbb
#
# 
# 
# add_file "packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch"
#  content [5a2a6f73e42cb00d5874801d916d1359e8deafed]
# 
# patch "packages/xscreensaver/xscreensaver_4.22.bb"
#  from [21f759df8959d61b184166c8170827d9462c75b2]
#    to [8062d945f2aefe017fb6e0f7804996a08281777a]
# 
============================================================
--- packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch	5a2a6f73e42cb00d5874801d916d1359e8deafed
+++ packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch	5a2a6f73e42cb00d5874801d916d1359e8deafed
@@ -0,0 +1,72 @@
+--- xscreensaver-4.22/configure.in.orig	2007-12-23 18:33:43.000000000 +0000
++++ xscreensaver-4.22/configure.in	2007-12-23 18:35:33.000000000 +0000
+@@ -944,9 +944,6 @@
+ #
+ AC_DEFUN(AC_CHECK_X_HEADER, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -955,9 +952,6 @@
+ #
+ AC_DEFUN(AC_EGREP_X_HEADER, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_EGREP_HEADER([$1], [$2], [$3], [$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -966,9 +960,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_COMPILE, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -982,9 +973,6 @@
+   ac_save_LDFLAGS="$LDFLAGS"
+ #  ac_save_LIBS="$LIBS"
+ 
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   # note: $X_CFLAGS includes $x_includes
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ 
+@@ -1005,9 +993,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_RUN, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_TRY_RUN([$1], [$2], [$3], [$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -2763,9 +2748,6 @@
+ EOF
+ 
+          ac_save_CPPFLAGS="$CPPFLAGS"
+-         if test \! -z "$includedir" ; then 
+-           CPPFLAGS="$CPPFLAGS -I$includedir"
+-         fi
+          CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ 
+          mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:`
+@@ -3395,9 +3377,6 @@
+ DEPEND_DEFINES=
+ 
+ 
+-if test \! -z "$includedir" ; then 
+-  INCLUDES="$INCLUDES -I$includedir"
+-fi
+ 
+ if test \! -z "$libdir" ; then
+   LDFLAGS="$LDFLAGS -L$libdir"
============================================================
--- packages/xscreensaver/xscreensaver_4.22.bb	21f759df8959d61b184166c8170827d9462c75b2
+++ packages/xscreensaver/xscreensaver_4.22.bb	8062d945f2aefe017fb6e0f7804996a08281777a
@@ -8,9 +8,12 @@ DEPENDS = "intltool virtual/libx11 gtk+ 
 LICENSE = "BSD"
 DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade"
 
+PR = "r1"
+
 SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
            file://fixes.patch;patch=1 \
            file://configure.in.patch;patch=1 \
+	   file://configure.in-includedir.patch;patch=1 \
            file://XScreenSaver"
 
 # xscreensaver-demo is a glade app
@@ -35,6 +38,8 @@ do_configure_prepend() {
 
 do_configure_prepend() {
 	sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in
+	
+	export includedir="/lib"
 }
 
 do_compile() {


#
# mt diff -r7c0754d01145df6906c2cfc824da2da420a2fe22 -r51181b2162a577bd188446458dc9adf512663dbb
#
# 
# 
# rename "packages/gammu/gammu_1.13.0.bb"
#     to "packages/gammu/gammu_1.17.0.bb"
# 
# rename "packages/python/python-gammu_0.21.bb"
#     to "packages/python/python-gammu_0.24.bb"
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [9bb6cf26f7a7451d99dda12e51b6584c26194aa5]
#    to [d0ef2c36f1b3189c7ab640814486bc42402933b7]
# 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	9bb6cf26f7a7451d99dda12e51b6584c26194aa5
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	d0ef2c36f1b3189c7ab640814486bc42402933b7
@@ -174,7 +174,7 @@ PREFERRED_VERSION_clish ?= "0.7.1"
 PREFERRED_VERSION_classpath-minimal-native ?= "0.95"
 PREFERRED_VERSION_clearsilver ?= "0.10.3"
 PREFERRED_VERSION_clish ?= "0.7.1"
-PREFERRED_VERSION_cmake-native ?= "2.2.3"
+PREFERRED_VERSION_cmake-native ?= "2.4.7"
 PREFERRED_VERSION_cms92init ?= "0.1"
 PREFERRED_VERSION_compositeproto ?= "0.4"
 PREFERRED_VERSION_comprec ?= "0.02"
@@ -422,7 +422,7 @@ PREFERRED_VERSION_gamin ?= "0.1.8"
 PREFERRED_VERSION_galculator ?= "1.2.3"
 PREFERRED_VERSION_gallery ?= "1.5.5"
 PREFERRED_VERSION_gamin ?= "0.1.8"
-PREFERRED_VERSION_gammu ?= "1.13.0"
+PREFERRED_VERSION_gammu ?= "1.17.0"
 PREFERRED_VERSION_gawk ?= "3.1.4"
 PREFERRED_VERSION_gawk-native ?= "3.1.4"
 PREFERRED_VERSION_gcalctool ?= "5.7.32"
@@ -1169,7 +1169,6 @@ PREFERRED_VERSION_madplay ?= "0.15.2b"
 PREFERRED_VERSION_macchanger ?= "1.5.0"
 PREFERRED_VERSION_madfu ?= "1.2"
 PREFERRED_VERSION_madplay ?= "0.15.2b"
-PREFERRED_VERSION_madwifi-ng ?= "r2518-20070626"
 PREFERRED_VERSION_mahjongg ?= "1.0.0"
 PREFERRED_VERSION_mailutils ?= "0.3.1"
 PREFERRED_VERSION_mailx ?= "8.1.2-0.20050715cvs"
@@ -1502,7 +1501,7 @@ PREFERRED_VERSION_python-fpconst ?= "0.6
 PREFERRED_VERSION_python-fam ?= "1.1.1"
 PREFERRED_VERSION_python-fnorb ?= "1.3"
 PREFERRED_VERSION_python-fpconst ?= "0.6.0"
-PREFERRED_VERSION_python-gammu ?= "0.21"
+PREFERRED_VERSION_python-gammu ?= "0.24"
 PREFERRED_VERSION_python-gmpy ?= "1.0.1"
 PREFERRED_VERSION_python-gnosis ?= "1.2.2"
 PREFERRED_VERSION_python-gst ?= "0.10.8"