diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-10-11 19:28:30 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-10-11 19:28:30 +0000 |
| commit | 4f2162a0d54f5d95c741a618577a2aafd500308f (patch) | |
| tree | 3144bcec3109220690d47df1929e65caea18da15 /multimedia/ffmpeg-devel/files/patch-Makefile | |
| parent | Add a fix that accounts for recently added <sys/endian.h> in (diff) | |
o Update ffmpeg to CVS snapshot dated Aug 20, 2002. Bump PORTREVISION
since this is unversioned.
o Add booktree capture support with patches kindly supplied by
"Steve O'Hara-Smith" <steve@sohara.org>. Work is in progress to get these
merged back into ffmpeg's CVS repo
o Add WITH_MP3 for lame mp3 support
o Add WITH_VORBIS for vorbis support
o Install shared library for the first time, begin versioning at 0
Reviewed by: freebsd-multimedia mailing list,
"Steve O'Hara-Smith" <steve@sohara.org>,
Anish Mistry <mistry.7@osu.edu>
Notes
Notes:
svn path=/head/; revision=67821
Diffstat (limited to 'multimedia/ffmpeg-devel/files/patch-Makefile')
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-Makefile | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/multimedia/ffmpeg-devel/files/patch-Makefile b/multimedia/ffmpeg-devel/files/patch-Makefile index 2aaebddaa06f..eebc45c27552 100644 --- a/multimedia/ffmpeg-devel/files/patch-Makefile +++ b/multimedia/ffmpeg-devel/files/patch-Makefile @@ -1,30 +1,26 @@ ---- Makefile.orig Wed Aug 15 10:11:45 2001 -+++ Makefile Tue Sep 25 15:10:12 2001 -@@ -3,8 +3,8 @@ - # - include config.mak +--- Makefile.orig Sun Sep 1 15:07:34 2002 ++++ Makefile Tue Oct 8 13:51:49 2002 +@@ -6,12 +6,12 @@ --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 + VPATH=$(SRC_PATH) - ffmpeg: ffmpeg.o libav/libav.a libavcodec/libavcodec.a -- gcc $(LDFLAGS) -o $@ $^ -lm -+ $(CC) $(LDFLAGS) -o $@ $^ -lm +-CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libav -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE ++CFLAGS= $(OPTFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libav -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE + ifeq ($(CONFIG_DARWIN),yes) + LDFLAGS+= -g -d + FFSLDFLAGS= -Wl,-bind_at_load + else +-LDFLAGS+= -g -Wl,--warn-common ++LDFLAGS+= -Wl,--warn-common + FFSLDFLAGS= -Wl,-E + endif + +@@ -60,7 +60,7 @@ + ffserver$(EXE): ffserver.o $(DEP_LIBS) + $(CC) $(LDFLAGS) $(FFSLDFLAGS) \ + -o $@ ffserver.o -L./libavcodec -L./libav \ +- -lavformat -lavcodec -ldl $(EXTRALIBS) ++ -lavformat -lavcodec $(EXTRALIBS) - 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 + ffplay: ffmpeg$(EXE) + ln -sf $< $@ |