cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to snapshot from 2007-09-10

Browse Source 
additions/changes in this update:

- RoQ muxer, audio encoder
- Renderware TXD demuxer and decoder
- extern C declarations for C++ removed from headers
- sws_flags command line option
- codebook generator
- RoQ video encoder
- QTRLE encoder
- OS/2 support removed
- AC-3 decoder
- NUT muxer (since r10052)
- Matroska muxer
- Slice-based parallel H.264 decoding

plus lots of bugfixes

prodding/testing/ok brad@
This commit is contained in:
jakemsr 2007-09-24 07:51:24 +00:00
parent 9c84a00f56
commit e7eafae972
15 changed files with 97 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
graphics/ffmpeg/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.29 2007/09/15 20:09:40 simon Exp $
# $OpenBSD: Makefile,v 1.30 2007/09/24 07:51:24 jakemsr Exp $
COMMENT= audio/video converter and streamer with bktr(4) support
DISTNAME= ffmpeg-svn-20070501
PKGNAME= ${DISTNAME:S/-svn//}p0
SHARED_LIBS= avutil 3.0 \
avcodec 9.0 \
avformat 9.0 \
postproc 9.0
DISTNAME= ffmpeg-svn-20070910
PKGNAME= ${DISTNAME:S/-svn//}
SHARED_LIBS= avutil 4.0 \
avcodec 10.0 \
avformat 10.0 \
postproc 10.0
CATEGORIES= graphics multimedia
@ -31,9 +31,10 @@ LIB_DEPENDS= SDL.>=4::devel/sdl \
vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis \
a52::audio/liba52 \
x264::multimedia/x264 \
theora::multimedia/libtheora
theora::multimedia/libtheora \
Imlib2::graphics/imlib2
WANTLIB= X11 Xext c freetype m pthread ogg ossaudio usbhid z
WANTLIB= X11 Xext c freetype m pthread ogg ossaudio z
USE_X11= Yes
USE_GMAKE= Yes
@ -56,26 +57,27 @@ CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--cc=${CC} \
--disable-opts \
--enable-liba52 \
--enable-pp \
--enable-gpl \
--enable-pthreads \
--disable-debug \
--enable-liba52 \
--enable-libfaac \
--enable-libfaad \
--enable-libmp3lame \
--enable-libogg \
--enable-libvorbis \
--enable-libtheora \
--enable-x264 \
--extra-libs="-L${LOCALBASE}/lib" \
--extra-cflags="-I${LOCALBASE}/include"
--enable-libvorbis \
--enable-libx264 \
--extra-libs="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
--extra-cflags="-I${LOCALBASE}/include -I${X11BASE}/include"
CONFIGURE_ENV+= LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \
LIBavcodec_EXTRALIBS="${LIBavcodec_EXTRALIBS}" \
LIBavformat_EXTRALIBS="${LIBavformat_EXTRALIBS}" \
LIBpostproc_EXTRALIBS="${LIBpostproc_EXTRALIBS}" \
TMPDIR=${WRKTMP}
TMPDIR=${WRKTMP} \
CPPFLAGS="-I${X11BASE}/include"
MAKE_FLAGS= LIBavutil_VERSION=$(LIBavutil_VERSION) \
LIBavcodec_VERSION=$(LIBavcodec_VERSION) \

10
graphics/ffmpeg/distinfo
View File

@ -1,5 +1,5 @@
MD5 (ffmpeg-svn-20070501.tar.gz) = 7CjiHgpM+BEIM9VXSpKfmw==
RMD160 (ffmpeg-svn-20070501.tar.gz) = 9O2Xt3UkaUVLqPI3e1oZ36gkU5E=
SHA1 (ffmpeg-svn-20070501.tar.gz) = Gh3M0xS5fbx6a+KfOWBJzfr0RKo=
SHA256 (ffmpeg-svn-20070501.tar.gz) = qTeso7MbiB9K5aPacZQ6yQrFl+rmXmlsXXf+wSFbJRk=
SIZE (ffmpeg-svn-20070501.tar.gz) = 2656700
MD5 (ffmpeg-svn-20070910.tar.gz) = ICfk45NDQGra1ggXDDQWJA==
RMD160 (ffmpeg-svn-20070910.tar.gz) = bLgwcgD94OFDzxrrewH9SzGGrz0=
SHA1 (ffmpeg-svn-20070910.tar.gz) = AzZtoWkYL+JPZRXPbSE3IF3Q5j8=
SHA256 (ffmpeg-svn-20070910.tar.gz) = mxiiwOkaTkqj01SR/adlMXkQkXaaf1a7aw7Oy4CEFJ8=
SIZE (ffmpeg-svn-20070910.tar.gz) = 2762138

22
graphics/ffmpeg/patches/patch-common_mak
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-common_mak,v 1.4 2007/05/25 15:54:14 jakemsr Exp $
--- common.mak.orig Wed Apr 4 21:25:05 2007
+++ common.mak Wed May 2 23:36:42 2007
@@ -64,13 +64,7 @@ install-libs: $(INSTLIBTARGETS)
$OpenBSD: patch-common_mak,v 1.5 2007/09/24 07:51:24 jakemsr Exp $
--- common.mak.orig Mon Sep 10 19:18:12 2007
+++ common.mak Mon Sep 10 19:57:58 2007
@@ -71,13 +71,7 @@ install-libs: $(INSTLIBTARGETS)
install-lib-shared: $(SLIBNAME)
install -d "$(shlibdir)"
- install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
- $(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
- cd "$(shlibdir)" && \
install -d "$(SHLIBDIR)"
- 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)" && \
- cd "$(SHLIBDIR)" && \
- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
- $(SLIB_INSTALL_EXTRA_CMD)
+ install -m 755 $(SLIBNAME) $(libdir)
+ install -m 755 $(SLIBNAME) $(SHLIBDIR)
install-lib-static: $(LIB)
install -d "$(libdir)"
install -d "$(LIBDIR)"

10
graphics/ffmpeg/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.15 2007/05/25 15:54:14 jakemsr Exp $
--- configure.orig Tue May 1 13:26:05 2007
+++ configure Wed May 2 23:46:49 2007
@@ -2126,11 +2126,11 @@ EOF
$OpenBSD: patch-configure,v 1.16 2007/09/24 07:51:24 jakemsr Exp $
--- configure.orig Mon Sep 10 19:18:12 2007
+++ configure Mon Sep 10 19:52:11 2007
@@ -2079,11 +2079,11 @@ EOF
pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.15 2007/05/25 15:54:14 jakemsr Exp $
if enabled pp; then
pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
@@ -2138,11 +2138,11 @@ if enabled pp; then
@@ -2091,11 +2091,11 @@ if enabled pp; then
fi
if enabled swscaler; then

24
graphics/ffmpeg/patches/patch-libavcodec_Makefile
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-libavcodec_Makefile,v 1.14 2007/05/25 15:54:14 jakemsr Exp $
--- libavcodec/Makefile.orig Tue May 1 13:26:00 2007
+++ libavcodec/Makefile Thu May 3 12:09:35 2007
@@ -335,7 +335,7 @@ ASM_OBJS-$(HAVE_ARMV6) += armv4l/simpl
OBJS-$(TARGET_ARCH_SPARC) += sparc/dsputil_vis.o \
$OpenBSD: patch-libavcodec_Makefile,v 1.15 2007/09/24 07:51:24 jakemsr Exp $
--- libavcodec/Makefile.orig Mon Sep 10 19:17:57 2007
+++ libavcodec/Makefile Mon Sep 10 19:52:11 2007
@@ -380,7 +380,7 @@ ASM_OBJS-$(HAVE_ARMV6) += armv4l/simpl
OBJS-$(ARCH_SPARC) += sparc/dsputil_vis.o \
sparc/simple_idct_vis.o \
-sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
+# sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \
@@ -380,10 +380,11 @@ ASM_OBJS-$(TARGET_ARCH_BFIN) += bfin/pixels_
bfin/idct_bfin.o \
@@ -426,10 +426,11 @@ ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_
bfin/fdct_bfin.o \
bfin/idct_bfin.o \
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+#EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
@ -23,13 +23,13 @@ $OpenBSD: patch-libavcodec_Makefile,v 1.14 2007/05/25 15:54:14 jakemsr Exp $
+LIBVERSION=$(LIBavcodec_VERSION)
LIBMAJOR=$(LAVCMAJOR)
TESTS= imgresample-test fft-test dct-test
@@ -413,7 +414,7 @@ cpuid_test: i386/cputest.c
$(CC) $(CFLAGS) -D__TEST__ -o $@ $<
include ../common.mak
@@ -464,7 +465,7 @@ dct-test: dct-test.o fdctref.o $(LIB)
fft-test: fft-test.o $(LIB)
imgresample-test: imgresample.c $(LIB)
- $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
+ $(CC) $(CFLAGS) -DTEST -o $@ $^ $(LIBavcodec_EXTRALIBS)
dct-test: dct-test.o fdctref.o $(LIB)
motion-test: motion-test.o $(LIB)

8
graphics/ffmpeg/patches/patch-libavcodec_dsputil_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libavcodec_dsputil_c,v 1.2 2007/05/25 15:54:14 jakemsr Exp $
--- libavcodec/dsputil.c.orig Wed Apr 4 21:25:04 2007
+++ libavcodec/dsputil.c Tue Apr 17 22:02:51 2007
@@ -3837,7 +3837,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx
$OpenBSD: patch-libavcodec_dsputil_c,v 1.3 2007/09/24 07:51:24 jakemsr Exp $
--- libavcodec/dsputil.c.orig Mon Sep 10 19:17:58 2007
+++ libavcodec/dsputil.c Mon Sep 10 19:52:11 2007
@@ -3847,7 +3847,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx
{
int i;

6
graphics/ffmpeg/patches/patch-libavcodec_faad_c → graphics/ffmpeg/patches/patch-libavcodec_libfaad_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libavcodec_faad_c,v 1.1 2007/06/29 06:15:52 jakemsr Exp $
--- libavcodec/faad.c.orig Thu May 31 16:09:10 2007
+++ libavcodec/faad.c Thu May 31 16:22:30 2007
$OpenBSD: patch-libavcodec_libfaad_c,v 1.1 2007/09/24 07:51:24 jakemsr Exp $
--- libavcodec/libfaad.c.orig Tue Jul 17 23:14:10 2007
+++ libavcodec/libfaad.c Mon Sep 10 20:03:04 2007
@@ -73,21 +73,21 @@ typedef struct {
short *sample_buffer,
unsigned long *samples);

30
graphics/ffmpeg/patches/patch-libavcodec_mpegvideo_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-libavcodec_mpegvideo_c,v 1.2 2007/05/25 15:54:14 jakemsr Exp $
--- libavcodec/mpegvideo.c.orig Wed Apr 4 21:25:04 2007
+++ libavcodec/mpegvideo.c Tue Apr 17 22:02:51 2007
@@ -4840,7 +4840,7 @@ static int pre_estimate_motion_thread(AVCodecContext *
static int estimate_motion_thread(AVCodecContext *c, void *arg){
MpegEncContext *s= arg;
- ff_check_alignment();
+ /*ff_check_alignment();*/
s->me.dia_size= s->avctx->dia_size;
s->first_slice_line=1;
@@ -4868,7 +4868,7 @@ static int mb_var_thread(AVCodecContext *c, void *arg)
MpegEncContext *s= arg;
int mb_x, mb_y;
- ff_check_alignment();
+ /*ff_check_alignment();*/
for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) {
for(mb_x=0; mb_x < s->mb_width; mb_x++) {
@@ -4917,7 +4917,7 @@ static int encode_thread(AVCodecContext *c, void *arg)
PutBitContext pb[2], pb2[2], tex_pb[2];
//printf("%d->%d\n", s->resync_mb_y, s->end_mb_y);
- ff_check_alignment();
+ /*ff_check_alignment();*/
for(i=0; i<2; i++){
init_put_bits(&pb [i], bit_buf [i], MAX_MB_BYTES);

18
graphics/ffmpeg/patches/patch-libavformat_Makefile
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-libavformat_Makefile,v 1.13 2007/05/25 15:54:14 jakemsr Exp $
--- libavformat/Makefile.orig Tue May 1 13:26:05 2007
+++ libavformat/Makefile Tue May 1 13:29:58 2007
@@ -154,8 +154,9 @@ OBJS+= framehook.o
OBJS-$(CONFIG_VIDEO_GRAB_V4L_DEMUXER) += grab.o
OBJS-$(CONFIG_VIDEO_GRAB_BKTR_DEMUXER) += grab_bktr.o
$OpenBSD: patch-libavformat_Makefile,v 1.14 2007/09/24 07:51:24 jakemsr Exp $
--- libavformat/Makefile.orig Mon Sep 10 19:18:10 2007
+++ libavformat/Makefile Mon Sep 10 19:53:09 2007
@@ -160,8 +160,9 @@ OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o r
OBJS-$(CONFIG_VHOOK) += framehook.o
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
+#EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
-lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
+EXTRALIBS=${LIBavformat_EXTRALIBS}
CPPOBJS-$(CONFIG_AUDIO_BEOS) += beosaudio.o
@@ -170,7 +171,7 @@ OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o
CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o
@@ -177,7 +178,7 @@ OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
NAME=avformat

10
graphics/ffmpeg/patches/patch-libavutil_Makefile
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-libavutil_Makefile,v 1.3 2007/05/25 15:54:14 jakemsr Exp $
--- libavutil/Makefile.orig Wed Apr 4 21:25:01 2007
+++ libavutil/Makefile Fri Apr 20 00:33:41 2007
@@ -21,7 +21,9 @@ HEADERS = avutil.h common.h mathematics.h integer.h ra
random.h mem.h base64.h
$OpenBSD: patch-libavutil_Makefile,v 1.4 2007/09/24 07:51:24 jakemsr Exp $
--- libavutil/Makefile.orig Mon Sep 10 19:18:00 2007
+++ libavutil/Makefile Mon Sep 10 19:53:09 2007
@@ -34,7 +34,9 @@ HEADERS = adler32.h \
rational.h \
NAME=avutil
-LIBVERSION=$(LAVUVERSION)

8
graphics/ffmpeg/patches/patch-libpostproc_Makefile
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-libpostproc_Makefile,v 1.2 2007/05/25 15:54:14 jakemsr Exp $
--- libpostproc/Makefile.orig Wed Apr 4 21:25:04 2007
+++ libpostproc/Makefile Fri Apr 20 00:36:12 2007
$OpenBSD: patch-libpostproc_Makefile,v 1.3 2007/09/24 07:51:24 jakemsr Exp $
--- libpostproc/Makefile.orig Mon Sep 10 19:18:01 2007
+++ libpostproc/Makefile Mon Sep 10 19:53:09 2007
@@ -4,10 +4,11 @@ include ../config.mak
# Overload incdir, postproc include files go in a different directory.
incdir=$(prefix)/include/postproc
INCDIR=$(prefix)/include/postproc
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+#EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)

17
graphics/ffmpeg/patches/patch-tests_regression_sh
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-tests_regression_sh,v 1.2 2007/05/25 15:54:14 jakemsr Exp $
--- tests/regression.sh.orig Tue Apr 17 21:21:06 2007
+++ tests/regression.sh Tue Apr 17 22:02:51 2007
@@ -91,7 +91,7 @@ fi
$OpenBSD: patch-tests_regression_sh,v 1.3 2007/09/24 07:51:24 jakemsr Exp $
--- tests/regression.sh.orig Mon Sep 10 19:18:02 2007
+++ tests/regression.sh Mon Sep 10 19:56:00 2007
@@ -92,7 +92,8 @@ fi
# various files
-ffmpeg="../ffmpeg_g"
+ffmpeg="env LD_LIBRARY_PATH=../libavcodec:../libavutil:../libavformat:../libswscale ../ffmpeg_g"
tiny_psnr="./tiny_psnr"
-ffmpeg="./ffmpeg_g"
+# ffmpeg="./ffmpeg_g"
+ffmpeg="env LD_LIBRARY_PATH=./libavcodec:./libavutil:./libavformat:./libswscale ./ffmpeg_g"
tiny_psnr="tests/tiny_psnr"
reffile="$2"
benchfile="$datadir/ffmpeg.bench"
@@ -107,6 +107,8 @@ if [ X"`echo | md5sum 2> /dev/null`" != X ]; then
@@ -108,6 +109,8 @@ if [ X"`echo | md5sum 2> /dev/null`" != X ]; then
do_md5sum() { md5sum -b $1; }
elif [ -x /sbin/md5 ]; then
do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; }

15
graphics/ffmpeg/patches/patch-version_sh
View File

@ -1,14 +1,17 @@
$OpenBSD: patch-version_sh,v 1.1 2007/05/25 15:54:14 jakemsr Exp $
--- version.sh.orig Wed Apr 4 21:25:05 2007
+++ version.sh Thu Apr 19 05:39:26 2007
@@ -1,9 +1,9 @@
$OpenBSD: patch-version_sh,v 1.2 2007/09/24 07:51:24 jakemsr Exp $
--- version.sh.orig Tue Jul 17 23:14:51 2007
+++ version.sh Mon Sep 10 19:59:57 2007
@@ -1,9 +1,12 @@
#!/bin/sh
-svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries | \
- cut -d '"' -f2 2> /dev/null`
-test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
-test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
-test $svn_revision || svn_revision=UNKNOWN
+#svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
+#test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
+#test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
+#test $svn_revision || svn_revision=UNKNOWN
+svn_revision=`cd "$1" && grep Revision svn-info | \
+ cut -d' ' -f2 2> /dev/null`
+test -n "$svn_revision" || svn_revision=UNKNOWN

3
graphics/ffmpeg/pkg/PFRAG.shared
View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PFRAG.shared,v 1.15 2007/03/02 23:38:28 kurt Exp $
@comment $OpenBSD: PFRAG.shared,v 1.16 2007/09/24 07:51:24 jakemsr Exp $
@lib lib/libavcodec.so.${LIBavcodec_VERSION}
@lib lib/libavformat.so.${LIBavformat_VERSION}
@lib lib/libavutil.so.${LIBavutil_VERSION}
@lib lib/libpostproc.so.${LIBpostproc_VERSION}
lib/vhook/drawtext.so
lib/vhook/fish.so
lib/vhook/imlib2.so
lib/vhook/null.so
lib/vhook/ppm.so
lib/vhook/watermark.so

3
graphics/ffmpeg/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2007/05/25 15:54:14 jakemsr Exp $
@comment $OpenBSD: PLIST,v 1.13 2007/09/24 07:51:24 jakemsr Exp $
%%SHARED%%
bin/ffmpeg
bin/ffplay
@ -8,6 +8,7 @@ include/ffmpeg/adler32.h
include/ffmpeg/avcodec.h
include/ffmpeg/avformat.h
include/ffmpeg/avio.h
include/ffmpeg/avstring.h
include/ffmpeg/avutil.h
include/ffmpeg/base64.h
include/ffmpeg/common.h