[oe-commits] org.oe.dev merge of '6c2994d284da06ed60c607d89622f27c35c68b0e'

[mickeyl commit]

merge of '6c2994d284da06ed60c607d89622f27c35c68b0e'
     and 'da3452ccd1d6234cb9dbbfb85923cce269a1daa7'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: eb0c98a311b18286f22de5289a92bd065bcd8db3
ViewMTN: http://monotone.openembedded.org/revision/info/eb0c98a311b18286f22de5289a92bd065bcd8db3
Files:
1
packages/libmad/files/mad.diff
packages/ffmpeg/ffmpeg_git.bb
packages/ffmpeg/omapfbplay_git.bb
packages/libmad/libmad_0.15.1b.bb
packages/ezx/ezx-gen-blob
packages/ezx/ezx-gen-blob/gen-blob
packages/ezx/ezx-gen-blob_20080707.bb
packages/dsplink/codec-engine_2.10.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -r6c2994d284da06ed60c607d89622f27c35c68b0e -reb0c98a311b18286f22de5289a92bd065bcd8db3
#
#
#
# add_file "packages/libmad/files/mad.diff"
#  content [97462f304c72a5a7cf9ea36b83b38e13c9a53b29]
# 
# patch "packages/ffmpeg/ffmpeg_git.bb"
#  from [dd0dfbb0e116e12cbef829defa334905ca9fa64c]
#    to [6595b7db30a4c0aa450baa53b7c03f70acc8211b]
# 
# patch "packages/ffmpeg/omapfbplay_git.bb"
#  from [17bff7c91288bcd756e1d9b4f7c54bb3ebcc64ec]
#    to [3efb5c482ac4afd4d7f31cd2a0de6c849e8f0e2a]
# 
# patch "packages/libmad/libmad_0.15.1b.bb"
#  from [55e89f58cb09590f6599edf4eef9e25444542c4d]
#    to [c0447b71ae96fb91ea0f4b950a2923f99c1cd081]
#
============================================================
--- packages/libmad/files/mad.diff	97462f304c72a5a7cf9ea36b83b38e13c9a53b29
+++ packages/libmad/files/mad.diff	97462f304c72a5a7cf9ea36b83b38e13c9a53b29
@@ -0,0 +1,24 @@
+--- /tmp/configure.ac	2008-07-11 10:19:17.000000000 +0200
++++ libmad-0.15.1b/configure.ac	2008-07-11 10:20:00.313198000 +0200
+@@ -140,21 +140,14 @@
+     case "$optimize" in
+ 	-O|"-O "*)
+ 	    optimize="-O"
+-	    optimize="$optimize -fforce-mem"
+-	    optimize="$optimize -fforce-addr"
+ 	    : #x optimize="$optimize -finline-functions"
+ 	    : #- optimize="$optimize -fstrength-reduce"
+-	    optimize="$optimize -fthread-jumps"
+-	    optimize="$optimize -fcse-follow-jumps"
+-	    optimize="$optimize -fcse-skip-blocks"
+ 	    : #x optimize="$optimize -frerun-cse-after-loop"
+ 	    : #x optimize="$optimize -frerun-loop-opt"
+ 	    : #x optimize="$optimize -fgcse"
+ 	    optimize="$optimize -fexpensive-optimizations"
+-	    optimize="$optimize -fregmove"
+ 	    : #* optimize="$optimize -fdelayed-branch"
+ 	    : #x optimize="$optimize -fschedule-insns"
+-	    optimize="$optimize -fschedule-insns2"
+ 	    : #? optimize="$optimize -ffunction-sections"
+ 	    : #? optimize="$optimize -fcaller-saves"
+ 	    : #> optimize="$optimize -funroll-loops"
============================================================
--- packages/ffmpeg/ffmpeg_git.bb	dd0dfbb0e116e12cbef829defa334905ca9fa64c
+++ packages/ffmpeg/ffmpeg_git.bb	6595b7db30a4c0aa450baa53b7c03f70acc8211b
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}" 
 DEPENDS += "libgsm"
 
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r10"
+PR = "r12"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv7a = "1"
@@ -12,7 +12,7 @@ SRCREV = "1e8300e71f79963eacdad6b180d9a1
 FFBRANCH ?= "master"
 
 SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d"
-SRCREV_arm = "4cc48b756abd09baa7b31909ebbc0c09be2c8e5a"
+SRCREV_arm = "749766cea9969418633abb77b6c8677a884dfcb9"
 SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
 "
 
