SOURCES: ffmpeg-libdir.patch - fix libdir in all *pc.

pluto pluto at pld-linux.org
Wed Feb 1 11:56:47 CET 2006


Author: pluto                        Date: Wed Feb  1 10:56:47 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix libdir in all *pc.

---- Files affected:
SOURCES:
   ffmpeg-libdir.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/ffmpeg-libdir.patch
diff -u SOURCES/ffmpeg-libdir.patch:1.2 SOURCES/ffmpeg-libdir.patch:1.3
--- SOURCES/ffmpeg-libdir.patch:1.2	Sun Oct 30 22:05:47 2005
+++ SOURCES/ffmpeg-libdir.patch	Wed Feb  1 11:56:42 2006
@@ -1,6 +1,15 @@
 --- FFMpeg-20050806/configure.orig	2005-08-04 21:50:09.000000000 +0200
 +++ FFMpeg-20050806/configure	2005-10-24 08:26:37.374034008 +0200
-@@ -1703,7 +1703,7 @@
+@@ -1877,7 +1877,7 @@
+ cat <<EOF >libavutil.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+-libdir=\${exec_prefix}/lib
++libdir=$libdir
+ includedir=\${prefix}/include
+ 
+ Name: libavutil
+@@ -1908,7 +1908,7 @@
  cat <<EOF >libavcodec.pc
  prefix=$prefix
  exec_prefix=\${prefix}
@@ -9,14 +18,30 @@
  includedir=\${prefix}/include
  
  Name: libavcodec
-@@ -1711,8 +1711,8 @@
- Version: $version-$lavc_build
- Requires: $requires
+@@ -1917,7 +1917,7 @@
+ Requires: $pkg_requires libavutil = $lavu_version
  Conflicts:
--Libs: -L\${libdir} -lavcodec $extralibs
+ Libs: -L\${libdir} -lavcodec $extralibs
 -Cflags: -I\${includedir} -I\${includedir}/ffmpeg
-+Libs: -L$libdir -lavcodec $extralibs
 +Cflags: -I\${includedir}/ffmpeg
  EOF
  
  cat <<EOF >libavcodec-uninstalled.pc
+@@ -1939,7 +1939,7 @@
+ cat <<EOF >libavformat.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+-libdir=\${exec_prefix}/lib
++libdir=$libdir
+ includedir=\${prefix}/include
+ 
+ Name: libavformat
+@@ -1971,7 +1971,7 @@
+ cat <<EOF >libpostproc.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+-libdir=\${exec_prefix}/lib
++libdir=$libdir
+ includedir=\${prefix}/include
+ 
+ Name: libpostproc
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ffmpeg-libdir.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list