From c5cfb81f1de09183e045568e7b72e47d43733b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 15 Jan 2008 17:01:37 +0100 Subject: Fix test for external dts that caused internal copy to be used instead. --- m4/decoders.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'm4') diff --git a/m4/decoders.m4 b/m4/decoders.m4 index 3552ba6a2..0ab38af29 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -173,7 +173,7 @@ use internal ffmpeg. else AC_MSG_RESULT([Using included libdts support]) fi - if test x"$have_external_libdts" != x"yes"; then + if test x"$have_external_dts" != x"yes"; then LIBDTS_CFLAGS='-I$(top_srcdir)/contrib/libdca/include' LIBDTS_DEPS='$(top_builddir)/contrib/libdca/libdca.la' LIBDTS_LIBS='$(top_builddir)/contrib/libdca/libdca.la' -- cgit v1.2.3 From d4422c12b810ff9af859ed141f064e137f6bf3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 16 Jan 2008 20:28:21 +0100 Subject: Fix libdts vs dts to avoid building libdca. --- m4/decoders.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'm4') diff --git a/m4/decoders.m4 b/m4/decoders.m4 index 0ab38af29..42f76b1a3 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -181,7 +181,7 @@ use internal ffmpeg. fi fi AM_CONDITIONAL([ENABLE_DTS], [test x"$enable_dts" != x"no"]) - AM_CONDITIONAL([WITH_EXTERNAL_LIBDTS], [test x"$have_external_libdts" = x"yes"]) + AM_CONDITIONAL([WITH_EXTERNAL_LIBDTS], [test x"$have_external_dts" = x"yes"]) dnl libFLAC (optional; disabled by default) -- cgit v1.2.3 From 2b3df508106c0cf311132baeab89a2049fe22a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 17 Jan 2008 20:25:53 +0100 Subject: Remove SyncFB video output plugin, and related documentation and code. Matthias Dahl, the last maintainer of the code, confirms that the needed Linux kernel module is not building anymore, and thus this is unusable. Please consider using VIDIX or DirectFB instead, which should both work fine with Matrox cards. --- m4/summary.m4 | 3 --- m4/video_out.m4 | 19 +------------------ 2 files changed, 1 insertion(+), 21 deletions(-) (limited to 'm4') diff --git a/m4/summary.m4 b/m4/summary.m4 index a96e11e5a..9661f072b 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -179,9 +179,6 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ echo " * video driver plugins:" if test x"$no_x" != x"yes"; then echo " - XShm (X11 shared memory)" - if test x"$have_syncfb" = x"yes"; then - echo " - SyncFB (for Matrox G200/G400 cards)" - fi if test x"$have_xv" = x"yes"; then if test x"$have_xv_static" = x"yes"; then echo " - Xv (XVideo *static*)" diff --git a/m4/video_out.m4 b/m4/video_out.m4 index 043d563e8..df782ff06 100644 --- a/m4/video_out.m4 +++ b/m4/video_out.m4 @@ -2,7 +2,7 @@ dnl ----------------- dnl Video out plugins dnl ----------------- AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ - dnl Setup defaults for the target operating system. For example, syncfb is + dnl Setup defaults for the target operating system. For example, linuxfb is dnl only ever available on Linux, so don't bother checking for it unless dnl explicitly requested to do so on other operating systems. dnl Notes: @@ -11,7 +11,6 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ dnl - dxr3 is Linux only dnl - Mac OS X video is Mac OS X only dnl - OpenGL requires Xwindows - dnl - SyncFB is Linux only, but disabled by default dnl - Vidix is FreeBSD and Linux only dnl - XvMC and xxmc depend on Xv @@ -24,7 +23,6 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ default_enable_linuxfb=disable default_enable_macosx_video=disable default_enable_opengl=enable - default_enable_syncfb=disable default_enable_vidix=disable default_enable_xinerama=enable default_enable_xvmc=enable @@ -293,21 +291,6 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ AM_CONDITIONAL([ENABLE_SUNFB], [test x"$have_sunfb" = x"yes"]) - dnl syncfb (Linux only) - AC_ARG_ENABLE([syncfb], - [AS_HELP_STRING([--enable-syncfb], [enable support for syncfb (Linux only)])], - [test x"$enableval" != x"no" && enable_syncfb="yes"], - [test $default_enable_syncfb = disable && enable_syncfb="no"]) - dnl There's no good test for this. If the user says so, then do it - if test x"$enable_syncfb" != x"no" && test x"$no_x" != x"yes"; then - have_syncfb=yes - fi - if test x"$enable_syncfb" = x"yes" && test x"$have_syncfb" != x"yes"; then - AC_MSG_ERROR([Linux syncfb support requested, but required X support is disabled]) - fi - AM_CONDITIONAL([ENABLE_SYNCFB], [test x"$have_syncfb" = x"yes"]) - - dnl xcb AC_ARG_WITH([xcb], [AS_HELP_STRING([--with-xcb], [Enable support for XCB video out plugins])], -- cgit v1.2.3 From b1c04841c72f050189af140c396729a316aedc4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 10 Feb 2008 15:39:37 +0100 Subject: Fix summary output for external libdts. --- m4/summary.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'm4') diff --git a/m4/summary.m4 b/m4/summary.m4 index 9661f072b..4a8f6db07 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -120,7 +120,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ fi fi if test x"$enable_libdts" != x"no"; then - if test x"$have_external_libdts" = x"yes"; then + if test x"$have_external_dts" = x"yes"; then echo " - DTS (external library)" else echo " - DTS (internal library)" -- cgit v1.2.3 From 30ed4f400f979adade61ca362377502464bee47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 10 Feb 2008 15:40:08 +0100 Subject: Remove --with-external-libfoo for options that have --enable-foo, and replace those with --enable-foo=external. --- m4/decoders.m4 | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) (limited to 'm4') diff --git a/m4/decoders.m4 b/m4/decoders.m4 index 42f76b1a3..9dfe20148 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -4,13 +4,9 @@ dnl --------------------------- AC_DEFUN([XINE_DECODER_PLUGINS], [ dnl a52dec (optional; enabled by default; external version allowed) AC_ARG_ENABLE([a52dec], - [AS_HELP_STRING([--enable-a52dec], [Enable support for a52dec decoding library (default: enabled)])], - [test x"$enableval" != x"no" && enable_a52dec="yes"]) - AC_ARG_WITH([external-a52dec], - [AS_HELP_STRING([--with-external-a52dec], [Use external a52dec library (not recommended)])], - [test x"$withval" != x"no" && with_external_a52dec="yes"], [with_external_a52dec="no"]) + [AS_HELP_STRING([--enable-a52dec], [Enable support for a52dec decoding library (default: enabled, external: use external copy)])]) if test x"$enable_a52dec" != x"no"; then - if test x"$with_external_a52dec" != x"no"; then + if test x"$enable_a52dec" == x"external"; then AC_CHECK_LIB([a52], [a52_init], [AC_CHECK_HEADERS([a52dec/a52.h a52dec/a52_internal.h], [have_external_a52dec=yes], [have_external_a52dec=no], [#ifdef HAVE_SYS_TYPES_H @@ -60,13 +56,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ dnl FAAD (optional; enabled by default) AC_ARG_ENABLE([faad], - [AS_HELP_STRING([--enable-faad], [Enable support for FAAD decoder (default: enabled)])], - [test x"$enableval" != x"no" && enable_faad="yes"]) - AC_ARG_WITH([external-faad], - [AS_HELP_STRING([--with-external-faad], [Use external FAAD decoeder])], - [test x"$withval" != x"no" && with_external_faad="yes"], [with_external_faad="no"]) + [AS_HELP_STRING([--enable-faad], [Enable support for FAAD decoder (default: enabled, external: use external copy)])]) if test x"$enable_faad" != x"no"; then - if test x"$with_external_faad" != x"no"; then + if test x"$enable_faad" == x"external"; then AC_CHECK_LIB([faad], [NeAACDecInit], [AC_CHECK_HEADERS([neaacdec.h], [have_external_faad=yes], [have_external_faad=no], [#include ])], [have_external_faad=no], [-lm]) @@ -159,13 +151,9 @@ use internal ffmpeg. dnl libdts (optional; enabled by default; external version allowed) AC_ARG_ENABLE([dts], - [AS_HELP_STRING([--enable-dts], [Enable support for DTS decoding library (default: enabled)])], - [test x"$enableval" != x"no" && enable_dts="yes"]) - AC_ARG_WITH([external-libdts], - [AS_HELP_STRING([--with-external-libdts], [Use external libdts/libdca library (not recommended)])], - [test x"$withval" != x"no" && with_external_libdts="yes"], [with_external_libdts="no"]) + [AS_HELP_STRING([--enable-dts], [Enable support for DTS decoding library (default: enabled, external: use external copy)])]) if test x"$enable_dts" != x"no"; then - if test x"$with_external_libdts" != x"no"; then + if test x"$enable_dts" == x"external"; then PKG_CHECK_MODULES([LIBDTS], [libdts], [have_external_dts=yes], [have_external_dts=no]) if test x"$have_external_dts" != x"yes"; then AC_MSG_RESULT([*** no usable version of libdts found, using internal copy ***]) @@ -254,13 +242,9 @@ use internal ffmpeg. dnl libmad (optional; enabled by default; external version allowed) AC_ARG_ENABLE([mad], - [AS_HELP_STRING([--enable-mad], [Enable support for MAD decoding library (default: enabled)])], - [test x"$enableval" != x"no" && enable_mad="yes"]) - AC_ARG_WITH([external-libmad], - [AS_HELP_STRING([--with-external-libmad], [use external libmad library (not recommended)])], - [test x"$withval" != x"no" && with_external_libmad="yes"], [with_external_libmad="no"]) + [AS_HELP_STRING([--enable-mad], [Enable support for MAD decoding library (default: enabled, external: use external copy)])]) if test x"$enable_mad" != x"no"; then - if test x"$with_external_libmad" != x"no"; then + if test x"$enable_mad" == x"external"; then PKG_CHECK_MODULES([LIBMAD], [mad], [AC_CHECK_HEADERS([mad.h], [have_external_libmad=yes], [have_external_libmad=no])], [have_external_libmad=no]) @@ -332,13 +316,9 @@ use internal ffmpeg. dnl libmpcdec (optional; enabled by default; external version allowed) AC_ARG_ENABLE([musepack], - [AS_HELP_STRING([--enable-musepack], [Enable support for Musepack decoding (default: enabled)])], - [test x"$enableval" != x"no" && enable_musepack="yes"]) - AC_ARG_WITH([external-libmpcdec], - [AS_HELP_STRING([--with-external-libmpcdec], [Use external libmpc library])], - [test x"$withval" != x"no" && with_external_libmpcdec="yes"], [with_external_libmpcdec="no"]) + [AS_HELP_STRING([--enable-musepack], [Enable support for Musepack decoding (default: enabled, external: use external copy)])]) if test x"$enable_musepack" != x"no"; then - if test x"$with_external_libmpcdec" != x"no"; then + if test x"$enable_musepack" == x"external"; then AC_CHECK_LIB([mpcdec], [mpc_decoder_decode], [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [have_external_libmpcdec=yes], [have_external_libmpcdec=no])], [have_external_libmpcdec=no]) -- cgit v1.2.3 From 344d6df02ac4d1ed1214ead4f3419405ee699177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 1 Mar 2008 02:53:23 +0100 Subject: Add test for ffmpeg's include directory style to 1.2 autotools. --- m4/decoders.m4 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'm4') diff --git a/m4/decoders.m4 b/m4/decoders.m4 index 9dfe20148..b8f03e231 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -107,6 +107,10 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc]) AC_DEFINE([HAVE_FFMPEG], 1, [Define this if you have ffmpeg library]) + dnl Check presence of ffmpeg/avutil.h to see if it's old or new + dnl style for headers. The new style would be preferred actually... + AC_CHECK_HEADER([ffmpeg/avutil.h]) + AC_MSG_NOTICE([ ********************************************************************* xine-lib is configured with external ffmpeg. -- cgit v1.2.3