summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg-devel/files
diff options
context:
space:
mode:
authorMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2001-09-25 19:27:11 +0000
committerMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2001-09-25 19:27:11 +0000
commitafac057a11d71b83b0b22bf68c20834c8dfe80e5 (patch)
tree373bc98dcfe00de6e0ff17bf11187f87e2ba5722 /multimedia/ffmpeg-devel/files
parentchase library dependency due to update of avifile port to 0.60.20010920 (diff)
o New port ffmpeg version 0.4.5: Hyper fast realtime audio/video
encoder/converter, streaming server Thanks to: fenner, imp, Chris "Vulpyne" Austin <vulpyne@way2fast.com> * for this patch -> #define INT64_C(x) x##LL
Notes
Notes: svn path=/head/; revision=48195
Diffstat (limited to 'multimedia/ffmpeg-devel/files')
-rw-r--r--multimedia/ffmpeg-devel/files/extra-bktr-patch-ffmpeg.c10
-rw-r--r--multimedia/ffmpeg-devel/files/patch-Makefile30
-rw-r--r--multimedia/ffmpeg-devel/files/patch-ffmpeg.c10
-rw-r--r--multimedia/ffmpeg-devel/files/patch-ffserver.c18
-rw-r--r--multimedia/ffmpeg-devel/files/patch-libav::Makefile9
-rw-r--r--multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile11
6 files changed, 88 insertions, 0 deletions
diff --git a/multimedia/ffmpeg-devel/files/extra-bktr-patch-ffmpeg.c b/multimedia/ffmpeg-devel/files/extra-bktr-patch-ffmpeg.c
new file mode 100644
index 000000000000..093e99aed89b
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/extra-bktr-patch-ffmpeg.c
@@ -0,0 +1,10 @@
+--- ffmpeg.c.orig Mon Aug 13 18:23:57 2001
++++ ffmpeg.c Tue Sep 25 14:47:58 2001
+@@ -35,6 +35,7 @@
+
+ #include "avformat.h"
+
++#define INT64_C(x) x##LL
+ #define MAXINT64 INT64_C(0x7fffffffffffffff)
+
+ typedef struct {
diff --git a/multimedia/ffmpeg-devel/files/patch-Makefile b/multimedia/ffmpeg-devel/files/patch-Makefile
new file mode 100644
index 000000000000..2aaebddaa06f
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-Makefile
@@ -0,0 +1,30 @@
+--- Makefile.orig Wed Aug 15 10:11:45 2001
++++ Makefile Tue Sep 25 15:10:12 2001
+@@ -3,8 +3,8 @@
+ #
+ include config.mak
+
+-CFLAGS= $(OPTFLAGS) -Wall -g -I./libavcodec -I./libav
+-LDFLAGS= -g
++CFLAGS= $(OPTFLAGS) -Wall -I./libavcodec -I./libav -I$(LOCALBASE)/include
++LDFLAGS= -L$(LOCALBASE)/lib
+ ifeq ($(TARGET_GPROF),yes)
+ CFLAGS+=-p
+ LDFLAGS+=-p
+@@ -19,13 +19,13 @@
+ $(MAKE) -C libav all
+
+ ffmpeg: ffmpeg.o libav/libav.a libavcodec/libavcodec.a
+- gcc $(LDFLAGS) -o $@ $^ -lm
++ $(CC) $(LDFLAGS) -o $@ $^ -lm
+
+ ffserver: ffserver.o libav/libav.a libavcodec/libavcodec.a
+- gcc $(LDFLAGS) -o $@ $^ -lm
++ $(CC) $(LDFLAGS) -o $@ $^ -lm -lgnugetopt
+
+ %.o: %.c
+- gcc $(CFLAGS) -c -o $@ $<
++ $(CC) $(CFLAGS) -c -o $@ $<
+
+ install: all
+ install -s -m 755 $(PROG) $(prefix)/bin
diff --git a/multimedia/ffmpeg-devel/files/patch-ffmpeg.c b/multimedia/ffmpeg-devel/files/patch-ffmpeg.c
new file mode 100644
index 000000000000..093e99aed89b
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-ffmpeg.c
@@ -0,0 +1,10 @@
+--- ffmpeg.c.orig Mon Aug 13 18:23:57 2001
++++ ffmpeg.c Tue Sep 25 14:47:58 2001
+@@ -35,6 +35,7 @@
+
+ #include "avformat.h"
+
++#define INT64_C(x) x##LL
+ #define MAXINT64 INT64_C(0x7fffffffffffffff)
+
+ typedef struct {
diff --git a/multimedia/ffmpeg-devel/files/patch-ffserver.c b/multimedia/ffmpeg-devel/files/patch-ffserver.c
new file mode 100644
index 000000000000..b0b444a8405a
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-ffserver.c
@@ -0,0 +1,18 @@
+--- ffserver.c.orig Tue Sep 25 14:53:44 2001
++++ ffserver.c Tue Sep 25 14:55:12 2001
+@@ -20,7 +20,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <netinet/in.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+@@ -31,6 +30,7 @@
+ #include <getopt.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <ctype.h>
diff --git a/multimedia/ffmpeg-devel/files/patch-libav::Makefile b/multimedia/ffmpeg-devel/files/patch-libav::Makefile
new file mode 100644
index 000000000000..34bf5410ed7e
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-libav::Makefile
@@ -0,0 +1,9 @@
+--- libav/Makefile.orig Tue Aug 14 19:32:28 2001
++++ libav/Makefile Tue Sep 25 15:05:38 2001
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-CFLAGS= $(OPTFLAGS) -Wall -g -I../libavcodec -DHAVE_AV_CONFIG_H
++CFLAGS= $(OPTFLAGS) -Wall -I../libavcodec -I$(LOCALBASE)/include -DHAVE_AV_CONFIG_H
+
+ OBJS= rm.o mpeg.o asf.o avienc.o jpeg.o swf.o wav.o raw.o \
+ avidec.o ffm.o \
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
new file mode 100644
index 000000000000..383195e6f309
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
@@ -0,0 +1,11 @@
+--- libavcodec/Makefile.orig Tue Sep 25 15:05:58 2001
++++ libavcodec/Makefile Tue Sep 25 15:06:08 2001
+@@ -1,7 +1,6 @@
+ include ../config.mak
+
+-CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H
+-LDFLAGS= -g
++CFLAGS= $(OPTFLAGS) -Wall -DHAVE_AV_CONFIG_H
+
+ OBJS= common.o utils.o mpegvideo.o h263.o jrevdct.o jfdctfst.o \
+ mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \