[oe-commits] Koen Kooi : ffmpeg: fix packaging
git version control
git at git.openembedded.org
Sat Jul 24 08:47:14 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: afa5bccb78c81527e454e88473a31490ce934a97
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=afa5bccb78c81527e454e88473a31490ce934a97
Author: Koen Kooi <koen at openembedded.org>
Date: Sat Jul 24 10:46:28 2010 +0200
ffmpeg: fix packaging
ffmpeg svn: make it distributable
---
recipes/ffmpeg/ffmpeg.inc | 12 +++++++++---
recipes/ffmpeg/ffmpeg_svn.bb | 7 ++++---
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index c3380dd..b05b79f 100644
--- a/recipes/ffmpeg/ffmpeg.inc
+++ b/recipes/ffmpeg/ffmpeg.inc
@@ -12,7 +12,7 @@ PE = "2"
DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
RSUGGESTS_${PN} = "mplayer"
-INC_PR = "r14"
+INC_PR = "r15"
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,9 @@ 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 \
+ "
FILES_ffmpeg-x264-presets = "${datadir}/*.ffpreset"
@@ -98,3 +100,7 @@ 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*"
diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb
index d7274b0..02be9a3 100644
--- a/recipes/ffmpeg/ffmpeg_svn.bb
+++ b/recipes/ffmpeg/ffmpeg_svn.bb
@@ -1,12 +1,15 @@
require ffmpeg.inc
+# The license depends on the configure option selected in this recipe 'non-free' is disabled and 'gpl' is enabled
+LICENSE = "GPLv2+"
+
DEPENDS += "schroedinger libgsm libvpx"
# When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
SRCREV = "23733"
PV = "0.6+${PR}+svnr${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_angstrom = "1"
@@ -28,14 +31,12 @@ EXTRA_OECONF = " \
--enable-pthreads \
--disable-stripping \
--enable-gpl \
- --enable-nonfree \
--enable-postproc \
\
--cross-prefix=${TARGET_PREFIX} \
--prefix=${prefix} \
\
--enable-x11grab \
- --enable-libfaac \
--enable-libgsm \
--enable-libmp3lame \
--enable-libschroedinger \
More information about the Openembedded-commits
mailing list