summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2004-06-20 02:36:24 +0000
committerxtraeme <xtraeme>2004-06-20 02:36:24 +0000
commit635aa8b15e2c44d9496d3d7be2cee3f043312b13 (patch)
tree39072649b6a02fdadad5ed5e0da2c182e7339e0a /multimedia
parente1bda555ba7b709adce9f5f93fbfa4ffaa68d624 (diff)
downloadpkgsrc-635aa8b15e2c44d9496d3d7be2cee3f043312b13.tar.gz
multimedia/ffmpeg:
o Use CONF_FILES for ffserver.conf. o Install the postprocess.h file into the right place. Bump PKGREVISION.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/Makefile15
-rw-r--r--multimedia/ffmpeg/PLIST4
2 files changed, 15 insertions, 4 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 32e7a99d1fb..3e137115d49 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -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 @@ HAS_CONFIGURE= YES
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 @@ CONFIGURE_ARGS+= --disable-mmx
.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 @@ post-install:
${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 --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST
index e828dc08aec..82f39bd077d 100644
--- a/multimedia/ffmpeg/PLIST
+++ b/multimedia/ffmpeg/PLIST
@@ -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/doc/ffmpeg/optimization.txt
share/examples/ffmpeg/ffserver.conf
@dirrm share/examples/ffmpeg
@dirrm share/doc/ffmpeg
+@dirrm include/ffmpeg/libpostproc
@dirrm include/ffmpeg