From b3277f96be1d4fb10c8c28092a31d352fe59b57d Mon Sep 17 00:00:00 2001 From: jolan Date: Tue, 4 Nov 2003 07:50:19 +0000 Subject: [PATCH] Update to 0.4.8. --- graphics/ffmpeg/Makefile | 8 +++---- graphics/ffmpeg/distinfo | 6 +++--- graphics/ffmpeg/patches/patch-common_h | 13 ------------ graphics/ffmpeg/patches/patch-configure | 10 ++++----- .../ffmpeg/patches/patch-libavcodec_Makefile | 11 +--------- .../ffmpeg/patches/patch-libavcodec_avcodec_h | 16 -------------- .../ffmpeg/patches/patch-libavformat_Makefile | 8 +++---- .../patches/patch-libavformat_avformat_h | 21 ++++--------------- graphics/ffmpeg/pkg/PFRAG.shared | 6 +++--- 9 files changed, 24 insertions(+), 75 deletions(-) delete mode 100644 graphics/ffmpeg/patches/patch-common_h delete mode 100644 graphics/ffmpeg/patches/patch-libavcodec_avcodec_h diff --git a/graphics/ffmpeg/Makefile b/graphics/ffmpeg/Makefile index 6272cb103c1..ad1002b03c4 100644 --- a/graphics/ffmpeg/Makefile +++ b/graphics/ffmpeg/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.5 2003/09/26 14:40:29 jolan Exp $ +# $OpenBSD: Makefile,v 1.6 2003/11/04 07:50:19 jolan Exp $ COMMENT= "audio/video converter and streamer" -DISTNAME= ffmpeg-0.4.7 +DISTNAME= ffmpeg-0.4.8 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ffmpeg/} @@ -25,9 +25,9 @@ CFLAGS+=-fomit-frame-pointer CONFIGURE_STYLE=simple CONFIGURE_ARGS+=--cc=${CC} --make=gmake ${CONFIGURE_SHARED} \ - --disable-ffserver + --disable-ffserver --disable-opts --enable-pp -SV= 0.3 +SV= 0.4 pre-configure: @perl -pi -e 's|_SV_|${SV}|g' ${WRKSRC}/configure diff --git a/graphics/ffmpeg/distinfo b/graphics/ffmpeg/distinfo index 58d592fffc7..3e0ad23801d 100644 --- a/graphics/ffmpeg/distinfo +++ b/graphics/ffmpeg/distinfo @@ -1,3 +1,3 @@ -MD5 (ffmpeg-0.4.7.tar.gz) = bd9ab3e27f6c92fa06286b8f40277994 -RMD160 (ffmpeg-0.4.7.tar.gz) = 65043d90abf0659e8fe6e79427e185477793a655 -SHA1 (ffmpeg-0.4.7.tar.gz) = 1e4a7df320c2fb79f33b1f1c0b1fd135ca562f41 +MD5 (ffmpeg-0.4.8.tar.gz) = e00d47614ba1afd99ad2ea387e782dd9 +RMD160 (ffmpeg-0.4.8.tar.gz) = 8196b92b16506ddd848410c20407a7416011447e +SHA1 (ffmpeg-0.4.8.tar.gz) = 629a0f8f4daa3da1dedd8ba58bfdec4c47581bb4 diff --git a/graphics/ffmpeg/patches/patch-common_h b/graphics/ffmpeg/patches/patch-common_h deleted file mode 100644 index e28f96462cd..00000000000 --- a/graphics/ffmpeg/patches/patch-common_h +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-common_h,v 1.1 2003/09/26 14:40:29 jolan Exp $ ---- common.h.orig 2003-08-24 17:29:49.000000000 -0500 -+++ common.h 2003-09-06 04:49:20.000000000 -0500 -@@ -1,7 +1,7 @@ - #ifndef FFMPEG_COMMON_H - #define FFMPEG_COMMON_H - --#define FFMPEG_VERSION_INT 0x000406 --#define FFMPEG_VERSION "0.4.6" -+#define FFMPEG_VERSION_INT 0x000407 -+#define FFMPEG_VERSION "0.4.7" - - #endif /* COMMON_H */ diff --git a/graphics/ffmpeg/patches/patch-configure b/graphics/ffmpeg/patches/patch-configure index fece44f2802..d6f053d5491 100644 --- a/graphics/ffmpeg/patches/patch-configure +++ b/graphics/ffmpeg/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.4 2003/09/26 14:40:29 jolan Exp $ ---- configure.orig 2003-08-24 17:29:49.000000000 -0500 -+++ configure 2003-09-26 02:35:26.000000000 -0500 -@@ -152,6 +152,15 @@ dv1394="no" +$OpenBSD: patch-configure,v 1.5 2003/11/04 07:50:19 jolan Exp $ +--- configure.orig 2003-09-28 10:26:39.000000000 -0500 ++++ configure 2003-11-03 22:20:14.000000000 -0600 +@@ -155,6 +155,15 @@ dv1394="no" make="gmake" LDFLAGS="$LDFLAGS -export-dynamic" ;; @@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.4 2003/09/26 14:40:29 jolan Exp $ BSD/OS) v4l="no" audio_oss="yes" -@@ -707,14 +716,14 @@ EOF +@@ -714,14 +723,14 @@ EOF sdl_too_old=no sdl=no diff --git a/graphics/ffmpeg/patches/patch-libavcodec_Makefile b/graphics/ffmpeg/patches/patch-libavcodec_Makefile index d3b081ef718..c1107b2fe65 100644 --- a/graphics/ffmpeg/patches/patch-libavcodec_Makefile +++ b/graphics/ffmpeg/patches/patch-libavcodec_Makefile @@ -1,15 +1,6 @@ -$OpenBSD: patch-libavcodec_Makefile,v 1.4 2003/09/26 14:40:29 jolan Exp $ +$OpenBSD: patch-libavcodec_Makefile,v 1.5 2003/11/04 07:50:19 jolan Exp $ --- libavcodec/Makefile.orig 2003-08-24 17:29:50.000000000 -0500 +++ libavcodec/Makefile 2003-09-26 02:47:15.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 --LDFLAGS= -g -+#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) diff --git a/graphics/ffmpeg/patches/patch-libavcodec_avcodec_h b/graphics/ffmpeg/patches/patch-libavcodec_avcodec_h deleted file mode 100644 index 9de5617fcf6..00000000000 --- a/graphics/ffmpeg/patches/patch-libavcodec_avcodec_h +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-libavcodec_avcodec_h,v 1.1 2003/09/26 14:40:29 jolan Exp $ ---- libavcodec/avcodec.h.orig 2003-08-24 17:29:50.000000000 -0500 -+++ libavcodec/avcodec.h 2003-09-06 04:51:28.000000000 -0500 -@@ -14,9 +14,9 @@ extern "C" { - #include "common.h" - - #define LIBAVCODEC_VERSION_INT 0x000406 --#define LIBAVCODEC_VERSION "0.4.6" --#define LIBAVCODEC_BUILD 4675 --#define LIBAVCODEC_BUILD_STR "4675" -+#define LIBAVCODEC_VERSION "0.4.7" -+#define LIBAVCODEC_BUILD 4700 -+#define LIBAVCODEC_BUILD_STR "4700" - - #define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR - diff --git a/graphics/ffmpeg/patches/patch-libavformat_Makefile b/graphics/ffmpeg/patches/patch-libavformat_Makefile index 392f1f8a6c8..275020b016f 100644 --- a/graphics/ffmpeg/patches/patch-libavformat_Makefile +++ b/graphics/ffmpeg/patches/patch-libavformat_Makefile @@ -1,7 +1,7 @@ -$OpenBSD: patch-libavformat_Makefile,v 1.4 2003/09/26 14:40:29 jolan Exp $ ---- libavformat/Makefile.orig 2003-08-24 17:29:50.000000000 -0500 -+++ libavformat/Makefile 2003-09-26 02:47:26.000000000 -0500 -@@ -68,6 +68,7 @@ endif +$OpenBSD: patch-libavformat_Makefile,v 1.5 2003/11/04 07:50:19 jolan Exp $ +--- libavformat/Makefile.orig 2003-09-28 10:26:40.000000000 -0500 ++++ libavformat/Makefile 2003-11-03 22:20:14.000000000 -0600 +@@ -65,6 +65,7 @@ endif LIB= $(LIBPREF)avformat$(LIBSUF) ifeq ($(BUILD_SHARED),yes) SLIB= $(SLIBPREF)avformat$(SLIBSUF) diff --git a/graphics/ffmpeg/patches/patch-libavformat_avformat_h b/graphics/ffmpeg/patches/patch-libavformat_avformat_h index fcd252fb3cf..c56945f76e8 100644 --- a/graphics/ffmpeg/patches/patch-libavformat_avformat_h +++ b/graphics/ffmpeg/patches/patch-libavformat_avformat_h @@ -1,20 +1,7 @@ -$OpenBSD: patch-libavformat_avformat_h,v 1.2 2003/09/26 14:40:29 jolan Exp $ ---- libavformat/avformat.h.orig 2003-08-24 17:29:50.000000000 -0500 -+++ libavformat/avformat.h 2003-09-06 04:51:59.000000000 -0500 -@@ -5,9 +5,9 @@ - extern "C" { - #endif - --#define LIBAVFORMAT_VERSION_INT 0x000406 --#define LIBAVFORMAT_VERSION "0.4.6" --#define LIBAVFORMAT_BUILD 4606 -+#define LIBAVFORMAT_VERSION_INT 0x000407 -+#define LIBAVFORMAT_VERSION "0.4.7" -+#define LIBAVFORMAT_BUILD 4700 - - #include "avcodec.h" - -@@ -15,6 +15,11 @@ extern "C" { +$OpenBSD: patch-libavformat_avformat_h,v 1.3 2003/11/04 07:50:19 jolan Exp $ +--- libavformat/avformat.h.orig 2003-09-28 10:26:40.000000000 -0500 ++++ libavformat/avformat.h 2003-11-03 22:20:14.000000000 -0600 +@@ -19,6 +19,11 @@ extern "C" { /* packet functions */ diff --git a/graphics/ffmpeg/pkg/PFRAG.shared b/graphics/ffmpeg/pkg/PFRAG.shared index 2351db8c9ca..341e9d19c93 100644 --- a/graphics/ffmpeg/pkg/PFRAG.shared +++ b/graphics/ffmpeg/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.5 2003/09/26 14:40:29 jolan Exp $ -lib/libavcodec.so.0.3 -lib/libavformat.so.0.3 +@comment $OpenBSD: PFRAG.shared,v 1.6 2003/11/04 07:50:19 jolan Exp $ +lib/libavcodec.so.0.4 +lib/libavformat.so.0.4 DYNLIBDIR(%D/lib)