summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/ffmpeg/ffmpeg.inc2
-rw-r--r--packages/ffmpeg/ffmpeg_git.bb12
2 files changed, 8 insertions, 6 deletions
diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc
index 1d72e5280a..33e7d7aaf7 100644
--- a/packages/ffmpeg/ffmpeg.inc
+++ b/packages/ffmpeg/ffmpeg.inc
@@ -7,7 +7,7 @@ LICENSE = "LGPL"
ARM_INSTRUCTION_SET = "arm"
-DEPENDS = "zlib libogg libvorbis faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
+DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
RSUGGESTS = "mplayer"
inherit autotools pkgconfig
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index c6b5db2c52..42e34d5d5b 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 = "r37"
+PR = "r38"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv5te = "1"
@@ -16,9 +16,9 @@ FFBRANCH_arm = "arm"
FFBRANCH ?= "master"
# When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
-SRCREV = "ffbaebee2114d4dc98125959be102b95c60d6c83"
-SRCREV_arm = "48518fbebda89c8f30146696a0be7c4ffa45465c"
-SRCREV_libswscale = "83327f385bf51acc4527fe72b73dd29b4b93ad7d"
+SRCREV = "997df8779ce24088d0ebf77aa36f71280785a549"
+SRCREV_arm = "e4f37d7bc8ebd5e63ce57af157c2ebebfdf871fa"
+SRCREV_libswscale = "b2e1c8222eeef74b0ca8053b400957dd69e18e4d"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"
@@ -49,7 +49,9 @@ EXTRA_OECONF = " \
--enable-libgsm \
--enable-libmp3lame \
--enable-libschroedinger \
- --enable-swscale \
+ --enable-libtheora \
+ --enable-libvorbis \
+ --enable-swscale \
--arch=${TARGET_ARCH} \
--enable-cross-compile \
--extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \