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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f83e905c6acee7d93906f90cd3628830187194a1..f55246a04253179c39fc55ed88946f59454ccb16 100644 (file)
--- 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 (file)
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