[vlc-devel] commit: Fix generation of libswscale.pc in ffmpeg. (Jean-Paul Saman )

[git version control]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Fri May 30 17:24:14 2008 +0200| [23c0576033063e9669a6443c42fbedbea09f043d]

Fix generation of libswscale.pc in ffmpeg.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=23c0576033063e9669a6443c42fbedbea09f043d
---

 extras/contrib/src/Makefile                        |    2 +-
 .../contrib/src/Patches/ffmpeg-svn-configure.patch |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f55246a..7a00286 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1090,7 +1090,7 @@ ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
 	patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
-
+	patch -p0 < Patches/ffmpeg-svn-configure.patch
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	echo "ffmpeg snapshot is too old, you MUST use subversion !"
diff --git a/extras/contrib/src/Patches/ffmpeg-svn-configure.patch b/extras/contrib/src/Patches/ffmpeg-svn-configure.patch
new file mode 100644
index 0000000..9e95d01
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-svn-configure.patch
@@ -0,0 +1,15 @@
+Index: configure
+===================================================================
+--- configure	(revision 12501)
++++ configure	(working copy)
+@@ -2201,8 +2201,8 @@
+ fi
+ 
+ if enabled swscale; then
+-    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"
++    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "-lswscale -lm"  "libavutil = $LIBAVUTIL_VERSION"
++    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "-lm" "libavutil = $LIBAVUTIL_VERSION"
+ else
+     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"