Re: UPDATE: ffmpeg-cvs-20070407
here are the wantlib changes for the ffmpeg dependent ports.
--
[EMAIL PROTECTED]
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: multimedia/ffmpeg2theora/Makefile
===
RCS file: /home/cvs/OpenBSD/ports/multimedia/ffmpeg2theora/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- multimedia/ffmpeg2theora/Makefile 2 Mar 2007 23:42:41 - 1.2
+++ multimedia/ffmpeg2theora/Makefile 21 Apr 2007 00:07:40 -
@@ -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: /home/cvs/OpenBSD/ports/multimedia/libquicktime/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- multimedia/libquicktime/Makefile2 Dec 2006 20:24:17 - 1.11
+++ multimedia/libquicktime/Makefile21 Apr 2007 00:07:52 -
@@ -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: /home/cvs/OpenBSD/ports/multimedia/transcode/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- multimedia/transcode/Makefile 23 Jan 2007 10:39:01 - 1.13
+++ multimedia/transcode/Makefile 21 Apr 2007 00:08:03 -
@@ -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: /home/cvs/OpenBSD/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- multimedia/xine-lib/Makefile14 Apr 2007 11:57:39 - 1.11
+++ multimedia/xine-lib/Makefile21 Apr 2007 00:08:12 -
@@ -4,7 +4,7 @@
V= 1.1.2
DISTNAME=
Re: UPDATE: ffmpeg-cvs-20070407
On Thu, Apr 19, 2007 at 01:24:20PM +, Jacob Meuser wrote:
> On Wed, Apr 11, 2007 at 09:10:20PM -0400, Brad wrote:
> > On Wed, 11 Apr 2007 12:27:17 +0200 (CEST)
> > Antoine Jacoutot <[EMAIL PROTECTED]> wrote:
> >
> > > Hi.
> > >
> > > The included diff
> > > - updates ffmpeg to CVS version 20070407
> > > - adds x264 support
> > >
> > > Note that adding libtheora and xvid support could be interesting too,
> > > but I leave this to the maintainer ;-)
> > > Tested under i386.
> > >
> > > Comments, Ok?
> >
> > Here is an updated version of your update to the ffmpeg port.
>
> below is another update. the x264 optimizations won't build on
> amd64. also, don't rely on svn being installed to get a version #.
here's another update.
this time: remove explicit inter-library dependencies and generate
correct pkgconfig files.
patches for ffmpeg dependent ports wantlib changes to follow ...
--
jakemsr
Index: graphics/ffmpeg/Makefile
===
RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- graphics/ffmpeg/Makefile2 Mar 2007 23:38:28 - 1.26
+++ graphics/ffmpeg/Makefile21 Apr 2007 00:10:01 -
@@ -2,16 +2,17 @@
COMMENT= "audio/video converter and streamer with bktr(4) support"
-DISTNAME= ffmpeg-cvs-20070110
-PKGNAME= ${DISTNAME:S/-cvs//}p1
-SHARED_LIBS= avutil 2.0 \
- avcodec 8.0 \
- avformat8.0 \
- postproc8.0
+DISTNAME= ffmpeg-svn-20070419
+PKGNAME= ${DISTNAME:S/-svn//}
+SHARED_LIBS= avutil 3.0 \
+ avcodec 9.0 \
+ avformat9.0 \
+ postproc9.0
+
CATEGORIES=graphics multimedia
-HOMEPAGE= http://www.ffmpeg.org/
-MAINTAINER=Nikns Siankin <[EMAIL PROTECTED]>
+HOMEPAGE= http://ffmpeg.mplayerhq.hu/
+MAINTAINER=Jacob Meuser <[EMAIL PROTECTED]>
# GPL
PERMIT_PACKAGE_CDROM= "patents"
@@ -19,15 +20,18 @@
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-# only available through CVS
-MASTER_SITES= ftp://ftp.secure.lv/pub/distfiles/
+# only available through SVN
+MASTER_SITES= http://jakemsr.trancell.org/distfiles/
BUILD_DEPENDS= ::textproc/texi2html
LIB_DEPENDS= SDL.>=4::devel/sdl \
faac::audio/faac \
faad::audio/faad \
mp3lame.>=0.1::audio/lame \
- vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis
+ vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis \
+ a52::audio/liba52 \
+ x264::multimedia/x264 \
+ theora::multimedia/libtheora
WANTLIB= X11 Xext c freetype m pthread ogg ossaudio usbhid z
@@ -39,28 +43,44 @@
CFLAGS+=-fomit-frame-pointer
.endif
+# inter-library dependencies for the current configuration
+LIBavutil_EXTRALIBS=-lm
+LIBavcodec_EXTRALIBS=-lavutil -lm -lz -L${LOCALBASE}/lib -lfaac -lfaad
-lmp3lame -lvorbis -lvorbisenc -la52 -ltheora -lx264 -pthread
+LIBavformat_EXTRALIBS=-lavutil -lavcodec -lossaudio -lm -L${LOCALBASE}/lib
-logg
+LIBpostproc_EXTRALIBS=-lavutil
+
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--cc=${CC} \
--disable-opts \
- --enable-a52 \
+ --enable-liba52 \
--enable-pp \
--enable-gpl \
--enable-pthreads \
--disable-debug \
- --enable-faac \
- --enable-faad \
- --enable-mp3lame \
+ --enable-libfaac \
+ --enable-libfaad \
+ --enable-libmp3lame \
--enable-libogg \
- --enable-vorbis \
+ --enable-libvorbis \
+ --enable-libtheora \
+ --enable-x264 \
--extra-libs="-L${LOCALBASE}/lib" \
--extra-cflags=-I${LOCALBASE}/include
+CONFIGURE_ENV+=LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \
+ LIBavcodec_EXTRALIBS="${LIBavcodec_EXTRALIBS}" \
+ LIBavformat_EXTRALIBS="${LIBavformat_EXTRALIBS}" \
+ LIBpostproc_EXTRALIBS="${LIBpostproc_EXTRALIBS}"
MAKE_FLAGS=LIBavutil_VERSION=$(LIBavutil_VERSION) \
LIBavcodec_VERSION=$(LIBavcodec_VERSION) \
LIBavformat_VERSION=$(LIBavformat_VERSION) \
- LIBpostproc_VERSI
Re: UPDATE: ffmpeg-cvs-20070407
On Wed, Apr 11, 2007 at 09:10:20PM -0400, Brad wrote:
> On Wed, 11 Apr 2007 12:27:17 +0200 (CEST)
> Antoine Jacoutot <[EMAIL PROTECTED]> wrote:
>
> > Hi.
> >
> > The included diff
> > - updates ffmpeg to CVS version 20070407
> > - adds x264 support
> >
> > Note that adding libtheora and xvid support could be interesting too,
> > but I leave this to the maintainer ;-)
> > Tested under i386.
> >
> > Comments, Ok?
>
> Here is an updated version of your update to the ffmpeg port.
below is another update. the x264 optimizations won't build on
amd64. also, don't rely on svn being installed to get a version #.
passed regression tests on amd64 and i386.
also tested recording from bktr and encoding to h264 on amd64 and i386.
--
[EMAIL PROTECTED]
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===
RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile2 Mar 2007 23:38:28 - 1.26
+++ Makefile19 Apr 2007 13:02:16 -
@@ -2,16 +2,17 @@
COMMENT= "audio/video converter and streamer with bktr(4) support"
-DISTNAME= ffmpeg-cvs-20070110
-PKGNAME= ${DISTNAME:S/-cvs//}p1
-SHARED_LIBS= avutil 2.0 \
- avcodec 8.0 \
- avformat8.0 \
- postproc8.0
+DISTNAME= ffmpeg-svn-20070419
+PKGNAME= ${DISTNAME:S/-svn//}
+SHARED_LIBS= avutil 3.0 \
+ avcodec 9.0 \
+ avformat9.0 \
+ postproc9.0
+
CATEGORIES=graphics multimedia
HOMEPAGE= http://www.ffmpeg.org/
-MAINTAINER=Nikns Siankin <[EMAIL PROTECTED]>
+MAINTAINER=Jacob Meuser <[EMAIL PROTECTED]>
# GPL
PERMIT_PACKAGE_CDROM= "patents"
@@ -19,15 +20,18 @@
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-# only available through CVS
-MASTER_SITES= ftp://ftp.secure.lv/pub/distfiles/
+# only available through SVN
+MASTER_SITES= http://jakemsr.trancell.org/distfiles/
BUILD_DEPENDS= ::textproc/texi2html
LIB_DEPENDS= SDL.>=4::devel/sdl \
faac::audio/faac \
faad::audio/faad \
mp3lame.>=0.1::audio/lame \
- vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis
+ vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis \
+ a52::audio/liba52 \
+ x264::multimedia/x264 \
+ theora::multimedia/libtheora
WANTLIB= X11 Xext c freetype m pthread ogg ossaudio usbhid z
@@ -43,19 +47,20 @@
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--cc=${CC} \
--disable-opts \
- --enable-a52 \
+ --enable-liba52 \
--enable-pp \
--enable-gpl \
--enable-pthreads \
--disable-debug \
- --enable-faac \
- --enable-faad \
- --enable-mp3lame \
+ --enable-libfaac \
+ --enable-libfaad \
+ --enable-libmp3lame \
--enable-libogg \
- --enable-vorbis \
+ --enable-libvorbis \
+ --enable-libtheora \
+ --enable-x264 \
--extra-libs="-L${LOCALBASE}/lib" \
--extra-cflags=-I${LOCALBASE}/include
-
MAKE_FLAGS=LIBavutil_VERSION=$(LIBavutil_VERSION) \
LIBavcodec_VERSION=$(LIBavcodec_VERSION) \
Index: distinfo
===
RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo5 Apr 2007 16:19:55 - 1.12
+++ distinfo19 Apr 2007 13:02:16 -
@@ -1,5 +1,5 @@
-MD5 (ffmpeg-cvs-20070110.tar.gz) = r3KEoeT0mi+FjlxlN7N2/w==
-RMD160 (ffmpeg-cvs-20070110.tar.gz) = oIacGOJ5H5jR55HkZfmyA4mTSXw=
-SHA1 (ffmpeg-cvs-20070110.tar.gz) = 1MuBCqHaZ7wjHhAJVEMV32JRBeo=
-SHA256 (ffmpeg-cvs-20070110.tar.gz) =
TA5XN14puseXcV7JEcX3RQJq1rWB4tXYecZ0kBMdWrk=
-SIZE (ffmpeg-cvs-20070110.tar.gz) = 2471143
+MD5 (ffmpeg-svn-20070419.tar.gz) = 0Ii0yytO/Pd3Tlf0TvwAzQ==
+RMD160 (ffmpeg-svn-20070419.tar.gz) = vYnOYS3TfJz7vAP1X/0c7ybm0e8=
+SHA1 (ffmpeg-svn-20070419.tar.gz) = Hrhte4jEkxDf9/S1OyQaUFFeqdA=
+SHA256 (ffmpeg-svn-20070419.tar.gz) =
OoHkV+hdazwtZcoyQf0xp29PjlsrDJwFPMVE/1hqyJM=
+SIZE (ffmpeg-svn-20070419.tar.gz) = 2638961
Index: patches/patch-common_mak
===
Re: UPDATE: ffmpeg-cvs-20070407
On Thu, Apr 19, 2007 at 12:35:16PM +0200, Antoine Jacoutot wrote:
> On Thu, 19 Apr 2007, Jacob Meuser wrote:
> >>after more testing, this only happens with UYVY format on amd64.
> >
> >yet more testing reveals it's not a bktr issue at all. apparently
> >there's an issue with XVideo and UYVY format on my amd64.
>
> Hmm...
> Does it work with previous ffmpeg version?
yes, bktr capture with ffmpeg has worked for a couple years now.
$ ffmpeg -s 640x480 -r 30 -f bktr -i /dev/bktr0 out-ntsc.mpg
$ ffmpeg -s 720x480 -r 25 -f bktr -i /dev/bktr0 out-pal.mpg
and you can watch it live with ffplay:
$ ffplay -s 640x480 -f bktr /dev/bktr0
note: the '-f bktr' is new, and used to not be needed.
I found the problem I was having though: missing break in switch()
in radeon driver in xenocara.
Index: driver/xf86-video-ati/src/radeon_video.c
===
RCS file: /home/cvs/OpenBSD/xenocara/driver/xf86-video-ati/src/radeon_video.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 radeon_video.c
--- driver/xf86-video-ati/src/radeon_video.c26 Nov 2006 20:01:02 -
1.1.1.1
+++ driver/xf86-video-ati/src/radeon_video.c19 Apr 2007 10:55:33 -
@@ -2674,6 +2674,7 @@
switch(id){
case FOURCC_UYVY:
scale_cntl |= RADEON_SCALER_SOURCE_YVYU422;
+ break;
case FOURCC_RGB24:
case FOURCC_RGBA32:
scale_cntl |= RADEON_SCALER_SOURCE_32BPP |
RADEON_SCALER_LIN_TRANS_BYPASS;
Re: UPDATE: ffmpeg-cvs-20070407
On Thu, 19 Apr 2007, Jacob Meuser wrote: after more testing, this only happens with UYVY format on amd64. yet more testing reveals it's not a bktr issue at all. apparently there's an issue with XVideo and UYVY format on my amd64. Hmm... Does it work with previous ffmpeg version? -- Antoine Jacoutot [EMAIL PROTECTED] CREA & ISC - UMR7656 CNRS / Ecole Polytechnique 1, rue Descartes 75005 Paris
Re: UPDATE: ffmpeg-cvs-20070407
On Thu, Apr 19, 2007 at 08:47:47AM +, Jacob Meuser wrote: > On Wed, Apr 18, 2007 at 09:17:26AM +, Jacob Meuser wrote: > > On Thu, Apr 12, 2007 at 08:55:53AM +0300, Nikns Siankin wrote: > > > > > bktr capturing seems to be broken with latest ffmpeg. > > > > bktr seems to be broken in -current, at least on amd64. every program > > I try only captures 1/2 the width it should. > > after more testing, this only happens with UYVY format on amd64. yet more testing reveals it's not a bktr issue at all. apparently there's an issue with XVideo and UYVY format on my amd64. -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org
Re: UPDATE: ffmpeg-cvs-20070407
On Wed, Apr 18, 2007 at 09:17:26AM +, Jacob Meuser wrote: > On Thu, Apr 12, 2007 at 08:55:53AM +0300, Nikns Siankin wrote: > > > bktr capturing seems to be broken with latest ffmpeg. > > bktr seems to be broken in -current, at least on amd64. every program > I try only captures 1/2 the width it should. after more testing, this only happens with UYVY format on amd64. -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org
Re: UPDATE: ffmpeg-cvs-20070407
On Thu, Apr 12, 2007 at 08:55:53AM +0300, Nikns Siankin wrote: > bktr capturing seems to be broken with latest ffmpeg. bktr seems to be broken in -current, at least on amd64. every program I try only captures 1/2 the width it should. does anyone else see this? I have an i386 running 4.1 which works fine, and while the mad64 was running 4.1, it was fine as well. I don't see any changes to the bktr driver itself that would cause this. -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org
Re: UPDATE: ffmpeg-cvs-20070407
On Wed, Apr 11, 2007 at 09:10:20PM -0400, Brad wrote:
>On Wed, 11 Apr 2007 12:27:17 +0200 (CEST)
>Antoine Jacoutot <[EMAIL PROTECTED]> wrote:
>
>> Hi.
>>
>> The included diff
>> - updates ffmpeg to CVS version 20070407
>> - adds x264 support
>>
>> Note that adding libtheora and xvid support could be interesting too,
>> but I leave this to the maintainer ;-)
>> Tested under i386.
>>
>> Comments, Ok?
>
>Here is an updated version of your update to the ffmpeg port.
bktr capturing seems to be broken with latest ffmpeg.
anyway, i have no time to play with ffmpeg.
if anybody wants - step in and take over.
>
>I have included some fixes for the H.264 & VC1 decoders taken
>from the SVN repo. I also bumped the major revs of all of the
>libraries. There have been API additions as well as what looks
>like existing APIs renamed or removed, so to be on the safe
>side we should just bump the majors.
>
>Thanks, I need this for an update of xine-lib to be able to use
>ffmpeg's native VC1 decoder, instead of the win32 binary as the
>current version of xine-lib uses, even with a newer ffmpeg being
>installed.
>
>Tested with Kaffeine/VLC and xine-ui with MPEG/MPEG4/H.264/WMV3/Xvid
>and a few other formats on i386.
>
>Index: Makefile
>===
>RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
>retrieving revision 1.26
>diff -u -p -r1.26 Makefile
>--- Makefile 2 Mar 2007 23:38:28 - 1.26
>+++ Makefile 11 Apr 2007 22:17:26 -
>@@ -2,12 +2,12 @@
>
> COMMENT= "audio/video converter and streamer with bktr(4) support"
>
>-DISTNAME= ffmpeg-cvs-20070110
>-PKGNAME= ${DISTNAME:S/-cvs//}p1
>-SHARED_LIBS= avutil 2.0 \
>- avcodec 8.0 \
>- avformat8.0 \
>- postproc8.0
>+DISTNAME= ffmpeg-cvs-20070407
>+PKGNAME= ${DISTNAME:S/-cvs//}
>+SHARED_LIBS= avutil 3.0 \
>+ avcodec 9.0 \
>+ avformat9.0 \
>+ postproc9.0
> CATEGORIES= graphics multimedia
>
> HOMEPAGE= http://www.ffmpeg.org/
>@@ -27,7 +27,9 @@ LIB_DEPENDS= SDL.>=4::devel/sdl \
> faac::audio/faac \
> faad::audio/faad \
> mp3lame.>=0.1::audio/lame \
>- vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis
>+ vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis \
>+ a52::audio/liba52 \
>+ x264::multimedia/x264
>
> WANTLIB= X11 Xext c freetype m pthread ogg ossaudio usbhid z
>
>@@ -43,16 +45,17 @@ CONFIGURE_STYLE= simple
> CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
> --cc=${CC} \
> --disable-opts \
>- --enable-a52 \
>+ --enable-liba52 \
> --enable-pp \
> --enable-gpl \
> --enable-pthreads \
> --disable-debug \
>- --enable-faac \
>- --enable-faad \
>- --enable-mp3lame \
>+ --enable-libfaac \
>+ --enable-libfaad \
>+ --enable-libmp3lame \
> --enable-libogg \
>- --enable-vorbis \
>+ --enable-libvorbis \
>+ --enable-x264 \
> --extra-libs="-L${LOCALBASE}/lib" \
> --extra-cflags=-I${LOCALBASE}/include
>
>Index: distinfo
>===
>RCS file: /cvs/ports/graphics/ffmpeg/distinfo,v
>retrieving revision 1.12
>diff -u -p -r1.12 distinfo
>--- distinfo 5 Apr 2007 16:19:55 - 1.12
>+++ distinfo 11 Apr 2007 21:12:12 -
>@@ -1,5 +1,5 @@
>-MD5 (ffmpeg-cvs-20070110.tar.gz) = r3KEoeT0mi+FjlxlN7N2/w==
>-RMD160 (ffmpeg-cvs-20070110.tar.gz) = oIacGOJ5H5jR55HkZfmyA4mTSXw=
>-SHA1 (ffmpeg-cvs-20070110.tar.gz) = 1MuBCqHaZ7wjHhAJVEMV32JRBeo=
>-SHA256 (ffmpeg-cvs-20070110.tar.gz) =
>TA5XN14puseXcV7JEcX3RQJq1rWB4tXYecZ0kBMdWrk=
>-SIZE (ffmpeg-cvs-20070110.tar.gz) = 2471143
>+MD5 (ffmpeg-cvs-20070407.tar.gz) = om00SbfOQ3b9RcuKdZAl3A==
>+RMD160 (ffmpeg-cvs-20070407.tar.gz) = 1rkRqTcQipwN/u7ezIKpqDq1Y9s=
>+SHA1 (ffmpeg-cvs-20070407.tar.gz) = xE49MUKgqdb9Eh3lvAEDzGklO0Y=
>+SHA256 (ffmpeg-cvs-20070407.tar.gz) =
>W/t54NrmSt2VF1BConxhqpZqowlRFzkVE9lEHcD66nE=
>+SIZE (ffmpeg-cvs-20070407.tar.gz) = 2623030
>Index: patches/patch-common_mak
>===
>RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-common_mak,v
>retrieving revision 1.3
>diff -u -p -r1.3 patch-common_mak
>--- patches/patch-common_mak 23 Jan 2007 09:34:45 - 1.3
>+++ patches/patch-
Re: UPDATE: ffmpeg-cvs-20070407
On Wed, 11 Apr 2007 12:27:17 +0200 (CEST)
Antoine Jacoutot <[EMAIL PROTECTED]> wrote:
> Hi.
>
> The included diff
> - updates ffmpeg to CVS version 20070407
> - adds x264 support
>
> Note that adding libtheora and xvid support could be interesting too,
> but I leave this to the maintainer ;-)
> Tested under i386.
>
> Comments, Ok?
Here is an updated version of your update to the ffmpeg port.
I have included some fixes for the H.264 & VC1 decoders taken
from the SVN repo. I also bumped the major revs of all of the
libraries. There have been API additions as well as what looks
like existing APIs renamed or removed, so to be on the safe
side we should just bump the majors.
Thanks, I need this for an update of xine-lib to be able to use
ffmpeg's native VC1 decoder, instead of the win32 binary as the
current version of xine-lib uses, even with a newer ffmpeg being
installed.
Tested with Kaffeine/VLC and xine-ui with MPEG/MPEG4/H.264/WMV3/Xvid
and a few other formats on i386.
Index: Makefile
===
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile2 Mar 2007 23:38:28 - 1.26
+++ Makefile11 Apr 2007 22:17:26 -
@@ -2,12 +2,12 @@
COMMENT= "audio/video converter and streamer with bktr(4) support"
-DISTNAME= ffmpeg-cvs-20070110
-PKGNAME= ${DISTNAME:S/-cvs//}p1
-SHARED_LIBS= avutil 2.0 \
- avcodec 8.0 \
- avformat8.0 \
- postproc8.0
+DISTNAME= ffmpeg-cvs-20070407
+PKGNAME= ${DISTNAME:S/-cvs//}
+SHARED_LIBS= avutil 3.0 \
+ avcodec 9.0 \
+ avformat9.0 \
+ postproc9.0
CATEGORIES=graphics multimedia
HOMEPAGE= http://www.ffmpeg.org/
@@ -27,7 +27,9 @@ LIB_DEPENDS= SDL.>=4::devel/sdl \
faac::audio/faac \
faad::audio/faad \
mp3lame.>=0.1::audio/lame \
- vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis
+ vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis \
+ a52::audio/liba52 \
+ x264::multimedia/x264
WANTLIB= X11 Xext c freetype m pthread ogg ossaudio usbhid z
@@ -43,16 +45,17 @@ CONFIGURE_STYLE=simple
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--cc=${CC} \
--disable-opts \
- --enable-a52 \
+ --enable-liba52 \
--enable-pp \
--enable-gpl \
--enable-pthreads \
--disable-debug \
- --enable-faac \
- --enable-faad \
- --enable-mp3lame \
+ --enable-libfaac \
+ --enable-libfaad \
+ --enable-libmp3lame \
--enable-libogg \
- --enable-vorbis \
+ --enable-libvorbis \
+ --enable-x264 \
--extra-libs="-L${LOCALBASE}/lib" \
--extra-cflags=-I${LOCALBASE}/include
Index: distinfo
===
RCS file: /cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo5 Apr 2007 16:19:55 - 1.12
+++ distinfo11 Apr 2007 21:12:12 -
@@ -1,5 +1,5 @@
-MD5 (ffmpeg-cvs-20070110.tar.gz) = r3KEoeT0mi+FjlxlN7N2/w==
-RMD160 (ffmpeg-cvs-20070110.tar.gz) = oIacGOJ5H5jR55HkZfmyA4mTSXw=
-SHA1 (ffmpeg-cvs-20070110.tar.gz) = 1MuBCqHaZ7wjHhAJVEMV32JRBeo=
-SHA256 (ffmpeg-cvs-20070110.tar.gz) =
TA5XN14puseXcV7JEcX3RQJq1rWB4tXYecZ0kBMdWrk=
-SIZE (ffmpeg-cvs-20070110.tar.gz) = 2471143
+MD5 (ffmpeg-cvs-20070407.tar.gz) = om00SbfOQ3b9RcuKdZAl3A==
+RMD160 (ffmpeg-cvs-20070407.tar.gz) = 1rkRqTcQipwN/u7ezIKpqDq1Y9s=
+SHA1 (ffmpeg-cvs-20070407.tar.gz) = xE49MUKgqdb9Eh3lvAEDzGklO0Y=
+SHA256 (ffmpeg-cvs-20070407.tar.gz) =
W/t54NrmSt2VF1BConxhqpZqowlRFzkVE9lEHcD66nE=
+SIZE (ffmpeg-cvs-20070407.tar.gz) = 2623030
Index: patches/patch-common_mak
===
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-common_mak,v
retrieving revision 1.3
diff -u -p -r1.3 patch-common_mak
--- patches/patch-common_mak23 Jan 2007 09:34:45 - 1.3
+++ patches/patch-common_mak11 Apr 2007 21:12:12 -
@@ -1,12 +1,12 @@
$OpenBSD: patch-common_mak,v 1.3 2007/01/23 09:34:45 robert Exp $
common.mak.origTue Jan 2 18:27:55 2007
-+++ common.mak Tue Jan 2 18:28:19 2007
-@@ -63,13 +63,7 @@ install-libs: $(INSTLIBTARG
Re: UPDATE: ffmpeg-cvs-20070407
On Wed, Apr 11, 2007 at 10:01:48PM +0200, Antoine Jacoutot wrote: > On Wed, 11 Apr 2007, Jacob Meuser wrote: > >once that is fixed, probably multimedia/transcode, multimedia/libquicktime > >and any other port that adds libraries when linking in libavcodec should > >be cleaned up too. just don't forget that avcodec always needs to be > >linked with -pthread. > > Yeah I won't have time to work on this anymore for now anyway. > I just updated it 'cause I needed to test some stuffs. I'll leave the > actual maintainer play with it ;-) sorry, I didn't see that there is a maintainer for ffmpeg. Nikns, if you need me to clarify anything, just let me know. -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org
Re: UPDATE: ffmpeg-cvs-20070407
On Wed, 11 Apr 2007, Jacob Meuser wrote: once that is fixed, probably multimedia/transcode, multimedia/libquicktime and any other port that adds libraries when linking in libavcodec should be cleaned up too. just don't forget that avcodec always needs to be linked with -pthread. Yeah I won't have time to work on this anymore for now anyway. I just updated it 'cause I needed to test some stuffs. I'll leave the actual maintainer play with it ;-) -- Antoine
Re: UPDATE: ffmpeg-cvs-20070407
Hey guys,
Why is libavutil not linked to libavcodec and libswscale? I had
removed all library interdependencies in this port, but now
there are lots of library interdependencies in this port. I bet
libavutil not being linked to libswscale is what's causing the problem
kurt had with vlc.
btw, there are several bogus library interdependencies in the port now,
(e.g. run 'objdump -p libpostproc.so.* | grep NEEDED' and then 'nm
libpostproc.so.* | grep -i 'U ') but that is mostly because the ffmpeg
folks only have 1 variable for the 'extralibs' instead of one 'extralibs'
variable each for libavcodec, libavformat, libpostproc, etc. fixing that
is a pain, especially now that other external libs (ogg, vorbis, etc) are
being used in the port.
once that is fixed, probably multimedia/transcode, multimedia/libquicktime
and any other port that adds libraries when linking in libavcodec should
be cleaned up too. just don't forget that avcodec always needs to be
linked with -pthread.
ciao
--
jakemsr
On Wed, Apr 11, 2007 at 12:27:17PM +0200, Antoine Jacoutot wrote:
> Hi.
>
> The included diff
> - updates ffmpeg to CVS version 20070407
> - adds x264 support
>
> Note that adding libtheora and xvid support could be interesting too,
> but I leave this to the maintainer ;-)
> Tested under i386.
>
> Comments, Ok?
>
> --
> Antoine
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
> retrieving revision 1.26
> diff -u -r1.26 Makefile
> --- Makefile 2 Mar 2007 23:38:28 - 1.26
> +++ Makefile 11 Apr 2007 10:22:01 -
> @@ -2,8 +2,8 @@
>
> COMMENT= "audio/video converter and streamer with bktr(4) support"
>
> -DISTNAME=ffmpeg-cvs-20070110
> -PKGNAME= ${DISTNAME:S/-cvs//}p1
> +DISTNAME=ffmpeg-cvs-20070407
> +PKGNAME= ${DISTNAME:S/-cvs//}
> SHARED_LIBS= avutil 2.0 \
> avcodec 8.0 \
> avformat8.0 \
> @@ -27,7 +27,9 @@
> faac::audio/faac \
> faad::audio/faad \
> mp3lame.>=0.1::audio/lame \
> - vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis
> + vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis \
> + a52::audio/liba52 \
> + x264::multimedia/x264
>
> WANTLIB= X11 Xext c freetype m pthread ogg ossaudio usbhid z
>
> @@ -43,16 +45,17 @@
> CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
> --cc=${CC} \
> --disable-opts \
> - --enable-a52 \
> + --enable-liba52 \
> --enable-pp \
> --enable-gpl \
> --enable-pthreads \
> --disable-debug \
> - --enable-faac \
> - --enable-faad \
> - --enable-mp3lame \
> + --enable-libfaac \
> + --enable-libfaad \
> + --enable-libmp3lame \
> --enable-libogg \
> - --enable-vorbis \
> + --enable-libvorbis \
> + --enable-x264 \
> --extra-libs="-L${LOCALBASE}/lib" \
> --extra-cflags=-I${LOCALBASE}/include
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/ffmpeg/distinfo,v
> retrieving revision 1.12
> diff -u -r1.12 distinfo
> --- distinfo 5 Apr 2007 16:19:55 - 1.12
> +++ distinfo 11 Apr 2007 10:22:01 -
> @@ -1,5 +1,5 @@
> -MD5 (ffmpeg-cvs-20070110.tar.gz) = r3KEoeT0mi+FjlxlN7N2/w==
> -RMD160 (ffmpeg-cvs-20070110.tar.gz) = oIacGOJ5H5jR55HkZfmyA4mTSXw=
> -SHA1 (ffmpeg-cvs-20070110.tar.gz) = 1MuBCqHaZ7wjHhAJVEMV32JRBeo=
> -SHA256 (ffmpeg-cvs-20070110.tar.gz) =
> TA5XN14puseXcV7JEcX3RQJq1rWB4tXYecZ0kBMdWrk=
> -SIZE (ffmpeg-cvs-20070110.tar.gz) = 2471143
> +MD5 (ffmpeg-cvs-20070407.tar.gz) = om00SbfOQ3b9RcuKdZAl3A==
> +RMD160 (ffmpeg-cvs-20070407.tar.gz) = 1rkRqTcQipwN/u7ezIKpqDq1Y9s=
> +SHA1 (ffmpeg-cvs-20070407.tar.gz) = xE49MUKgqdb9Eh3lvAEDzGklO0Y=
> +SHA256 (ffmpeg-cvs-20070407.tar.gz) =
> W/t54NrmSt2VF1BConxhqpZqowlRFzkVE9lEHcD66nE=
> +SIZE (ffmpeg-cvs-20070407.tar.gz) = 2623030
> Index: patches/patch-common_mak
> ===
> RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-common_mak,v
> retrieving revision 1.3
> diff -u -r1.3 patch-common_mak
> --- patches/patch-common_mak 23 Jan 2007 09:34:45 - 1.3
> +++ patches/patch-common_mak 11 Apr 2007 10:22:01 -
> @@ -1,12 +1,12 @@
> $OpenBSD: patch-common_mak,v 1.3 2007/01/23 09:34:45 robert Exp $
> common.mak.orig Tue Jan 2 18:27:55 2007
> -+++ common.mak Tue Jan 2 18:28:19 2007
>
UPDATE: ffmpeg-cvs-20070407
Hi.
The included diff
- updates ffmpeg to CVS version 20070407
- adds x264 support
Note that adding libtheora and xvid support could be interesting too,
but I leave this to the maintainer ;-)
Tested under i386.
Comments, Ok?
--
AntoineIndex: Makefile
===
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile2 Mar 2007 23:38:28 - 1.26
+++ Makefile11 Apr 2007 10:22:01 -
@@ -2,8 +2,8 @@
COMMENT= "audio/video converter and streamer with bktr(4) support"
-DISTNAME= ffmpeg-cvs-20070110
-PKGNAME= ${DISTNAME:S/-cvs//}p1
+DISTNAME= ffmpeg-cvs-20070407
+PKGNAME= ${DISTNAME:S/-cvs//}
SHARED_LIBS= avutil 2.0 \
avcodec 8.0 \
avformat8.0 \
@@ -27,7 +27,9 @@
faac::audio/faac \
faad::audio/faad \
mp3lame.>=0.1::audio/lame \
- vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis
+ vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis \
+ a52::audio/liba52 \
+ x264::multimedia/x264
WANTLIB= X11 Xext c freetype m pthread ogg ossaudio usbhid z
@@ -43,16 +45,17 @@
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--cc=${CC} \
--disable-opts \
- --enable-a52 \
+ --enable-liba52 \
--enable-pp \
--enable-gpl \
--enable-pthreads \
--disable-debug \
- --enable-faac \
- --enable-faad \
- --enable-mp3lame \
+ --enable-libfaac \
+ --enable-libfaad \
+ --enable-libmp3lame \
--enable-libogg \
- --enable-vorbis \
+ --enable-libvorbis \
+ --enable-x264 \
--extra-libs="-L${LOCALBASE}/lib" \
--extra-cflags=-I${LOCALBASE}/include
Index: distinfo
===
RCS file: /cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo5 Apr 2007 16:19:55 - 1.12
+++ distinfo11 Apr 2007 10:22:01 -
@@ -1,5 +1,5 @@
-MD5 (ffmpeg-cvs-20070110.tar.gz) = r3KEoeT0mi+FjlxlN7N2/w==
-RMD160 (ffmpeg-cvs-20070110.tar.gz) = oIacGOJ5H5jR55HkZfmyA4mTSXw=
-SHA1 (ffmpeg-cvs-20070110.tar.gz) = 1MuBCqHaZ7wjHhAJVEMV32JRBeo=
-SHA256 (ffmpeg-cvs-20070110.tar.gz) =
TA5XN14puseXcV7JEcX3RQJq1rWB4tXYecZ0kBMdWrk=
-SIZE (ffmpeg-cvs-20070110.tar.gz) = 2471143
+MD5 (ffmpeg-cvs-20070407.tar.gz) = om00SbfOQ3b9RcuKdZAl3A==
+RMD160 (ffmpeg-cvs-20070407.tar.gz) = 1rkRqTcQipwN/u7ezIKpqDq1Y9s=
+SHA1 (ffmpeg-cvs-20070407.tar.gz) = xE49MUKgqdb9Eh3lvAEDzGklO0Y=
+SHA256 (ffmpeg-cvs-20070407.tar.gz) =
W/t54NrmSt2VF1BConxhqpZqowlRFzkVE9lEHcD66nE=
+SIZE (ffmpeg-cvs-20070407.tar.gz) = 2623030
Index: patches/patch-common_mak
===
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-common_mak,v
retrieving revision 1.3
diff -u -r1.3 patch-common_mak
--- patches/patch-common_mak23 Jan 2007 09:34:45 - 1.3
+++ patches/patch-common_mak11 Apr 2007 10:22:01 -
@@ -1,12 +1,12 @@
$OpenBSD: patch-common_mak,v 1.3 2007/01/23 09:34:45 robert Exp $
common.mak.origTue Jan 2 18:27:55 2007
-+++ common.mak Tue Jan 2 18:28:19 2007
-@@ -63,13 +63,7 @@ install-libs: $(INSTLIBTARGETS)
+--- common.mak.origWed Apr 11 10:21:45 2007
common.mak Wed Apr 11 10:22:23 2007
+@@ -64,13 +64,7 @@ install-libs: $(INSTLIBTARGETS)
install-lib-shared: $(SLIBNAME)
install -d "$(shlibdir)"
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-- "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+- install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+- $(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
- cd "$(shlibdir)" && \
- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
- cd "$(shlibdir)" && \
Index: patches/patch-libavcodec_Makefile
===
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavcodec_Makefile,v
retrieving revision 1.13
diff -u -r1.13 patch-libavcodec_Makefile
--- patches/patch-libavcodec_Makefile 23 Jan 2007 09:34:45 - 1.13
+++ patches/patch-libavcodec_Makefile 11 Apr 2007 10:22:01 -
@@ -1,16 +1,15 @@
$OpenBSD: patch-libavcodec_Makefile,v 1.13 2007/01/23 09:34:45 robert Exp $
libavcodec/Makefile.orig Mon Jan 8 01:24:14 2007
-+++ libavcodec/Makefil
