aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorAndrey Slusar <anray@FreeBSD.org>2006-06-15 15:48:16 +0000
committerAndrey Slusar <anray@FreeBSD.org>2006-06-15 15:48:16 +0000
commit82fda83533ad0bafa07db6454f0daac1fc886505 (patch)
tree4aad4262e16940fb208065dceb0fd52ba8c1d83e /multimedia
parentf1bfe6a36ce8637717e6c62c818b299a143da309 (diff)
downloadports-82fda83533ad0bafa07db6454f0daac1fc886505.tar.gz
ports-82fda83533ad0bafa07db6454f0daac1fc886505.zip
Notes
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mplayer/Makefile2
-rw-r--r--multimedia/mplayer/files/patch-ad8
2 files changed, 8 insertions, 2 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index db2d566505e5..9fb1b5ad8438 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -274,7 +274,7 @@
PORTNAME= mplayer
PORTVERSION= 0.99.7
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= multimedia audio
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index d3f3cfb5358b..c8f65c0f5eb4 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -152,7 +152,7 @@
fi
# internal faad: check if our dear gcc is able to compile it...
cp "`pwd`/libfaad2/cfft.c" $TMPC
-@@ -5935,7 +5874,7 @@
+@@ -5935,12 +5878,12 @@
cat > $TMPC << EOF
#include <inttypes.h>
#include <x264.h>
@@ -161,6 +161,12 @@
#error We do not support old versions of x264. Get the latest from SVN.
#endif
int main(void) { x264_encoder_open((void*)0); return 0; }
+ EOF
+-_ld_x264="$_ld_x264 -lx264 $_ld_lm"
++_ld_x264="$_ld_x264 `pkg-config --libs x264` $_ld_lm"
+ if test "$_x264" != no && cc_check $_inc_x264 $_ld_x264 ; then
+ _x264=yes
+ _def_x264='#define HAVE_X264 1'
@@ -6115,8 +6054,11 @@
if test "$_tv" = yes ; then
cat > $TMPC <<EOF