mirror of
https://git.freebsd.org/ports.git
synced 2025-06-02 19:36:28 -04:00
amd64/i386: - Enable VDPAU by default for the large NVIDIA user base, proposed by ehaupt - BUILD_DEPEND on yasm only on amd64/i386 General cleanups: - Remove REINPLACE_CMD on CONFIGURE_SCRIPT conditional for post-8.x machines, is now part of patch-configure - Offer RTCPU OPTION only on archs that support it (amd64, i386, ppc) - Update RTCPU_DESC accordingly - Use OPTION helper for RTCPU instead of complicated conditionals - Remove superfluous check for ARCH when setting CFLAGS for armv6
178 lines
5.6 KiB
Text
178 lines
5.6 KiB
Text
--- configure.orig 2015-08-02 17:29:05 UTC
|
|
+++ configure
|
|
@@ -646,7 +646,7 @@ armthumb=auto
|
|
_iwmmxt=auto
|
|
_mtrr=auto
|
|
_altivec=auto
|
|
-_install=install
|
|
+_install=@${BSD_INSTALL_PROGRAM}
|
|
_ranlib=ranlib
|
|
_windres=windres
|
|
_cc=cc
|
|
@@ -988,7 +988,7 @@ for ac_option do
|
|
ld_static=''
|
|
;;
|
|
--enable-profile)
|
|
- _profile='-p'
|
|
+ _profile='-pg'
|
|
;;
|
|
--disable-profile)
|
|
_profile=
|
|
@@ -1459,7 +1459,6 @@ for ac_option do
|
|
|
|
*)
|
|
echo "Unknown parameter: $ac_option"
|
|
- exit 1
|
|
;;
|
|
|
|
esac
|
|
@@ -1712,7 +1711,7 @@ if test -z "$_target" ; then
|
|
case "$1" in
|
|
x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
|
|
ia64) host_arch=ia64 ;;
|
|
- macppc|ppc*|Power*) host_arch=ppc ;;
|
|
+ macppc|powerpc|ppc*|Power*) host_arch=ppc ;;
|
|
alpha) host_arch=alpha ;;
|
|
sun4*|sparc*) host_arch=sparc ;;
|
|
parisc*|hppa*|9000*) host_arch=hppa ;;
|
|
@@ -1835,7 +1834,11 @@ echocheck "working compiler"
|
|
cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
|
|
echo "yes"
|
|
|
|
-cflag_check "-lm" && libm="-lm"
|
|
+if test -z "$_profile" ; then
|
|
+ cflag_check "-lm" && libm="-lm"
|
|
+else
|
|
+ cflag_check "-lm_p" && libm="-lm_p"
|
|
+fi
|
|
|
|
if test -z "$_target" ; then
|
|
cat > $TMPC << EOF
|
|
@@ -3170,6 +3173,13 @@ if arm ; then
|
|
fi
|
|
echores "$setend"
|
|
|
|
+ echocheck "ARM setend"
|
|
+ if test $setend = "auto" ; then
|
|
+ setend=no
|
|
+ inline_asm_check '"setend be"' && setend=yes
|
|
+ fi
|
|
+ echores "$setend"
|
|
+
|
|
echocheck "softfloat ABI"
|
|
softfloat=yes
|
|
cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
|
|
@@ -3920,7 +3930,7 @@ echocheck "pthread"
|
|
if linux ; then
|
|
THREAD_CFLAGS=-D_REENTRANT
|
|
elif freebsd || netbsd || openbsd || bsdos ; then
|
|
- THREAD_CFLAGS=-D_THREAD_SAFE
|
|
+ THREAD_CFLAGS=
|
|
fi
|
|
if test "$_pthreads" = auto ; then
|
|
cat > $TMPC << EOF
|
|
@@ -3930,7 +3940,7 @@ int main(void) { pthread_t tid; return p
|
|
EOF
|
|
_pthreads=no
|
|
if ! hpux ; then
|
|
- for ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
|
|
+ for ld_tmp in "-lpthread" "-pthread" ; do
|
|
# for crosscompilation, we cannot execute the program, be happy if we can link statically
|
|
cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
|
|
done
|
|
@@ -4082,7 +4092,7 @@ EOF
|
|
# NOTE: -L/usr/lib is a hack to avoid issues due to a
|
|
# broken libiconv that e.g. macports installs into /opt/local/lib
|
|
# which might get addded to the search path later by e.g. SDL
|
|
- for ld_tmp in "" "-L/usr/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
|
|
+ for ld_tmp in "" "-L$_prefix/lib -liconv" "-L%%LOCALBASE%%/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
|
|
cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
|
|
ld_iconv="$ld_tmp" && _iconv=yes && break
|
|
done
|
|
@@ -5484,15 +5494,6 @@ EOF
|
|
break
|
|
fi
|
|
done
|
|
- if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then
|
|
- _gl=yes
|
|
- _gl_egl_x11=yes
|
|
- libs_mplayer="$libs_mplayer -lEGL $ld_dl"
|
|
- elif cc_check -DGL_EGL_ANDROID -lEGL ; then
|
|
- _gl=yes
|
|
- _gl_egl_android=yes
|
|
- libs_mplayer="$libs_mplayer -lEGL $ld_dl"
|
|
- fi
|
|
if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
|
|
_gl=yes
|
|
_gl_win32=yes
|
|
@@ -6056,7 +6057,7 @@ elif darwin ; then
|
|
elif dragonfly ; then
|
|
default_cdrom_device="/dev/cd0"
|
|
elif freebsd ; then
|
|
- default_cdrom_device="/dev/acd0"
|
|
+ default_cdrom_device="/dev/cdrom"
|
|
elif openbsd ; then
|
|
default_cdrom_device="/dev/rcd0c"
|
|
elif sunos ; then
|
|
@@ -6069,7 +6070,7 @@ else
|
|
default_cdrom_device="/dev/cdrom"
|
|
fi
|
|
|
|
-if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then
|
|
+if win32 || os2 || dragonfly || openbsd || sunos || amigaos ; then
|
|
default_dvd_device=$default_cdrom_device
|
|
elif darwin ; then
|
|
default_dvd_device="/dev/rdiskN"
|
|
@@ -6586,7 +6587,7 @@ echores "$_speex"
|
|
echocheck "libgsm"
|
|
if test "$_libgsm" = auto ; then
|
|
_libgsm=no
|
|
- statement_check gsm/gsm.h 'gsm_create()' -lgsm && _libgsm=yes
|
|
+ statement_check gsm.h 'gsm_create()' -lgsm && _libgsm=yes
|
|
fi
|
|
if test "$_libgsm" = yes ; then
|
|
def_libgsm='#define CONFIG_LIBGSM 1'
|
|
@@ -7071,6 +7072,16 @@ if test "$_librtmp" = yes && test "$netw
|
|
nolibrtmp=no
|
|
def_librtmp='#define CONFIG_LIBRTMP 1'
|
|
inputmodules="librtmp $inputmodules"
|
|
+
|
|
+ if $_pkg_config --exists librtmp; then
|
|
+ _inc_tmp=$($_pkg_config --cflags librtmp)
|
|
+ _ld_tmp=$($_pkg_config --libs librtmp)
|
|
+ else
|
|
+ _inc_tmp="-I${LOCALBASE}/include"
|
|
+ _ld_tmp="-L${LOCALBASE}/lib -lrtmp -lz -lssl -lcrypto"
|
|
+ fi
|
|
+ extra_ldflags="$extra_ldflags $_ld_tmp"
|
|
+ extra_cflags="$extra_cflags $_inc_tmp"
|
|
else
|
|
nolibrtmp=yes
|
|
_librtmp=no
|
|
@@ -7471,7 +7482,7 @@ echores "$_mp3lame"
|
|
echocheck "mencoder"
|
|
if test "$_mencoder" = no ; then
|
|
# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
|
|
- libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
|
|
+ libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
|
|
fi
|
|
echores "$_mencoder"
|
|
|
|
@@ -8072,7 +8083,7 @@ libs_mplayer=$ld_tmp
|
|
|
|
#############################################################################
|
|
|
|
-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
|
|
+CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
|
|
|
|
CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
|
|
|
|
@@ -8353,7 +8364,7 @@ TIMER = $_timer
|
|
EXESUF = $_exesuf
|
|
EXESUFS_ALL = .exe
|
|
|
|
-ARCH = $arch
|
|
+MPLAYER_ARCH = $arch
|
|
$(mak_enable "$arch_all" "$arch" ARCH)
|
|
$(mak_enable "$subarch_all" "$subarch" ARCH)
|
|
$(mak_enable "$cpuexts_all" "$cpuexts" HAVE)
|