[vlc-devel] commit: Fix FFmpeg .pc creation - patch to be sent at FFmpeg developers ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon May 26 21:48:09 2008 +0200| [f66f01a125d936a607991a13fc18e09c9e2e1d8e]

Fix FFmpeg .pc creation - patch to be sent at FFmpeg developers

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

 extras/contrib/src/Makefile                        |    1 +
 extras/contrib/src/Patches/ffmpeg-pkg-config.patch |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f83e905..f55246a 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1068,6 +1068,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 ifdef SVN
 ffmpeg:
 	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 12920
+	(cd $@; patch -p0 < ../Patches/ffmpeg-pkg-config.patch)
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
diff --git a/extras/contrib/src/Patches/ffmpeg-pkg-config.patch b/extras/contrib/src/Patches/ffmpeg-pkg-config.patch
new file mode 100644
index 0000000..9e1656c
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-pkg-config.patch
@@ -0,0 +1,20 @@
+Index: configure
+===================================================================
+--- configure	(révision 13435)
++++ configure	(copie de travail)
+@@ -2169,11 +2169,13 @@
+ version=$3
+ libs=$4
+ requires=$5
++libdir_pc=`echo $libdir|sed s'|$(PREFIX)|${prefix}|'`
++incdir_pc=`echo $incdir|sed 's|$(PREFIX)|${prefix}|'`
+ cat <<EOF > $name.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+-libdir=$libdir
+-includedir=$incdir
++libdir=$libdir_pc
++includedir=$incdir_pc
+ 
+ Name: $name
+ Description: $comment