diff options
| -rw-r--r-- | packages/ffmpeg/omapfbplay/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/ffmpeg/omapfbplay/fbplay-static.diff | 10 | ||||
| -rw-r--r-- | packages/ffmpeg/omapfbplay_git.bb | 7 | ||||
| -rw-r--r-- | packages/images/beagleboard-demo-image.bb | 1 |
4 files changed, 15 insertions, 3 deletions
diff --git a/packages/ffmpeg/omapfbplay/.mtn2git_empty b/packages/ffmpeg/omapfbplay/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ffmpeg/omapfbplay/.mtn2git_empty diff --git a/packages/ffmpeg/omapfbplay/fbplay-static.diff b/packages/ffmpeg/omapfbplay/fbplay-static.diff new file mode 100644 index 0000000000..439fc6e6bb --- /dev/null +++ b/packages/ffmpeg/omapfbplay/fbplay-static.diff @@ -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 diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb index 6274575a34..8f19d27469 100644 --- a/packages/ffmpeg/omapfbplay_git.bb +++ b/packages/ffmpeg/omapfbplay_git.bb @@ -2,19 +2,20 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" 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 diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb index 67632ff0a9..6ac22916dd 100644 --- a/packages/images/beagleboard-demo-image.bb +++ b/packages/images/beagleboard-demo-image.bb @@ -28,6 +28,7 @@ IMAGE_INSTALL = "\ powertop oprofile \ pidgin \ # irssi \ + mplayer omapfbplay \ " IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" |