mirror of
https://git.freebsd.org/ports.git
synced 2025-06-26 23:20:30 -04:00
bffe7f9063
- Supersedes ports/164943 PR: ports/166946 Submitted by: Thomas Zander <thomas.e.zander@googlemail.com> (maintainer)
95 lines
2.8 KiB
Text
95 lines
2.8 KiB
Text
--- configure.orig 2012-03-15 16:20:02.000000000 +0100
|
|
+++ configure 2012-03-22 15:36:16.583006073 +0100
|
|
@@ -637,7 +637,7 @@
|
|
_iwmmxt=auto
|
|
_mtrr=auto
|
|
_altivec=auto
|
|
-_install=install
|
|
+_install=@${BSD_INSTALL_PROGRAM}
|
|
_ranlib=ranlib
|
|
_windres=windres
|
|
_cc=cc
|
|
@@ -1455,7 +1455,6 @@
|
|
|
|
*)
|
|
echo "Unknown parameter: $ac_option"
|
|
- exit 1
|
|
;;
|
|
|
|
esac
|
|
@@ -3576,7 +3575,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
|
|
@@ -3586,7 +3585,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
|
|
@@ -6245,7 +6244,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'
|
|
@@ -6705,6 +6704,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
|
|
@@ -7097,7 +7106,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"
|
|
|
|
@@ -7435,8 +7444,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 &&
|
|
@@ -8001,7 +8013,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)
|