diff options
| author | anray <anray@FreeBSD.org> | 2006-06-15 15:48:16 +0000 |
|---|---|---|
| committer | anray <anray@FreeBSD.org> | 2006-06-15 15:48:16 +0000 |
| commit | d2840475407f7930d04698fc7cb1d331eb0499c6 (patch) | |
| tree | 53c7e414ca8812e20a132f7741f4b8b9a3c4f100 /multimedia/mplayer | |
| parent | 75ff79d55a36deeb1201df278bfb67db29b6b8f9 (diff) | |
| download | FreeBSD-ports-d2840475407f7930d04698fc7cb1d331eb0499c6.zip FreeBSD-ports-d2840475407f7930d04698fc7cb1d331eb0499c6.tar.gz | |
When compiling mplayer against x264, configure says it's unavailable
because it does not link the test-program with -pthread.
Remove the static -lx264 and replaces it with the accurate
`pkg-config --libs x264`, so the linker finds all the symbols needed.
After that, mencoder can finally encode x264-movies.
PR: ports/98914
Submitted by: Mark Daniel Reidel <ports@mark.reidel.info>
Approved by: maintainer
Diffstat (limited to 'multimedia/mplayer')
| -rw-r--r-- | multimedia/mplayer/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mplayer/files/patch-ad | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index db2d566..9fb1b5a 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 d3f3cfb..c8f65c0 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 |
