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

Update to 0.4.7.

Browse Source
This commit is contained in:
jolan 2003-09-26 14:40:29 +00:00
parent 8ae15b3b31
commit 3e95410059
12 changed files with 85 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
graphics/ffmpeg/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2003/08/15 14:25:08 jolan Exp $
# $OpenBSD: Makefile,v 1.5 2003/09/26 14:40:29 jolan Exp $
COMMENT= "audio/video converter and streamer"
DISTNAME= ffmpeg-20030813
EXTRACT_SUFX= .tar.bz2
DISTNAME= ffmpeg-0.4.7
CATEGORIES= graphics
MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ffmpeg/}
HOMEPAGE= http://ffmpeg.sourceforge.net/
@ -19,22 +18,20 @@ PERMIT_PACKAGE_FTP= Yes
NO_REGRESS= Yes # Possible to adapt with some work
USE_GMAKE= Yes
# It's either this or disable mmx so postprocess_template.c will build.
.if ${MACHINE_ARCH} == "i386"
CFLAGS+=-fomit-frame-pointer
.endif
CONFIGURE_STYLE=simple
CONFIGURE_ARGS+=--cc=${CC} --make=gmake ${CONFIGURE_SHARED} \
--disable-ffserver
SV= 0.2
SV= 0.3
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

6
graphics/ffmpeg/distinfo
View File

@ -1,3 +1,3 @@
MD5 (ffmpeg-20030813.tar.bz2) = 7cf66a413f64d930de1f498aac58d630
RMD160 (ffmpeg-20030813.tar.bz2) = f2c857da899523413bfad0c821fb728cd0d20dda
SHA1 (ffmpeg-20030813.tar.bz2) = 7d45b78ba80abca4fd9c47b17323f8576fcb60bb
MD5 (ffmpeg-0.4.7.tar.gz) = bd9ab3e27f6c92fa06286b8f40277994
RMD160 (ffmpeg-0.4.7.tar.gz) = 65043d90abf0659e8fe6e79427e185477793a655
SHA1 (ffmpeg-0.4.7.tar.gz) = 1e4a7df320c2fb79f33b1f1c0b1fd135ca562f41

13
graphics/ffmpeg/patches/patch-common_h Normal file
View File

@ -0,0 +1,13 @@
$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 */

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

@ -1,7 +1,7 @@
$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"
$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"
make="gmake"
LDFLAGS="$LDFLAGS -export-dynamic"
;;
@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.3 2003/08/15 14:25:08 jolan Exp $
BSD/OS)
v4l="no"
audio_oss="yes"
@@ -713,14 +722,14 @@ EOF
@@ -707,14 +716,14 @@ EOF
sdl_too_old=no
sdl=no

14
graphics/ffmpeg/patches/patch-ffserver_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ffserver_c,v 1.2 2003/08/29 23:59:56 jolan Exp $
--- ffserver.c.orig 2003-08-11 16:35:46.000000000 -0500
+++ ffserver.c 2003-08-28 19:53:53.000000000 -0500
@@ -45,6 +45,10 @@
/* maximum number of simultaneous HTTP connections */
#define HTTP_MAX_CONNECTIONS 2000
+#ifndef RTLD_NOW
+#define RTLD_NOW 0
+#endif
+
enum HTTPState {
HTTPSTATE_WAIT_REQUEST,
HTTPSTATE_SEND_HEADER,

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-libavcodec_Makefile,v 1.4 2003/09/26 14:40:29 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
@ -14,7 +14,7 @@ $OpenBSD: patch-libavcodec_Makefile,v 1.3 2003/08/15 14:25:08 jolan Exp $
LIB= $(LIBPREF)avcodec$(LIBSUF)
ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
+###CFLAGS += ${PIC}
+CFLAGS += ${PIC} -DPIC
endif
TESTS= imgresample-test dct-test motion-test fft-test

12
graphics/ffmpeg/patches/patch-libavcodec_alpha_simple_idct_alpha_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libavcodec_alpha_simple_idct_alpha_c,v 1.3 2003/09/26 14:40:29 jolan Exp $
--- libavcodec/alpha/simple_idct_alpha.c.orig 2003-08-24 17:29:50.000000000 -0500
+++ libavcodec/alpha/simple_idct_alpha.c 2003-09-06 14:55:20.000000000 -0500
@@ -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,

16
graphics/ffmpeg/patches/patch-libavcodec_avcodec_h Normal file
View File

@ -0,0 +1,16 @@
$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

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

@ -1,11 +1,11 @@
$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
$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
LIB= $(LIBPREF)avformat$(LIBSUF)
ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avformat$(SLIBSUF)
+###CFLAGS += ${PIC}
+CFLAGS += ${PIC} -DPIC
endif
SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)

19
graphics/ffmpeg/patches/patch-libavformat_avformat_h
View File

@ -1,6 +1,19 @@
$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
$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" {
/* packet functions */

13
graphics/ffmpeg/patches/patch-libavformat_framehook_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-libavformat_framehook_c,v 1.2 2003/08/29 23:59:56 jolan Exp $
--- libavformat/framehook.c.orig 2003-02-11 10:35:28.000000000 -0600
+++ libavformat/framehook.c 2003-08-28 20:07:26.000000000 -0500
@@ -25,6 +25,9 @@
#include <dlfcn.h>
#endif
+#ifndef RTLD_NOW
+#define RTLD_NOW 0
+#endif
typedef struct _FrameHookEntry {
struct _FrameHookEntry *next;

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

@ -1,4 +1,4 @@
@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
@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
DYNLIBDIR(%D/lib)