update to 20030725

This commit is contained in:
jolan 2003-08-02 10:26:54 +00:00
parent eb00ce45e2
commit 69cca4e23e
7 changed files with 20 additions and 49 deletions

View File

@ -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 <bsd.port.mk>

View File

@ -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

View File

@ -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

View File

@ -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;
}

View File

@ -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,

View File

@ -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

View File

@ -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)