|
|
| @@ -82,7 +82,7 @@
#
diff -uNr mythtv-0.21/configure mythtv/configure
--- mythtv-0.21/configure 2008-03-04 22:23:23.000000000 +0100
-+++ mythtv/configure 2008-06-30 08:40:35.000000000 +0200
++++ mythtv/configure 2009-04-19 23:30:15.000000000 +0200
@@ -163,6 +163,7 @@
echo " directory with frontend.h [$dvb_path]"
echo " --disable-x11 disable X11 support"
@@ -100,7 +100,7 @@
echo " --with-bindings=LIST install the bindings specified in the"
echo " comma-separated list"
echo " Supported bindings: perl, python"
-@@ -904,6 +907,7 @@
+@@ -904,9 +907,11 @@
xvmc_vld
dvdv
fribidi
@@ -108,7 +108,20 @@
'
MYTHTV_LIST='
-@@ -1178,6 +1182,7 @@
++ audio_pulse
+ audio_alsa
+ audio_arts
+ audio_jack
+@@ -1156,6 +1161,8 @@
+ CONFIG_DEFINES=""
+ CONFIG_INCLUDEPATH=""
+ PROFILEFLAGS=""
++audio_pulse="default"
++audio_pulse_libs="-lpulse"
+ audio_alsa="default"
+ audio_alsa_libs="-lasound"
+ audio_arts="default"
+@@ -1178,6 +1185,7 @@
joystick_menu="default"
lamemp3="yes"
lirc="yes"
@@ -116,7 +129,7 @@
opengl="yes"
v4l="yes"
x11="yes"
-@@ -1186,9 +1191,9 @@
+@@ -1186,9 +1194,9 @@
xv="yes"
xvmc="yes"
xvmc_lib=""
@@ -127,7 +140,7 @@
# libraries
enable zlib
-@@ -1353,6 +1358,10 @@
+@@ -1353,6 +1361,10 @@
;;
--xvmc-lib=*) xvmc_lib="$optval"
;;
@@ -138,7 +151,7 @@
--enable-mac-accel) dvdv="yes"
;;
--disable-mac-accel) dvdv="no"
-@@ -1382,6 +1391,10 @@
+@@ -1382,6 +1394,10 @@
# disabled due to abuse in Gentoo ebuild
--disable-backend)
;;
@@ -149,7 +162,23 @@
--previous|--prev)
echo "No history of previous configure parameters."
;;
-@@ -1599,10 +1612,13 @@
+@@ -1475,6 +1491,7 @@
+ fi
+ fi
+ cmov="yes"
++ fast_cmov="yes"
+ ;;
+ # armv4l is a subset of armv[567]*l
+ arm|armv[4567]*l)
+@@ -1586,6 +1603,7 @@
+ ;;
+ freebsd)
+ append CCONFIG "freebsd"
++ disable ivtv
+ disable need_memalign
+ backend="yes"
+ ;;
+@@ -1599,10 +1617,13 @@
enable darwin
disable dvb
disable ivtv
@@ -166,7 +195,7 @@
disable need_memalign
disable opengl_video
disable opengl_vsync
-@@ -1619,9 +1635,23 @@
+@@ -1619,9 +1640,23 @@
FFSERVERLDFLAGS=-Wl,-bind_at_load
;;
mingw32*)
@@ -192,7 +221,7 @@
shlibdir="$bindir"
VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
-@@ -1629,17 +1659,7 @@
+@@ -1629,17 +1664,7 @@
VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
fi
@@ -210,19 +239,6 @@
SLIBPREF="lib"
SLIBSUF=".dll"
EXESUF=".exe"
-@@ -1712,7 +1732,12 @@
- HAS_IT="no"
- for LIBPATH in $LIBPATHS ; do
- if test x`ls $LIBPATH/$1* 2> /dev/null | head -n 1` != x"" ; then
-+ echo "$1 IS at $LIBPATH"
-+ expr 1 > /dev/null
-+ return
- HAS_IT="yes"
-+ else
-+ echo "$1 not at $LIBPATH"
- fi
- done
- expr $HAS_IT : "yes" > /dev/null
@@ -2034,6 +2059,8 @@
# EM64T era Intel Xeon
if expr "$processor" : ".*Intel(R) Xeon(R) CPU.*5110" > /dev/null ; then
@@ -232,7 +248,20 @@
# Various Intel Duo processors (EMT64T capable)
elif expr "$processor" : ".*Intel(R).*Core(TM)2.*CPU" > /dev/null ; then
ARCHFLAGS="-march=k8" # this would be pentium4 on 32 bit systems
-@@ -2691,6 +2718,9 @@
+@@ -2528,6 +2555,12 @@
+ check_header sys/soundcard.h
+ check_header soundcard.h
+
++# PulseAudio probe
++! disabled audio_pulse &&
++ check_lib pulse/version.h pa_get_library_version $audio_pulse_libs &&
++ enable audio_pulse ||
++ disable audio_pulse
++
+ # ALSA probe
+ ! disabled audio_alsa &&
+ check_lib alsa/asoundlib.h snd_asoundlib_version $audio_alsa_libs &&
+@@ -2691,6 +2724,9 @@
fi
fi
@@ -242,7 +271,7 @@
enabled x11 && has_library libX11 || disable x11
enabled xrandr && has_header X11/extensions/Xrandr.h || disable xrandr
enabled xv && has_library libXv || disable xv
-@@ -2702,8 +2732,6 @@
+@@ -2702,38 +2738,38 @@
check_header X11/extensions/XvMClib.h
has_library libXvMCW || disable xvmcw
check_header X11/extensions/vldXvMC.h
@@ -251,32 +280,41 @@
if test x"$xvmc_lib" != x""; then
VENDOR_XVMC_LIBS="-l"$xvmc_lib
-@@ -2715,25 +2743,34 @@
- VENDOR_XVMC_LIBS="-lviaXvMCPro"
- elif has_library libchromeXvMCPro ; then
- VENDOR_XVMC_LIBS="-lchromeXvMCPro"
-+ else
-+ disable xvmc_pro
- fi
- elif enabled xvmc_vld; then
- if has_library libviaXvMC ; then
- VENDOR_XVMC_LIBS="-lviaXvMC"
- elif has_library libchromeXvMC ; then
- VENDOR_XVMC_LIBS="-lchromeXvMC"
-+ else
-+ disable xvmc_pro
- fi
+ disable xvmcw
+ elif enabled xvmcw; then
+ VENDOR_XVMC_LIBS="-lXvMCW"
+-elif enabled xvmc_pro; then
+- if has_library libviaXvMCPro ; then
+- VENDOR_XVMC_LIBS="-lviaXvMCPro"
+- elif has_library libchromeXvMCPro ; then
+- VENDOR_XVMC_LIBS="-lchromeXvMCPro"
+- fi
+-elif enabled xvmc_vld; then
+- if has_library libviaXvMC ; then
+- VENDOR_XVMC_LIBS="-lviaXvMC"
+- elif has_library libchromeXvMC ; then
+- VENDOR_XVMC_LIBS="-lchromeXvMC"
+- fi
++elif enabled xvmc_pro && has_library libviaXvMCPro ; then
++ VENDOR_XVMC_LIBS="-lviaXvMCPro"
++elif enabled xvmc_pro && has_library libchromeXvMCPro ; then
++ VENDOR_XVMC_LIBS="-lchromeXvMCPro"
++elif enabled xvmc_vld && has_library libviaXvMC ; then
|
