aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/ffmpeg
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-05-23 20:23:53 -0700
committerChris Larson <chris_larson@mentor.com>2010-05-25 12:53:41 -0700
commitbf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 (patch)
tree96f28e2f5133d68c3e3dadabaa2339340671454f /recipes/ffmpeg
parentfab0af3aefee22b21541e403d3c356a6979bfa63 (diff)
downloadopenembedded-bf7d0467a0788a7fcc1c96e0dc35a25ae09278a0.tar.gz
Rename url params patch=<ignored>/pnum=<n> to apply={yes,no}/striplevel=<n>
I think this makes the behavior rather more clear. Signed-off-by: Chris Larson <chris_larson@mentor.com> Acked-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/ffmpeg')
-rw-r--r--recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb12
-rw-r--r--recipes/ffmpeg/ffmpeg_0.5.bb4
-rw-r--r--recipes/ffmpeg/omapfbplay_git.bb2
3 files changed, 9 insertions, 9 deletions
diff --git a/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb b/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 3c6197d67d..63bfde17e8 100644
--- a/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
+++ b/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
@@ -3,12 +3,12 @@ require ffmpeg.inc
PR = "${INC_PR}.0"
SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
- file://configure.patch;patch=0 \
- file://gcc4.patch;patch=1 \
- file://soname.patch;patch=1 \
- file://Makefile-avformat-use-LDFLAGS.patch;patch=1 \
- file://Makefile-add-liblame.patch;patch=1 \
- file://install-must-not-strip.patch;patch=1 \
+ file://configure.patch;apply=yes \
+ file://gcc4.patch;apply=yes \
+ file://soname.patch;apply=yes \
+ file://Makefile-avformat-use-LDFLAGS.patch;apply=yes \
+ file://Makefile-add-liblame.patch;apply=yes \
+ file://install-must-not-strip.patch;apply=yes \
"
EXTRA_OECONF += " \
diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index 956d0cb09b..62bedafb1a 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -8,8 +8,8 @@ DEFAULT_PREFERENCE = "1"
SRCREV_libswscale = "b2e1c8222eeef74b0ca8053b400957dd69e18e4d"
SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2 \
- file://armv4.patch;patch=1 \
- file://ffmpeg-arm-update.diff;patch=1 \
+ file://armv4.patch;apply=yes \
+ file://ffmpeg-arm-update.diff;apply=yes \
"
#S = "${WORKDIR}/git"
diff --git a/recipes/ffmpeg/omapfbplay_git.bb b/recipes/ffmpeg/omapfbplay_git.bb
index afc3b2aa36..abbc0df2c6 100644
--- a/recipes/ffmpeg/omapfbplay_git.bb
+++ b/recipes/ffmpeg/omapfbplay_git.bb
@@ -8,7 +8,7 @@ PV = "0.0+${PR}+gitr${SRCREV}"
SRCREV = "26df4208b57ccb0f0ca101ae4ddb92c956a0ecc0"
SRC_URI = "git://git.mansr.com/${PN};protocol=git \
- file://fbplay-static.diff;patch=1 "
+ file://fbplay-static.diff;apply=yes "
S = "${WORKDIR}/git"