From 69cca4e23e61a97b243e37f59cd027a72d9145bd Mon Sep 17 00:00:00 2001 From: jolan Date: Sat, 2 Aug 2003 10:26:54 +0000 Subject: [PATCH] update to 20030725 --- graphics/ffmpeg/Makefile | 11 ++++++----- graphics/ffmpeg/distinfo | 6 +++--- graphics/ffmpeg/patches/patch-configure | 10 +++++----- .../patch-libavcodec_alpha_dsputil_alpha_c | 18 ------------------ .../patch-libavcodec_alpha_simple_idct_alpha_c | 12 ------------ .../ffmpeg/patches/patch-libavformat_Makefile | 8 ++++---- graphics/ffmpeg/pkg/PFRAG.shared | 4 ++-- 7 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 graphics/ffmpeg/patches/patch-libavcodec_alpha_dsputil_alpha_c delete mode 100644 graphics/ffmpeg/patches/patch-libavcodec_alpha_simple_idct_alpha_c diff --git a/graphics/ffmpeg/Makefile b/graphics/ffmpeg/Makefile index 57640967e28..98f0d6c94e1 100644 --- a/graphics/ffmpeg/Makefile +++ b/graphics/ffmpeg/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2003/07/19 18:16:34 jolan Exp $ +# $OpenBSD: Makefile,v 1.2 2003/08/02 10:26:54 jolan Exp $ COMMENT= "audio/video converter and streamer" -DISTNAME= ffmpeg-20030622 +DISTNAME= ffmpeg-20030725 EXTRACT_SUFX= .tar.bz2 CATEGORIES= graphics -MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/0.6.0/contrib/ +MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/0.6.1/contrib/ HOMEPAGE= http://ffmpeg.sourceforge.net/ @@ -20,7 +20,8 @@ NO_REGRESS= Yes # Possible to adapt with some work USE_GMAKE= Yes CONFIGURE_STYLE=simple -CONFIGURE_ARGS+=--cc=${CC} --make=gmake ${CONFIGURE_SHARED} +CONFIGURE_ARGS+=--cc=${CC} --make=gmake ${CONFIGURE_SHARED} \ + --disable-ffserver do-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/ffmpeg @@ -33,7 +34,7 @@ do-install: ${WRKBUILD}/libavformat/libavformat.a ${PREFIX}/lib .if !defined(NO_SHARED_LIBS) ${INSTALL_DATA} ${WRKBUILD}/libavcodec/libavcodec.so \ - ${PREFIX}/lib/libavcodec.so.0.0 + ${PREFIX}/lib/libavcodec.so.0.1 .endif .include diff --git a/graphics/ffmpeg/distinfo b/graphics/ffmpeg/distinfo index e88537a384a..8ac0d8bda93 100644 --- a/graphics/ffmpeg/distinfo +++ b/graphics/ffmpeg/distinfo @@ -1,3 +1,3 @@ -MD5 (ffmpeg-20030622.tar.bz2) = 35fa282723b0f928214788f28620c19f -RMD160 (ffmpeg-20030622.tar.bz2) = 9b5ef8cbeb22dde1c28b4b3866af0f525a00b2e1 -SHA1 (ffmpeg-20030622.tar.bz2) = d7c88a26056d23b18d56885abb4cbcc09a544230 +MD5 (ffmpeg-20030725.tar.bz2) = 29426f84c39d83e5395edfba13202330 +RMD160 (ffmpeg-20030725.tar.bz2) = 443ed96d0b77bc420f3bb818d0329b4371ec5ceb +SHA1 (ffmpeg-20030725.tar.bz2) = 7e443dd27a1c951fb47981ce765e8b66a7bb43c5 diff --git a/graphics/ffmpeg/patches/patch-configure b/graphics/ffmpeg/patches/patch-configure index c2afdbb76b8..04386a028a7 100644 --- a/graphics/ffmpeg/patches/patch-configure +++ b/graphics/ffmpeg/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2003/07/19 18:16:34 jolan Exp $ ---- configure.orig Sun Jun 22 06:27:05 2003 -+++ configure Wed Jul 16 20:21:00 2003 -@@ -145,6 +145,14 @@ dv1394="no" +$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" make="gmake" LDFLAGS="$LDFLAGS -export-dynamic" ;; @@ -16,7 +16,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2003/07/19 18:16:34 jolan Exp $ BSD/OS) v4l="no" audio_oss="yes" -@@ -633,14 +641,14 @@ EOF +@@ -703,14 +711,14 @@ EOF sdl_too_old=no sdl=no diff --git a/graphics/ffmpeg/patches/patch-libavcodec_alpha_dsputil_alpha_c b/graphics/ffmpeg/patches/patch-libavcodec_alpha_dsputil_alpha_c deleted file mode 100644 index 37944b0ee3b..00000000000 --- a/graphics/ffmpeg/patches/patch-libavcodec_alpha_dsputil_alpha_c +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-libavcodec_alpha_dsputil_alpha_c,v 1.1.1.1 2003/07/19 18:16:34 jolan Exp $ ---- libavcodec/alpha/dsputil_alpha.c.orig Sat Jul 19 02:28:29 2003 -+++ libavcodec/alpha/dsputil_alpha.c Sat Jul 19 02:30:39 2003 -@@ -20,6 +20,7 @@ - #include "asm.h" - #include "../dsputil.h" - -+extern void simple_idct_axp(DCTELEM *block); - extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block); - extern void simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block); - -@@ -363,5 +364,5 @@ void dsputil_init_alpha(DSPContext* c, A - - c->idct_put = simple_idct_put_axp; - c->idct_add = simple_idct_add_axp; -- c->idct_idct = simple_idct_axp; -+ c->idct = simple_idct_axp; - } diff --git a/graphics/ffmpeg/patches/patch-libavcodec_alpha_simple_idct_alpha_c b/graphics/ffmpeg/patches/patch-libavcodec_alpha_simple_idct_alpha_c deleted file mode 100644 index aeb45d2bf95..00000000000 --- a/graphics/ffmpeg/patches/patch-libavcodec_alpha_simple_idct_alpha_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libavcodec_alpha_simple_idct_alpha_c,v 1.1.1.1 2003/07/19 18:16:34 jolan Exp $ ---- libavcodec/alpha/simple_idct_alpha.c.orig Sat Jul 19 02:32:13 2003 -+++ libavcodec/alpha/simple_idct_alpha.c Sat Jul 19 02:34:42 2003 -@@ -27,6 +27,8 @@ - #include "asm.h" - #include "../dsputil.h" - -+typedef int32_t int_fast32_t; -+ - extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, - int line_size); - extern void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, diff --git a/graphics/ffmpeg/patches/patch-libavformat_Makefile b/graphics/ffmpeg/patches/patch-libavformat_Makefile index 100c734af62..57f197f4dd0 100644 --- a/graphics/ffmpeg/patches/patch-libavformat_Makefile +++ b/graphics/ffmpeg/patches/patch-libavformat_Makefile @@ -1,11 +1,11 @@ -$OpenBSD: patch-libavformat_Makefile,v 1.1.1.1 2003/07/19 18:16:34 jolan Exp $ ---- libavformat/Makefile.orig Sun Jun 22 06:28:09 2003 -+++ libavformat/Makefile Wed Jul 16 20:45:11 2003 +$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 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 +-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 diff --git a/graphics/ffmpeg/pkg/PFRAG.shared b/graphics/ffmpeg/pkg/PFRAG.shared index e2ca78b449f..a97c8d444cd 100644 --- a/graphics/ffmpeg/pkg/PFRAG.shared +++ b/graphics/ffmpeg/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2003/07/19 18:16:34 jolan Exp $ -lib/libavcodec.so.0.0 +@comment $OpenBSD: PFRAG.shared,v 1.2 2003/08/02 10:26:54 jolan Exp $ +lib/libavcodec.so.0.1 DYNLIBDIR(%D/lib)