summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2006-01-30 08:44:25 +0000
committerxtraeme <xtraeme@pkgsrc.org>2006-01-30 08:44:25 +0000
commitb0712984e6c132eb8b09821f8d42c51f550ab225 (patch)
treeb7062f3ae85d77562defcef095db5106e5071416 /multimedia
parentd4e778b4bc4fa03dc81d2005288d8fa1c551e413 (diff)
downloadpkgsrc-b0712984e6c132eb8b09821f8d42c51f550ab225.tar.gz
* Add missing files now that mplex has been re-added.
* Add a patch that should fix the build on amd64. * Fixed pkglint warnings. Bump PKGREVISION.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mjpegtools/Makefile6
-rw-r--r--multimedia/mjpegtools/PLIST19
-rw-r--r--multimedia/mjpegtools/distinfo3
-rw-r--r--multimedia/mjpegtools/hacks.mk4
-rw-r--r--multimedia/mjpegtools/patches/patch-aa12
5 files changed, 37 insertions, 7 deletions
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 1bc8d4ecca7..961234c948e 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2006/01/29 04:25:58 ben Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/30 08:44:25 xtraeme Exp $
DISTNAME= mjpegtools-1.8.0
+PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mjpeg/}
@@ -8,7 +9,6 @@ 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
@@ -17,7 +17,7 @@ USE_TOOLS+= gmake
USE_TOOLS+= bash:run pkg-config
USE_LIBTOOL= yes
-SHLIBTOOL_OVERRIDE= libtool
+SHLIBTOOL_OVERRIDE+= libtool
PKGCONFIG_OVERRIDE= mjpegtools.pc.in
GNU_CONFIGURE= yes
diff --git a/multimedia/mjpegtools/PLIST b/multimedia/mjpegtools/PLIST
index 651a83623cd..8ca6558d57e 100644
--- a/multimedia/mjpegtools/PLIST
+++ b/multimedia/mjpegtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/01/29 04:25:58 ben Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/01/30 08:44:25 xtraeme Exp $
bin/anytovcd.sh
bin/jpeg2yuv
bin/lav2avi.sh
@@ -80,12 +80,28 @@ include/mjpegtools/mpeg2enc/synchrolib.h
include/mjpegtools/mpeg2enc/syntaxconsts.h
include/mjpegtools/mpegconsts.h
include/mjpegtools/mpegtimecode.h
+include/mjpegtools/mplex/audiostrm.hpp
+include/mjpegtools/mplex/aunit.hpp
+include/mjpegtools/mplex/aunitbuffer.hpp
+include/mjpegtools/mplex/bits.hpp
+include/mjpegtools/mplex/decodebufmodel.hpp
+include/mjpegtools/mplex/inputstrm.hpp
+include/mjpegtools/mplex/interact.hpp
+include/mjpegtools/mplex/mplexconsts.hpp
+include/mjpegtools/mplex/multiplexor.hpp
+include/mjpegtools/mplex/outputstrm.hpp
+include/mjpegtools/mplex/padstrm.hpp
+include/mjpegtools/mplex/stillsstream.hpp
+include/mjpegtools/mplex/stream_params.hpp
+include/mjpegtools/mplex/systems.hpp
+include/mjpegtools/mplex/videostrm.hpp
include/mjpegtools/yuv4mpeg.h
lib/liblavfile.la
lib/liblavjpeg.la
lib/liblavplay.la
lib/libmjpegutils.la
lib/libmpeg2encpp.la
+lib/libmplex2.la
lib/pkgconfig/mjpegtools.pc
man/man1/jpeg2yuv.1
man/man1/lav2mpeg.1
@@ -118,5 +134,6 @@ man/man1/yuvplay.1
man/man1/yuvscaler.1
man/man1/yuvycsnoise.1
man/man5/yuv4mpeg.5
+@dirrm include/mjpegtools/mplex
@dirrm include/mjpegtools/mpeg2enc
@dirrm include/mjpegtools
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
index b2872a320a4..4dca62f48fd 100644
--- a/multimedia/mjpegtools/distinfo
+++ b/multimedia/mjpegtools/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2006/01/29 04:25:58 ben Exp $
+$NetBSD: distinfo,v 1.11 2006/01/30 08:44:25 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
+SHA1 (patch-aa) = 3db2656a4d74b1ec1ac21b654c7a8ea33b791e19
diff --git a/multimedia/mjpegtools/hacks.mk b/multimedia/mjpegtools/hacks.mk
index c30b7f7cee5..1a26d4f2aba 100644
--- a/multimedia/mjpegtools/hacks.mk
+++ b/multimedia/mjpegtools/hacks.mk
@@ -1,9 +1,9 @@
-# $NetBSD: hacks.mk,v 1.2 2005/07/29 01:15:16 grant Exp $
+# $NetBSD: hacks.mk,v 1.3 2006/01/30 08:44:25 xtraeme Exp $
.if !defined(MJPEGTOOLS_HACKS_MK)
MJPEGTOOLS_HACKS_MK= defined
-### Hack to work around MacOS X 4.x (and probably other)'s gcc 4.x
+### Hack to work around MacOS X 4.x (and probably other)'s gcc 4.x
### which does not understand -fmove-all-movables. Remove that option
### if gcc-4 is used.
###
diff --git a/multimedia/mjpegtools/patches/patch-aa b/multimedia/mjpegtools/patches/patch-aa
new file mode 100644
index 00000000000..75afe17dec7
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.6 2006/01/30 08:44:25 xtraeme Exp $
+
+--- configure.orig 2006-01-30 09:29:46.000000000 +0100
++++ configure 2006-01-30 09:29:49.000000000 +0100
+@@ -27102,7 +27102,6 @@
+ echo $ECHO_N "checking sub-architecture settings... $ECHO_C" >&6
+ if test x$have_x86cpu = xtrue; then
+ host_mod_cpu=`echo $host_cpu | tr _ -`
+- ARCHFLAGS="-march=$host_mod_cpu -mcpu=$host_mod_cpu"
+ fi
+ else
+ if test ! -r $srcdir/cpuinfo.sh; then