pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia Include mplex in the mjpegtools package, an...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/945e4b2b9efb
branches:  trunk
changeset: 507213:945e4b2b9efb
user:      ben <ben%pkgsrc.org@localhost>
date:      Sun Jan 29 04:25:58 2006 +0000

description:
Include mplex in the mjpegtools package, and bump PKGREVISION.
Remove mplex as a standalone package, to reduce maintenance.

diffstat:

 multimedia/mjpegtools/Makefile         |   4 ++-
 multimedia/mjpegtools/PLIST            |   4 ++-
 multimedia/mjpegtools/distinfo         |   4 +--
 multimedia/mjpegtools/patches/patch-aa |  12 -----------
 multimedia/mjpegtools/patches/patch-ab |  13 ------------
 multimedia/mplex/DESCR                 |  17 ----------------
 multimedia/mplex/Makefile              |  36 ----------------------------------
 multimedia/mplex/PLIST                 |   7 ------
 multimedia/mplex/distinfo              |   5 ----
 9 files changed, 7 insertions(+), 95 deletions(-)

diffs (169 lines):

diff -r 721699f3fded -r 945e4b2b9efb multimedia/mjpegtools/Makefile
--- a/multimedia/mjpegtools/Makefile    Sun Jan 29 03:32:17 2006 +0000
+++ b/multimedia/mjpegtools/Makefile    Sun Jan 29 04:25:58 2006 +0000
@@ -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 @@
 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 -r 721699f3fded -r 945e4b2b9efb multimedia/mjpegtools/PLIST
--- a/multimedia/mjpegtools/PLIST       Sun Jan 29 03:32:17 2006 +0000
+++ b/multimedia/mjpegtools/PLIST       Sun Jan 29 04:25:58 2006 +0000
@@ -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/mp2enc
 bin/mpeg2enc
 bin/mpegtranscode
+bin/mplex
 bin/multiblend.flt
 bin/pgmtoy4m
 bin/png2yuv
@@ -97,6 +98,7 @@
 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 -r 721699f3fded -r 945e4b2b9efb multimedia/mjpegtools/distinfo
--- a/multimedia/mjpegtools/distinfo    Sun Jan 29 03:32:17 2006 +0000
+++ b/multimedia/mjpegtools/distinfo    Sun Jan 29 04:25:58 2006 +0000
@@ -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 -r 721699f3fded -r 945e4b2b9efb multimedia/mjpegtools/patches/patch-aa
--- a/multimedia/mjpegtools/patches/patch-aa    Sun Jan 29 03:32:17 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 721699f3fded -r 945e4b2b9efb multimedia/mjpegtools/patches/patch-ab
--- a/multimedia/mjpegtools/patches/patch-ab    Sun Jan 29 03:32:17 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 \
diff -r 721699f3fded -r 945e4b2b9efb multimedia/mplex/DESCR
--- a/multimedia/mplex/DESCR    Sun Jan 29 03:32:17 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-The mplex multiplexes MPEG audio and video streams into system layers.
-
-From INSTRUCT (in the mplex source):
->
-> Please note that I do not have a comprehensive instruction manual for this
-> release. I suggest you try the program out with some default values and
-> learn something more about ISO/IEC 11172-1 (aka MPEG1/Systems).
->
->
-> Christoph.
-> moar%heaven.zfe.siemens.de@localhost
-> +---------------------------------------+--------------------------------+
-> | http://www.informatik.tu-muenchen.de/ |                 Christoph Moar |
-> | cgi-bin/nph-gateway/hphalle6/~moar/   |                Kaulbachstr.29a |
-> | index.html                            |                   80539 Munich |
-> | email:moar%informatik.tu-muenchen.de@localhost  |   voice: ++49 - 89 -  23862874 |
-> +---------------------------------------+--------------------------------+
diff -r 721699f3fded -r 945e4b2b9efb multimedia/mplex/Makefile
--- a/multimedia/mplex/Makefile Sun Jan 29 03:32:17 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/01/25 08:09:12 xtraeme Exp $
-
-DISTNAME=      mjpegtools-1.8.0
-PKGNAME=       mplex-1.8.0
-CATEGORIES=    multimedia
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mjpeg/}
-
-MAINTAINER=    ben%NetBSD.org@localhost
-HOMEPAGE=      http://mjpeg.sourceforge.net/
-COMMENT=       Multiplexes MPEG component streams into system layers
-
-BUILD_DEPENDS+=        nasm>=0.98:../../devel/nasm
-
-GNU_CONFIGURE= yes
-USE_TOOLS+=    gmake
-USE_LANGUAGES+=        c++
-USE_LIBTOOL=   yes
-
-INSTALLATION_DIRS=     bin lib
-
-do-build:
-       cd ${WRKSRC}/utils && ${GMAKE}
-       cd ${WRKSRC}/mplex && ${GMAKE}
-
-do-install:
-       cd ${WRKSRC}/mplex && \
-               ${LIBTOOL} --mode=install ${INSTALL_DATA} libmplex2.la \
-                       ${PREFIX}/lib && \
-               ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} mplex ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mplex
-       for FILE in COPYING INSTRUCT README; do \
-         ${INSTALL_DATA} ${WRKSRC}/mplex/$$FILE ${PREFIX}/share/doc/mplex; \
-       done
-
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 721699f3fded -r 945e4b2b9efb multimedia/mplex/PLIST
--- a/multimedia/mplex/PLIST    Sun Jan 29 03:32:17 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:46 jlam Exp $
-bin/mplex
-lib/libmplex2.la
-share/doc/mplex/COPYING
-share/doc/mplex/INSTRUCT
-share/doc/mplex/README
-@dirrm share/doc/mplex
diff -r 721699f3fded -r 945e4b2b9efb multimedia/mplex/distinfo
--- a/multimedia/mplex/distinfo Sun Jan 29 03:32:17 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/01/25 08:09:12 xtraeme 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



Home | Main Index | Thread Index | Old Index