119 lines
2.9 KiB
Diff
119 lines
2.9 KiB
Diff
diff -ruN mplayer-1.3.0/configure my_mplayer-1.3.0/configure
|
|
--- mplayer-1.3.0/configure 2016-02-14 00:05:42.000000000 +0300
|
|
+++ my_mplayer-1.3.0/configure 2024-04-12 22:15:42.655350521 +0300
|
|
@@ -276,6 +276,12 @@
|
|
*) return 1;;
|
|
esac
|
|
}
|
|
+e2k() {
|
|
+ case "$host_arch" in
|
|
+ e2k*) return 0;;
|
|
+ *) return 1;;
|
|
+ esac
|
|
+}
|
|
|
|
# Use this before starting a check
|
|
echocheck() {
|
|
@@ -546,6 +552,8 @@
|
|
--enable-runtime-cpudetection enable runtime CPU detection [disable]
|
|
--enable-cross-compile enable cross-compilation [autodetect]
|
|
--cc=COMPILER C compiler to build MPlayer [gcc]
|
|
+ --cxx=COMPILER
|
|
+ --strip=COMPILER
|
|
--host-cc=COMPILER C compiler for tools needed while building [gcc]
|
|
--as=ASSEMBLER assembler to build MPlayer [as]
|
|
--nm=NM nm tool to build MPlayer [nm]
|
|
@@ -602,6 +610,7 @@
|
|
--with-xvmclib=NAME adapter-specific library name (e.g. XvMCNVIDIA)
|
|
|
|
--with-freetype-config=PATH path to freetype-config
|
|
+
|
|
--with-sdl-config=PATH path to sdl*-config
|
|
--with-dvdnav-config=PATH path to dvdnav-config
|
|
--with-dvdread-config=PATH path to dvdread-config
|
|
@@ -650,8 +659,12 @@
|
|
_ranlib=ranlib
|
|
_windres=windres
|
|
_cc=cc
|
|
+_cxx=cxx
|
|
+_strip=strip
|
|
_ar=ar
|
|
test "$CC" && _cc="$CC"
|
|
+test "$CXX" && _cxx="$CXX"
|
|
+test "$STRIP" && _strip="$STRIP"
|
|
_as=auto
|
|
_nm=auto
|
|
_yasm=yasm
|
|
@@ -944,6 +957,12 @@
|
|
--cc=*)
|
|
_cc=$(option_value $ac_option)
|
|
;;
|
|
+ --cxx=*)
|
|
+ _cxx=$(option_value $ac_option)
|
|
+ ;;
|
|
+ --strip=*)
|
|
+ _strip=$(option_value $ac_option)
|
|
+ ;;
|
|
--host-cc=*)
|
|
_host_cc=$(option_value $ac_option)
|
|
;;
|
|
@@ -1635,6 +1654,15 @@
|
|
echores "$cc_version"
|
|
else
|
|
for _cc in "$_cc" gcc cc ; do
|
|
+
|
|
+ if test "$_cc" = "cccross" ; then
|
|
+ cc_name=$_cc
|
|
+ echocheck "$_cc version"
|
|
+ cc_vendor=mcst
|
|
+ cc_version=$($_cc -dumpversion 2>&1)
|
|
+ echores "$cc_version"
|
|
+ break
|
|
+ fi
|
|
cc_name_tmp=$($_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1)
|
|
if test "$cc_name_tmp" = "gcc"; then
|
|
cc_name=$cc_name_tmp
|
|
@@ -1725,6 +1753,7 @@
|
|
nios2) host_arch=nios2 ;;
|
|
vax) host_arch=vax ;;
|
|
xtensa*) host_arch=xtensa ;;
|
|
+ e2k*) host_arch=e2k ;;
|
|
*) host_arch=UNKNOWN ;;
|
|
esac
|
|
}
|
|
@@ -2691,6 +2720,16 @@
|
|
iproc='xtensa'
|
|
;;
|
|
|
|
+ e2k)
|
|
+ arch='e2k'
|
|
+ def_fast_64bit='#define HAVE_FAST_64BIT 1'
|
|
+ def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1'
|
|
+ def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1'
|
|
+ proc='e2k'
|
|
+ iproc='e2k'
|
|
+ proc_intr='e2k'
|
|
+ ;;
|
|
+
|
|
generic)
|
|
arch='generic'
|
|
;;
|
|
@@ -8351,7 +8390,7 @@
|
|
AR_O = \$@
|
|
AS = $_cc
|
|
CC = $_cc
|
|
-CXX = $_cc
|
|
+CXX = $_cxx
|
|
HOST_CC = $_host_cc
|
|
INSTALL = $_install
|
|
INSTALLSTRIP = $_install_strip
|
|
@@ -8587,7 +8626,7 @@
|
|
YASM = $_yasm
|
|
DEPYASM = $_yasm
|
|
YASMFLAGS = $YASMFLAGS
|
|
-STRIP = strip
|
|
+STRIP = $_strip
|
|
|
|
CONFIG_FFPROBE = no
|
|
CONFIG_LAVFI_INDEV = no
|