[pkgsrc/trunk]: pkgsrc multimedia/ffmpeg:

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f8342dce24f6
branches:  trunk
changeset: 476688:f8342dce24f6
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sun Jun 20 02:36:24 2004 +0000

description:
multimedia/ffmpeg:

        o Use CONF_FILES for ffserver.conf.
        o Install the postprocess.h file into the right place.

Bump PKGREVISION.

diffstat:

 doc/CHANGES                |   3 ++-
 multimedia/ffmpeg/Makefile |  15 ++++++++++++---
 multimedia/ffmpeg/PLIST    |   4 +++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diffs (81 lines):

diff -r ceecf0c5ce8d -r f8342dce24f6 doc/CHANGES
--- a/doc/CHANGES       Sun Jun 20 02:02:58 2004 +0000
+++ b/doc/CHANGES       Sun Jun 20 02:36:24 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6229 2004/06/19 17:41:31 xtraeme Exp $
+$NetBSD: CHANGES,v 1.6230 2004/06/20 02:36:24 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2961,3 +2961,4 @@
        Updated xconq to 7.4.1nb3 [minskim 2004-06-18]
        Updated t1lib to 5.0.2nb2 [markd 2004-06-19]
        Updated squid to 2.5.5nb5 [taca 2004-06-19]
+       Updated ffmpeg to 0.4.8nb1 [xtraeme 2004-06-20]
diff -r ceecf0c5ce8d -r f8342dce24f6 multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Sun Jun 20 02:02:58 2004 +0000
+++ b/multimedia/ffmpeg/Makefile        Sun Jun 20 02:36:24 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/06/20 02:02:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/06/20 02:36:24 xtraeme Exp $
 
 DISTNAME=      ffmpeg-0.4.8
+PKGREVISION=   1
 CATEGORIES=    multimedia net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ffmpeg/}
 
@@ -12,6 +13,11 @@
 USE_BUILDLINK3=        YES
 USE_GNU_TOOLS+=        make
 USE_LIBTOOL=   YES
+USE_PKGINSTALL=        YES
+
+CONF_FILES=    ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
+               ${PKG_SYSCONFDIR}/ffserver.conf
+
 MAKE_ENV+=     EXTRA_LIBS="${LIBGETOPT}" \
                FFSERVER_CONF=${PKG_SYSCONFDIR}/ffserver.conf \
                LOCALBASE="${LOCALBASE}"
@@ -32,8 +38,9 @@
 .endif
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ffmpeg \
-               ${PREFIX}/share/examples/ffmpeg
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ffmpeg \
+               ${PREFIX}/share/doc/ffmpeg \
+               ${PREFIX}/include/ffmpeg/libpostproc
        ${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \
                ${PREFIX}/share/doc/ffmpeg
        ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
@@ -44,6 +51,8 @@
                ${PREFIX}/share/examples/ffmpeg
        # ffplay not installed
        ${RM} ${PREFIX}/man/man1/ffplay.1
+       ${INSTALL_DATA} ${WRKSRC}/libavcodec/libpostproc/postprocess.h \
+               ${PREFIX}/include/ffmpeg/libpostproc
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
diff -r ceecf0c5ce8d -r f8342dce24f6 multimedia/ffmpeg/PLIST
--- a/multimedia/ffmpeg/PLIST   Sun Jun 20 02:02:58 2004 +0000
+++ b/multimedia/ffmpeg/PLIST   Sun Jun 20 02:36:24 2004 +0000
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/25 21:49:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/06/20 02:36:24 xtraeme Exp $
 bin/ffmpeg
 bin/ffserver
 include/ffmpeg/avcodec.h
 include/ffmpeg/avformat.h
 include/ffmpeg/avio.h
 include/ffmpeg/common.h
+include/ffmpeg/libpostproc/postprocess.h
 include/ffmpeg/rtp.h
 include/ffmpeg/rtsp.h
 include/ffmpeg/rtspcodes.h
@@ -33,4 +34,5 @@
 share/examples/ffmpeg/ffserver.conf
 @dirrm share/examples/ffmpeg
 @dirrm share/doc/ffmpeg
+@dirrm include/ffmpeg/libpostproc
 @dirrm include/ffmpeg