mirror of
https://git.freebsd.org/ports.git
synced 2025-06-26 07:00:31 -04:00
975b6ff93b
- Stagify Note: options have been modified, please review your config! PR: ports/184407 Submitted by: Thomas Zander (maintainer)
131 lines
4.2 KiB
Text
131 lines
4.2 KiB
Text
--- configure.orig 2013-11-08 17:59:55.000000000 +0100
|
|
+++ configure 2013-11-09 14:34:53.996868923 +0100
|
|
@@ -640,7 +640,7 @@
|
|
_iwmmxt=auto
|
|
_mtrr=auto
|
|
_altivec=auto
|
|
-_install=install
|
|
+_install=@${BSD_INSTALL_PROGRAM}
|
|
_ranlib=ranlib
|
|
_windres=windres
|
|
_cc=cc
|
|
@@ -1452,7 +1452,6 @@
|
|
|
|
*)
|
|
echo "Unknown parameter: $ac_option"
|
|
- exit 1
|
|
;;
|
|
|
|
esac
|
|
@@ -1689,7 +1688,7 @@
|
|
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 ;;
|
|
@@ -3822,7 +3821,7 @@
|
|
if linux ; then
|
|
THREAD_CFLAGS=-D_REENTRANT
|
|
elif freebsd || netbsd || openbsd || bsdos ; then
|
|
- THREAD_CFLAGS=-D_THREAD_SAFE
|
|
+ THREAD_CFLAGS=${PTHREAD_CFLAGS}
|
|
fi
|
|
if test "$_pthreads" = auto ; then
|
|
cat > $TMPC << EOF
|
|
@@ -3832,7 +3831,7 @@
|
|
EOF
|
|
_pthreads=no
|
|
if ! hpux ; then
|
|
- for ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
|
|
+ for ld_tmp in ${PTHREAD_LIBS} ; 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
|
|
@@ -3979,7 +3978,7 @@
|
|
# 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" "-liconv" "-liconv $ld_dl" ; do
|
|
cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
|
|
ld_iconv="$ld_tmp" && _iconv=yes && break
|
|
done
|
|
@@ -5903,7 +5902,7 @@
|
|
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
|
|
@@ -5916,7 +5915,7 @@
|
|
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"
|
|
@@ -6514,7 +6513,7 @@
|
|
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'
|
|
@@ -6999,6 +6998,16 @@
|
|
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
|
|
@@ -7391,7 +7400,7 @@
|
|
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"
|
|
|
|
@@ -7729,8 +7738,11 @@
|
|
if test "$_gui" = yes ; then
|
|
|
|
# Required libraries
|
|
- if test "$ffmpeg" != yes ||
|
|
- ! echo $libavdecoders | grep -q PNG_DECODER ; then
|
|
+ # Work around a sh bug in FreeBSD < 8
|
|
+ if test "$ffmpeg" != yes ; then
|
|
+ die "The GUI requires libavcodec with PNG support (needs zlib)."
|
|
+ fi
|
|
+ if ! echo $libavdecoders | grep -q PNG_DECODER ; then
|
|
die "The GUI requires libavcodec with PNG support (needs zlib)."
|
|
fi
|
|
test "$_freetype" = no && test "$_bitmap_font" = no &&
|
|
@@ -8318,7 +8330,7 @@
|
|
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)
|