============================================================
--- packages/ffmpeg/omapfbplay_git.bb	17bff7c91288bcd756e1d9b4f7c54bb3ebcc64ec
+++ packages/ffmpeg/omapfbplay_git.bb	3efb5c482ac4afd4d7f31cd2a0de6c849e8f0e2a
@@ -2,7 +2,7 @@ LICENSE = "MIT"
 DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
 LICENSE = "MIT"
 
-PR = "r3"
+PR = "r4"
 
 inherit module-base
 
============================================================
--- packages/libmad/libmad_0.15.1b.bb	55e89f58cb09590f6599edf4eef9e25444542c4d
+++ packages/libmad/libmad_0.15.1b.bb	c0447b71ae96fb91ea0f4b950a2923f99c1cd081
@@ -3,10 +3,11 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 DEPENDS = "libid3tag"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
-           file://add-pkgconfig.patch;patch=1"
+           file://add-pkgconfig.patch;patch=1 \
+	   file://mad.diff;patch=1 "
 
 S = "${WORKDIR}/libmad-${PV}"
 


#
# mt diff -rda3452ccd1d6234cb9dbbfb85923cce269a1daa7 -reb0c98a311b18286f22de5289a92bd065bcd8db3
#
#
#
# add_dir "packages/ezx/ezx-gen-blob"
# 
# add_file "packages/ezx/ezx-gen-blob/gen-blob"
#  content [6f13ad8f7b89a9d338775e7470575426a505e674]
# 
# add_file "packages/ezx/ezx-gen-blob_20080707.bb"
#  content [9743098583597f6587d90ff68db65f40e48d0edc]
# 
# patch "packages/dsplink/codec-engine_2.10.bb"
#  from [811c730621069ed158a4cbe9dfb3d042da4161d2]
#    to [27ec35eee8d5be23f7a29ece8b87c24f3e403d08]
# 
#   set "packages/ezx/ezx-gen-blob/gen-blob"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/ezx/ezx-gen-blob/gen-blob is binary
============================================================
--- packages/ezx/ezx-gen-blob_20080707.bb	9743098583597f6587d90ff68db65f40e48d0edc
+++ packages/ezx/ezx-gen-blob_20080707.bb	9743098583597f6587d90ff68db65f40e48d0edc
@@ -0,0 +1,32 @@
+DESCRIPTION = "Generic Blob [Bootloader] for the Motorola EZX platform"
+SECTION = "bootloaders"
+AUTHOR = "Daniel Riberio"
+HOMEPAGE = "http://people.openezx.org/wyrm/gen-blob"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PROVIDES = "virtual/bootloader"
+
+SRC_URI = "file://gen-blob"
+S = "${WORKDIR}"
+
+do_deploy() {
+	dd if=${WORKDIR}/gen-blob bs=1k seek=2 conv=sync of=${WORKDIR}/gen-blob-a1200
+
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0644 gen-blob ${DEPLOY_DIR_IMAGE}/gen-blob-for-1stgen.${SRCDATE}
+	install -m 0644 gen-blob-a1200 ${DEPLOY_DIR_IMAGE}/gen-blob-for-2ndgen.${SRCDATE}
+}
+
+do_install() {
+	dd if=${WORKDIR}/gen-blob bs=1k seek=2 conv=sync of=${WORKDIR}/gen-blob-a1200
+
+	install -d ${D}/${datadir}/openezx
+	install -m 0644 gen-blob ${D}${datadir}/openezx/gen-blob-for-1stgen.${SRCDATE}
+	install -m 0644 gen-blob-a1200 ${D}${datadir}/openezx/gen-blob-for-2ndgen.${SRCDATE}
+}
+
+addtask deploy before do_build after do_compile
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILES_${PN} = "${datadir}"
+
============================================================
--- packages/dsplink/codec-engine_2.10.bb	811c730621069ed158a4cbe9dfb3d042da4161d2
+++ packages/dsplink/codec-engine_2.10.bb	27ec35eee8d5be23f7a29ece8b87c24f3e403d08
@@ -17,6 +17,7 @@ S = "${WORKDIR}/codec_engine_2_10_01"
 
 S = "${WORKDIR}/codec_engine_2_10_01"
 
+PARALLEL_MAKE = ""
 do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS	
 	cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem