contribs/extras: Compensate for shortfalls in ffmpeg's svn repository. Will submit...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6c1776b477726ec85802a509e91c23488106c1ee..94439d20a53a73dcf71c60f0d12f9189d85b8443 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1038,6 +1038,7 @@ ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-internal-define.patch
        patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
+       (cd $@; patch -p0 < ../Patches/ffmpeg-svn-configure.patch)
 
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:

diff --git a/extras/contrib/src/Patches/ffmpeg-svn-configure.patch b/extras/contrib/src/Patches/ffmpeg-svn-configure.patch
new file mode 100644 (file)
index 0000000..be3d6f3
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-svn-configure.patch
@@ -0,0 +1,72 @@
+Index: configure
+===================================================================
+--- configure  (revision 12257)
++++ configure  (working copy)
+@@ -2036,7 +2036,7 @@
+ get_version LIBAVDEVICE libavdevice/avdevice.h
+ get_version LIBAVFORMAT libavformat/avformat.h
+ get_version LIBAVUTIL   libavutil/avutil.h
+-lavfi_version=$(get_version LIBAVFILTER   libavfilter/avfilter.h)
++get_version LIBAVFILTER libavfilter/avfilter.h
+ 
+ if enabled shared; then
+     echo "BUILD_SHARED=yes" >> config.mak
+@@ -2170,7 +2170,7 @@
+ Requires: $requires
+ Conflicts:
+ Libs: -L\${libdir} $libs
+-Cflags: -I\${includedir}
++Cflags: -I\${includedir}/$name
+ EOF
+ }
+ 
+@@ -2197,33 +2197,33 @@
+ EOF
+ }
+ 
+-pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil ""
+-pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
++pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" -lavutil ""
++pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"
+ 
+-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version"
+-pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
++pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "-lavcodec $extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
++pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
+ 
+-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version"
+-pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
++pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "-lavformat $extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
++pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
+ 
+-pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version"
+-pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
++pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "-lavdevice $extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION"
++pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION"
+ if enabled pp; then
+-    pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc ""
+-    pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
++    pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" -lpostproc ""
++    pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"
+ fi
+ 
+ if enabled swscaler; then
+-    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version"
+-    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
++    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" -lswscale "libavutil = $LIBAVUTIL_VERSION"
++    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
+ else
+-    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
+-    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
++    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
++    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
+     apply libswscale.pc sed s/^Libs:.*$/Libs:/
+     apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
+ fi
+ 
+ if enabled avfilter; then
+-  pkgconfig_generate libavfilter "FFmpeg video filtering library" "$avfilter_version" "-lavfilter $extralibs" "$pkg_requires libavutil = $lavu=version" ffmpeg
+-  pkgconfig_generate_uninstalled libavfilter "FFmpeg video filtering library" "$avfilter_version" "$extralibs" "$pkg_requires libavutil = $libavu_version"
++  pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "-lavfilter $extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" ffmpeg
++  pkgconfig_generate_uninstalled libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
+ fi