diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2009-09-23 14:37:46 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2009-09-23 14:37:46 +0000 |
| commit | bb99b8106cc9137efd2f5d2286bb65994375c68c (patch) | |
| tree | 56b2090720829d8a88368688419097a3a6eba10e | |
| parent | 497475262e6378a0892a6ec8ee674d86b0f5e5ec (diff) | |
| download | ports-bb99b8106cc9137efd2f5d2286bb65994375c68c.tar.gz ports-bb99b8106cc9137efd2f5d2286bb65994375c68c.zip | |
Notes
| -rw-r--r-- | multimedia/libxine/Makefile | 13 | ||||
| -rw-r--r-- | multimedia/libxine/files/patch-configure | 13 |
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 |