[SCM] FFmpeg packaging branch, master, updated. 7e16ace7ebff2d85563fe4cc3e46bda6d83db3b6

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c6afaca1cf89611006da8b82fbd317c30fe69725
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 10 16:52:04 2009 +0100

    remove 050_fix_pkgconfig_files.patch
    
    it has been merged upstream

diff --git a/debian/changelog b/debian/changelog
index 16eb32e..f16984b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ffmpeg-debian (3:0.svn20090110-1) experimental; urgency=low
   Upstream Changes:
    - RV30 and RV40 decoder
    - QCELP / PureVoice decoder
+  
+  * removed patch 050_fix_pkgconfig_files.patch. Merged upstream
 
  -- Reinhard Tartler <siretart at tauware.de>  Sat, 10 Jan 2009 16:36:52 +0100
 
diff --git a/debian/patches/050_fix_pkgconfig_files.patch b/debian/patches/050_fix_pkgconfig_files.patch
deleted file mode 100644
index 41a4b1e..0000000
--- a/debian/patches/050_fix_pkgconfig_files.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-patch by Reinhard Tartler <siretart at debian.org>
-
-remove varialbe pkg_requires from the configure script. According to
-pkg-config upstream the field Requires.private is only necessary if a
-library exposes internal types (structs, enums) of the "required"
-libraries. This is only the case for libavutil that is exposed by
-libavcodec, libavformat and others. Libraries like theora, dirac, etc
-are exposed in Libs.private already.
-
-Discussion about this started at:
-
-http://permalink.gmane.org/gmane.comp.video.ffmpeg.devel/76897
-http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/76897
-
-
---- a/configure
-+++ b/configure
-@@ -2064,11 +2064,6 @@ check_deps $CONFIG_LIST       \
-            $OUTDEV_LIST       \
-            $PROTOCOL_LIST     \
- 
--enabled libdc1394 && append pkg_requires "libraw1394"
--enabled libdirac  && append pkg_requires "dirac"
--enabled libtheora && append pkg_requires "theora"
--enabled libvorbis && append pkg_requires "vorbisenc"
--
- echo "install prefix            $prefix"
- echo "source path               $source_path"
- echo "C compiler                $cc"
-@@ -2386,16 +2381,16 @@ EOF
- }
- 
- pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"
--pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
--pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
--pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION"
-+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
-+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
-+pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"
- enabled avfilter &&
--    pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
-+    pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
- enabled postproc &&
-     pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"
- if enabled swscale; then
-     pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
- else
--    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
-+    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavcodec = $LIBAVCODEC_VERSION"
-     apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/
- fi
diff --git a/debian/patches/series b/debian/patches/series
index 3ad14ed..7b43f5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 020_visibility_patch
-050_fix_pkgconfig_files.patch
 900_doxyfile

-- 
FFmpeg packaging