From 4e0b4f896da2041dfee51d50b8b429467cc07414 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Jul 2008 10:03:10 +0000
Subject: mythtv: <= 0.21 are qt3 based >= 0.22 are qt4 based, so move inherits
 around * update 0.21 to use the fixes branch

---
 packages/mythtv/mythtv-0.21/.mtn2git_empty  |   0
 packages/mythtv/mythtv-0.21/configure.patch | 183 ++++++++++++++++++++++++++++
 packages/mythtv/mythtv.inc                  |   2 -
 packages/mythtv/mythtv_0.18.1.bb            |   2 +
 packages/mythtv/mythtv_0.20.bb              |   2 +
 packages/mythtv/mythtv_0.21.bb              |  53 ++++++--
 packages/mythtv/mythtv_svn.bb               |   7 +-
 7 files changed, 234 insertions(+), 15 deletions(-)
 create mode 100644 packages/mythtv/mythtv-0.21/.mtn2git_empty
 create mode 100644 packages/mythtv/mythtv-0.21/configure.patch

(limited to 'packages')

diff --git a/packages/mythtv/mythtv-0.21/.mtn2git_empty b/packages/mythtv/mythtv-0.21/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/mythtv/mythtv-0.21/configure.patch b/packages/mythtv/mythtv-0.21/configure.patch
new file mode 100644
index 0000000000..3b0b9a313a
--- /dev/null
+++ b/packages/mythtv/mythtv-0.21/configure.patch
@@ -0,0 +1,183 @@
+--- /tmp/configure	2008-06-30 08:40:35.000000000 +0200
++++ mythtv/configure	2008-07-23 09:51:41.000000000 +0200
+@@ -475,12 +475,13 @@
+ }
+ 
+ check_cmd(){
+-    log "$@"
++   	echo "Checking $@" 
++	log "$@"
+     "$@" >>$logfile 2>&1
+ }
+ 
+ check_cc(){
+-    log check_cc "$@"
++	log check_cc "$@"
+     cat >$TMPC
+     log_file $TMPC
+     check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS "$@" -c -o $TMPO $TMPC
+@@ -1115,11 +1116,11 @@
+ fi
+ 
+ # machine
+-arch=`uname -m`
++disabled cross_compile && arch=`uname -m`
+ arch_raw="$arch"
+ cpu="generic"
+ cpu_override="no"
+-processor=`uname -p 2>/dev/null`
++disabled cross_compile && processor=`uname -p 2>/dev/null`
+ processor_flags=""
+ tune="generic"
+ 
+@@ -1183,7 +1184,7 @@
+ lamemp3="yes"
+ lirc="yes"
+ mac_bundle="no"
+-opengl="yes"
++opengl="no"
+ v4l="yes"
+ x11="yes"
+ x11_include_path="/usr/X11R6/include"
+@@ -1212,7 +1213,7 @@
+ # build settings
+ SHFLAGS='-shared -Wl,-soname,$@'
+ VHOOKSHFLAGS='$(SHFLAGS)'
+-LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
++#LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
+ FFSERVERLDFLAGS=-Wl,-E
+ LDCONFIG="ldconfig"
+ LIBPREF="lib"
+@@ -1707,7 +1708,7 @@
+ 
+ has_library()
+ {
+-    if test -f /etc/ld.so.conf ; then
++	if test -f /etc/ld.so.conf && disabled cross_compile ; then
+         LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
+     else
+         LIBPATHS=''
+@@ -1718,7 +1719,7 @@
+     LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
+ 
+     # recurse down just one level, should be enough in most cases
+-    if test -f /etc/ld.so.conf ; then
++    if test -f /etc/ld.so.conf && disabled cross_compile ; then
+         INCL=`cat /etc/ld.so.conf | grep -v "#" | grep  "^include"`
+         SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
+         for x in $SRCH ; do
+@@ -1727,9 +1728,9 @@
+         done
+     fi
+ 
+-    LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
++    enabled cross_compile || LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
+ 
+-    HAS_IT="no"
++    HAS_IT="yes"
+     for LIBPATH in $LIBPATHS ; do
+         if test x`ls $LIBPATH/$1* 2> /dev/null | head -n 1` != x"" ; then
+             echo "$1  IS at $LIBPATH"
+@@ -1745,17 +1746,18 @@
+ 
+ has_header()
+ {
+-    HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
++    enabled cross_compile || HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
+     INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
+     HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name/include/g")
+ 
+-    HAS_IT="no"
++    HAS_IT="yes"
+     for HPATH in $HPATHS ; do
+         if test x`ls $HPATH/$1* 2> /dev/null | head -n 1` != x"" ; then
+             HAS_IT="yes"
+         fi
+     done
+-    expr $HAS_IT : "yes" > /dev/null
++    echo "$1: $HAS_IT"
++	expr $HAS_IT : "yes" > /dev/null
+ }
+ 
+ append CCONFIG "$compile_type"
+@@ -1861,13 +1863,15 @@
+ if test x"$cmov" = x"default"; then
+     disable cmov
+     if enabled cpu_override; then
+-        is_x86_cmov_cpu "$cpu" && enable cmov
++        disabled cross_compile && is_x86_cmov_cpu "$cpu" && enable cmov
+         disabled cmov || is_x86_slow_cmov_cpu "$cpu" || enable fast_cmov
+     elif expr "$processor_flags" : ".*cmov" > /dev/null ; then
+-        enable cmov
++        disabled cross_compile && enable cmov
+     fi
+ fi
+ 
++enabled cross_compile && disable cmov
++
+ # use different default ARCHFLAGS for CPU missing cmov (Via C3 ...)
+ if test x"$arch" = x"x86_32" && disabled cmov && disabled cpu_override; then
+     ARCHFLAGS="-march=i586"
+@@ -2239,7 +2243,7 @@
+ EOF
+ 
+ if $cc $CFLAGS $ECFLAGS -o $TMPE $TMPC 2>/dev/null ; then
+-$TMPE && cpuclipspositive="yes"
++enabled cross_compile || $TMPE && cpuclipspositive="yes"
+ fi
+ 
+ # test negative wrap
+@@ -2254,7 +2258,7 @@
+ EOF
+ 
+ if $cc $CFLAGS $ECFLAGS -o $TMPE $TMPC 2>/dev/null ; then
+-$TMPE && cpuclipsnegative="yes"
++enabled cross_compile || $TMPE && cpuclipsnegative="yes"
+ fi
+ 
+ # test for distcc
+@@ -2607,33 +2611,9 @@
+ check_ldflags -Wl,--warn-common
+ check_ldflags $LDLATEFLAGS
+ 
+-# GCC version
+-cat > $TMPC << EOF
+-int main(int argc, char **argv)
+-{
+-    int ret = 0;
+-    if (argc == 1)
+-    {
+-        #if defined(__GNUC__)
+-            ret = __GNUC__;
+-        #endif
+-    }
+-    else
+-    {
+-        #if defined(__GNUC_MINOR__)
+-            ret = __GNUC_MINOR__;
+-        #endif
+-    }
+-    return ret;
+-}
+-EOF
+-
+-if $cc $CFLAGS $TMPC -o $TMPE ; then
+-    $TMPE
+-    GCC_MAJOR=$?
+-    $TMPE "minor"
+-    GCC_MINOR=$?
+-fi
++gcc_version=$($cc -v 2>&1 | grep version | cut -s -d' ' -f 3) 
++GCC_MAJOR=$(echo ${gcc_version} | cut -s -d'.' -f1) 
++GCC_MINOR=$(echo ${gcc_version} | cut -s -d'.' -f2)
+ 
+ if enabled symbol_visibility; then
+     if test x"$GCC_MAJOR" = x"4" ; then
+@@ -2727,6 +2707,7 @@
+ 
+ check_header GL/gl.h
+ has_library libGL || has_library libopengl32 || disable opengl
++enabled cross_compile && disable opengl
+ 
+ VENDOR_XVMC_LIBS=""
+ check_header X11/extensions/XvMClib.h
diff --git a/packages/mythtv/mythtv.inc b/packages/mythtv/mythtv.inc
index 9b7a0a768e..8355e0f1a1 100644
--- a/packages/mythtv/mythtv.inc
+++ b/packages/mythtv/mythtv.inc
@@ -7,8 +7,6 @@ DEPENDS = "jack alsa-lib lame libxinerama libxv libxxf86vm libxvmc lirc"
 
 SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
 
-inherit qmake2 qt4x11
-
 
 QMAKE_PROFILES = "mythtv.pro"
 
diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb
index 1602ce0e42..fd2c351845 100644
--- a/packages/mythtv/mythtv_0.18.1.bb
+++ b/packages/mythtv/mythtv_0.18.1.bb
@@ -1,5 +1,7 @@
 require mythtv.inc
 
+inherit qmake2 qt3x11
+
 PR = "r1"
 
 SRC_URI += "file://msmpeg-underscore-pic.patch;patch=1 \
diff --git a/packages/mythtv/mythtv_0.20.bb b/packages/mythtv/mythtv_0.20.bb
index c9e2fdc431..2ebebd3012 100644
--- a/packages/mythtv/mythtv_0.20.bb
+++ b/packages/mythtv/mythtv_0.20.bb
@@ -1,5 +1,7 @@
 require mythtv.inc
 
+inherit qmake2 qt3x11
+
 DEPENDS += "openchrome"
 PR = "r0"
 
diff --git a/packages/mythtv/mythtv_0.21.bb b/packages/mythtv/mythtv_0.21.bb
index a33c446813..cdb26c2c31 100644
--- a/packages/mythtv/mythtv_0.21.bb
+++ b/packages/mythtv/mythtv_0.21.bb
@@ -1,23 +1,29 @@
 require mythtv.inc
 
-PR = "r0"
+inherit qmake qt3x11
 
-#SRC_URI += "file://configure.patch;patch=1 \
-#            file://libmyth-libdir.patch;patch=1"
+PR = "${SRCREV}+r0"
+REALPV = "0.21"
 
-# Seen on the mythtv web page:
-# http://www.mythtv.org/mc/fix-mythweb-in-0.20.diff;patch=1
+SRCREV = "17789"
+SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-21-fixes;module=mythtv;proto=http"
+
+SRC_URI += "file://configure.patch;patch=1 \
+           "
+
+S = "${WORKDIR}/mythtv"
 
 QMAKE_PROFILES = "mythtv.pro"
 
-mythlibs = "mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
+mythlibs = "mythdb mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
 PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
 
+FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug"
 FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode"
 FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf"
 RDEPENDS_mythtv-frontend = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
-FILES_mythtv-bin = "${bindir}"
-FILES_mythtv-filters = "${libdir}/mythtv/filters"
+FILES_mythtv-bin = "${bindir}/*"
+FILES_mythtv-filters = "${libdir}/mythtv/filters/*"
 FILES_mythtv-data = "${datadir}"
 RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
 ALLOW_EMPTY_${PN} = "1"
@@ -28,7 +34,7 @@ python __anonymous () {
     import bb
 
     mythlibs = bb.data.getVar('mythlibs', d).split()
-    pv = bb.data.expand(bb.data.getVar("PV", d), d)
+    pv = bb.data.expand(bb.data.getVar("REALPV", d), d)
 
     for m in mythlibs:
         bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d)
@@ -38,22 +44,49 @@ python __anonymous () {
 
     bb.data.setVar("PACKAGES", packages, d)
 }
+
+EXTRA_OECONF_armv5te = " --enable-armv5te "
+EXTRA_OECONF_armv6 = " --enable-armv6 "
+EXTRA_OECONF_armv7a =  --enable-armv6"
+
+#build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
+#not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '${MY_ARCH}',d)}"
+
+MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}"
+TARGET_CC_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}"
+
+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable-pxa --enable-iwmmxt', '',d)} "
+
+
 do_configure_prepend() {
 # it's not autotools anyway, so we call ./configure directly
 	find . -name "Makefile"|xargs rm -f
+
 	./configure	--prefix=/usr		\
 			--mandir=/usr/man 	\
 			--cpu=${MYTHTV_ARCH}	\
+			--arch=${MYTHTV_ARCH} \
 			--disable-altivec	\
+		 	--disable-opengl-video \
+			--disable-strip \
 			--enable-v4l		\
 			--enable-audio-oss	\
 			--enable-proc-opt	\
 			--enable-dvb		\
+			--enable-libmp3lame \
 			--cross-compile	\
-            --dvb-path=${STAGING_INCDIR}
+            --dvb-path=${STAGING_INCDIR} \
+			--with-bindings= \
+			${EXTRA_OECONF}
 
 	sed 's!PREFIX =.*!PREFIX = ${prefix}!;/INCLUDEPATH += $${PREFIX}\/include/d' < settings.pro > settings.pro.new
 	mv settings.pro.new settings.pro
+    for pro in ${S}/*/*pro ${S}/*/*/*pro ${S}/*/*/*/*pro ; do
+		sed -i -e s:opengl::g $pro
+	done
+	sed -i /.SUBDIR/d ${S}/bindings/*pro
 }
 
 python populate_packages_prepend () {
diff --git a/packages/mythtv/mythtv_svn.bb b/packages/mythtv/mythtv_svn.bb
index cb22a36f58..09cc1ec947 100644
--- a/packages/mythtv/mythtv_svn.bb
+++ b/packages/mythtv/mythtv_svn.bb
@@ -1,9 +1,11 @@
 require mythtv.inc
 
+inherit qmake2 qt4x11
+
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.21+svnr${SRCREV}"
-PR = "r1"
+PV = "0.21+0.22rc+svnr${SRCREV}"
+PR = "r2"
 REALPV = "0.22"
 
 SRCREV = "17892"
@@ -22,7 +24,6 @@ PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-dat
 FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug"
 FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode"
 FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf"
-RDEPENDS_mythtv-frontend = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
 FILES_mythtv-bin = "${bindir}/*"
 FILES_mythtv-filters = "${libdir}/mythtv/filters/*"
 FILES_mythtv-data = "${datadir}"
-- 
cgit v1.2.3


From 5172891ca869635e3ee54d4aed5c855bc95ab1bd Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Jul 2008 10:18:06 +0000
Subject: mythtv: fix quoting for armv7a

---
 packages/mythtv/mythtv_0.21.bb | 2 +-
 packages/mythtv/mythtv_svn.bb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/mythtv/mythtv_0.21.bb b/packages/mythtv/mythtv_0.21.bb
index cdb26c2c31..7b4c8437b0 100644
--- a/packages/mythtv/mythtv_0.21.bb
+++ b/packages/mythtv/mythtv_0.21.bb
@@ -47,7 +47,7 @@ python __anonymous () {
 
 EXTRA_OECONF_armv5te = " --enable-armv5te "
 EXTRA_OECONF_armv6 = " --enable-armv6 "
-EXTRA_OECONF_armv7a =  --enable-armv6"
+EXTRA_OECONF_armv7a = " --enable-armv6"
 
 #build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
 #not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt
diff --git a/packages/mythtv/mythtv_svn.bb b/packages/mythtv/mythtv_svn.bb
index 09cc1ec947..83ce8252fa 100644
--- a/packages/mythtv/mythtv_svn.bb
+++ b/packages/mythtv/mythtv_svn.bb
@@ -49,7 +49,7 @@ python __anonymous () {
 
 EXTRA_OECONF_armv5te = " --enable-armv5te "
 EXTRA_OECONF_armv6 = " --enable-armv6 "
-EXTRA_OECONF_armv7a =  --enable-armv6"
+EXTRA_OECONF_armv7a = " --enable-armv6"
 
 #build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
 #not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt
-- 
cgit v1.2.3


From 394c91bfa37677969a56bb2474484166d704d800 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Jul 2008 11:18:04 +0000
Subject: lirc modules: update to 0.8.3+cvs20080713

---
 packages/lirc/lirc-modules_0.8.3+cvs20080713.bb | 31 +++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 packages/lirc/lirc-modules_0.8.3+cvs20080713.bb

(limited to 'packages')

diff --git a/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb b/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
new file mode 100644
index 0000000000..094c6fd380
--- /dev/null
+++ b/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls. This package contains the lirc kernel modules."
+SECTION = "base"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.lirc.org"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel fakeroot-native setserial"
+PR = "r0"
+
+SRCDATE=${@bb.data.getVar('PV', d, 1)[9:]}
+
+SRC_URI = "cvs://anonymous@lirc.cvs.sourceforge.net/cvsroot/lirc;module=lirc;method=pserver;cvsdate=${SRCDATE}"
+S = "${WORKDIR}/lirc"
+
+
+inherit autotools module
+
+require lirc-config.inc
+
+MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e V=1' -C drivers"
+
+fakeroot do_install() {
+	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
+	rm -rf ${D}/dev
+}
+
+# this is for distributions that don't use udev
+pkg_postinst_append() {
+if [ ! -c $D/dev/lirc -a ! -f /sbin/udevd ]; then mknod $D/dev/lirc c 61 0; fi
+}
+
+FILES_${PN} = "/lib/modules"
-- 
cgit v1.2.3


From 45688aa68ee20dd886f6b99adf95d011b75496cf Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Jul 2008 11:40:32 +0000
Subject: tcp-wrappers: fix staging

---
 packages/tcp-wrappers/tcp-wrappers_7.6.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/tcp-wrappers/tcp-wrappers_7.6.bb b/packages/tcp-wrappers/tcp-wrappers_7.6.bb
index 047adc23a6..e10d3e8172 100644
--- a/packages/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/packages/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Tools for monitoring and filtering incoming requests for tcp \
 LICENSE = "tcp-wrappers"
 PRIORITY = "optional"
 SECTION = "console/network"
-PR="r1"
+PR="r2"
 
 
 PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev tcp-wrappers tcp-wrappers-doc"
@@ -107,5 +107,6 @@ do_install () {
 
 do_stage() {
         oe_libinstall -C shared -so  libwrap ${STAGING_LIBDIR}
+		install -m 0644 tcpd.h ${STAGING_INCDIR}
 }
 
-- 
cgit v1.2.3


From b8542d17bc79828f982ba69e1d6cf83f5e182802 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Jul 2008 11:41:13 +0000
Subject: codec-engine: stage some more libsf

---
 packages/dsplink/codec-engine_2.10.bb | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'packages')

diff --git a/packages/dsplink/codec-engine_2.10.bb b/packages/dsplink/codec-engine_2.10.bb
index 21d2684c31..f444c24e1f 100644
--- a/packages/dsplink/codec-engine_2.10.bb
+++ b/packages/dsplink/codec-engine_2.10.bb
@@ -85,18 +85,17 @@ do_compile() {
 
 }
 
-export DSPLIBS = "${S}/packages/ti/sdo/ce/utils/trace/lib/*.a \
-                  ${S}/packages/ti/sdo/ce/bioslog/lib/*.a \
-                  ${S}/packages/ti/sdo/ce/video/lib/*.a \
-                  ${S}/packages/ti/sdo/ce/audio/lib/*.a \
-                  ${S}/packages/ti/sdo/ce/speech/lib/*.a \
-                  ${S}/packages/ti/sdo/ce/lib/*.a \
-                  ${S}/packages/ti/sdo/ce/alg/lib/*.a \
-                  ${S}/cetools/packages/ti/sdo/fc/dman3/*.a \
-                  ${S}/cetools/packages/ti/sdo/fc/acpy3/*.a \
-                  ${S}/packages/ti/sdo/ce/utils/xdm/lib/*.a \
-                  ${S}/cetools/packages/ti/sdo/utils/trace/lib/*.a \
-                  ${S}/cetools/packages/ti/sdo/linuxutils/cmem/lib/*.a \ 
+export DSPLIBS = "${S}/packages/ti/sdo/ce/utils/trace/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/bioslog/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/video/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/audio/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/speech/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/alg/lib/*.a* \
+                  ${S}/cetools/packages/ti/sdo/fc/dman3/*.a* \
+                  ${S}/cetools/packages/ti/sdo/fc/acpy3/*.a* \
+                  ${S}/packages/ti/sdo/ce/utils/xdm/lib/*.a* \
+                  ${S}/cetools/packages/ti/sdo/utils/trace/lib/*.a* \
                  "
 
 do_install() {
@@ -108,17 +107,23 @@ do_install() {
 		install -d ${D}/${base_sbindir}
 		cd ${D} ; mv apitest apitestd multi_process multi_processd translate translated ${D}/${base_sbindir}		
 
+
 		install -d ${D}/${libdir}
 		for i in ${DSPLIBS}; do
 			install -m 0755 $i ${D}/${libdir}/ || true
 		done
+        install -m 0755 ${S}/cetools/packages/ti/sdo/linuxutils/cmem/lib/*.a ${D}/${libdir}
 }
 
 do_stage() {
 		install -d ${STAGING_LIBDIR}	
 		for i in ${DSPLIBS} ; do
-			install -m 0755 $i ${STAGING_LIBDIR}/ || true 
+			install -m 0755 $i ${STAGING_LIBDIR}/ 
+			ln -sf ${STAGING_LIBDIR}/$(basename $i | awk -F. '{print $1}').a470MV  ${STAGING_LIBDIR}/$(basename $i | awk -F. '{print $1}').a || true 
 		done
+
+        install -m 0755 ${S}/cetools/packages/ti/sdo/linuxutils/cmem/lib/*.a ${STAGING_LIBDIR}/
+
 		install -d ${STAGING_INCDIR}/codec-engine}
 		
 		for header in $(find ${S}/cetools/packages/ -name "*.h") ; do
-- 
cgit v1.2.3


From ead59a1b031931b99a2ac6c9e27f6056e4d836ad Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Jul 2008 11:51:35 +0000
Subject: mythtv 0.21: fix depends for themes

---
 packages/mythtv/mythtv_0.21.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/mythtv/mythtv_0.21.bb b/packages/mythtv/mythtv_0.21.bb
index 7b4c8437b0..f4f947b53b 100644
--- a/packages/mythtv/mythtv_0.21.bb
+++ b/packages/mythtv/mythtv_0.21.bb
@@ -2,7 +2,7 @@ require mythtv.inc
 
 inherit qmake qt3x11
 
-PR = "${SRCREV}+r0"
+PR = "${SRCREV}+r1"
 REALPV = "0.21"
 
 SRCREV = "17789"
@@ -15,7 +15,7 @@ S = "${WORKDIR}/mythtv"
 
 QMAKE_PROFILES = "mythtv.pro"
 
-mythlibs = "mythdb mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
+mythlibs = "mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
 PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
 
 FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug"
-- 
cgit v1.2.3


From 714908d475361a25179229cd6cf145f33968db7d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Jul 2008 12:14:24 +0000
Subject: nfs-utils: update to 1.1.2

---
 packages/nfs-utils/nfs-utils_1.1.2.bb | 63 +++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 packages/nfs-utils/nfs-utils_1.1.2.bb

(limited to 'packages')

diff --git a/packages/nfs-utils/nfs-utils_1.1.2.bb b/packages/nfs-utils/nfs-utils_1.1.2.bb
new file mode 100644
index 0000000000..67adf6e964
--- /dev/null
+++ b/packages/nfs-utils/nfs-utils_1.1.2.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "userspace utilities for kernel nfs"
+PRIORITY = "optional"
+SECTION = "console/network"
+LICENSE = "GPL"
+
+DEPENDS = "tcp-wrappers libevent"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
+	file://nfsserver \
+   "
+
+S = "${WORKDIR}/nfs-utils-${PV}/"
+
+PARALLEL_MAKE = ""
+
+# Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
+# pull in the remainder of the dependencies.
+RDEPENDS = "portmap"
+RRECOMMENDS = "kernel-module-nfsd"
+
+INITSCRIPT_NAME = "nfsserver"
+# The server has no dependencies at the user run levels, so just put
+# it in at the default levels.  It must be terminated before the network
+# in the shutdown levels, but that works fine.
+INITSCRIPT_PARAMS = "defaults"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF = "--with-statduser=nobody \
+		--enable-nfsv3 \
+		--disable-nfsv4 \
+		--disable-gss \
+		--with-statedir=/var/lib/nfs"
+
+do_ccompile() {
+	# UGLY HACK ALERT
+	cat ${WORKDIR}/forgotten-defines >> ${S}/support/include/config.h
+	oe_runmake 'BUILD=1'
+}
+
+INHIBIT_AUTO_STAGE = "1"
+
+do_install() {
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
+
+	install -d ${D}${sbindir}
+	install -m 0755 ${S}/utils/exportfs/exportfs ${D}${sbindir}/exportfs
+	install -m 0755 ${S}/utils/mountd/mountd ${D}${sbindir}/mountd
+	install -m 0755 ${S}/utils/mount/mount.nfs ${D}${sbindir}/mount.nfs
+	install -m 0755 ${S}/utils/nfsd/nfsd ${D}${sbindir}/nfsd
+	install -m 0755 ${S}/utils/nfsstat/nfsstat ${D}${sbindir}/nfsstat
+	install -m 0755 ${S}/utils/showmount/showmount ${D}${sbindir}/showmount
+	install -m 0755 ${S}/utils/statd/statd ${D}${sbindir}/statd
+
+	install -d ${D}${mandir}/man8
+	install -m 0644 ${S}/utils/exportfs/exportfs.man ${D}${mandir}/man8/exportfs.8
+	install -m 0644 ${S}/utils/mountd/mountd.man ${D}${mandir}/man8/mountd.8
+	install -m 0644 ${S}/utils/nfsd/nfsd.man ${D}${mandir}/man8/nfsd.8
+	install -m 0644 ${S}/utils/nfsstat/nfsstat.man ${D}${mandir}/man8/nfsstat.8
+	install -m 0644 ${S}/utils/showmount/showmount.man ${D}${mandir}/man8/showmount.8
+	install -m 0644 ${S}/utils/statd/statd.man ${D}${mandir}/man8/statd.8
+}
-- 
cgit v1.2.3


From 50373753d65cab18022e734ef3feb117295c5909 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Jul 2008 18:58:37 +0000
Subject: linux omap2 git: refresh mru's clock patches

---
 .../linux-omap2-git/beagleboard/mru-clocks1.diff   |  2 +-
 .../linux-omap2-git/beagleboard/mru-clocks2.diff   |  2 +-
 .../linux-omap2-git/beagleboard/mru-clocks3.diff   | 94 ++++++++++++++++++++++
 packages/linux/linux-omap2_git.bb                  |  4 +-
 4 files changed, 98 insertions(+), 4 deletions(-)
 create mode 100644 packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff

(limited to 'packages')

diff --git a/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff b/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
index a17cc52c16..d7dadbc85e 100644
--- a/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
+++ b/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
@@ -1,7 +1,7 @@
 From: Mans Rullgard <mans@mansr.com>
 Date: Tue, 22 Jul 2008 00:31:11 +0000 (+0100)
 Subject: ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate()
-X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=edc6cd29284f64f524dd410fdc5e6133bc177a8f
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=2b7b958dc79e51127d7a4ecf88ce12dbc6c31426
 
 ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate()
 
diff --git a/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff b/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
index 99c8f7c285..c8b370da03 100644
--- a/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
+++ b/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
@@ -1,7 +1,7 @@
 From: Mans Rullgard <mans@mansr.com>
 Date: Tue, 22 Jul 2008 00:58:18 +0000 (+0100)
 Subject: ARM: OMAP: add clk_get_parent() for OMAP2/3
-X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=76a35ce79194b60e3697378e726e1e510c9349d1
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=e2de5e5578fbaa9b4b75074796da0608fc93e6ae
 
 ARM: OMAP: add clk_get_parent() for OMAP2/3
 
diff --git a/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff b/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff
new file mode 100644
index 0000000000..f8407fc2d5
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff
@@ -0,0 +1,94 @@
+From: Mans Rullgard <mans@mansr.com>
+Date: Wed, 23 Jul 2008 08:40:07 +0000 (+0100)
+Subject: ARM: OMAP: Set DSS1_ALWON_FCLK to a multiple of the pixel clock
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=01ee28c50701caa94739e764c3dae9298edd8216
+
+ARM: OMAP: Set DSS1_ALWON_FCLK to a multiple of the pixel clock
+
+This sets the DSS1_ALWON_FCLK clock as close as possible to a
+multiple of the requested pixel clock, while keeping it below
+the 173MHz limit.
+
+Due to of the structure of the clock tree, dss1_alwon_fck cannot
+be set directly, and we must use dpll4_m4_ck instead.
+
+Signed-off-by: Mans Rullgard <mans@mansr.com>
+---
+
+diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
+index fd06ca2..e0e8528 100644
+--- a/drivers/video/omap/dispc.c
++++ b/drivers/video/omap/dispc.c
+@@ -176,6 +176,7 @@ static struct {
+ 
+ 	struct clk	*dss_ick, *dss1_fck;
+ 	struct clk	*dss_54m_fck;
++	struct clk	*dpll4_m4_ck;
+ 
+ 	enum omapfb_update_mode	update_mode;
+ 	struct omapfb_device	*fbdev;
+@@ -738,21 +739,34 @@ static void setup_color_conv_coef(void)
+ 	MOD_REG_FLD(at2_reg, (1 << 11), ct->full_range);
+ }
+ 
+-#define MAX_FCK_LCD 173000000
++#define MAX_FCK 173000000
+ 
+ static void calc_ck_div(int is_tft, int pck, int *lck_div, int *pck_div)
+ {
++	unsigned long prate = clk_get_rate(clk_get_parent(dispc.dpll4_m4_ck));
++	unsigned long pcd_min = is_tft? 2: 3;
++	unsigned long fck_div;
+ 	unsigned long fck, lck;
+ 
+ 	pck = max(1, pck);
++
++	if (pck * pcd_min > MAX_FCK) {
++		dev_warn(dispc.fbdev->dev, "pixclock %d kHz too high.\n",
++			 pck / 1000);
++		pck = MAX_FCK / pcd_min;
++	}
++
++	fck = pck * 2;
++	fck_div = (prate + pck) / fck;
++	if (fck_div > 16)
++		fck_div /= (fck_div + 15) / 16;
++	if (fck_div < 1)
++		fck_div = 1;
++	clk_set_rate(dispc.dpll4_m4_ck, prate / fck_div);
+ 	fck = clk_get_rate(dispc.dss1_fck);
+-	*lck_div = (fck + MAX_FCK_LCD - 1) / MAX_FCK_LCD;
+-	lck = fck / *lck_div;
+-	*pck_div = (lck + pck - 1) / pck;
+-	if (is_tft)
+-		*pck_div = max(2, *pck_div);
+-	else
+-		*pck_div = max(3, *pck_div);
++
++	*lck_div = 1;
++	*pck_div = (fck + pck - 1) / pck;
+ 	if (*pck_div > 255) {
+ 		*pck_div = 255;
+ 		lck = pck * *pck_div;
+@@ -914,11 +928,21 @@ static int get_dss_clocks(void)
+ 		return PTR_ERR(dispc.dss_54m_fck);
+ 	}
+ 
++	if (IS_ERR((dispc.dpll4_m4_ck =
++				clk_get(dispc.fbdev->dev, "dpll4_m4_ck")))) {
++		dev_err(dispc.fbdev->dev, "can't get dpll4_m4_ck");
++		clk_put(dispc.dss_ick);
++		clk_put(dispc.dss1_fck);
++		clk_put(dispc.dss_54m_fck);
++		return PTR_ERR(dispc.dss_54m_fck);
++	}
++
+ 	return 0;
+ }
+ 
+ static void put_dss_clocks(void)
+ {
++	clk_put(dispc.dpll4_m4_ck);
+ 	clk_put(dispc.dss_54m_fck);
+ 	clk_put(dispc.dss1_fck);
+ 	clk_put(dispc.dss_ick);
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index c6ffd347de..d205131925 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -6,7 +6,7 @@ SRCREV = "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
 
 PV = "2.6.26"
 #PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCREV}"
-PR = "r46"
+PR = "r47"
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
@@ -23,7 +23,6 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
            file://logo_linux_clut224.ppm \
            file://oprofile-0.9.3.armv7.diff;patch=1 \
            file://01-fix-timing-print.diff;patch=1 \
-           file://02-set-clkseld11.diff;patch=1 \
            file://03-enable-overlay-opt.diff;patch=1 \
            file://04-use-pcd.diff;patch=1 \
            file://05-fix-display-panning.diff;patch=1 \
@@ -43,6 +42,7 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
            file://TWL4030-09.patch;patch=1 \
            file://mru-clocks1.diff;patch=1 \
            file://mru-clocks2.diff;patch=1 \
+           file://mru-clocks3.diff;patch=1 \	
 "
 
 SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \
-- 
cgit v1.2.3


From c053a525974d48a5a2ede5399d465733728c8008 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 24 Jul 2008 07:46:01 +0000
Subject: linux omap2 git: reduce i2c speed and enable 4bit for SD

---
 packages/linux/linux-omap2_git.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index d205131925..2cba2fe537 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -6,7 +6,7 @@ SRCREV = "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
 
 PV = "2.6.26"
 #PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCREV}"
-PR = "r47"
+PR = "r48"
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
@@ -43,6 +43,8 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
            file://mru-clocks1.diff;patch=1 \
            file://mru-clocks2.diff;patch=1 \
            file://mru-clocks3.diff;patch=1 \	
+           file://4bitmmc.diff;patch=1 \
+	   file://400khz-i2c.diff;patch=1 \
 "
 
 SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \
-- 
cgit v1.2.3


From db6d312d3a5527113fbfbfb56ab13e4c9dfc81ca Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 24 Jul 2008 08:40:29 +0000
Subject: neuros-public: clean up apps, add mainmenu

---
 packages/neuros-public/neuros-lib-widgets_git.bb |  8 +++++++-
 packages/neuros-public/neuros-mainmenu_git.bb    | 23 +++++++++++++++++++++++
 packages/neuros-public/neuros-nwm_git.bb         | 22 ++++++++++++++++++++++
 packages/neuros-public/neuros-qt-plugins_git.bb  |  3 ++-
 4 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 packages/neuros-public/neuros-mainmenu_git.bb
 create mode 100644 packages/neuros-public/neuros-nwm_git.bb

(limited to 'packages')

diff --git a/packages/neuros-public/neuros-lib-widgets_git.bb b/packages/neuros-public/neuros-lib-widgets_git.bb
index 0e1e22e6d2..45dde3c14a 100644
--- a/packages/neuros-public/neuros-lib-widgets_git.bb
+++ b/packages/neuros-public/neuros-lib-widgets_git.bb
@@ -1,6 +1,9 @@
 DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r1"
+
 DEPENDS = "qt-embedded"
 
 inherit qtopia4core
@@ -14,4 +17,7 @@ do_install() {
 	install -m 0755 ${S}/build/lib* ${D}/${libdir}
 }
 
-
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	install -m 0755 ${S}/build/lib* ${STAGING_LIBDIR}	
+}
diff --git a/packages/neuros-public/neuros-mainmenu_git.bb b/packages/neuros-public/neuros-mainmenu_git.bb
new file mode 100644
index 0000000000..c16cbeb036
--- /dev/null
+++ b/packages/neuros-public/neuros-mainmenu_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Neuros window manager"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "27fc35bd349ccbac1226ebb3d41417d8164b7dd1"
+SRC_URI = "git://git.neurostechnology.com/git/app-mainmenu;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755  ${S}/build/main-menu ${D}/${bindir}
+
+	install -d ${D}/${sysconfdir}/menu
+	install -m 0644 ${S}/resources/menu/* ${D}/${sysconfdir}/menu
+}
+
+
diff --git a/packages/neuros-public/neuros-nwm_git.bb b/packages/neuros-public/neuros-nwm_git.bb
new file mode 100644
index 0000000000..6dbbd4cabd
--- /dev/null
+++ b/packages/neuros-public/neuros-nwm_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Neuros window manager"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r2"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "d0b6789dde38d321d3c90c04512a4ea43e28e79e"
+SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_configure_prepend() {
+	rm ${S}/src/Makefile || true
+}
+
+do_install() {
+    install -d ${D}/${bindir}
+    install -m 0755  ${S}/build/nwm ${D}/${bindir}
+}
diff --git a/packages/neuros-public/neuros-qt-plugins_git.bb b/packages/neuros-public/neuros-qt-plugins_git.bb
index d0de64d945..62a9d43fca 100644
--- a/packages/neuros-public/neuros-qt-plugins_git.bb
+++ b/packages/neuros-public/neuros-qt-plugins_git.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
-PR = "r1"
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r2"
 
 DEPENDS = "qt-embedded"
 
-- 
cgit v1.2.3


From d948d16754b7cda41bf4ab402d410dee306bd599 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 24 Jul 2008 08:51:40 +0000
Subject: python-setuptools[-native] 0.6c8 fix log usage bug

---
 packages/python/python-setuptools-native_0.6c8.bb     |  4 ++--
 packages/python/python-setuptools/.mtn2git_empty      |  0
 packages/python/python-setuptools/fix-log-usage.patch | 13 +++++++++++++
 packages/python/python-setuptools_0.6c8.bb            |  7 +++++--
 4 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 packages/python/python-setuptools/.mtn2git_empty
 create mode 100644 packages/python/python-setuptools/fix-log-usage.patch

(limited to 'packages')

diff --git a/packages/python/python-setuptools-native_0.6c8.bb b/packages/python/python-setuptools-native_0.6c8.bb
index b7716d8cac..0bbf9c32fc 100644
--- a/packages/python/python-setuptools-native_0.6c8.bb
+++ b/packages/python/python-setuptools-native_0.6c8.bb
@@ -1,9 +1,9 @@
 require python-setuptools_${PV}.bb
 inherit native
 
+FILESPATH = "${FILE_DIRNAME}/python-setuptools"
 DEPENDS = "python-native"
 
 do_stage() {
-    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-      ${STAGING_BINDIR_NATIVE}/python setup.py install
+	distutils_stage_all
 }
diff --git a/packages/python/python-setuptools/.mtn2git_empty b/packages/python/python-setuptools/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/python/python-setuptools/fix-log-usage.patch b/packages/python/python-setuptools/fix-log-usage.patch
new file mode 100644
index 0000000000..6363c850c2
--- /dev/null
+++ b/packages/python/python-setuptools/fix-log-usage.patch
@@ -0,0 +1,13 @@
+Index: setuptools-0.6c8/setuptools/command/sdist.py
+===================================================================
+--- setuptools-0.6c8.orig/setuptools/command/sdist.py
++++ setuptools-0.6c8/setuptools/command/sdist.py
+@@ -95,7 +95,7 @@ def entries_finder(dirname, filename):
+         for match in entries_pattern.finditer(data):
+             yield joinpath(dirname,unescape(match.group(1)))
+     else:
+-        log.warn("unrecognized .svn/entries format in %s", dirname)
++        print ("unrecognized .svn/entries format in %s", dirname)
+ 
+ 
+ finders = [
diff --git a/packages/python/python-setuptools_0.6c8.bb b/packages/python/python-setuptools_0.6c8.bb
index 19f73d3f67..5b82ecea69 100644
--- a/packages/python/python-setuptools_0.6c8.bb
+++ b/packages/python/python-setuptools_0.6c8.bb
@@ -5,9 +5,12 @@ PRIORITY = "optional"
 LICENSE = "MIT-like"
 RDEPENDS = "python-distutils python-compression"
 SRCNAME = "setuptools"
-PR = "ml0"
+PR = "ml1"
 
-SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "\
+  http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
+  file://fix-log-usage.patch;patch=1 \
+"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
-- 
cgit v1.2.3


From 6486d71d56e0f71c601d3f7cfdd8455108715dc1 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Thu, 24 Jul 2008 13:37:44 +0000
Subject: libsdl-net: fix building with libtool2

---
 packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty |  0
 packages/libsdl/libsdl-net-1.2.7/libtool2.patch | 13 +++++++++++++
 packages/libsdl/libsdl-net_1.2.7.bb             | 11 +++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty
 create mode 100644 packages/libsdl/libsdl-net-1.2.7/libtool2.patch

(limited to 'packages')

diff --git a/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty b/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/libsdl/libsdl-net-1.2.7/libtool2.patch b/packages/libsdl/libsdl-net-1.2.7/libtool2.patch
new file mode 100644
index 0000000000..ea6daf7d48
--- /dev/null
+++ b/packages/libsdl/libsdl-net-1.2.7/libtool2.patch
@@ -0,0 +1,13 @@
+Index: SDL_net-1.2.7/configure.in
+===================================================================
+--- SDL_net-1.2.7.orig/configure.in	2007-07-20 14:40:02.000000000 +0200
++++ SDL_net-1.2.7/configure.in	2008-07-24 00:41:04.282718579 +0200
+@@ -42,6 +42,8 @@
+ dnl Setup for automake
+ AM_INIT_AUTOMAKE(SDL_net, $VERSION)
+ 
++dnl got macros
++AC_CONFIG_MACRO_DIR([acinclude])
+ dnl Check for tools
+ 
+ AC_LIBTOOL_WIN32_DLL
diff --git a/packages/libsdl/libsdl-net_1.2.7.bb b/packages/libsdl/libsdl-net_1.2.7.bb
index 8149cce379..8cbea5bd01 100644
--- a/packages/libsdl/libsdl-net_1.2.7.bb
+++ b/packages/libsdl/libsdl-net_1.2.7.bb
@@ -3,16 +3,19 @@ SECTION = "libs/network"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl"
 LICENSE = "LGPL"
+PR = "r1"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \
+	   file://libtool2.patch;patch=1 \
+	  "
 
-SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_net-${PV}"
 
 inherit autotools
+
 EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config"
 
 do_stage() {
-	oe_libinstall -so libSDL_net ${STAGING_LIBDIR}
-	ln -sf libSDL_net.so ${STAGING_LIBDIR}/libSDL_net-1.2.so
-	install -m 0644 SDL_net.h ${STAGING_INCDIR}/SDL/SDL_net.h
+	autotools_stage_all
 }
 
-- 
cgit v1.2.3


From f971e668220de7290500008f3d06d73afae308de Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Thu, 24 Jul 2008 13:38:45 +0000
Subject: libsdl-image: fix building with libtool2

---
 packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty  |   0
 packages/libsdl/libsdl-image-1.2.3/autotools.patch | 805 +++++++++++++++++++++
 packages/libsdl/libsdl-image_1.2.3.bb              |  12 +-
 3 files changed, 813 insertions(+), 4 deletions(-)
 create mode 100644 packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty
 create mode 100644 packages/libsdl/libsdl-image-1.2.3/autotools.patch

(limited to 'packages')

diff --git a/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty b/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/libsdl/libsdl-image-1.2.3/autotools.patch b/packages/libsdl/libsdl-image-1.2.3/autotools.patch
new file mode 100644
index 0000000000..c93a1dd9c3
--- /dev/null
+++ b/packages/libsdl/libsdl-image-1.2.3/autotools.patch
@@ -0,0 +1,805 @@
+Index: SDL_image-1.2.3/acinclude.m4
+===================================================================
+--- SDL_image-1.2.3.orig/acinclude.m4	2001-11-02 21:39:10.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,608 +0,0 @@
+-# Configure paths for SDL
+-# Sam Lantinga 9/21/99
+-# stolen from Manish Singh
+-# stolen back from Frank Belew
+-# stolen from Manish Singh
+-# Shamelessly stolen from Owen Taylor
+-
+-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+-dnl
+-AC_DEFUN(AM_PATH_SDL,
+-[dnl 
+-dnl Get the cflags and libraries from the sdl-config script
+-dnl
+-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+-            sdl_prefix="$withval", sdl_prefix="")
+-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+-		    , enable_sdltest=yes)
+-
+-  if test x$sdl_exec_prefix != x ; then
+-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+-     fi
+-  fi
+-  if test x$sdl_prefix != x ; then
+-     sdl_args="$sdl_args --prefix=$sdl_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+-     fi
+-  fi
+-
+-  AC_REQUIRE([AC_CANONICAL_TARGET])
+-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
+-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+-  no_sdl=""
+-  if test "$SDL_CONFIG" = "no" ; then
+-    no_sdl=yes
+-  else
+-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+-
+-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-    if test "x$enable_sdltest" = "xyes" ; then
+-      ac_save_CFLAGS="$CFLAGS"
+-      ac_save_LIBS="$LIBS"
+-      CFLAGS="$CFLAGS $SDL_CFLAGS"
+-      LIBS="$LIBS $SDL_LIBS"
+-dnl
+-dnl Now check if the installed SDL is sufficiently new. (Also sanity
+-dnl checks the results of sdl-config to some extent
+-dnl
+-      rm -f conf.sdltest
+-      AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include "SDL.h"
+-
+-char*
+-my_strdup (char *str)
+-{
+-  char *new_str;
+-  
+-  if (str)
+-    {
+-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+-      strcpy (new_str, str);
+-    }
+-  else
+-    new_str = NULL;
+-  
+-  return new_str;
+-}
+-
+-int main (int argc, char *argv[])
+-{
+-  int major, minor, micro;
+-  char *tmp_version;
+-
+-  /* This hangs on some systems (?)
+-  system ("touch conf.sdltest");
+-  */
+-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+-
+-  /* HP/UX 9 (%@#!) writes to sscanf strings */
+-  tmp_version = my_strdup("$min_sdl_version");
+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-     printf("%s, bad version string\n", "$min_sdl_version");
+-     exit(1);
+-   }
+-
+-   if (($sdl_major_version > major) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+-    {
+-      return 0;
+-    }
+-  else
+-    {
+-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+-      printf("*** best to upgrade to the required version.\n");
+-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+-      printf("*** config.cache before re-running configure\n");
+-      return 1;
+-    }
+-}
+-
+-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+-       CFLAGS="$ac_save_CFLAGS"
+-       LIBS="$ac_save_LIBS"
+-     fi
+-  fi
+-  if test "x$no_sdl" = x ; then
+-     AC_MSG_RESULT(yes)
+-     ifelse([$2], , :, [$2])     
+-  else
+-     AC_MSG_RESULT(no)
+-     if test "$SDL_CONFIG" = "no" ; then
+-       echo "*** The sdl-config script installed by SDL could not be found"
+-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+-       echo "*** full path to sdl-config."
+-     else
+-       if test -f conf.sdltest ; then
+-        :
+-       else
+-          echo "*** Could not run SDL test program, checking why..."
+-          CFLAGS="$CFLAGS $SDL_CFLAGS"
+-          LIBS="$LIBS $SDL_LIBS"
+-          AC_TRY_LINK([
+-#include <stdio.h>
+-#include "SDL.h"
+-
+-int main(int argc, char *argv[])
+-{ return 0; }
+-#undef  main
+-#define main K_and_R_C_main
+-],      [ return 0; ],
+-        [ echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-	  echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+-          CFLAGS="$ac_save_CFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     SDL_CFLAGS=""
+-     SDL_LIBS=""
+-     ifelse([$3], , :, [$3])
+-  fi
+-  AC_SUBST(SDL_CFLAGS)
+-  AC_SUBST(SDL_LIBS)
+-  rm -f conf.sdltest
+-])
+-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
+-## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
+-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
+-
+-# serial 40 AC_PROG_LIBTOOL
+-AC_DEFUN(AC_PROG_LIBTOOL,
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-
+-# Save cache, so that ltconfig can load it
+-AC_CACHE_SAVE
+-
+-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+-|| AC_MSG_ERROR([libtool configure failed])
+-
+-# Reload cache, that may have been modified by ltconfig
+-AC_CACHE_LOAD
+-
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+-
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+-
+-# Redirect the config.log output again, so that the ltconfig log is not
+-# clobbered by the next message.
+-exec 5>>./config.log
+-])
+-
+-AC_DEFUN(AC_LIBTOOL_SETUP,
+-[AC_PREREQ(2.13)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([AC_PROG_RANLIB])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
+-AC_REQUIRE([AC_PROG_LN_S])dnl
+-dnl
+-
+-case "$target" in
+-NONE) lt_target="$host" ;;
+-*) lt_target="$target" ;;
+-esac
+-
+-# Check for any special flags to pass to ltconfig.
+-libtool_flags="--cache-file=$cache_file"
+-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+-[libtool_flags="$libtool_flags --enable-dlopen"])
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-[libtool_flags="$libtool_flags --enable-win32-dll"])
+-AC_ARG_ENABLE(libtool-lock,
+-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+-
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case "$lt_target" in
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+-
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
+-
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+-  ;;
+-])
+-esac
+-])
+-
+-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+-
+-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+-
+-# AC_ENABLE_SHARED - implement the --enable-shared flag
+-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN(AC_ENABLE_SHARED, [dnl
+-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(shared,
+-changequote(<<, >>)dnl
+-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_shared=yes ;;
+-no) enable_shared=no ;;
+-*)
+-  enable_shared=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_shared=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+-])
+-
+-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)])
+-
+-# AC_ENABLE_STATIC - implement the --enable-static flag
+-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN(AC_ENABLE_STATIC, [dnl
+-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(static,
+-changequote(<<, >>)dnl
+-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_static=yes ;;
+-no) enable_static=no ;;
+-*)
+-  enable_static=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_static=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+-])
+-
+-# AC_DISABLE_STATIC - set the default static flag to --disable-static
+-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)])
+-
+-
+-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(fast-install,
+-changequote(<<, >>)dnl
+-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_fast_install=yes ;;
+-no) enable_fast_install=no ;;
+-*)
+-  enable_fast_install=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_fast_install=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+-])
+-
+-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)])
+-
+-# AC_PROG_LD - find the path to the GNU or non-GNU linker
+-AC_DEFUN(AC_PROG_LD,
+-[AC_ARG_WITH(gnu-ld,
+-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-ac_prog=ld
+-if test "$ac_cv_prog_gcc" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  AC_MSG_CHECKING([for ld used by GCC])
+-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+-  case "$ac_prog" in
+-    # Accept absolute paths.
+-changequote(,)dnl
+-    [\\/]* | [A-Za-z]:[\\/]*)
+-      re_direlt='/[^/][^/]*/\.\./'
+-changequote([,])dnl
+-      # Canonicalize the path of ld
+-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
+-    ;;
+-  *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
+-    ;;
+-  esac
+-elif test "$with_gnu_ld" = yes; then
+-  AC_MSG_CHECKING([for GNU ld])
+-else
+-  AC_MSG_CHECKING([for non-GNU ld])
+-fi
+-AC_CACHE_VAL(ac_cv_path_LD,
+-[if test -z "$LD"; then
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      ac_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+-	test "$with_gnu_ld" != no && break
+-      else
+-	test "$with_gnu_ld" != yes && break
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-else
+-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi])
+-LD="$ac_cv_path_LD"
+-if test -n "$LD"; then
+-  AC_MSG_RESULT($LD)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
+-])
+-
+-AC_DEFUN(AC_PROG_LD_GNU,
+-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+-  ac_cv_prog_gnu_ld=yes
+-else
+-  ac_cv_prog_gnu_ld=no
+-fi])
+-])
+-
+-# AC_PROG_NM - find the path to a BSD-compatible name lister
+-AC_DEFUN(AC_PROG_NM,
+-[AC_MSG_CHECKING([for BSD-compatible nm])
+-AC_CACHE_VAL(ac_cv_path_NM,
+-[if test -n "$NM"; then
+-  # Let the user override the test.
+-  ac_cv_path_NM="$NM"
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$ac_dir/nm -B"
+-	break
+-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$ac_dir/nm -p"
+-	break
+-      else
+-	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+-	continue # so that we can try to find one that supports BSD flags
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+-fi])
+-NM="$ac_cv_path_NM"
+-AC_MSG_RESULT([$NM])
+-])
+-
+-# AC_CHECK_LIBM - check for math library
+-AC_DEFUN(AC_CHECK_LIBM,
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-LIBM=
+-case "$lt_target" in
+-*-*-beos* | *-*-cygwin*)
+-  # These system don't have libm
+-  ;;
+-*-ncr-sysv4.3*)
+-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+-  ;;
+-*)
+-  AC_CHECK_LIB(m, main, LIBM="-lm")
+-  ;;
+-esac
+-])
+-
+-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl convenience library and INCLTDL to the include flags for
+-# the libltdl header and adds --enable-ltdl-convenience to the
+-# configure arguments.  Note that LIBLTDL and INCLTDL are not
+-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
+-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
+-# with '${top_builddir}/' and INCLTDL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
+-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case "$enable_ltdl_convenience" in
+-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+-  esac
+-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-])
+-
+-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl installable library and INCLTDL to the include flags for
+-# the libltdl header and adds --enable-ltdl-install to the configure
+-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
+-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
+-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
+-# with '${top_srcdir}/' (note the single quotes!).  If your package is
+-# not flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  AC_CHECK_LIB(ltdl, main,
+-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+-  [if test x"$enable_ltdl_install" = xno; then
+-     AC_MSG_WARN([libltdl not installed, but installation disabled])
+-   else
+-     enable_ltdl_install=yes
+-   fi
+-  ])
+-  if test x"$enable_ltdl_install" = x"yes"; then
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  else
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+-    LIBLTDL="-lltdl"
+-    INCLTDL=
+-  fi
+-])
+-
+-dnl old names
+-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+-
+-dnl This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])dnl
+Index: SDL_image-1.2.3/m4/sdl.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ SDL_image-1.2.3/m4/sdl.m4	2008-07-24 01:32:20.220875043 +0200
+@@ -0,0 +1,174 @@
++# Configure paths for SDL
++# Sam Lantinga 9/21/99
++# stolen from Manish Singh
++# stolen back from Frank Belew
++# stolen from Manish Singh
++# Shamelessly stolen from Owen Taylor
++
++dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
++dnl
++AC_DEFUN(AM_PATH_SDL,
++[dnl 
++dnl Get the cflags and libraries from the sdl-config script
++dnl
++AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
++            sdl_prefix="$withval", sdl_prefix="")
++AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
++            sdl_exec_prefix="$withval", sdl_exec_prefix="")
++AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
++		    , enable_sdltest=yes)
++
++  if test x$sdl_exec_prefix != x ; then
++     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
++     if test x${SDL_CONFIG+set} != xset ; then
++        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
++     fi
++  fi
++  if test x$sdl_prefix != x ; then
++     sdl_args="$sdl_args --prefix=$sdl_prefix"
++     if test x${SDL_CONFIG+set} != xset ; then
++        SDL_CONFIG=$sdl_prefix/bin/sdl-config
++     fi
++  fi
++
++  AC_REQUIRE([AC_CANONICAL_TARGET])
++  AC_PATH_PROG(SDL_CONFIG,