ALT Linux repos
S: | 1.5-alt1.38416.2 |
D: | 1.0-alt35.27330.1 |
5.0: | 1.0-alt35.27654.3 |
4.1: | 1.0-alt35.26470.1 |
4.0: | 1.0-alt35.23722.M40.1 |
Group :: Video
RPM: mplayer
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: mplayer-svn-r27330-configure.patch
Download
Download
diff -urN mplayer-svn-r27330.orig/configure mplayer-svn-r27330/configure
--- mplayer-svn-r27330.orig/configure 2008-07-21 03:35:30 +0300
+++ mplayer-svn-r27330/configure 2008-07-21 04:02:07 +0300
@@ -129,7 +129,7 @@
x86_64() {
case "$host_arch" in
- x86_64|amd64) return 0 ;;
+ x86-64|x86_64|amd64) return 0 ;;
*) return 1 ;;
esac
}
@@ -1285,7 +1285,7 @@
case "`uname -m 2>&1`" in
i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
ia64) host_arch=ia64 ;;
- x86_64|amd64)
+ x86-64|x86_64|amd64)
if [ -n "`$_cc -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p'`" -a \
-z "`echo $CFLAGS | grep -- -m32`" ]; then
host_arch=x86_64
@@ -1874,7 +1874,7 @@
_optimizing=''
;;
- x86_64|amd64)
+ x86-64|x86_64|amd64)
_arch='X86 X86_64'
_target_arch='ARCH_X86_64 = yes'
_target_arch_x86="ARCH_X86 = yes"
@@ -2870,6 +2870,7 @@
_noinputmodules="network $_noinputmodules"
_def_network='#undef MPLAYER_NETWORK'
_ftp=no
+ _live=no
fi
echores "$_network"
@@ -3295,7 +3296,7 @@
echocheck "termcap"
-if test "$_termcap" = auto ; then
+if test "$_termcap" != no ; then
cat > $TMPC <<EOF
#include <stddef.h>
#include <term.h>
@@ -3320,7 +3321,7 @@
_def_termios='#undef HAVE_TERMIOS'
_def_termios_h='#undef HAVE_TERMIOS_H'
_def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H'
-if test "$_termios" = auto ; then
+if test "$_termios" != no ; then
_termios=no
for _termios_header in "sys/termios.h" "termios.h"; do
cat > $TMPC <<EOF
@@ -4261,7 +4262,7 @@
_vidix_drv_sis=no
_def_vidix_drv_unichrome='#undef CONFIG_VIDIX_DRV_UNICHROME'
_vidix_drv_unichrome=no
-if test "$_vidix" = auto ; then
+if test "$_vidix" != no ; then
_vidix=no
x86 && (linux || freebsd || netbsd || openbsd || dragonfly || sunos || win32) \
&& _vidix=yes
@@ -4416,7 +4417,9 @@
if test "$_aa" = yes ; then
_def_aa='#define HAVE_AA 1'
if cygwin ; then
- _libs_mplayer="$_libs_mplayer `aalib-config --libs | cut -d " " -f 2,5,6`"
+ _libs_mplayer="$_libs_mplayer `aalib-config --libs | cut -d ' ' -f 2,5,6`"
+ else
+ _libs_mplayer="$_libs_mplayer `aalib-config --libs | cut -d ' ' -f 1,2,4-6`"
fi
_vosrc="$_vosrc vo_aa.c"
_vomodules="aa $_vomodules"
@@ -4444,7 +4447,7 @@
if test "$_caca" = yes ; then
_def_caca='#define HAVE_CACA 1'
_inc_extra="$_inc_extra `caca-config --cflags`"
- _libs_mplayer="$_libs_mplayer `caca-config --libs`"
+ _libs_mplayer="$_libs_mplayer `caca-config --libs | cut -d ' ' -f 1-4`"
_vosrc="$_vosrc vo_caca.c"
_vomodules="caca $_vomodules"
else
@@ -5148,7 +5151,7 @@
echocheck "JACK"
-if test "$_jack" = auto ; then
+if test "$_jack" != no ; then
_jack=yes
cat > $TMPC << EOF
@@ -5175,7 +5178,7 @@
echores "$_jack"
echocheck "OpenAL"
-if test "$_openal" = auto ; then
+if test "$_openal" != no ; then
_openal=no
cat > $TMPC << EOF
#ifdef OPENAL_AL_H
@@ -5610,7 +5613,7 @@
_res_comment="freetype support needed"
fi
echocheck "fontconfig"
-if test "$_fontconfig" = auto ; then
+if test "$_fontconfig" != no ; then
cat > $TMPC << EOF
#include <stdio.h>
#include <stdlib.h>
@@ -5924,7 +5927,7 @@
echores "$_speex"
echocheck "OggTheora support"
-if test "$_theora" = auto ; then
+if test "$_theora" != no ; then
_theora=no
cat > $TMPC << EOF
#include <theora/theora.h>
@@ -6073,7 +6076,7 @@
echocheck "FAAC (AAC encoder) support"
-if test "$_faac" = auto ; then
+if test "$_faac" != no ; then
cat > $TMPC <<EOF
#include <inttypes.h>
#include <faac.h>
@@ -6198,7 +6201,7 @@
echocheck "Win32 codecs"
-if test "$_win32dll" = auto ; then
+if test "$_win32dll" != no ; then
_win32dll=no
if x86_32 && ! qnx; then
_win32dll=yes
@@ -6307,56 +6310,6 @@
fi
echores "$_nemesi"
-echocheck "LIVE555 Streaming Media libraries"
-if test "$_live" = auto && test "$_network" = yes ; then
- cat > $TMPCPP << EOF
-#include <liveMedia.hh>
-#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600)
-#error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
-#endif
-int main(void) { return 0; }
-EOF
-
- _live=no
- for I in $_inc_extra "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do
- cxx_check $I/liveMedia/include $I/UsageEnvironment/include \
- $I/groupsock/include && _livelibdir=`echo $I| sed s/-I//` && \
- _ld_extra="$_livelibdir/liveMedia/libliveMedia.a \
- $_livelibdir/groupsock/libgroupsock.a \
- $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
- $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
- $_ld_extra -lstdc++" \
- _inc_extraxx="-I$_livelibdir/liveMedia/include \
- -I$_livelibdir/UsageEnvironment/include \
- -I$_livelibdir/BasicUsageEnvironment/include \
- -I$_livelibdir/groupsock/include" && \
- _live=yes && break
- done
- if test "$_live" != yes ; then
- if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock; then
- _live_dist=yes
- fi
- fi
-fi
-if test "$_live" = yes && test "$_network" = yes; then
- _res_comment="using $_livelibdir"
- _def_live='#define STREAMING_LIVE555 1'
- _inputmodules="live555 $_inputmodules"
-elif test "$_live_dist" = yes && test "$_network" = yes; then
- _res_comment="using distribution version"
- _live="yes"
- _def_live='#define STREAMING_LIVE555 1'
- _ld_extra="$_ld_extra -lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++"
- _inc_extraxx="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment \
- -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
- _inputmodules="live555 $_inputmodules"
-else
- _live=no
- _def_live='#undef STREAMING_LIVE555'
- _noinputmodules="live555 $_noinputmodules"
-fi
-echores "$_live"
-
echocheck "FFmpeg libavutil"
if test "$_libavutil_a" = auto ; then
@@ -6366,7 +6319,7 @@
else
die "MPlayer will not compile without libavutil in the source tree."
fi
-elif test "$_libavutil_so" = auto ; then
+elif test "$_libavutil_so" != no ; then
_libavutil_so=no
cat > $TMPC << EOF
#include <libavutil/common.h>
@@ -6404,7 +6357,7 @@
_libavcodec_a="yes"
_res_comment="static"
fi
-elif test "$_libavcodec_so" = auto ; then
+elif test "$_libavcodec_so" != no ; then
_libavcodec_so=no
_res_comment="libavcodec.so is discouraged over static libavcodec"
cat > $TMPC << EOF
@@ -6448,7 +6401,7 @@
_libavformat_a=yes
_res_comment="static"
fi
-elif test "$_libavformat_so" = auto ; then
+elif test "$_libavformat_so" != no ; then
_libavformat_so=no
cat > $TMPC <<EOF
#include <libavformat/avformat.h>
@@ -6484,7 +6437,7 @@
_libpostproc_a='yes'
_res_comment="static"
fi
-elif test "$_libpostproc_so" = auto ; then
+elif test "$_libpostproc_so" != no ; then
_libpostproc_so=no
cat > $TMPC << EOF
#define USE_LIBPOSTPROC 1
@@ -6511,7 +6464,7 @@
echocheck "libamr narrowband"
-if test "$_libamr_nb" = auto ; then
+if test "$_libavcodec_a" = yes -a "$_libamr_nb" = auto ; then
_libamr_nb=no
cat > $TMPC << EOF
#include <amrnb/sp_dec.h>
@@ -6539,7 +6492,7 @@
echocheck "libamr wideband"
-if test "$_libamr_wb" = auto ; then
+if test "$_libavcodec_a" = yes -a "$_libamr_wb" = auto ; then
_libamr_wb=no
cat > $TMPC << EOF
#include <amrwb/dec_if.h>
@@ -6586,7 +6539,7 @@
echocheck "Xvid"
-if test "$_xvid" = auto ; then
+if test "$_xvid" != no ; then
_xvid=no
cat > $TMPC << EOF
#include <xvid.h>
@@ -6625,7 +6578,7 @@
echocheck "x264"
-if test "$_x264" = auto ; then
+if test "$_x264" != no ; then
cat > $TMPC << EOF
#include <inttypes.h>
#include <x264.h>
@@ -6660,7 +6613,7 @@
echocheck "libnut"
-if test "$_libnut" = auto ; then
+if test "$_libnut" != no ; then
cat > $TMPC << EOF
#include <stdio.h>
#include <stdlib.h>
@@ -7111,6 +7064,57 @@
fi
echores "$_ftp"
+echocheck "LIVE555 Streaming Media libraries"
+if test "$_live" != no && test "$_network" = yes ; then
+ cat > $TMPCPP << EOF
+#include <liveMedia.hh>
+#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600)
+#error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
+#endif
+int main(void) { return 0; }
+EOF
+
+ _live=no
+ for I in "$_inc_extra" -I"$_libdir/live" -I"/usr/lib/live" -I"/usr/local/live" -I"/usr/local/lib/live" ; do
+ cxx_check $I/liveMedia/include $I/UsageEnvironment/include \
+ $I/groupsock/include && _livelibdir=`echo $I | sed s/^-I//` && \
+ _ld_extra="$_livelibdir/liveMedia/libliveMedia.a \
+ $_livelibdir/groupsock/libgroupsock.a \
+ $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
+ $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
+ $_ld_extra -lstdc++" \
+ _inc_extraxx="-I$_livelibdir/liveMedia/include \
+ -I$_livelibdir/UsageEnvironment/include \
+ -I$_livelibdir/BasicUsageEnvironment/include \
+ -I$_livelibdir/groupsock/include" && \
+ _live=yes && break
+ done
+ if test "$_live" != yes ; then
+ if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock; then
+ _live_dist=yes
+ fi
+ fi
+fi
+if test "$_live" = yes && test "$_network" = yes; then
+ _res_comment="using $_livelibdir"
+ _def_live='#define STREAMING_LIVE555 1'
+ _inputmodules="live555 $_inputmodules"
+elif test "$_live_dist" = yes && test "$_network" = yes; then
+ _res_comment="using distribution version"
+ _live="yes"
+ _def_live='#define STREAMING_LIVE555 1'
+ _ld_extra="$_ld_extra -lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++"
+ _inc_extraxx="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment \
+ -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
+ _inputmodules="live555 $_inputmodules"
+else
+ _live=no
+ _def_live='#undef STREAMING_LIVE555'
+ _noinputmodules="live555 $_noinputmodules"
+fi
+echores "$_live"
+
+
echocheck "vstream client"
if test "$_vstream" = auto ; then
_vstream=no
@@ -7192,7 +7196,7 @@
if darwin ; then
_ld_extra="$_ld_extra ${_xmmslibdir}/libxmms.dylib"
else
- _ld_extra="$_ld_extra ${_xmmslibdir}/libxmms.so.1 -export-dynamic"
+ _ld_extra="$_ld_extra `xmms-config --libs`"
fi
else
_def_xmms='#undef HAVE_XMMS'
@@ -7252,10 +7256,7 @@
if test "$_gui" = yes ; then
# Required libraries
- if test "$_libavcodec" != yes ||
- ! echo $_libavdecoders | grep -q PNG_DECODER ; then
- die "The GUI requires libavcodec with PNG support (needs zlib)."
- fi
+ test "$_libavcodec" = yes || die "The GUI requires libavcodec with PNG support."
test "$_freetype" = no && test "$_bitmap_font" = no && \
die "The GUI requires either FreeType or bitmap font support."
if ! win32 ; then
diff -urN mplayer-svn-r27330.orig/Makefile mplayer-svn-r27330/Makefile
--- mplayer-svn-r27330.orig/Makefile 2008-07-21 03:35:30 +0300
+++ mplayer-svn-r27330/Makefile 2008-07-21 03:56:50 +0300
@@ -882,7 +882,7 @@
###### tests / tools #######
-TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm
+TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltinfo -lm
codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS)
$(CC) -I. -DCODECS2HTML -o $@ $^
@@ -918,6 +918,7 @@
TOOLS/asfinfo$(EXESUF) \
TOOLS/avi-fix$(EXESUF) \
TOOLS/avisubdump$(EXESUF) \
+ TOOLS/bmovl-test$(EXESUF) \
TOOLS/compare$(EXESUF) \
TOOLS/dump_mp4$(EXESUF) \
TOOLS/movinfo$(EXESUF) \
@@ -925,12 +926,7 @@
TOOLS/subrip$(EXESUF) \
TOOLS/vivodump$(EXESUF) \
-ifdef ARCH_X86
-TOOLS += TOOLS/modify_reg$(EXESUF)
-endif
-
ALLTOOLS = $(TOOLS) \
- TOOLS/bmovl-test$(EXESUF) \
TOOLS/vfw2menc$(EXESUF) \
tools: $(TOOLS)