[pkgsrc/trunk]: pkgsrc/multimedia Fix faad2 test in configure script on -curr...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8703cef2448
branches:  trunk
changeset: 483011:e8703cef2448
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Nov 06 00:47:34 2004 +0000

description:
Fix faad2 test in configure script on -current;
based on PR 26412 by Tom Spindler.
Bump PKGREVISION on all affected packages.

diffstat:

 multimedia/gmplayer/Makefile              |   4 ++--
 multimedia/mencoder/Makefile              |   4 ++--
 multimedia/mplayer-share/distinfo         |   3 ++-
 multimedia/mplayer-share/patches/patch-ac |  13 +++++++++++++
 multimedia/mplayer/Makefile               |   4 ++--
 5 files changed, 21 insertions(+), 7 deletions(-)

diffs (77 lines):

diff -r af55b831d78b -r e8703cef2448 multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Fri Nov 05 23:41:57 2004 +0000
+++ b/multimedia/gmplayer/Makefile      Sat Nov 06 00:47:34 2004 +0000
@@ -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 -r af55b831d78b -r e8703cef2448 multimedia/mencoder/Makefile
--- a/multimedia/mencoder/Makefile      Fri Nov 05 23:41:57 2004 +0000
+++ b/multimedia/mencoder/Makefile      Sat Nov 06 00:47:34 2004 +0000
@@ -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 -r af55b831d78b -r e8703cef2448 multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Fri Nov 05 23:41:57 2004 +0000
+++ b/multimedia/mplayer-share/distinfo Sat Nov 06 00:47:34 2004 +0000
@@ -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 @@
 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 -r af55b831d78b -r e8703cef2448 multimedia/mplayer-share/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-ac Sat Nov 06 00:47:34 2004 +0000
@@ -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 -r af55b831d78b -r e8703cef2448 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Fri Nov 05 23:41:57 2004 +0000
+++ b/multimedia/mplayer/Makefile       Sat Nov 06 00:47:34 2004 +0000
@@ -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