merge of '085fdb053bd524c93d21f1f230ab0b9ae7e0143f'

     and 'a0e35a653641856b7a032c32949f7d3b2c23b5af'

1 files changed, 127 insertions, 0 deletions

diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb
new file mode 100644
index 0000000000..4098d721f9
--- /dev/null
+++ b/packages/ffmpeg/ffmpeg_svn.bb
@@ -0,0 +1,127 @@
+DESCRIPTION = "ffmpeg"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "zlib libvorbis faac liba52 lame"
+PV = "0.4.9+svn${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://svn.mplayerhq.hu/ffmpeg/;module=trunk"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+TARGET_LDFLAGS_append = " -lm -la52 "
+
+EXTRA_OECONF = " \
+	--enable-mp3lame \
+        --enable-vorbis \
+        --enable-faad \
+        --enable-a52 \
+        --enable-a52bin \
+        --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}"
+}
+
+oe_runconf () {
+        if [ -x ${S}/configure ] ; then
+                cfgcmd="${S}/configure \
+                        --prefix=${prefix} \
+                        --mandir=${mandir} \
+                        ${EXTRA_OECONF} \
+                    $@"
+                oenote "Running $cfgcmd..."
+                $cfgcmd || oefatal "oe_runconf failed"
+        else
+                oefatal "no configure script found"
+        fi
+
+}
+
+do_stage() {
+        oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
+        oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
+        oe_libinstall -a -so -C libavutil libavutil ${STAGING_LIBDIR}
+        oe_libinstall -a -so -C libpostproc libpostproc ${STAGING_LIBDIR}
+
+        install -d ${STAGING_INCDIR}/ffmpeg
+        install -m 0644 ${S}/libavcodec/avcodec.h \
+                ${STAGING_INCDIR}/ffmpeg/avcodec.h
+
+        install -m 0644 ${S}/libavformat/avformat.h \
+                ${STAGING_INCDIR}/ffmpeg/avformat.h
+        install -m 0644 ${S}/libavformat/avio.h \
+                ${STAGING_INCDIR}/ffmpeg/avio.h
+        install -m 0644 ${S}/libavformat/rtp.h \
+                ${STAGING_INCDIR}/ffmpeg/rtp.h
+        install -m 0644 ${S}/libavformat/rtsp.h \
+                ${STAGING_INCDIR}/ffmpeg/rtsp.h
+        install -m 0644 ${S}/libavformat/rtspcodes.h \
+                ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
+
+        install -m 0644 ${S}/libavutil/avutil.h \
+                ${STAGING_INCDIR}/ffmpeg/avutil.h
+        install -m 0644 ${S}/libavutil/bswap.h \
+                ${STAGING_INCDIR}/ffmpeg/bswap.h
+        install -m 0644 ${S}/libavutil/common.h \
+                ${STAGING_INCDIR}/ffmpeg/common.h
+        install -m 0644 ${S}/libavutil/crc.h \
+                ${STAGING_INCDIR}/ffmpeg/crc.h
+        install -m 0644 ${S}/libavutil/integer.h \
+                ${STAGING_INCDIR}/ffmpeg/integer.h
+        install -m 0644 ${S}/libavutil/intfloat_readwrite.h \
+                ${STAGING_INCDIR}/ffmpeg/intfloat_readwrite.h
+        install -m 0644 ${S}/libavutil/mathematics.h \
+                ${STAGING_INCDIR}/ffmpeg/mathematics.h
+        install -m 0644 ${S}/libavutil/rational.h \
+                ${STAGING_INCDIR}/ffmpeg/rational.h
+}
+
+PACKAGES += "libavcodec libavcodec-dev \
+        libavformat libavformat-dev \
+        libavutil libavutil-dev \
+        libpostproc libpostproc-dev"
+
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-doc = "${mandir}"
+
+FILES_libavcodec = "${libdir}/libavcodec*.so.*"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so \
+        ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
+
+FILES_libavformat = "${libdir}/libavformat*.so.*"
+FILES_libavformat-dev = "${libdir}/libavformat*.so \
+        ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
+
+FILES_libavutil = "${libdir}/libavutil*.so.*"
+FILES_libavutil-dev = "${libdir}/libavutil*.so \
+        ${libdir}/libavutil*.la ${libdir}/libavutil*.a"
+
+FILES_libpostproc = "${libdir}/libpostproc*.so.*"
+FILES_libpostproc-dev = "${libdir}/libpostproc*.so \
+        ${libdir}/libpostproc*.la ${libdir}/libpostproc*.a"