Update to 20030813.

2003-08-15 14:25:08 +00:00 · 2003-08-15 14:25:08 +00:00 · e90b0ba85c
commit e90b0ba85c
parent f0b211a916
8 changed files with 81 additions and 37 deletions
--- a/graphics/ffmpeg/Makefile
+++ b/graphics/ffmpeg/Makefile
@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2003/08/04 06:08:22 jolan Exp $
+# $OpenBSD: Makefile,v 1.4 2003/08/15 14:25:08 jolan Exp $

 COMMENT=	"audio/video converter and streamer"
-DISTNAME=	ffmpeg-20030725
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	ffmpeg-20030813
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/0.6.1/contrib/
+MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/

 HOMEPAGE=	http://ffmpeg.sourceforge.net/

@ -24,6 +23,18 @@ CONFIGURE_STYLE=simple
 CONFIGURE_ARGS+=--cc=${CC} --make=gmake ${CONFIGURE_SHARED} \
 		--disable-ffserver

+SV=	0.2
+
+pre-configure:
+	@perl -pi -e 's|_SV_|${SV}|g' ${WRKSRC}/configure
+
+post-configure:
+# -fPIC causes a compilation error on i386
+.if ${MACHINE_ARCH} != "i386"
+	@perl -pi -e 's|###CFLAGS|CFLAGS|g' ${WRKSRC}/libavcodec/Makefile \
+		${WRKSRC}/libavformat/Makefile
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/ffmpeg ${PREFIX}/bin/ffmpeg
 	${INSTALL_DATA_DIR} ${PREFIX}/include/ffmpeg
@ -35,10 +46,10 @@ do-install:
 	${INSTALL_DATA} ${WRKBUILD}/libavcodec/libavcodec.a \
 		${WRKBUILD}/libavformat/libavformat.a ${PREFIX}/lib
 .if !defined(NO_SHARED_LIBS)
-	${INSTALL_DATA} ${WRKBUILD}/libavcodec/libavcodec.so \
-		${PREFIX}/lib/libavcodec.so.0.1
-	${INSTALL_DATA} ${WRKBUILD}/libavformat/libavformat.so \
-		${PREFIX}/lib/libavformat.so.0.1
+	${INSTALL_DATA} ${WRKBUILD}/libavcodec/libavcodec.so.${SV} \
+		${PREFIX}/lib/libavcodec.so.${SV}
+	${INSTALL_DATA} ${WRKBUILD}/libavformat/libavformat.so.${SV} \
+		${PREFIX}/lib/libavformat.so.${SV}
 .endif
 	
 .include <bsd.port.mk>
--- a/graphics/ffmpeg/distinfo
+++ b/graphics/ffmpeg/distinfo
@ -1,3 +1,3 @@
-MD5 (ffmpeg-20030725.tar.bz2) = 29426f84c39d83e5395edfba13202330
-RMD160 (ffmpeg-20030725.tar.bz2) = 443ed96d0b77bc420f3bb818d0329b4371ec5ceb
-SHA1 (ffmpeg-20030725.tar.bz2) = 7e443dd27a1c951fb47981ce765e8b66a7bb43c5
+MD5 (ffmpeg-20030813.tar.bz2) = 7cf66a413f64d930de1f498aac58d630
+RMD160 (ffmpeg-20030813.tar.bz2) = f2c857da899523413bfad0c821fb728cd0d20dda
+SHA1 (ffmpeg-20030813.tar.bz2) = 7d45b78ba80abca4fd9c47b17323f8576fcb60bb
--- a/graphics/ffmpeg/patches/patch-configure
+++ b/graphics/ffmpeg/patches/patch-configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.2 2003/08/02 10:26:54 jolan Exp $
--- configure.orig	2003-07-25 04:19:55.000000000 -0500
-+++ configure	2003-07-31 21:44:39.000000000 -0500
-@@ -148,6 +148,14 @@ dv1394="no"
+$OpenBSD: patch-configure,v 1.3 2003/08/15 14:25:08 jolan Exp $
+--- configure.orig	2003-08-13 14:54:47.000000000 -0500
+++ configure	2003-08-14 10:14:42.000000000 -0500
+@@ -151,6 +151,15 @@ dv1394="no"
 make="gmake"
 LDFLAGS="$LDFLAGS -export-dynamic"
 ;;
@ -12,11 +12,12 @@ $OpenBSD: patch-configure,v 1.2 2003/08/02 10:26:54 jolan Exp $
 +sdl="no"	# not respected
 +v4l="no"
 +vhook="no"
+SLIBSUF=.so._SV_
 +;;
 BSD/OS)
 v4l="no"
 audio_oss="yes"
-@@ -703,14 +711,14 @@ EOF
+@@ -713,14 +722,14 @@ EOF
 
 sdl_too_old=no
 sdl=no
