diff options
| -rw-r--r-- | recipes/ffmpeg/ffmpeg.inc | 2 | ||||
| -rw-r--r-- | recipes/ffmpeg/ffmpeg_0.5.bb | 1 | ||||
| -rw-r--r-- | recipes/ffmpeg/ffmpeg_git.bb | 3 | ||||
| -rw-r--r-- | recipes/ffmpeg/ffmpeg_svn.bb | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index c855877e8d..2b4d26e8f6 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -7,6 +7,8 @@ LICENSE = "LGPL" ARM_INSTRUCTION_SET = "arm" +PE = "2" + DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS = "mplayer" diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb index 6dfc1859ed..956d0cb09b 100644 --- a/recipes/ffmpeg/ffmpeg_0.5.bb +++ b/recipes/ffmpeg/ffmpeg_0.5.bb @@ -2,7 +2,6 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -PE = "1" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "1" diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb index fc9bdf2dee..5c84ea7a01 100644 --- a/recipes/ffmpeg/ffmpeg_git.bb +++ b/recipes/ffmpeg/ffmpeg_git.bb @@ -2,8 +2,7 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -PE = "1" -PV = "0.5.0+${PR}+gitr${SRCREV}" +PV = "0.5.0+${PR}+gitr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index 620783c07d..3b8da50b44 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -4,7 +4,6 @@ DEPENDS += "schroedinger libgsm" SRCREV = "22521" -PE = "1" PV = "0.5.0+${PR}+svnr${SRCPV}" PR = "${INC_PR}.0" |