head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.50 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.48 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.46 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.44 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.42 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.40 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.38 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.36 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.34 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.32 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.30 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.28 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.26 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.24 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.22 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.20 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.18 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.16 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.14 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.12 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.10 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.8 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.6 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.4 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2004.05.10.13.43.44; author wiz; state dead; branches; next 1.2; 1.2 date 2002.03.22.11.59.19; author tron; state Exp; branches; next 1.1; 1.1 date 2002.03.19.12.39.27; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.03.19.12.39.27; author tron; state Exp; branches; next ; desc @@ 1.3 log @Move graphics/ffmpeg to multimedia/ffmpeg. @ text @$NetBSD: patch-ac,v 1.2 2002/03/22 11:59:19 tron Exp $ --- Makefile.orig Wed Aug 15 15:12:07 2001 +++ 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 + $(MAKE) -C libavcodec install + $(MAKE) -C libav install + $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) $(prefix)/bin clean: $(MAKE) -C libavcodec clean @ 1.2 log @Improve package based on patches supplied by Rui-Xiang Guo in PR pkg/15978: - Build and install shared libraries "libav" and "libavcodec". - Fix "ffserver" to search its configuration file in "${PKG_SYSCONFDIR}". - Install "ffserver.conf" configuration to example and not into documentation directory. Bump package revision to 1 after these changes. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d4 29 a32 3 +++ Makefile Tue Mar 19 13:33:28 2002 @@@@ -28,7 +28,7 @@@@ gcc $(CFLAGS) -c -o $@@ $< d36 3 a38 1 + $(BSD_INSTALL_PROGRAM) $(PROG) $(prefix)/bin @ 1.1.1.1 log @Import new "ffmpeg" package: MPEG decoding, encoding and streaming software This fixes PR pkg/15944 by Rui-Xiang Guo. @ text @@