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

[thebohemian commit]

merge of 'c1a81a9f8ce5ecb75232b4be49a91f4f1a0e19a0'
     and 'f25e95db78aa5e69fe6e1ce592806448ba1dfe00'

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 8acf3d08d60b9f58e48ff7ad9fcdf8c9e034abc9
ViewMTN: http://monotone.openembedded.org/revision/info/8acf3d08d60b9f58e48ff7ad9fcdf8c9e034abc9
Files:
1
conf/distro/chinook-compat.conf
packages/ffmpeg/omapfbplay
packages/ffmpeg/omapfbplay/fbplay-static.diff
packages/ffmpeg/omapfbplay_git.bb
packages/images/beagleboard-demo-image.bb
Diffs:

#
# mt diff -rc1a81a9f8ce5ecb75232b4be49a91f4f1a0e19a0 -r8acf3d08d60b9f58e48ff7ad9fcdf8c9e034abc9
#
#
#
# patch "conf/distro/chinook-compat.conf"
#  from [82f061f680e83ac8f98ea7c468da6ace94ccba60]
#    to [61ddfe57a63bdd965dd857bd75478e87045007b9]
#
============================================================
--- conf/distro/chinook-compat.conf	82f061f680e83ac8f98ea7c468da6ace94ccba60
+++ conf/distro/chinook-compat.conf	61ddfe57a63bdd965dd857bd75478e87045007b9
@@ -87,8 +87,11 @@ PREFERRED_VERSION_libpng           = "1.
 PREFERRED_VERSION_atk              = "1.18.0"
 PREFERRED_VERSION_gtk+             = "2.10.14"
 PREFERRED_VERSION_libpng           = "1.2.8"
+PREFERRED_VERSION_expat            = "1.95.7"
+
+# only dbus-glib 0.7.4 works with older dbus 1.0.x
 PREFERRED_VERSION_dbus             = "1.0.3"
-PREFERRED_VERSION_expat            = "1.95.7"
+PREFERRED_VERSION_dbus-glib        = "0.7.4"
 
 PREFERRED_VERSION_gnome-vfs        = "2.16.3"
 


#
# mt diff -rf25e95db78aa5e69fe6e1ce592806448ba1dfe00 -r8acf3d08d60b9f58e48ff7ad9fcdf8c9e034abc9
#
#
#
# add_dir "packages/ffmpeg/omapfbplay"
# 
# add_file "packages/ffmpeg/omapfbplay/fbplay-static.diff"
#  content [39aa924c731660c6f60aa4bee0e0f16bbba80123]
# 
# patch "packages/ffmpeg/omapfbplay_git.bb"
#  from [249fac23eea37220610a8ab9c00935bd606ecb4b]
#    to [0480261a94ed82d3ec30fd7677c8775310776eb2]
# 
# patch "packages/images/beagleboard-demo-image.bb"
#  from [4d5ef75d06c67bfb38408d85c478c77ebb96e226]
#    to [a5e29d5371d9630726fac8ef24450a866fcd1dec]
#
============================================================
--- packages/ffmpeg/omapfbplay/fbplay-static.diff	39aa924c731660c6f60aa4bee0e0f16bbba80123
+++ packages/ffmpeg/omapfbplay/fbplay-static.diff	39aa924c731660c6f60aa4bee0e0f16bbba80123
@@ -0,0 +1,10 @@
+--- /tmp/Makefile	2008-07-10 12:59:00.000000000 +0200
++++ git/Makefile	2008-07-10 12:57:38.723198000 +0200
+@@ -5,6 +5,6 @@
+ CFLAGS = -O3 -Wall -fomit-frame-pointer -mcpu=cortex-a8 -mfpu=neon \
+ 	-I$(LINUX)/include -I$(FFMPEG)
+ LDFLAGS = -L$(FFMPEG)/libavcodec -L$(FFMPEG)/libavformat -L$(FFMPEG)/libavutil
+-LDLIBS = -lavformat -lavcodec -lavutil -lm -lz -lpthread
++LDLIBS = -lavformat -lavcodec -lavutil -lz -ldl -lbz2 -lfaac -lgsm -lmp3lame -lm -lpthread
+ 
+ all: omapfbplay
============================================================
--- packages/ffmpeg/omapfbplay_git.bb	249fac23eea37220610a8ab9c00935bd606ecb4b
+++ packages/ffmpeg/omapfbplay_git.bb	0480261a94ed82d3ec30fd7677c8775310776eb2
@@ -2,19 +2,20 @@ LICENSE = "MIT"
 DEPENDS = "ffmpeg virtual/kernel"
 LICENSE = "MIT"
 
-PR = "r1"
+PR = "r2"
 
 inherit module-base
 
 PV = "0.0+${PR}+gitr${SRCREV}"
 
 SRCREV = "5d0a1fd4c9733ef8c57823c368e21688344bbeb4"
-SRC_URI = "git://git.mansr.com/${PN};protocol=git"
+SRC_URI = "git://git.mansr.com/${PN};protocol=git \
+           file://fbplay-static.diff;patch=1 "
 
 S = "${WORKDIR}/git"
 
 
-CFLAGS += "-I${STAGING_KERNEL_DIR}/include "
+CFLAGS += " -static -I${STAGING_KERNEL_DIR}/include "
 
 do_compile() {
 	oe_runmake -e
============================================================
--- packages/images/beagleboard-demo-image.bb	4d5ef75d06c67bfb38408d85c478c77ebb96e226
+++ packages/images/beagleboard-demo-image.bb	a5e29d5371d9630726fac8ef24450a866fcd1dec
@@ -28,6 +28,7 @@ IMAGE_INSTALL = "\
     powertop oprofile \
     pidgin \
 #    irssi \
+    mplayer omapfbplay \
 "
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"