summaryrefslogtreecommitdiff
path: root/packages/ffmpeg
diff options
context:
space:
mode:
Diffstat (limited to 'packages/ffmpeg')
-rw-r--r--packages/ffmpeg/ffmpeg.inc2
-rw-r--r--packages/ffmpeg/ffmpeg_0.4.9-pre1.bb2
-rw-r--r--packages/ffmpeg/ffmpeg_git.bb2
-rw-r--r--packages/ffmpeg/ffmpeg_svn.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc
index 44e00e6764..f26c71e80f 100644
--- a/packages/ffmpeg/ffmpeg.inc
+++ b/packages/ffmpeg/ffmpeg.inc
@@ -5,7 +5,7 @@ SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
-DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame"
+DEPENDS = "zlib libogg libvorbis faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
RSUGGESTS = "mplayer"
inherit autotools pkgconfig
diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 3e05040854..6e347b16f1 100644
--- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
+++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
@@ -1,6 +1,6 @@
require ffmpeg.inc
-PR = "r8"
+PR = "r9"
SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
file://configure.patch;patch=0 \
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index aa955b1648..3f8785b6d7 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm"
PE = "1"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r34"
+PR = "r35"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv5te = "1"
diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb
index 2433565bbe..09f1003a1d 100644
--- a/packages/ffmpeg/ffmpeg_svn.bb
+++ b/packages/ffmpeg/ffmpeg_svn.bb
@@ -6,7 +6,7 @@ SRCREV ?= "12186"
PE = "1"
PV = "0.4.9+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"