From a43a4aafd08650254a4b91fe73f82ec96bf2a6ef Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Mon, 27 Feb 2012 18:18:49 +0200
Subject: configure, build: support compiling without libpostproc

libpostproc has been removed from Libav and the library now exists as
a separate project. Because it's not essential, separate it from the
Libav library check and allow compiling without it.
---
 configure | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index ad4e1f9b46..fb4dd04f22 100755
--- a/configure
+++ b/configure
@@ -363,6 +363,7 @@ Optional features:
   --disable-w32threads   disable Win32 threads support [autodetect]
   --disable-libass       disable subtitle rendering with libass [autodetect]
   --enable-rpath         enable runtime linker path for extra libs [disabled]
+  --disable-libpostproc  disable postprocess filter (vf_pp) [autodetect]
 
 Codecs:
   --enable-gif              enable GIF support [autodetect]
@@ -712,6 +713,7 @@ _pthreads=auto
 _w32threads=auto
 _ass=auto
 _rpath=no
+libpostproc=auto
 _asmalign_pot=auto
 _stream_cache=yes
 _priority=no
@@ -1101,6 +1103,8 @@ for ac_option do
   --disable-libass)     _ass=no         ;;
   --enable-rpath)       _rpath=yes      ;;
   --disable-rpath)      _rpath=no       ;;
+  --enable-libpostproc) libpostproc=yes ;;
+  --disable-libpostproc) libpostproc=no ;;
 
   --enable-fribidi)     _fribidi=yes    ;;
   --disable-fribidi)    _fribidi=no     ;;
@@ -5772,7 +5776,7 @@ echores "$_live"
 
 # Test with > against Libav 0.8 versions which will NOT work rather than
 # specify minimum version, to allow (future) point releases to possibly work.
-all_libav_libs="libavutil > 51.21.0:libavcodec > 53.34.0:libavformat > 53.20.0:libswscale >= 2.0.0:libpostproc >= 52.0.0"
+all_libav_libs="libavutil > 51.21.0:libavcodec > 53.34.0:libavformat > 53.20.0:libswscale >= 2.0.0"
 echocheck "Libav ($all_libav_libs)"
 if test "$ffmpeg" = auto ; then
   IFS=":"   # shell should not be used for programming
@@ -5789,6 +5793,19 @@ if ! test -z "$_ffmpeg_source" ; then
   def_ffmpeg_internals="#define CONFIG_FFMPEG_INTERNALS 1" && ffmpeg_internals=yes
 fi
 
+echocheck "libpostproc >= 52.0.0"
+if test "$libpostproc" = auto ; then
+    libpostproc=no
+    if pkg_config_add "libpostproc >= 52.0.0" ; then
+        libpostproc=yes
+    fi
+fi
+if test "$libpostproc" = yes ; then
+    def_libpostproc='#define CONFIG_LIBPOSTPROC 1'
+else
+    def_libpostproc='#undef CONFIG_LIBPOSTPROC'
+fi
+echores "$libpostproc"
 
 
 echocheck "libdv-0.9.5+"
@@ -6481,6 +6498,7 @@ LIBDVDCSS_INTERNAL = $_libdvdcss_internal
 LIBMAD = $_mad
 LIBNEMESI = $_nemesi
 LIBNUT = $_libnut
+LIBPOSTPROC = $libpostproc
 LIBSMBCLIENT = $_smb
 LIBTHEORA = $_theora
 LIRC = $_lirc
@@ -6750,6 +6768,7 @@ $def_vorbis
 $def_xvid
 $def_zlib
 
+$def_libpostproc
 $def_libnut
 
 
-- 
cgit v1.2.3