On Wed, May 02, 2007 at 09:49:10AM +0000, Jacob Meuser wrote: > On Wed, May 02, 2007 at 09:24:04AM +0200, Antoine Jacoutot wrote: > > On Wednesday 02 May 2007 09:13:42 Jacob Meuser wrote: > > > update FFmpeg to (more or less) latest svn. > > > > Didn't you forget anything ;) > > yeah, the diff would help. >
and here is the diff for FFmpeg dependent ports. sorry about the delay. -- [EMAIL PROTECTED] Index: multimedia//ffmpeg2theora/Makefile =================================================================== RCS file: /cvs/ports/multimedia/ffmpeg2theora/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- multimedia//ffmpeg2theora/Makefile 2007/03/02 23:42:41 1.2 +++ multimedia//ffmpeg2theora/Makefile 2007/05/02 20:01:23 @@ -3,7 +3,7 @@ COMMENT= "reencode many media file formats to Ogg Theora" DISTNAME= ffmpeg2theora-0.17 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= multimedia EXTRACT_SUFX= .tar.bz2 @@ -16,7 +16,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c faac faad m mp3lame ogg ossaudio pthread z +WANTLIB= a52 c faac faad m mp3lame ogg ossaudio \ + pthread x264 z MASTER_SITES= ${HOMEPAGE} Index: multimedia//libquicktime/Makefile =================================================================== RCS file: /cvs/ports/multimedia/libquicktime/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- multimedia//libquicktime/Makefile 2006/12/02 20:24:17 1.11 +++ multimedia//libquicktime/Makefile 2007/05/02 20:01:23 @@ -5,7 +5,7 @@ COMMENT= library for reading and writing quicktime files DISTNAME= libquicktime-0.9.7 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 CATEGORIES= multimedia SHARED_LIBS= quicktime 2.0 @@ -22,7 +22,8 @@ glib-2.0.>=800.3 gmodule-2.0.>=800.3 \ gobject-2.0.>=800.3 m ogg ossaudio \ pango-1.0.>=1001.1 pangocairo-1.0.>=1001.1 \ - cairo glitz pangoft2-1.0.>=1001.1 pthread z + cairo glitz pangoft2-1.0.>=1001.1 pthread z \ + Xau Xdmcp a52 expat faac faad theora x264 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/} @@ -46,7 +47,7 @@ CONFIGURE_STYLE= autoconf CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \ LDFLAGS="-L${LOCALBASE}/lib" \ - AVCODEC_LIBS="-lavcodec -lavutil -lz -lm -pthread" + AVCODEC_LIBS="$$(pkg-config --libs libavcodec)" CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --disable-firewire \ --with-avcodec="${LOCALBASE}" \ Index: multimedia//transcode/Makefile =================================================================== RCS file: /cvs/ports/multimedia/transcode/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- multimedia//transcode/Makefile 2007/01/23 10:39:01 1.13 +++ multimedia//transcode/Makefile 2007/05/02 20:01:25 @@ -3,6 +3,7 @@ COMMENT= "video stream processing tools" DISTNAME= transcode-1.0.3rc2 +PKGNAME= ${DISTNAME}p0 CATEGORIES= multimedia HOMEPAGE= http://www.transcoding.org/ @@ -12,7 +13,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE SM X11 Xaw Xext Xi Xpm Xt Xv c freetype \ +WANTLIB= ICE SM X11 Xau Xaw Xdmcp Xext Xi Xpm Xt Xv c \ + faac faad freetype x264 \ m pthread usbhid z glib gmodule intl MASTER_SITES= http://fromani.exit1.org/ @@ -42,7 +44,7 @@ ogg.>=5::audio/libogg \ postproc.>=6::graphics/ffmpeg \ theora.>=1::multimedia/libtheora \ - vorbis.>=3,vorbisfile.>=4::audio/libvorbis \ + vorbis.>=3,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \ xml2.>=8::textproc/libxml RUN_DEPENDS= ::graphics/ffmpeg \ @@ -60,7 +62,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - LIBAVCODEC_EXTRA_LIBS="-lavutil -lm -lz -pthread" + LIBAVCODEC_EXTRA_LIBS="$$(pkg-config --libs libavcodec)" MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools Index: multimedia//xine-lib/Makefile =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- multimedia//xine-lib/Makefile 2007/05/01 20:20:48 1.12 +++ multimedia//xine-lib/Makefile 2007/05/02 20:01:25 @@ -4,7 +4,7 @@ V= 1.1.2 DISTNAME= xine-lib-${V} -PKGNAME= ${DISTNAME}p6 +PKGNAME= ${DISTNAME}p7 EXTRACT_SUFX= .tar.bz2 CATEGORIES= multimedia SHARED_LIBS= xine 14.1 @@ -20,7 +20,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} WANTLIB= ICE SM X11 Xau Xdmcp Xext Xinerama Xv freetype \ - jpeg lcms m usbhid z + jpeg lcms m usbhid z faac faad mp3lame x264 .if ${MACHINE_ARCH} == "i386" PKG_ARGS+= -Di386=1 @@ -37,7 +37,7 @@ mad.>=2::audio/libmad \ mng.>=3::graphics/libmng \ ogg.>=5::audio/libogg \ - vorbis.>=4::audio/libvorbis \ + vorbis.>=4,vorbisenc.>=2::audio/libvorbis \ speex.>=3::audio/speex \ theora.>=1::multimedia/libtheora @@ -79,9 +79,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ - FFMPEG_CPPFLAGS="-I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include/postproc" \ - FFMPEG_LIBS="-lavcodec -lavutil -lpostproc -lm -lz -pthread" \ - FFMPEG_POSTPROC_LIBS="-lpostproc" + FFMPEG_CPPFLAGS="$$(pkg-config --cflags libavcodec libpostproc)" \ + FFMPEG_LIBS="$$(pkg-config --libs libavcodec libpostproc)" \ + FFMPEG_POSTPROC_LIBS="$$(pkg-config --libs libavcodec libpostproc)" post-patch: .if ${MACHINE_ARCH} == "i386" Index: www/gnash/Makefile =================================================================== RCS file: /cvs/ports/www/gnash/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- www/gnash/Makefile 2007/02/15 17:07:21 1.8 +++ www/gnash/Makefile 2007/05/02 20:01:54 @@ -3,7 +3,7 @@ COMMENT= "flash player with firefox browser plugin" DISTNAME= gnash-0.7.2 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 SHARED_LIBS += gnashbase 1.0 SHARED_LIBS += gnashgeo 1.0 SHARED_LIBS += gnashamf 1.0 @@ -42,11 +42,12 @@ avcodec.>=7,avutil.>=1,avformat.>=7::graphics/ffmpeg \ gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 -WANTLIB= freetype fontconfig Xrender ossaudio usbhid \ - ICE SM Xext X11 z stdc++ m pthread c ssl crypto \ - faac faad mp3lame ogg vorbis vorbisenc cairo \ +WANTLIB= expat freetype fontconfig Xrender ossaudio usbhid \ + Xext X11 Xau Xdmcp z stdc++ m pthread c ssl crypto \ + faac faad mp3lame ogg vorbis vorbisenc a52 x264 cairo \ glib-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 pangox-1.0 \ - gobject-2.0 gmodule-2.0 atk-1.0 png jpeg glitz SDL + gobject-2.0 gmodule-2.0 atk-1.0 png jpeg glitz SDL \ + Xcursor Xfixes Xi Xinerama Xrandr CONFIGURE_STYLE=gnu CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \