summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2004-11-06 00:47:34 +0000
committerwiz <wiz@pkgsrc.org>2004-11-06 00:47:34 +0000
commit2a65b48bea256db5144c7508999dd4fac3959f42 (patch)
tree52d4d40a90275b8a15ae9d85485a507b00bae808 /multimedia
parent8a4c68795c57abc97653248a9d5bead4bdb41f64 (diff)
downloadpkgsrc-2a65b48bea256db5144c7508999dd4fac3959f42.tar.gz
Fix faad2 test in configure script on -current;
based on PR 26412 by Tom Spindler. Bump PKGREVISION on all affected packages.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gmplayer/Makefile4
-rw-r--r--multimedia/mencoder/Makefile4
-rw-r--r--multimedia/mplayer-share/distinfo3
-rw-r--r--multimedia/mplayer-share/patches/patch-ac13
-rw-r--r--multimedia/mplayer/Makefile4
5 files changed, 21 insertions, 7 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index 6da33e57bd1..cc3e53e5094 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/11/04 11:19:17 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2004/11/06 00:47:34 wiz Exp $
#
# NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,7 @@
#
PKGNAME= gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
SKIN_SITES= http://www.mplayerhq.hu/MPlayer/Skin/ \
ftp://ftp.mplayerhq.hu/MPlayer/Skin/ \
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 103409b6126..60ebc797336 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.14 2004/11/06 00:47:34 wiz Exp $
#
PKGNAME= mencoder-${MPLAYER_PKG_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Simple movie encoder for MPlayer-playable movies
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 8363dcf1161..e60f2f98eec 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2004/07/24 01:19:35 wiz Exp $
+$NetBSD: distinfo,v 1.13 2004/11/06 00:47:34 wiz Exp $
SHA1 (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = cf64892871b8673e452b5d390be25144d85fe307
Size (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = 5072836 bytes
@@ -10,4 +10,5 @@ SHA1 (mplayer-1.0rc5/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b747
Size (mplayer-1.0rc5/font-arial-cp1250.tar.bz2) = 249705 bytes
SHA1 (patch-aa) = 9a90cadba608c518e998024f8dbde39cbfab70da
SHA1 (patch-ab) = 68e81c67cd3902499f912d3ca8c6d6bc208a2433
+SHA1 (patch-ac) = 696183adc3777cb4d9bc4b6d96d5cb7c88ec489d
SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
diff --git a/multimedia/mplayer-share/patches/patch-ac b/multimedia/mplayer-share/patches/patch-ac
new file mode 100644
index 00000000000..bb939647285
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2004/11/06 00:47:34 wiz Exp $
+
+--- libfaad2/common.h.orig 2004-06-23 15:50:49.000000000 +0200
++++ libfaad2/common.h
+@@ -337,7 +337,7 @@ char *strchr(), *strrchr();
+ #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__)
+ #define HAS_LRINTF
+ // from http://www.stereopsis.com/FPU.html
+- static INLINE int lrintf(float f)
++ static INLINE long int lrintf(float f)
+ {
+ int i;
+ __asm__ __volatile__ (
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 94842e1953e..68dce330c3c 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/08/18 13:35:06 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/11/06 00:47:34 wiz Exp $
PKGNAME= mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Software-only MPEG-1/2/4 video decoder