summaryrefslogtreecommitdiff
path: root/pcr/zoneminder/patch-ffmpeg-configure.patch
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-10-05 10:14:17 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-10-05 10:14:17 -0300
commitaaa3df82f05f180efa04d645a5ffcfba5895a393 (patch)
tree11e08037d87d01edb1e4c53387e0967c81c82982 /pcr/zoneminder/patch-ffmpeg-configure.patch
parent44479c7a68d5393d10f9a8895852d73a2728010e (diff)
parentf04cc1ece8c79107dcaaed0ee737eb43404ab51e (diff)
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'pcr/zoneminder/patch-ffmpeg-configure.patch')
-rw-r--r--pcr/zoneminder/patch-ffmpeg-configure.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/pcr/zoneminder/patch-ffmpeg-configure.patch b/pcr/zoneminder/patch-ffmpeg-configure.patch
new file mode 100644
index 000000000..ba1674a4a
--- /dev/null
+++ b/pcr/zoneminder/patch-ffmpeg-configure.patch
@@ -0,0 +1,26 @@
+--- configure.old 2011-08-23 12:10:37.000000000 -0300
++++ configure 2012-09-26 16:23:33.211940267 -0300
+@@ -3026,8 +3026,8 @@
+ fi
+
+
+-FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}"
+-FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include"
++FFMPEG_LIBS=`pkg-config --cflags libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale`
++FFMPEG_CFLAGS=`pkg-config --cflags libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale`
+
+
+
+--- configure.ac.old 2011-08-23 12:10:32.000000000 -0300
++++ configure.ac 2012-09-26 18:16:44.146848335 -0300
+@@ -88,8 +88,8 @@
+ e.g. --with-ffmpeg=/usr/local])
+ )
+ AC_SUBST(FFMPEG_PREFIX)
+-FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}"
+-FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include"
++FFMPEG_LIBS=`pkg-config --libs libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale`
++FFMPEG_CFLAGS=`pkg-config --libs libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale`
+ AC_SUBST(FFMPEG_LIBS)
+ AC_SUBST(FFMPEG_CFLAGS)
+