From f4fc71ab98cba7ed3d3d70769917f2363c711d93 Mon Sep 17 00:00:00 2001 From: tron Date: Fri, 22 Mar 2002 11:59:18 +0000 Subject: 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. --- graphics/ffmpeg/Makefile | 13 +++++++++++-- graphics/ffmpeg/PLIST | 15 ++++++++++++-- graphics/ffmpeg/distinfo | 8 +++++--- graphics/ffmpeg/patches/patch-ab | 21 ++++++++++++++++---- graphics/ffmpeg/patches/patch-ac | 38 +++++++++++++++++++++++++++++++----- graphics/ffmpeg/patches/patch-ad | 30 ++++++++++++++++++++++++++++ graphics/ffmpeg/patches/patch-ae | 42 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 151 insertions(+), 16 deletions(-) create mode 100644 graphics/ffmpeg/patches/patch-ad create mode 100644 graphics/ffmpeg/patches/patch-ae (limited to 'graphics') diff --git a/graphics/ffmpeg/Makefile b/graphics/ffmpeg/Makefile index 08b8f3685fe..20890e2a847 100644 --- a/graphics/ffmpeg/Makefile +++ b/graphics/ffmpeg/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2002/03/21 10:42:38 tron Exp $ +# $NetBSD: Makefile,v 1.3 2002/03/22 11:59:18 tron Exp $ DISTNAME= ffmpeg-0.4.5 +PKGREVISION= 1 CATEGORIES= graphics net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ffmpeg/} @@ -12,13 +13,21 @@ BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm HAS_CONFIGURE= YES USE_GMAKE= YES +USE_LIBTOOL= YES +MAKE_ENV+= EXTRA_LIBS="${LIBGETOPT}" \ + FFSERVER_CONF=${PKG_SYSCONFDIR}/ffserver.conf \ + LOCALBASE="${LOCALBASE}" CONFIGURE_ARGS= --cc=${CC} --disable-grab --disable-mmx --prefix=${PREFIX} WRKSRC= ${WRKDIR}/ffmpeg post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ffmpeg + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ffmpeg \ + ${PREFIX}/share/examples/ffmpeg ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/* \ ${PREFIX}/share/doc/ffmpeg + ${MV} ${PREFIX}/share/doc/ffmpeg/ffserver.conf \ + ${PREFIX}/share/examples/ffmpeg +.include "../../devel/libgetopt/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ffmpeg/PLIST b/graphics/ffmpeg/PLIST index 0e86b3d9f66..edbfb01f380 100644 --- a/graphics/ffmpeg/PLIST +++ b/graphics/ffmpeg/PLIST @@ -1,6 +1,16 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/19 12:39:27 tron Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/22 11:59:18 tron Exp $ bin/ffmpeg bin/ffserver +lib/libav.a +lib/libav.la +lib/libav.so +lib/libav.so.0 +lib/libav.so.0.0 +lib/libavcodec.a +lib/libavcodec.la +lib/libavcodec.so +lib/libavcodec.so.0 +lib/libavcodec.so.0.0 share/doc/ffmpeg/FAQ share/doc/ffmpeg/README share/doc/ffmpeg/README.dev @@ -8,6 +18,7 @@ share/doc/ffmpeg/README.tech share/doc/ffmpeg/TODO share/doc/ffmpeg/bench.txt share/doc/ffmpeg/ffmpeg.txt -share/doc/ffmpeg/ffserver.conf share/doc/ffmpeg/ffserver.txt +share/examples/ffmpeg/ffserver.conf +@dirrm share/examples/ffmpeg @dirrm share/doc/ffmpeg diff --git a/graphics/ffmpeg/distinfo b/graphics/ffmpeg/distinfo index c6bc80efde7..31ebab90044 100644 --- a/graphics/ffmpeg/distinfo +++ b/graphics/ffmpeg/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/03/19 12:39:27 tron Exp $ +$NetBSD: distinfo,v 1.2 2002/03/22 11:59:18 tron Exp $ SHA1 (ffmpeg-0.4.5.tar.gz) = 7d99250eb20c45b77a08e00ecad1f73d11f57cb8 Size (ffmpeg-0.4.5.tar.gz) = 280506 bytes SHA1 (patch-aa) = e2e7ca0465ea69514a6b36e93451ea7eaca0513c -SHA1 (patch-ab) = d9938d202f9c40e54361abf60bbe275ecc752d28 -SHA1 (patch-ac) = c5d40e240f447316128a0bfca15eb902fe0468db +SHA1 (patch-ab) = 812984db77f24c49d492162d83106d859b50d0f6 +SHA1 (patch-ac) = 1b009f7878ec4b85c0204db210ce26b337422820 +SHA1 (patch-ad) = db06e7ab8d60f523e02051339c5a0b66f8ac497f +SHA1 (patch-ae) = d0f681ed5878c5e49c3daa956a7e0f28bdaf2b05 diff --git a/graphics/ffmpeg/patches/patch-ab b/graphics/ffmpeg/patches/patch-ab index 31cc814fe3c..b8f6e31f580 100644 --- a/graphics/ffmpeg/patches/patch-ab +++ b/graphics/ffmpeg/patches/patch-ab @@ -1,9 +1,22 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/03/19 12:39:27 tron Exp $ +$NetBSD: patch-ab,v 1.2 2002/03/22 11:59:19 tron Exp $ --- ffserver.c.orig Wed Aug 15 00:38:17 2001 -+++ ffserver.c Tue Mar 19 13:27:31 2002 -@@ -1526,7 +1526,7 @@ - config_filename = "/etc/ffserver.conf"; ++++ ffserver.c Fri Mar 22 12:39:59 2002 +@@ -1491,7 +1491,7 @@ + "\n" + "-L : print the LICENCE\n" + "-h : this help\n" +- "-f configfile : use configfile instead of /etc/ffserver.conf\n" ++ "-f configfile : use configfile instead of " FFSERVER_CONF "\n" + ); + } + +@@ -1523,10 +1523,10 @@ + + register_all(); + +- config_filename = "/etc/ffserver.conf"; ++ config_filename = FFSERVER_CONF; for(;;) { - c = getopt_long_only(argc, argv, "Lh?f:", NULL, NULL); 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 diff --git a/graphics/ffmpeg/patches/patch-ad b/graphics/ffmpeg/patches/patch-ad new file mode 100644 index 00000000000..1ce7cea9c8f --- /dev/null +++ b/graphics/ffmpeg/patches/patch-ad @@ -0,0 +1,30 @@ +$NetBSD: patch-ad,v 1.1 2002/03/22 11:59:19 tron Exp $ + +--- libav/Makefile.orig Wed Aug 15 06:32:50 2001 ++++ libav/Makefile +@@ -1,3 +1,4 @@ + 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 + +@@ -12,14 +13,17 @@ + + LIB= libav.a + ++install: all ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib ++ + all: $(LIB) + + $(LIB): $(OBJS) + rm -f $@ +- $(AR) rcs $@ $(OBJS) ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(prefix)/lib + + %.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< + + clean: + rm -f *.o *~ *.a diff --git a/graphics/ffmpeg/patches/patch-ae b/graphics/ffmpeg/patches/patch-ae new file mode 100644 index 00000000000..0592941dd49 --- /dev/null +++ b/graphics/ffmpeg/patches/patch-ae @@ -0,0 +1,42 @@ +$NetBSD: patch-ae,v 1.1 2002/03/22 11:59:19 tron Exp $ + +--- libavcodec/Makefile.orig Mon Aug 13 06:52:36 2001 ++++ libavcodec/Makefile +@@ -1,5 +1,4 @@ + include ../config.mak + +-CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H +-LDFLAGS= -g ++CFLAGS= $(OPTFLAGS) -Wall -DHAVE_AV_CONFIG_H + +@@ -42,23 +41,26 @@ + LIB= libavcodec.a + TESTS= imgresample-test dct-test + ++install: all ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib ++ + all: $(LIB) + tests: apiexample cpuid_test $(TESTS) + + $(LIB): $(OBJS) $(ASM_OBJS) + rm -f $@ +- $(AR) rcs $@ $(OBJS) $(ASM_OBJS) ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(prefix)/lib + + dsputil.o: dsputil.c dsputil.h + + %.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< + + %.o: %.S +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< + + %.o: %.s +- nasm -f elf -o $@ $< ++ nasm -f $(FILEFORMAT) -o $@ $< + + # depend only used by mplayer now + dep: depend -- cgit v1.2.3