head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.36 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.34 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.32 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.30 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.28 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.26 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.24 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.22 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.20 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.18 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2006.02.16.10.27.25; author abs; state dead; branches; next 1.1; 1.1 date 2006.01.24.04.00.37; author xtraeme; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2006.01.24.04.00.37; author xtraeme; state Exp; branches; next ; desc @@ 1.2 log @ffmpeg is now 0.4.9pre1 @ text @$NetBSD: patch-ac,v 1.1 2006/01/24 04:00:37 xtraeme Exp $ --- Makefile.orig 2004-07-08 13:02:04.000000000 +0200 +++ Makefile @@@@ -5,9 +5,7 @@@@ include config.mak VPATH=$(SRC_PATH) - -CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -LDFLAGS+= -g +CFLAGS= $(OPTFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE ifeq ($(TARGET_GPROF),yes) CFLAGS+=-p @@@@ -46,6 +44,8 @@@@ ifeq ($(CONFIG_VORBIS),yes) EXTRALIBS+=-logg -lvorbis -lvorbisenc endif +EXTRALIBS+=${LIBOSSAUDIO} + ifeq ($(CONFIG_FAAD),yes) ifeq ($(CONFIG_FAADBIN),yes) # no libs needed @@@@ -76,7 +76,7 @@@@ endif OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) -FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec +FFLIBS = libavformat/libavformat.la libavcodec/libavcodec.la all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) @@@@ -84,25 +84,18 @@@@ lib: $(MAKE) -C libavcodec all $(MAKE) -C libavformat all -ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs - $(CC) $(LDFLAGS) -o $@@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) - -ffmpeg$(EXESUF): ffmpeg_g$(EXESUF) - cp -p $< $@@ - $(STRIP) $@@ +ffmpeg$(EXESUF): ffmpeg.o cmdutils.o .ffmpeglibs + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) -ffserver$(EXESUF): ffserver.o .libs - $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@@ ffserver.o $(FFLIBS) $(EXTRALIBS) +ffserver$(EXESUF): ffserver.o .ffmpeglibs + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@@ ffserver.o $(FFLIBS) $(EXTRALIBS) -ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs - $(CC) $(LDFLAGS) -o $@@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) -ffplay$(EXESUF): ffplay_g$(EXESUF) - cp -p $< $@@ - $(STRIP) $@@ +ffplay$(EXESUF): ffplay.o cmdutils.o .ffmpeglibs + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) -output_example$(EXESUF): output_example.o .libs - $(CC) $(LDFLAGS) -o $@@ output_example.o $(FFLIBS) $(EXTRALIBS) +output_example$(EXESUF): output_example.o .ffmpeglibs + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@@ output_example.o $(FFLIBS) $(EXTRALIBS) qt-faststart$(EXESUF): qt-faststart.c $(CC) qt-faststart.c -o qt-faststart$(EXESUF) @@@@ -111,9 +104,9 @@@@ ffplay.o: ffplay.c $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@@ $< %.o: %.c - $(CC) $(CFLAGS) -c -o $@@ $< + $(CC) -DFFSERVER_CONF=\"$(FFSERVER_CONF)\" $(CFLAGS) -c -o $@@ $< -videohook: .libs +videohook: .ffmpeglibs $(MAKE) -C vhook all documentation: @@@@ -122,10 +115,10 @@@@ documentation: .PHONY: install install: all install-man $(INSTALLVHOOK) - $(MAKE) -C libavcodec install - $(MAKE) -C libavformat install + $(MAKE) -C libavcodec install install-headers + $(MAKE) -C libavformat install install-headers install -d "$(bindir)" - install -c -s -m 755 $(PROG) "$(bindir)" + $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) "$(bindir)" # create the window installer wininstaller: all install @@@@ -159,15 +152,15 @@@@ endif .depend: $(SRCS) $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend -.libs: lib - @@test -f .libs || touch .libs - @@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done +.ffmpeglibs: lib + @@test -f .ffmpeglibs || touch .ffmpeglibs + @@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .ffmpeglibs ; then touch .ffmpeglibs; fi ; done clean: $(CLEANVHOOK) $(MAKE) -C libavcodec clean $(MAKE) -C libavformat clean $(MAKE) -C tests clean - rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST) + rm -f *.o *.d *~ .ffmpeglibs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST) clean-vhook: $(MAKE) -C vhook clean @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of ffmpeg-devel-0.4.9pre1 from pkgsrc-wip, packaged by zul at netbsd-fr dot org. Development version of ffmpeg, required in some new packages or updates. @ text @@