[oe-commits] Koen Kooi : omapfbplay: update SRCREV and make it non-machine specific

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: bdd4100f8a21cefd7ee0fd9e1579207ee22de6f8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bdd4100f8a21cefd7ee0fd9e1579207ee22de6f8

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri Nov 28 10:29:57 2008 +0100

omapfbplay: update SRCREV and make it non-machine specific

---

 packages/ffmpeg/omapfbplay/fbplay-static.diff |   11 +++++++++++
 packages/ffmpeg/omapfbplay_git.bb             |   12 +++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/packages/ffmpeg/omapfbplay/fbplay-static.diff b/packages/ffmpeg/omapfbplay/fbplay-static.diff
index f1f7015..021194a 100644
--- a/packages/ffmpeg/omapfbplay/fbplay-static.diff
+++ b/packages/ffmpeg/omapfbplay/fbplay-static.diff
@@ -8,3 +8,14 @@
 +LDLIBS = -lavformat -lavcodec -lavutil -lz -ldl -lbz2 -lfaac -lgsm -lmp3lame -lm -lpthread -lrt
  
  all: omapfbplay
+--- /tmp/omapfbplay.c	2008-11-28 10:28:21.000000000 +0100
++++ git/omapfbplay.c	2008-11-28 10:28:47.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include <semaphore.h>
+ 
+ #include <linux/fb.h>
+-#include <mach/omapfb.h>
++#include "omapfb.h"
+ 
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb
index 00c0804..5ad2e13 100644
--- a/packages/ffmpeg/omapfbplay_git.bb
+++ b/packages/ffmpeg/omapfbplay_git.bb
@@ -2,22 +2,24 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
 DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
 LICENSE = "MIT"
 
-PR = "r13"
-
-inherit module-base
+PR = "r14"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
 
-SRCREV = "0e4b69dbdc807da9b51e97fcffd8e26427b57162"
+SRCREV = "f4765e699090872679d4fb2799e35fff5ed4c8df"
 SRC_URI = "git://git.mansr.com/${PN};protocol=git \
            file://fbplay-static.diff;patch=1 "
 
 S = "${WORKDIR}/git"
 
+# We want a kernel header for armv7a, but we don't want to make mplayer machine specific for that
+STAGING_KERNEL_DIR = "${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
 
-CFLAGS += " -I${STAGING_KERNEL_DIR}/include "
+CFLAGS += " -I. -I${STAGING_KERNEL_DIR}/include "
 
 do_compile() {
+	cp ${STAGING_KERNEL_DIR}/arch/arm/plat-omap/include/mach/omapfb.h ${S} || true
+	cp ${STAGING_KERNEL_DIR}/include/asm-arm/arch-omap/omapfb.h ${S} || true
 	oe_runmake -e
 }