From 04ca25a7f9957906c5121005391967de930eb58a Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sun, 24 Feb 2008 02:23:16 +0000
Subject: ffmpeg: fix 0.4.9-pre1 oebug 1897, fix svn packaging oebug 3850 *
 gcc4.patch absorbs the original common.patch and adds hacks to satisfy  
 stricter type checking by gcc4 * soname.patch adds libpostproc fix in oebug
 1897 comment#1 * drop the obsolete/dup patches in ffmpeg dir * 1st attemp to
 unify 0.4.9 and svn. * TODO: further unification of packaging and staging is
 desired once svn recipie settles

---
 packages/ffmpeg/ffmpeg.inc | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 packages/ffmpeg/ffmpeg.inc

(limited to 'packages/ffmpeg/ffmpeg.inc')

diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc
new file mode 100644
index 0000000000..00f1423450
--- /dev/null
+++ b/packages/ffmpeg/ffmpeg.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = "ffmpeg"
+HOMEPAGE = "http://ffmpeg.mplayerhq.hu/"
+AUTHOR = "Fabrice Bellard ffmpeg-devel@mplayerhq.hu"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "zlib libvorbis faac liba52 lame"
+RSUGGESTS = "mplayer"
+
+inherit autotools pkgconfig
+
+TARGET_LDFLAGS_append = " -lm -la52 "
+
+EXTRA_OECONF = "\
+        --enable-pp \
+        --enable-shared \
+        --enable-pthreads \
+        --enable-gpl \
+        \
+        --disable-audio-beos \
+        --disable-v4l \
+        --disable-dv1394 \
+        --disable-debug \
+        --disable-ffserver \
+        --disable-ffplay \
+        \
+        --cross-prefix=${TARGET_PREFIX} \
+        \
+        --cpu=${PACKAGE_ARCH} \
+        \
+"
+
+# We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff..
+PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
+
+do_configure_prepend() {
+        export CC="${CC}"
+}
-- 
cgit v1.2.3


From d9a1af61ed037f1d5847bbaca10000b248937ce1 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sun, 24 Feb 2008 11:14:19 +0000
Subject: ffmpeg: make svn buildable, fix configure options for 0.4.9-pre1,
 unify, clean up * fix svn using SRCDATE * reformat EXTRA_OECONF to make the
 order of the options follow  ./configure --help * NOTE: --cpu(0.4.9-pre1)
 equals --arch(svn); while --tune(0.4.9-pre1) equals --cpu(svn) * NOTE: oe
 uses --march and --mtune, so the above optimization by ffmpeg (--mcpu) is not
 really needed * NOTE: but we try to make --cpu(0.4.9-pre1) or --arch(svn) as
 close to $TARGET_ARCH as possible * checked --march and --mtune and
 $TARGET_CFLAGS are used correctly * remove unnecessary FLAGS, configure
 options, oe_runconf(), etc in either svn or pre1 * unify svn and 0.4.9-pre1,
 however not much can be done for packaging and staging * QA: add LEAD_SONAME,
 fix DESCRIPTION, HOME, AUTHOR

---
 packages/ffmpeg/ffmpeg.inc | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'packages/ffmpeg/ffmpeg.inc')

diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc
index 00f1423450..aab2c62fa9 100644
--- a/packages/ffmpeg/ffmpeg.inc
+++ b/packages/ffmpeg/ffmpeg.inc
@@ -1,39 +1,35 @@
-DESCRIPTION = "ffmpeg"
+DESCRIPTION = "FFmpeg is a complete solution to record, convert and stream audio and video"
 HOMEPAGE = "http://ffmpeg.mplayerhq.hu/"
 AUTHOR = "Fabrice Bellard ffmpeg-devel@mplayerhq.hu"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 
-DEPENDS = "zlib libvorbis faac liba52 lame"
+DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame"
 RSUGGESTS = "mplayer"
 
 inherit autotools pkgconfig
 
-TARGET_LDFLAGS_append = " -lm -la52 "
+LEAD_SONAME = "libavcodec.so"
 
 EXTRA_OECONF = "\
+        \
         --enable-pp \
         --enable-shared \
         --enable-pthreads \
         --enable-gpl \
         \
-        --disable-audio-beos \
-        --disable-v4l \
-        --disable-dv1394 \
+        --cross-prefix=${TARGET_PREFIX} \
         --disable-debug \
         --disable-ffserver \
         --disable-ffplay \
         \
-        --cross-prefix=${TARGET_PREFIX} \
-        \
-        --cpu=${PACKAGE_ARCH} \
-        \
 "
 
-# We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
+PACKAGES += "${PN}-vhook-dbg ${PN}-vhook"
+
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dev = "${includedir}/${PN}"
 
-do_configure_prepend() {
-        export CC="${CC}"
-}
+FILES_${PN}-vhook = "${libdir}/vhook"
+FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug"
-- 
cgit v1.2.3