--- a/graphics/ffmpeg/patches/patch-libavcodec_Makefile
+++ b/graphics/ffmpeg/patches/patch-libavcodec_Makefile
@ -1,14 +1,20 @@
-$OpenBSD: patch-libavcodec_Makefile,v 1.2 2003/08/05 22:24:21 jolan Exp $
--- libavcodec/Makefile.orig	2003-07-25 04:20:24.000000000 -0500
-+++ libavcodec/Makefile	2003-08-05 16:40:52.000000000 -0500
-@@ -7,8 +7,8 @@ include ../config.mak
- VPATH=$(SRC_PATH)/libavcodec
+$OpenBSD: patch-libavcodec_Makefile,v 1.3 2003/08/15 14:25:08 jolan Exp $
+--- libavcodec/Makefile.orig	2003-08-13 14:54:50.000000000 -0500
+++ libavcodec/Makefile	2003-08-14 10:32:19.000000000 -0500
+@@ -8,7 +8,7 @@ VPATH=$(SRC_PATH)/libavcodec
 
 # NOTE: -I.. is needed to include config.h
-CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 -LDFLAGS= -g
-+CFLAGS= $(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 +#LDFLAGS= -g
 
 OBJS= common.o utils.o mem.o allcodecs.o \
       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
+@@ -142,6 +142,7 @@ OBJS := $(OBJS) $(ASM_OBJS)
+ LIB= $(LIBPREF)avcodec$(LIBSUF)
+ ifeq ($(BUILD_SHARED),yes)
+ SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
+###CFLAGS += ${PIC}
+ endif
+ TESTS= imgresample-test dct-test motion-test fft-test
+ 
--- a/graphics/ffmpeg/patches/patch-libavcodec_h263dec_c
+++ b/graphics/ffmpeg/patches/patch-libavcodec_h263dec_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-libavcodec_h263dec_c,v 1.1 2003/08/15 14:25:08 jolan Exp $
+--- libavcodec/h263dec.c.orig	2003-08-11 16:36:16.000000000 -0500
+++ libavcodec/h263dec.c	2003-08-14 11:29:13.000000000 -0500
+@@ -40,6 +40,8 @@ static inline long long rdtsc()
+ }
+ #endif
+ 
+int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s);
+
+ int ff_h263_decode_init(AVCodecContext *avctx)
+ {
+     MpegEncContext *s = avctx->priv_data;
--- a/graphics/ffmpeg/patches/patch-libavformat_Makefile
+++ b/graphics/ffmpeg/patches/patch-libavformat_Makefile
@ -1,12 +1,11 @@
-$OpenBSD: patch-libavformat_Makefile,v 1.2 2003/08/02 10:26:54 jolan Exp $
--- libavformat/Makefile.orig	2003-07-25 04:22:57.000000000 -0500
-+++ libavformat/Makefile	2003-07-31 21:45:46.000000000 -0500
-@@ -6,7 +6,7 @@ include ../config.mak
+$OpenBSD: patch-libavformat_Makefile,v 1.3 2003/08/15 14:25:08 jolan Exp $
+--- libavformat/Makefile.orig	2003-08-13 14:56:45.000000000 -0500
+++ libavformat/Makefile	2003-08-14 10:25:30.000000000 -0500
+@@ -68,6 +68,7 @@ endif
+ LIB= $(LIBPREF)avformat$(LIBSUF)
+ ifeq ($(BUILD_SHARED),yes)
+ SLIB= $(SLIBPREF)avformat$(SLIBSUF)
+###CFLAGS += ${PIC}
+ endif
 
- VPATH=$(SRC_PATH)/libavformat
- 
-CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -Werror
-+CFLAGS= $(OPTFLAGS) -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- OBJS= utils.o cutils.o allformats.o
- PPOBJS=
+ SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
--- a/graphics/ffmpeg/patches/patch-libavformat_avformat_h
+++ b/graphics/ffmpeg/patches/patch-libavformat_avformat_h
@ -0,0 +1,15 @@
+$OpenBSD: patch-libavformat_avformat_h,v 1.1 2003/08/15 14:25:08 jolan Exp $
+--- libavformat/avformat.h.orig	2003-08-11 16:37:04.000000000 -0500
+++ libavformat/avformat.h	2003-08-14 12:05:32.000000000 -0500
+@@ -15,6 +15,11 @@ extern "C" {
+ 
+ /* packet functions */
+ 
+#ifndef int64_t_C
+#define int64_t_C(c)     (c ## LL)
+#define uint64_t_C(c)    (c ## ULL)
+#endif
+
+ #ifndef MAXINT64
+ #define MAXINT64 int64_t_C(0x7fffffffffffffff)
+ #endif
--- a/graphics/ffmpeg/pkg/PFRAG.shared
+++ b/graphics/ffmpeg/pkg/PFRAG.shared
@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2003/08/04 06:08:22 jolan Exp $
-lib/libavcodec.so.0.1
-lib/libavformat.so.0.1
+@comment $OpenBSD: PFRAG.shared,v 1.4 2003/08/15 14:25:08 jolan Exp $
+lib/libavcodec.so.0.2
+lib/libavformat.so.0.2
 DYNLIBDIR(%D/lib)