aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/ffmpeg
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/ffmpeg')
-rw-r--r--recipes/ffmpeg/ffmpeg.inc19
-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/ffmpeg_svn.bb21
-rw-r--r--recipes/ffmpeg/omapfbplay-cmem_git.bb1
-rw-r--r--recipes/ffmpeg/omapfbplay-xv_git.bb2
-rw-r--r--recipes/ffmpeg/omapfbplay_git.bb8
7 files changed, 41 insertions, 26 deletions
diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index 2b4d26e8f6..be67e61250 100644
--- a/recipes/ffmpeg/ffmpeg.inc
+++ b/recipes/ffmpeg/ffmpeg.inc
@@ -10,9 +10,9 @@ ARM_INSTRUCTION_SET = "arm"
PE = "2"
DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
-RSUGGESTS = "mplayer"
+RSUGGESTS_${PN} = "mplayer"
-INC_PR = "r13"
+INC_PR = "r16"
inherit autotools pkgconfig
@@ -33,7 +33,7 @@ EXTRA_OECONF = "\
"
FFMPEG_LIBS = "libavcodec libavdevice libavformat \
- libavutil libpostproc libswscale"
+ libavutil libpostproc libswscale libavfilter"
SYSROOT_PREPROCESS_FUNCS = " \
ffmpeg_stage_cleanup \
@@ -70,7 +70,10 @@ PACKAGES += "ffmpeg-x264-presets \
libavformat libavformat-dev libavformat-dbg \
libavutil libavutil-dev libavutil-dbg \
libpostproc libpostproc-dev libpostproc-dbg \
- libswscale libswscale-dev libswscale-dbg"
+ libswscale libswscale-dev libswscale-dbg \
+ libavfilter libavfilter-dev libavfilter-dbg \
+ libavcore libavcore-dev libavcore-dbg \
+ "
FILES_ffmpeg-x264-presets = "${datadir}/*.ffpreset"
@@ -98,3 +101,11 @@ FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*"
FILES_libswscale = "${libdir}/libswscale*.so.*"
FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a"
FILES_libswscale-dbg += "${libdir}/.debug/libswscale*"
+
+FILES_libavfilter = "${libdir}/libavfilter*.so.*"
+FILES_libavfilter-dev = "${libdir}/libavfilter*.so ${libdir}/pkgconfig/libavfilter.pc ${libdir}/libavfilter*.a"
+FILES_libavfilter-dbg += "${libdir}/.debug/libavfilter*"
+
+FILES_libavcore = "${libdir}/libavcore*.so.*"
+FILES_libavcore-dev = "${libdir}/libavcore*.so ${libdir}/pkgconfig/libavcore.pc ${libdir}/libavcore*.a"
+FILES_libavcore-dbg += "${libdir}/.debug/libavcore*"
diff --git a/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb b/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 3c6197d67d..1ac8610ef8 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 \
+ file://gcc4.patch \
+ file://soname.patch \
+ file://Makefile-avformat-use-LDFLAGS.patch \
+ file://Makefile-add-liblame.patch \
+ file://install-must-not-strip.patch \
"
EXTRA_OECONF += " \
diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index 956d0cb09b..d24ff145b9 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 \
+ file://ffmpeg-arm-update.diff \
"
#S = "${WORKDIR}/git"
diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb
index 3b8da50b44..80c79b6c6a 100644
--- a/recipes/ffmpeg/ffmpeg_svn.bb
+++ b/recipes/ffmpeg/ffmpeg_svn.bb
@@ -1,11 +1,15 @@
require ffmpeg.inc
-DEPENDS += "schroedinger libgsm"
+# The license depends on the configure option selected in this recipe 'non-free' is disabled and 'gpl' is enabled
+LICENSE = "GPLv2+"
-SRCREV = "22521"
+DEPENDS += "virtual/libsdl schroedinger libgsm libvpx"
-PV = "0.5.0+${PR}+svnr${SRCPV}"
-PR = "${INC_PR}.0"
+# When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
+SRCREV = "24596"
+
+PV = "0.6+${PR}+svnr${SRCPV}"
+PR = "${INC_PR}.3"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_angstrom = "1"
@@ -27,23 +31,22 @@ EXTRA_OECONF = " \
--enable-pthreads \
--disable-stripping \
--enable-gpl \
- --enable-nonfree \
--enable-postproc \
\
--cross-prefix=${TARGET_PREFIX} \
--prefix=${prefix} \
\
+ --enable-ffserver \
+ --enable-ffplay \
--enable-x11grab \
- --enable-libfaac \
- --enable-libfaad \
- --enable-libfaadbin \
--enable-libgsm \
--enable-libmp3lame \
--enable-libschroedinger \
--enable-libtheora \
--enable-libvorbis \
+ --enable-libvpx \
--arch=${TARGET_ARCH} \
- --target-os="linux" \
+ --target-os="linux" \
--enable-cross-compile \
--extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
--extra-ldflags="${TARGET_LDFLAGS}" \
diff --git a/recipes/ffmpeg/omapfbplay-cmem_git.bb b/recipes/ffmpeg/omapfbplay-cmem_git.bb
index 3976c4cd00..d578583186 100644
--- a/recipes/ffmpeg/omapfbplay-cmem_git.bb
+++ b/recipes/ffmpeg/omapfbplay-cmem_git.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
DEPENDS = "ti-linuxutils bzip2 lame ffmpeg virtual/kernel"
LICENSE = "MIT"
+PR = "r1"
PV = "0.0+${PR}+gitr${SRCREV}"
SRCREV = "70bc185cfc3dd64399dc664a90a56a15796fb2e8"
diff --git a/recipes/ffmpeg/omapfbplay-xv_git.bb b/recipes/ffmpeg/omapfbplay-xv_git.bb
index 3e676e92bb..646a704a55 100644
--- a/recipes/ffmpeg/omapfbplay-xv_git.bb
+++ b/recipes/ffmpeg/omapfbplay-xv_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
DEPENDS = "libxv bzip2 lame ffmpeg virtual/kernel"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
PV = "0.0+${PR}+gitr${SRCREV}"
SRCREV = "e66bf25df1f1ff085e6db102b282d90e7ceff4bf"
diff --git a/recipes/ffmpeg/omapfbplay_git.bb b/recipes/ffmpeg/omapfbplay_git.bb
index afc3b2aa36..65b7ac33f7 100644
--- a/recipes/ffmpeg/omapfbplay_git.bb
+++ b/recipes/ffmpeg/omapfbplay_git.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
LICENSE = "MIT"
-PR = "r18"
+PR = "r21"
PV = "0.0+${PR}+gitr${SRCREV}"
-SRCREV = "26df4208b57ccb0f0ca101ae4ddb92c956a0ecc0"
+SRCREV = "190b44619bac188d86e8dcee74b0853e33fb7de0"
SRC_URI = "git://git.mansr.com/${PN};protocol=git \
- file://fbplay-static.diff;patch=1 "
+"
S = "${WORKDIR}/git"
@@ -21,7 +21,7 @@ do_compile() {
cp ${STAGING_KERNEL_DIR}/arch/arm/plat-omap/include/mach/omapfb.h ${S} || true
cp ${STAGING_KERNEL_DIR}/include/asm-arm/arch-omap/omapfb.h ${S} || true
cp ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ${S} || true
- oe_runmake -e
+ oe_runmake ${TARGET_ARCH}=y OMAPFB=y NETSYNC=y -e
}
do_install() {
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-25 06:07:48 +0000