Update ffmpeg2theora to version 0.24, which introduces two new
dependencies. Due to those, this is one thing I'm not too sure about ...
but see below.

Neither oggz nor libkate have been properly tested ("it compiles"). I
only managed to use ffmpeg2theora for a while, so for that they seem okay.

multimedia/oggz:
- Various tools and a library to work with Ogg streams.
- Dependency of multimedia/libkate, which is a new dependency of
  multimedia/ffmpeg2theora.
- Crappy release engineering, and hilarity ensues in oggz-chop source
  code. There may be dragons.

multimedia/libkate:
- Ogg Kate, a karaoke and text encapsulation codec.
- New dependency of multimedia/ffmpeg2theora.
Update ffmpeg2theora to 0.24:
- Newer, shinier.
- USE_X11=Yes due to new set of WANTLIBs.
- Uses scons to build, but needs do-install: target for DESTDIR
  handling. Bug in devel/scons module or ffmpeg2theora? (No idea.)
- Depends on (new) multimedia/libkate now.
- Wrap DESCR at 78 instead of 72 columns.
(Removes patch, use `patch -E'.)

Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/ffmpeg2theora/Makefile,v
retrieving revision 1.7
diff -p -u -r1.7 Makefile
--- Makefile    9 Jul 2008 02:13:01 -0000       1.7
+++ Makefile    20 Jun 2009 09:17:48 -0000
@@ -2,8 +2,7 @@
 
 COMMENT=       reencode many media file formats to Ogg Theora
 
-DISTNAME=      ffmpeg2theora-0.19
-PKGNAME=       ${DISTNAME}p1
+DISTNAME=      ffmpeg2theora-0.24
 CATEGORIES=    multimedia
 EXTRACT_SUFX=  .tar.bz2
 
@@ -16,18 +15,20 @@ PERMIT_PACKAGE_CDROM=       patents in ffmpeg
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
-WANTLIB=               bz2 c m ogg pthread a52 faac faad mp3lame x264 z
+WANTLIB=       X11 Xext a52 bz2 c faac faad m mp3lame ogg ossaudio \
+               pthread theora vorbis vorbisenc x264 z
 
 MASTER_SITES=  ${HOMEPAGE}
 
-LIB_DEPENDS=   
avcodec.>=8,avformat.>=8,avutil.>=2,swscale.>=1::graphics/ffmpeg \
-               vorbis.>=5,vorbisenc.>=2::audio/libvorbis \
-               theora.>=2::multimedia/libtheora
-
-SEPARATE_BUILD=        flavored
-USE_LIBTOOL=   Yes
-
-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV+=        CPPFLAGS=-pthread LDFLAGS=-pthread
+MODULES=       devel/scons
+LIB_DEPENDS=   
avcodec.>=8,avdevice.>=2,avformat.>=8,avutil.>=2,postproc.>=10,swscale.>=1::graphics/ffmpeg
 \
+               kate.>=2,oggkate.>=2::multimedia/libkate
+
+USE_X11=       Yes
+
+do-install:
+       @${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKSRC} \
+               ${MODSCONS_ENV} ${MODSCONS_FLAGS} ${INSTALL_TARGET} \
+               DESTDIR=${WRKINST} prefix=${LOCALBASE} destdir=${WRKINST}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/ffmpeg2theora/distinfo,v
retrieving revision 1.3
diff -p -u -r1.3 distinfo
--- distinfo    25 Jul 2007 14:26:24 -0000      1.3
+++ distinfo    20 Jun 2009 09:17:48 -0000
@@ -1,5 +1,5 @@
-MD5 (ffmpeg2theora-0.19.tar.bz2) = ZyFxEzXamQP5hLQD5RigUg==
-RMD160 (ffmpeg2theora-0.19.tar.bz2) = /Lznc6M6odf/DkcYImS7vc43dyE=
-SHA1 (ffmpeg2theora-0.19.tar.bz2) = efywLJKmrpfK/UsgkBwWDaxoCIw=
-SHA256 (ffmpeg2theora-0.19.tar.bz2) = 
DwmQ+8HaivuJM1gkAeVvRafQ1Tn22Obtuyb8qVJ3DWo=
-SIZE (ffmpeg2theora-0.19.tar.bz2) = 221195
+MD5 (ffmpeg2theora-0.24.tar.bz2) = jPNPNrvr7e22fHv42tw4jw==
+RMD160 (ffmpeg2theora-0.24.tar.bz2) = Q8+NES/BeypuzMObyrFpwEm2E9A=
+SHA1 (ffmpeg2theora-0.24.tar.bz2) = Y8aOfDb0xK4VQppa+617Rilhi70=
+SHA256 (ffmpeg2theora-0.24.tar.bz2) = 
ip5Bt7jTkRIk/XPDUyJ3jUL4OfPwt3OoJph6e8mw5Rk=
+SIZE (ffmpeg2theora-0.24.tar.bz2) = 63090
Index: patches/patch-ffmpeg2theora_c
===================================================================
RCS file: patches/patch-ffmpeg2theora_c
diff -N patches/patch-ffmpeg2theora_c
--- patches/patch-ffmpeg2theora_c       9 Jul 2008 02:13:01 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-ffmpeg2theora_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
---- ffmpeg2theora.c.orig       Sat Jun 21 20:56:30 2008
-+++ ffmpeg2theora.c    Sat Jun 21 20:56:54 2008
-@@ -26,8 +26,8 @@
- #include <getopt.h>
- #include <math.h>
- 
--#include "avformat.h"
--#include "swscale.h"
-+#include "libavformat/avformat.h"
-+#include "libswscale/swscale.h"
- 
- #include "theora/theora.h"
- #include "vorbis/codec.h"
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/multimedia/ffmpeg2theora/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 DESCR
--- pkg/DESCR   27 Jan 2007 17:56:14 -0000      1.1.1.1
+++ pkg/DESCR   20 Jun 2009 09:17:48 -0000
@@ -1,3 +1,3 @@
-ffmpeg2theora is a simple command line tool to convert media files to
-.ogg with Theora video and Vorbis audio streams. It supports reading any
-file format that ffmpeg can decode.
+ffmpeg2theora is a simple command line tool to convert media files to .ogg
+with Theora video and Vorbis audio streams. It supports reading any file
+format that ffmpeg can decode.

Attachment: multimedia_oggz.tar.gz
Description: application/gzip

Attachment: multimedia_libkate.tar.gz
Description: application/gzip

Reply via email to