diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-07-11 09:12:41 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-07-11 09:12:41 +0000 |
| commit | c402c5af43c5881feba53c224b27cb2f0c58bec0 (patch) | |
| tree | e1663b0c9405ec984952a10a4f4f5dd06bc5cb74 | |
| parent | f341777c4bf277731c4ff8b776f09ad38ed4f00b (diff) | |
| parent | a7b535066025fea712e253cd0951f244ec4bbaf8 (diff) | |
merge of '6c2994d284da06ed60c607d89622f27c35c68b0e'
and 'da3452ccd1d6234cb9dbbfb85923cce269a1daa7'
| -rw-r--r-- | packages/ffmpeg/ffmpeg_git.bb | 4 | ||||
| -rw-r--r-- | packages/ffmpeg/omapfbplay_git.bb | 2 | ||||
| -rw-r--r-- | packages/libmad/files/mad.diff | 24 | ||||
| -rw-r--r-- | packages/libmad/libmad_0.15.1b.bb | 5 |
4 files changed, 30 insertions, 5 deletions
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 0c9936a2f9..294b6afc22 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r10" +PR = "r12" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -12,7 +12,7 @@ FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d" -SRCREV_arm = "4cc48b756abd09baa7b31909ebbc0c09be2c8e5a" +SRCREV_arm = "749766cea9969418633abb77b6c8677a884dfcb9" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb index e87550207f..b8e092def6 100644 --- a/packages/ffmpeg/omapfbplay_git.bb +++ b/packages/ffmpeg/omapfbplay_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" DEPENDS = "bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" -PR = "r3" +PR = "r4" inherit module-base diff --git a/packages/libmad/files/mad.diff b/packages/libmad/files/mad.diff new file mode 100644 index 0000000000..851dc01201 --- /dev/null +++ b/packages/libmad/files/mad.diff @@ -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" diff --git a/packages/libmad/libmad_0.15.1b.bb b/packages/libmad/libmad_0.15.1b.bb index d828ca85a4..4a75c2d927 100644 --- a/packages/libmad/libmad_0.15.1b.bb +++ b/packages/libmad/libmad_0.15.1b.bb @@ -3,10 +3,11 @@ SECTION = "libs" 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}" |