aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia/libxine
diff options
context:
space:
mode:
authornobutaka <nobutaka@FreeBSD.org>2009-09-23 22:37:46 +0800
committernobutaka <nobutaka@FreeBSD.org>2009-09-23 22:37:46 +0800
commit3cb001603f887c5ca061b52bc1f7045cba45e6a8 (patch)
tree056cb9a852478a6fb615a7896187222178ce93b7 /multimedia/libxine
parent51fde703c9ab798c7e1e81b0cab511202a214157 (diff)
downloadfreebsd-ports-gnome-3cb001603f887c5ca061b52bc1f7045cba45e6a8.tar.gz
freebsd-ports-gnome-3cb001603f887c5ca061b52bc1f7045cba45e6a8.tar.zst
freebsd-ports-gnome-3cb001603f887c5ca061b52bc1f7045cba45e6a8.zip
Add WITH_FFMPEG knob to use external ffmpeg.
PR: ports/137792 Submitted by: "Dima Panov" <fluffy@fluffy.khv.ru> Feature safe: yes
Diffstat (limited to 'multimedia/libxine')
-rw-r--r--multimedia/libxine/Makefile13
-rw-r--r--multimedia/libxine/files/patch-configure13
2 files changed, 24 insertions, 2 deletions
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index c39ebf17e20f..cd811b7a4491 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -55,8 +55,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCA
EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 --enable-ipv6 \
--with-external-libmad \
- --with-external-libdts --with-libflac --disable-v4l \
- --with-external-ffmpeg=no
+ --with-external-libdts --with-libflac --disable-v4l
OPTIONS= ARTS "Enable aRts support" off \
CACA "Enable libcaca support" off \
@@ -64,6 +63,7 @@ OPTIONS= ARTS "Enable aRts support" off \
JACK "Enable JACK support" off \
GNOMEVFS2 "Enable GnomeVFS2 support" off \
PULSEAUDIO "Enable PulseAudio support" off \
+ FFMPEG "Enable external FFMpeg" off \
XVMC "Enable XvMC support" off \
SMB "Enable SMB protocol support" off \
AALIB "Enable aalib support" off \
@@ -133,6 +133,15 @@ PLIST_SUB+= WITH_PULSEAUDIO="@comment "
CONFIGURE_ARGS+= --without-pulseaudio
.endif
+.if defined(WITH_FFMPEG)
+LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+CONFIGURE_ARGS+= --with-external-ffmpeg
+CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/ffmeg" \
+ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/ffmpeg"
+.else
+CONFIGURE_ARGS+= --with-external-ffmpeg=no
+.endif
+
.if defined(WITH_XVMC)
.if defined(WITH_NVIDIA_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
CONFIGURE_ARGS+= --with-xvmc-lib=XvMCNVIDIA
diff --git a/multimedia/libxine/files/patch-configure b/multimedia/libxine/files/patch-configure
index 2a8ce001c8e8..71497e0a336a 100644
--- a/multimedia/libxine/files/patch-configure
+++ b/multimedia/libxine/files/patch-configure
@@ -22,6 +22,19 @@
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
else
LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+@@ -19693,12 +19693,6 @@
+
+ done
+
+- if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then
+- { { $as_echo "$as_me:$LINENO: error: old & new ffmpeg headers found - you need to clean up!" >&5
+-$as_echo "$as_me: error: old & new ffmpeg headers found - you need to clean up!" >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+-
+ { $as_echo "$as_me:$LINENO: result: using external ffmpeg" >&5
+ $as_echo "using external ffmpeg" >&6; }
+ else
@@ -27953,12 +27959,12 @@
pkg_cv_CACA_CFLAGS="$CACA_CFLAGS"
else