[oe-commits] Koen Kooi : ffmpeg svn: ffmpeg is in git now after the change of management , catch up with it

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: fb36a895a080c235bf797264cfcd04bffa820e1b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fb36a895a080c235bf797264cfcd04bffa820e1b

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Jan 19 20:48:13 2011 +0100

ffmpeg svn: ffmpeg is in git now after the change of management, catch up with it

Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 recipes/ffmpeg/ffmpeg_git.bb |   36 +++++++++--------------
 recipes/ffmpeg/ffmpeg_svn.bb |   63 ------------------------------------------
 2 files changed, 14 insertions(+), 85 deletions(-)

diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index 231b9cb..27e88ea 100644
--- a/recipes/ffmpeg/ffmpeg_git.bb
+++ b/recipes/ffmpeg/ffmpeg_git.bb
@@ -1,26 +1,23 @@
 require ffmpeg.inc
 
-DEPENDS += "schroedinger libgsm"
+DEPENDS += "virtual/libsdl schroedinger libgsm libvpx"
 
-PV = "0.5.0+${PR}+gitr${SRCPV}"
+# When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
+SRCREV = "a4f5af13fb00d7f55946470bb0f52e1dbf5f3c6a"
+
+PV = "0.6.1+${PR}+gitr${SRCPV}"
 PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+DEFAULT_PREFERENCE_shr = "1"
 
-#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 = "d886804643d7427debfa70d824de7e53ae8e3e83"
-SRCREV_arm = "d886804643d7427debfa70d824de7e53ae8e3e83"
-SRCREV_libswscale = "b2e1c8222eeef74b0ca8053b400957dd69e18e4d"
-SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
-"
+SRC_URI = "git://git.ffmpeg.org/ffmpeg.git;protocol=git"
 
 S = "${WORKDIR}/git"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -fno-tree-vectorize -fomit-frame-pointer -O4 -ffast-math"
 BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
 
 EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
@@ -31,22 +28,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" \
         --enable-cross-compile \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --extra-ldflags="${TARGET_LDFLAGS}" \
@@ -55,12 +52,7 @@ EXTRA_OECONF = " \
 "
 
 do_configure() {
-        sed -i -e s:'check_cflags -std=c99'::g ${S}/configure
-        cd ${S}
-        git clone git://git.mplayerhq.hu/libswscale || true
-        cd libswscale
-        git checkout ${SRCREV_libswscale} || true
-        cd ${S}
+#        sed -i -e s:'check_cflags -std=c99'::g ${S}/configure
         mkdir -p ${B}
         cd ${B}
         ${S}/configure ${EXTRA_OECONF}
diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb
deleted file mode 100644
index 52c57d9..0000000
--- a/recipes/ffmpeg/ffmpeg_svn.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-require ffmpeg.inc
-
-DEPENDS += "virtual/libsdl 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 = "25825"
-
-PV = "0.6+${PR}+svnr${SRCPV}"
-PR = "${INC_PR}.4"
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_angstrom = "1"
-DEFAULT_PREFERENCE_shr = "1"
-
-SRC_URI = "svn://svn.ffmpeg.org/ffmpeg/;module=trunk"
-
-S = "${WORKDIR}/trunk"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -fno-tree-vectorize -fomit-frame-pointer -O4 -ffast-math"
-BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
-
-EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
-EXTRA_FFCONF ?= ""
-
-EXTRA_OECONF = " \
-        --enable-shared \
-        --enable-pthreads \
-        --disable-stripping \
-        --enable-gpl \
-        --enable-postproc \
-        \
-        --cross-prefix=${TARGET_PREFIX} \
-        --prefix=${prefix} \
-        \
-        --enable-ffserver \
-        --enable-ffplay \
-        --enable-x11grab \
-        --enable-libgsm \
-        --enable-libmp3lame \
-        --enable-libschroedinger \
-        --enable-libtheora  \
-        --enable-libvorbis \
-        --enable-libvpx \
-        --arch=${TARGET_ARCH} \
-        --target-os="linux" \
-        --enable-cross-compile \
-        --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
-        --extra-ldflags="${TARGET_LDFLAGS}" \
-        --enable-hardcoded-tables \
-        ${EXTRA_FFCONF} \
-"
-
-do_configure() {
-        sed -i -e s:'check_cflags -std=c99'::g ${S}/configure
-        mkdir -p ${B}
-        cd ${B}
-        ${S}/configure ${EXTRA_OECONF}
-        sed -i -e s:Os:O4:g ${B}/config.h
-        # Don't use hardfp args when using softfp
-        sed -i -e 's:if HAVE_VFP_ARGS:ifdef __ARM_PCS_VFP:' ${S}/libavcodec/arm/asm.S
-}
-