On 06/20/11 14:50, Stuart Henderson wrote:
> On 2011/06/20 14:14, Nigel Taylor wrote:
>>
>> 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?
>
> Only these actually use libavformat;
>
> sqlite> select fullpkgpath from wantlib where value='avformat';
> audio/akode
> audio/aqualung
> audio/audacious-plugins,-main
> audio/picard
> graphics/ffmpegthumbnailer
> graphics/gegl,-plugins
> multimedia/dvdstyler
> multimedia/ffmpeg-php
> multimedia/ffmpeg2theora
> multimedia/gstreamer-0.10/plugins-ffmpeg
> multimedia/k3b
> multimedia/mediatomb
> multimedia/transcode
> www/cherokee,-streaming
> www/gnash
> x11/mplayer
> x11/vlc,-main
> x11/wxSVG
> x11/xfce4/tumbler
>
> I haven't checked every single one but it looks like in most cases where
> avformat is linked, avcodec is also linked to the same file with its
> usual set of -l.
>
> Besides transcode, it looks like mediatomb may be another exception to this.
>
>> 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.
>
> A couple more tests would be good but I think this is relatively low
> risk, given that pkg-config was previously generating --libs output along
> the same lines as these.
>
>
Hi,
Here is a revised diff for ffmpeg, after faac changes.
Regards
Nigel Taylor
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile 24 Jun 2011 11:16:21 -0000 1.73
+++ Makefile 25 Jun 2011 22:02:49 -0000
@@ -5,7 +5,7 @@ COMMENT= audio/video converter and strea
V= 20110408
DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
-REVISION= 1
+REVISION= 2
CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/
@@ -50,13 +50,13 @@ LIB_DEPENDS= archivers/bzip2 \
multimedia/x264
# inter-library dependencies for the current configuration
-LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -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 -lavutil -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${LOCALBASE}/lib -L${X11BASE}/lib -lX11 -lXext
-lXfixes -lavcodec -lavformat -lavutil -lbz2 -lgsm -lm -lmp3lame -logg
-lorc-0.4 -lschroedinger-1.0 -lsndio -lspeex -ltheoradec -ltheoraenc -lvorbis
-lvorbisenc -lvpx -lx264 -lz -pthread -Wl,-rpath,${LOCALBASE}/lib
-Wl,-rpath,${X11BASE}/lib
+LIBavfilter_EXTRALIBS=-L${LOCALBASE}/lib -lavcodec -lavformat -lavutil -lbz2
-lgsm -lm -lmp3lame -logg -lorc-0.4 -lschroedinger-1.0 -lspeex -lswscale
-ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx -lx264 -lz -pthread
-Wl,-rpath,${LOCALBASE}/lib
+LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lavcodec -lavutil -lbz2 -lgsm -lm
-lmp3lame -logg -lorc-0.4 -lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc
-lvorbis -lvorbisenc -lvpx -lx264 -lz -pthread -Wl,-rpath,${LOCALBASE}/lib
+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
@@ -122,13 +122,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
