Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

5 files changed, 98 insertions, 12 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 60d003f4cf..a7b7ab578a 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -630,6 +630,14 @@ sha256=fbd907dde45054227568f3117df0418a7819cfee02875d3723779432e8a66dc9
 md5=f766680bb237ca2f837c005efba54efa
 sha256=fbd907dde45054227568f3117df0418a7819cfee02875d3723779432e8a66dc9
 
+[http://download.java.net/openjdk/jdk6/promoted/b12/openjdk-6-src-b12-28_aug_2008.tar.gz]
+md5=b53e1ef643909ce82721ee4c970d958b
+sha256=f099b3b1f3c22b8cea950403b992267ec69f43ad8a80bbcb84448b26340807ab
+
+[http://download.java.net/openjdk/jdk6/promoted/b14/openjdk-6-src-b14-25_nov_2008.tar.gz]
+md5=9f9773a822156dd3d576d83d794364ce
+sha256=1272f975052e51d3faf2d7ac13d0b8b4ac68019a688bffe03d9b684a9e3b4480
+
 [http://downloads.sourceforge.net/openjade/OpenSP-1.5.tar.gz]
 md5=87f56e79ae0c20397f4207d61d154303
 sha256=987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704
@@ -8542,6 +8550,10 @@ sha256=a7ec60003a96975523598c2ef5f2927c9a362e689e7159b268c7fe431754635a
 md5=7ba3d2592585c8bcf9d3bf1aafeefef3
 sha256=609e24aa1413b1053ee3fd42c36c6ccf05d8067867021511c7d50d4829875b44
 
+[http://gpe.linuxtogo.org/download/source/gpe-scap-1.4.tar.bz2]
+md5=eaf545561b0ad981c9d01833f30fcf95
+sha256=762778421fae7c62d5ec6a9d27986166c0dbbe2ff51fc10bb9b8baff5c367534
+
 [http://gpe.linuxtogo.org/download/source/gpe-session-scripts-0.67.tar.gz]
 md5=774c64ed54455f1297ecbeeffdc52eed
 sha256=da051f5049d44415fff02b48368db4e3e3b6154135a50f990844d73896d18e19
@@ -9922,6 +9934,10 @@ sha256=af40399fe434678454ae8ea100db6cba0482aa65b8972a05098c779cac57bc48
 md5=faa08f321fefd2c61ce4c9355a62fe31
 sha256=ca7ef124cde06883fbf28c7e78ce1e4c5526434bbe5672ef0a3e85a61a9d0b5f
 
+[http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/f9d938ede196.tar.gz]
+md5=c8f78d48ac83987bc2adebeebcd354e9
+sha256=89952cf8bbe1bcce91c2c1fcf9a071991a890b3f8a783dee741cdb23c8ac763a
+
 [http://www.porchdogsoft.com/download/howl-0.9.7.tar.gz]
 md5=85fbe016e2ebad99108b1212ae4b1d6f
 sha256=f8766c44291aac92b2b4abc762e1b11e3504dd9f2a855fdde371b5abd730fe9f
@@ -10110,6 +10126,14 @@ sha256=9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834
 md5=ce7b1827e6f4cbe73b9ffa90b0d45a6a
 sha256=63170836095f8451498c813a1f93a9ec70a1164d82aa30650c0f2216ca4377ab
 
+[http://icedtea.classpath.org/download/source/icedtea6-1.3.1.tar.gz]
+md5=6865c25cbc087e4142031a846b71ae56
+sha256=c15fb24475ad93e064ba252f2739c020f9981a808bde6cbd6c41eae38dd0143d
+
+[http://icedtea.classpath.org/download/source/icedtea6-1.4.tar.gz]
+md5=6428ca1b0c38111cca230f5b69460b03
+sha256=4f23aadcee80a9a03c858e36a8eaaa92149987ce0a3eac276e3003c9b2462739
+
 [http://ftp.de.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0.1-1.diff.gz]
 md5=7124ea3c13369ff27bcff0080aca678f
 sha256=1d70e21e1c20e8d88bf3d2590de75c3e65b12da335097716adc58712cea41dad
@@ -19670,6 +19694,10 @@ sha256=24ee0f94226879038fe1d117c251900400376e942b4c82368d46f9466bb57243
 md5=61b724a4e1a48d0735fb18d4f68c0506
 sha256=13cce714959056d41627ec9442342d46072f9d72ef57554b9d03ebfb353ed2d1
 
+[ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R1.zip]
+md5=613eed8201d37be201805e5048ebb0c3
+sha256=084e250d2392369b2548b663e61bcf128baecb2f527e381e9ba89f0148db2c0d
+
 [http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-0.8.5.tar.gz]
 md5=5ac4e1b5ff4f2fdada81c007ac599cb9
 sha256=654d6b190f4644d82c10b4ce5645b72405c2e78ea346ce3d8eb385fc3f3732de
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index e0757a7abd..7bb9e4b0bb 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -78,6 +78,8 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.20"
 PREFERRED_VERSION_glibc = "2.5"
 PREFERRED_VERSION_glibc-initial = "2.5"
 
+PREFERRED_VERSION_libtool-native = "1.5.10"
+PREFERRED_VERSION_libtool-cross = "1.5.10"
 PREFERRED_VERSION_libtool = "1.5.6"
 
 require conf/distro/include/sane-srcrevs.inc
@@ -122,7 +124,7 @@ PREFERRED_PROVIDER_virtual/xserver      = "xserver-kdrive"
 
 # This is a hack to avoid building mesa which crashes the compiler
 PREFERRED_PROVIDER_virtual/libsdl       = "libsdl-directfb"
-PREFERRED_VERSION_libsdl-directfb       = "1.2.9"
+PREFERRED_VERSION_libsdl-directfb       = "1.2.11"
 PREFERRED_VERSION_libsdl-image          = "1.2.3"
 PREFERRED_VERSION_libsdl-mixer          = "1.2.6"
 
@@ -157,6 +159,8 @@ PREFERRED_VERSION_pixman                  = "0.9.6"
 PREFERRED_PROVIDER_virtual/libqte2	  = "qte-mt"
 PREFERRED_PROVIDER_avahi		  = "avahi"
 
+PREFERRED_VERSION_avahi = "0.6.20"
+
 PREFERRED_VERSION_libsoup = "2.2.7"
 PREFERRED_VERSION_libglade = "2.4.2"
 PREFERRED_VERSION_gnutls = "1.4.5"
diff --git a/packages/dsplink/ti-codec-combos_3.16.bb b/packages/dsplink/ti-codec-combos_3.16.bb
index ae9edee4ae..923e9eeff2 100644
--- a/packages/dsplink/ti-codec-combos_3.16.bb
+++ b/packages/dsplink/ti-codec-combos_3.16.bb
@@ -4,25 +4,47 @@ LICENCE = "unknown"
 
 require ti-paths.inc
 
-# TODO update this...
-# https://www-a.ti.com/downloads/sds_support/applications_packages/dmai/dmai_1_20_00_06/dmai_setuplinux_1_20_00_06.bin
-# Install the above link and put the omap3530_dvsdk_combos_3_16.tar.gz file in the same directory as this recipe
-SRC_URI = "file://omap3530_dvsdk_combos_3_16.tar.gz \
-   "
+SRC_URI = "http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16-Linux-x86.bin \
+    "
 
 S = "${WORKDIR}/omap3530_dvsdk_combos_3_16"
+
 # Yes, the xdc stuff still breaks with a '.' in PWD
 PV = "316"
-PR = "r11"
+PR = "r12"
 
 TARGET = "all"
 
 export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/packages;${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
 
+# Needed for now since makefile in latest package assumes this is set
+export CODEC_INSTALL_DIR="${S}"
+
+# Helper function to run the binary installer and unpack the tar.gz in the same place as it was before - this could be optimised later
+do_accept_license() {
+        export HOME="${WORKDIR}"
+	chmod +x ${WORKDIR}/omap3530_dvsdk_combos_tspa-3_16-Linux-x86.bin
+        ${WORKDIR}/omap3530_dvsdk_combos_tspa-3_16-Linux-x86.bin --mode silent --prefix ${S}_install
+        cd "${S}_install"
+	tar -xzvf omap3530_dvsdk_combos_tspa_3_16.tar.gz
+	if [ -d ${S} ] ; then 
+            rm -rf ${S}
+        fi
+        mv omap3530_dvsdk_combos_tspa_3_16 ${S}
+}
+
+addtask accept_license after do_unpack before do_configure
+
 do_compile() {
-	sed -i -e s:/db/toolsrc/library/vendors2005/ti/c6x/6.0.16/Linux:${TITOOLSDIR}/${TICGTOOLSDIR}:g \
-	-e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g \
-	-e s:/home/dvsdkval/workdir/OMAP3530/nfs/workdir/opt/toolchain/arm-2007q3:${CROSS_DIR}:g \
+
+        # For now, remove the reference to Rules.make and swap prod for eval, since this only has eval libs included
+        sed -i \
+        -e '/Rules.make/d' \
+        -e s:prod:eval:g \
+        ${S}/Makefile
+
+        # Fix-up config.bld to swap out hardcoded references to tools paths
+	sed -i -e s:/opt/dmsw/cg6x_6_0_16:${TITOOLSDIR}/${TICGTOOLSDIR}:g \
 	${S}/config.bld
 
 	oe_runmake clean
@@ -41,7 +63,10 @@ do_install () {
 		install ${i} ${D}/${datadir}/ti-codec-combos
 	done
 	
-	# should copy the generated data sheets as well for reference
+	# copy the generated data sheets as well for reference
+        for i in $(find . -name "*.DataSheet.*") ; do
+                install ${i} ${D}/${datadir}/ti-codec-combos
+        done
 }
 
 do_stage () {
diff --git a/packages/libsdl/libsdl-directfb_1.2.11.bb b/packages/libsdl/libsdl-directfb_1.2.11.bb
new file mode 100644
index 0000000000..3f44f9df3f
--- /dev/null
+++ b/packages/libsdl/libsdl-directfb_1.2.11.bb
@@ -0,0 +1,27 @@
+require libsdl.inc
+
+DEPENDS = "alsa-lib directfb"
+# extra-keys.patch is missing
+DEFAULT_PREFERENCE = "-1" 
+
+PR = "r0"
+
+SRC_URI = "\
+  http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+  file://acinclude.m4 \
+  file://configure_tweak.patch;patch=1 \
+  file://pagesize.patch;patch=1 \
+  file://kernel-asm-page.patch;patch=1 \
+  file://sdl-cdfix.patch;patch=1 \
+  file://fixmfour.patch;patch=1 \
+"
+
+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 --disable-video-x11 --disable-video-dga \
+                --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"
+
diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb
index 4f54029457..56076140fa 100644
--- a/packages/ncurses/ncurses_5.4.bb
+++ b/packages/ncurses/ncurses_5.4.bb
@@ -1,4 +1,4 @@
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
            file://makefile_tweak.patch;patch=1 \
@@ -6,3 +6,5 @@ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
 S = "${WORKDIR}/ncurses-${PV}"
 
 require ncurses.inc
+
+LEAD_SONAME = "libncurses.so.5"