kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

When compiling mplayer against x264, configure says it's unavailable

Browse source 
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
This commit is contained in:
Andrey Slusar 2006-06-15 15:48:16 +00:00
parent f1bfe6a36c
commit 82fda83533
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=165511
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
multimedia/mplayer/Makefile
View file

@ -274,7 +274,7 @@
PORTNAME= mplayer PORTNAME= mplayer
PORTVERSION= 0.99.7 PORTVERSION= 0.99.7
PORTREVISION= 14 PORTREVISION= 15
CATEGORIES= multimedia audio CATEGORIES= multimedia audio
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \ http://www2.mplayerhq.hu/MPlayer/releases/ \

8
multimedia/mplayer/files/patch-ad
View file

@ -152,7 +152,7 @@
fi fi
# internal faad: check if our dear gcc is able to compile it... # internal faad: check if our dear gcc is able to compile it...
cp "`pwd`/libfaad2/cfft.c" $TMPC cp "`pwd`/libfaad2/cfft.c" $TMPC
@@ -5935,7 +5874,7 @@ @@ -5935,12 +5878,12 @@
cat > $TMPC << EOF cat > $TMPC << EOF
#include <inttypes.h> #include <inttypes.h>
#include <x264.h> #include <x264.h>
@ -161,6 +161,12 @@
#error We do not support old versions of x264. Get the latest from SVN. #error We do not support old versions of x264. Get the latest from SVN.
#endif #endif
int main(void) { x264_encoder_open((void*)0); return 0; } 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 @@ @@ -6115,8 +6054,11 @@
if test "$_tv" = yes ; then if test "$_tv" = yes ; then
cat > $TMPC <<EOF cat > $TMPC <<EOF