diff options
author | ben <ben> | 2006-01-29 04:25:58 +0000 |
---|---|---|
committer | ben <ben> | 2006-01-29 04:25:58 +0000 |
commit | 089e592bb04e24a2977a1058bdbfca92f3022bf0 (patch) | |
tree | 6486c47f11b41600fd6f87ea3174e0fb03a26aff /multimedia/mjpegtools | |
parent | 0ee4d0ebecbd208fa1abf7273595c5d86d505837 (diff) | |
download | pkgsrc-089e592bb04e24a2977a1058bdbfca92f3022bf0.tar.gz |
Include mplex in the mjpegtools package, and bump PKGREVISION.
Remove mplex as a standalone package, to reduce maintenance.
Diffstat (limited to 'multimedia/mjpegtools')
-rw-r--r-- | multimedia/mjpegtools/Makefile | 4 | ||||
-rw-r--r-- | multimedia/mjpegtools/PLIST | 4 | ||||
-rw-r--r-- | multimedia/mjpegtools/distinfo | 4 | ||||
-rw-r--r-- | multimedia/mjpegtools/patches/patch-aa | 12 | ||||
-rw-r--r-- | multimedia/mjpegtools/patches/patch-ab | 13 |
5 files changed, 7 insertions, 30 deletions
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index 72d9f14fbf4..1bc8d4ecca7 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/01/25 10:01:36 xtraeme Exp $ +# $NetBSD: Makefile,v 1.25 2006/01/29 04:25:58 ben Exp $ DISTNAME= mjpegtools-1.8.0 CATEGORIES= multimedia @@ -8,6 +8,8 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://mjpeg.sourceforge.net/ COMMENT= Programs for compressing video streams +PKGREVISION= 1 +CONFLICTS+= mplex-[0-9]* DEPENDS+= toolame>=02l:../../audio/toolame BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm diff --git a/multimedia/mjpegtools/PLIST b/multimedia/mjpegtools/PLIST index d06efdc7742..651a83623cd 100644 --- a/multimedia/mjpegtools/PLIST +++ b/multimedia/mjpegtools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2006/01/25 08:09:12 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.8 2006/01/29 04:25:58 ben Exp $ bin/anytovcd.sh bin/jpeg2yuv bin/lav2avi.sh @@ -15,6 +15,7 @@ bin/mjpeg_simd_helper bin/mp2enc bin/mpeg2enc bin/mpegtranscode +bin/mplex bin/multiblend.flt bin/pgmtoy4m bin/png2yuv @@ -97,6 +98,7 @@ man/man1/lavtrans.1 man/man1/mjpegtools.1 man/man1/mp2enc.1 man/man1/mpeg2enc.1 +man/man1/mplex.1 man/man1/pgmtoy4m.1 man/man1/png2yuv.1 man/man1/pnmtoy4m.1 diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo index cbbc62b7fd5..b2872a320a4 100644 --- a/multimedia/mjpegtools/distinfo +++ b/multimedia/mjpegtools/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.9 2006/01/25 08:09:12 xtraeme Exp $ +$NetBSD: distinfo,v 1.10 2006/01/29 04:25:58 ben Exp $ SHA1 (mjpegtools-1.8.0.tar.gz) = e11d68298a64b52f98724dbf3fd14f168e140290 RMD160 (mjpegtools-1.8.0.tar.gz) = 4d97a6a721f29223975605e2a5e645b4d7d129b5 Size (mjpegtools-1.8.0.tar.gz) = 1475998 bytes -SHA1 (patch-aa) = e35a3e7e242d6e6faaf04b836dc92c312ae28fc8 -SHA1 (patch-ab) = 571eb234862b5533a23c58bd9a607c9a9abf5f89 diff --git a/multimedia/mjpegtools/patches/patch-aa b/multimedia/mjpegtools/patches/patch-aa deleted file mode 100644 index 510f0082b6a..00000000000 --- a/multimedia/mjpegtools/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2006/01/25 08:09:12 xtraeme Exp $ - ---- Makefile.in.orig 2006-01-25 08:51:27.000000000 +0100 -+++ Makefile.in 2006-01-25 08:51:35.000000000 +0100 -@@ -259,7 +259,6 @@ - mpeg2enc \ - lavtools \ - aenc \ -- mplex \ - scripts \ - docs \ - yuvdenoise \ diff --git a/multimedia/mjpegtools/patches/patch-ab b/multimedia/mjpegtools/patches/patch-ab deleted file mode 100644 index 69223a1cd2e..00000000000 --- a/multimedia/mjpegtools/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2006/01/25 08:09:12 xtraeme Exp $ - ---- docs/Makefile.in.orig 2006-01-25 08:56:21.000000000 +0100 -+++ docs/Makefile.in 2006-01-25 08:56:30.000000000 +0100 -@@ -216,7 +216,7 @@ - - # If the installation of man pages by you (e.g. you're a package builder) - # You may want to disable it --man_MANS = lavplay.1 lavrec.1 mjpegtools.1 mpeg2enc.1 mplex.1 \ -+man_MANS = lavplay.1 lavrec.1 mjpegtools.1 mpeg2enc.1 \ - yuvplay.1 lav2wav.1 lav2yuv.1 lavtrans.1 mp2enc.1 \ - yuvscaler.1 lavpipe.1 yuv2lav.1 yuvdenoise.1 jpeg2yuv.1 \ - png2yuv.1 \ |