On 06/20/11 11:25, Stuart Henderson wrote:
> On 2011-06-20, Nigel Taylor <[email protected]> wrote:
> [..]
>>>> ffmpeg - The libavformat.pc is created in the configure stage not build,
>>>> the MAKE_FLAGS has no effect. The
>>>> LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lm
>>>> -Wl,-rpath,${LOCALBASE}/lib is used in creating the libavformat.pc, and
>>>> that doesn't contain the -lavcodec -lavutil that was added for the
>>>> MAKE_FLAGS.
>>> Right.
>>>
>>
>> The attached patch will allow transcode to build with the current
>> pkg-config. Builds on amd64 current.
>
> I think the correct place to fix this is in ffmpeg, if somebody
> linking against libavformat needs to use -lavcodec -lavutil,
> libavformat.pc should contain those flags.
>
>
>
Hi,
I have a fix for ffmpeg attached which did before transcode, I held
back. ffmpeg is a dependency for a lot of packages around 50, why then
just one transcode requires a change?
Changing ffmpeg requires all those dependent packages to be retested,
gstreamer-ffmpeg, xine, mplayer, opal, vlc, webkit, minitube, gnash etc.
ffmpeg doesn't have regression tests.
Build tested on amd64 current, and a few things like ffplay, mplayer tried.
Regards
Nigel Taylor
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile 4 Jun 2011 09:20:36 -0000 1.71
+++ Makefile 19 Jun 2011 13:25:01 -0000
@@ -5,6 +5,7 @@ COMMENT= audio/video converter and strea
V= 20110408
DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
+REVISION= 0
CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/
@@ -50,13 +51,13 @@ LIB_DEPENDS= archivers/bzip2 \
multimedia/x264
# inter-library dependencies for the current configuration
-LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lfaac -lgsm -lm -lmp3lame -logg
-lorc-0.4 -lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis
-lvorbisenc -lvpx -lx264 -lz -pthread -Wl,-rpath,${LOCALBASE}/lib
-LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lm -lsndio
-Wl,-rpath,${LOCALBASE}/lib -Wl,-rpath,${X11BASE}/lib
-LIBavfilter_EXTRALIBS=-lm
-LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lm -Wl,-rpath,${LOCALBASE}/lib
-LIBavutil_EXTRALIBS=-lm
-LIBpostproc_EXTRALIBS=-lm
-LIBswscale_EXTRALIBS=-lm
+LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -pthread -Wl,-rpath,${LOCALBASE}/lib
-lfaac -lgsm -lmp3lame -logg -lorc-0.4 -lschroedinger-1.0 -lspeex -ltheoradec
-ltheoraenc -lvorbis -lvorbisenc -lvpx -lx264 -lz -lavutil -lm
+LIBavdevice_EXTRALIBS=-L${LOCALBASE}/lib -L${X11BASE}/lib
-Wl,-rpath,${LOCALBASE}/lib -Wl,-rpath,${X11BASE}/lib -pthread -lX11 -lXext
-lXfixes -lsndio -lavformat -lbz2 -lavcodec -lfaac -lgsm -lmp3lame -logg
-lorc-0.4 -lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis
-lvorbisenc -lvpx -lx264 -lz -lavutil -lm
+LIBavfilter_EXTRALIBS=-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -pthread
-lavformat -lbz2 -lavcodec -lfaac -lgsm -lmp3lame -logg -lorc-0.4
-lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx
-lx264 -lz -lswscale -lavutil -lm
+LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -pthread
-lbz2 -lavcodec -lfaac -lgsm -lmp3lame -logg -lorc-0.4 -lschroedinger-1.0
-lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx -lx264 -lz -lavutil
-lm
+LIBavutil_EXTRALIBS=-L${LOCALBASE}/lib -lm
+LIBpostproc_EXTRALIBS=-L${LOCALBASE}/lib -lavutil -lm
+LIBswscale_EXTRALIBS=-L${LOCALBASE}/lib -lavutil -lm
# configure wants a directory it can execute files in
WRKTMP= ${WRKDIR}/tmp
@@ -124,13 +125,13 @@ VERSION_FLAGS= libavcodec_VERSION=${LIBa
MAKE_ENV= V=1
MAKE_FLAGS= ${VERSION_FLAGS} \
- LIBavcodec_EXTRALIBS="-lavutil ${LIBavcodec_EXTRALIBS}" \
- LIBavdevice_EXTRALIBS="-lavformat -lavcodec -lavutil
${LIBavdevice_EXTRALIBS}" \
- LIBavfilter_EXTRALIBS="-lavformat -lavcodec -lavutil -lswscale
${LIBavfilter_EXTRALIBS}" \
- LIBavformat_EXTRALIBS="-lavcodec -lavutil
${LIBavformat_EXTRALIBS}" \
+ LIBavcodec_EXTRALIBS="${LIBavcodec_EXTRALIBS}" \
+ LIBavdevice_EXTRALIBS="${LIBavdevice_EXTRALIBS}" \
+ LIBavfilter_EXTRALIBS="${LIBavfilter_EXTRALIBS}" \
+ LIBavformat_EXTRALIBS="${LIBavformat_EXTRALIBS}" \
LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \
- LIBpostproc_EXTRALIBS="-lavutil ${LIBpostproc_EXTRALIBS}" \
- LIBswscale_EXTRALIBS="-lavutil ${LIBswscale_EXTRALIBS}"
+ LIBpostproc_EXTRALIBS="${LIBpostproc_EXTRALIBS}" \
+ LIBswscale_EXTRALIBS="${LIBswscale_EXTRALIBS}"
FAKE_FLAGS= ${VERSION_FLAGS} \
LDCONFIG=true
