diff options
Diffstat (limited to 'graphics/ffmpeg/patches/patch-ac')
| -rw-r--r-- | graphics/ffmpeg/patches/patch-ac | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/graphics/ffmpeg/patches/patch-ac b/graphics/ffmpeg/patches/patch-ac index 5610f945266..436df038e10 100644 --- a/graphics/ffmpeg/patches/patch-ac +++ b/graphics/ffmpeg/patches/patch-ac @@ -1,13 +1,41 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/03/19 12:39:27 tron Exp $ +$NetBSD: patch-ac,v 1.2 2002/03/22 11:59:19 tron Exp $ --- Makefile.orig Wed Aug 15 15:12:07 2001 -+++ Makefile Tue Mar 19 13:33:28 2002 -@@ -28,7 +28,7 @@ - gcc $(CFLAGS) -c -o $@ $< ++++ Makefile Fri Mar 22 12:43:45 2002 +@@ -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 +@@ -18,17 +18,19 @@ + $(MAKE) -C libavcodec all + $(MAKE) -C libav all + +-ffmpeg: ffmpeg.o libav/libav.a libavcodec/libavcodec.a +- gcc $(LDFLAGS) -o $@ $^ -lm ++ffmpeg: ffmpeg.o libav/libav.la libavcodec/libavcodec.la ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ -lm + +-ffserver: ffserver.o libav/libav.a libavcodec/libavcodec.a +- gcc $(LDFLAGS) -o $@ $^ -lm ++ffserver: ffserver.o libav/libav.la libavcodec/libavcodec.la ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ -lm $(EXTRA_LIBS) + + %.o: %.c +- gcc $(CFLAGS) -c -o $@ $< ++ $(CC) -DFFSERVER_CONF=\"$(FFSERVER_CONF)\" $(CFLAGS) -c -o $@ $< install: all - install -s -m 755 $(PROG) $(prefix)/bin -+ $(BSD_INSTALL_PROGRAM) $(PROG) $(prefix)/bin ++ $(MAKE) -C libavcodec install ++ $(MAKE) -C libav install ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) $(prefix)/bin clean: $(MAKE) -C libavcodec clean |