[pkgsrc/trunk]: pkgsrc/multimedia/avidemux Update to 2.1.1 (latest stable ver...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0bca8494b281
branches:  trunk
changeset: 507159:0bca8494b281
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Jan 27 20:28:56 2006 +0000

description:
Update to 2.1.1 (latest stable version).

Please see the Changelog file, because our previous version was
really out of date (maybe 1 year) and there were a lot of changes.

diffstat:

 multimedia/avidemux/Makefile         |  16 ++++++++++------
 multimedia/avidemux/PLIST            |   2 +-
 multimedia/avidemux/distinfo         |   9 +++++----
 multimedia/avidemux/patches/patch-aa |  14 ++++++++++++++
 4 files changed, 30 insertions(+), 11 deletions(-)

diffs (84 lines):

diff -r 1ff7004fdb43 -r 0bca8494b281 multimedia/avidemux/Makefile
--- a/multimedia/avidemux/Makefile      Fri Jan 27 19:48:53 2006 +0000
+++ b/multimedia/avidemux/Makefile      Fri Jan 27 20:28:56 2006 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2006/01/25 08:10:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/27 20:28:56 xtraeme Exp $
 #
 
-DISTNAME=      avidemux-2.0.40
-PKGREVISION=   3
+DISTNAME=      avidemux-2.1.1
 CATEGORIES=    multimedia
 MASTER_SITES=  http://download.berlios.de/avidemux/
 
@@ -11,15 +10,19 @@
 COMMENT=       Graphical video editing program
 
 GCC_REQD+=             3.0
-GNU_CONFIGURE=         YES
-USE_LANGUAGES=         c c++
+GNU_CONFIGURE=         yes
+USE_LANGUAGES+=                c++
 USE_LIBTOOL=           YES
 USE_TOOLS+=            gmake pkg-config
 
 CPPFLAGS+=             -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-LDFLAGS+=              ${LIBOSSAUDIO}
+LIBS+=                 ${LIBOSSAUDIO}
+
 CONFIGURE_ENV+=                ac_cv_path_ART_CONFIG=no
+CONFIGURE_ARGS+=       --without-newfaad
 CONFIGURE_ARGS+=       --disable-faad # Dolby doesn't allow binary distribution
+CONFIGURE_ARGS+=       \
+       --with-jsapi-include=${BUILDLINK_PREFIX.spidermonkey}/include
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -48,6 +51,7 @@
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../lang/spidermonkey/buildlink3.mk"
 .include "../../multimedia/mjpegtools/buildlink3.mk"
 .include "../../multimedia/xvidcore/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff -r 1ff7004fdb43 -r 0bca8494b281 multimedia/avidemux/PLIST
--- a/multimedia/avidemux/PLIST Fri Jan 27 19:48:53 2006 +0000
+++ b/multimedia/avidemux/PLIST Fri Jan 27 20:28:56 2006 +0000
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/28 05:52:18 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/01/27 20:28:56 xtraeme Exp $
 bin/avidemux2
diff -r 1ff7004fdb43 -r 0bca8494b281 multimedia/avidemux/distinfo
--- a/multimedia/avidemux/distinfo      Fri Jan 27 19:48:53 2006 +0000
+++ b/multimedia/avidemux/distinfo      Fri Jan 27 20:28:56 2006 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/05/28 05:52:18 reed Exp $
+$NetBSD: distinfo,v 1.5 2006/01/27 20:28:56 xtraeme Exp $
 
-SHA1 (avidemux-2.0.40.tar.gz) = 0231cf9e6a42b091bde2d90f5fc5d65fa9b3d06d
-RMD160 (avidemux-2.0.40.tar.gz) = faa76ae78fb60bdb0790174cce591118d03578e0
-Size (avidemux-2.0.40.tar.gz) = 3755632 bytes
+SHA1 (avidemux-2.1.1.tar.gz) = ef2ac55a28ded0ba6b8edd4dfbd251144c63928e
+RMD160 (avidemux-2.1.1.tar.gz) = 4e3252beaf58d0839df58b56341174b66f6246b6
+Size (avidemux-2.1.1.tar.gz) = 4121344 bytes
+SHA1 (patch-aa) = 7d8a6c9318fb68db6456515ddddbf4be5788a694
diff -r 1ff7004fdb43 -r 0bca8494b281 multimedia/avidemux/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/avidemux/patches/patch-aa      Fri Jan 27 20:28:56 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.3 2006/01/27 20:28:56 xtraeme Exp $
+
+--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig    2006-01-27 21:17:12.000000000 +0100
++++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp 2006-01-27 21:17:39.000000000 +0100
+@@ -28,7 +28,8 @@
+ 
+ #if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__)
+       #include <soundcard.h>
+-      const char *dsp = DEVOSSAUDIO;;
++      const char *dsp = DEVOSSAUDIO;
++      const char *device_mixer = "/dev/mixer";
+ 
+ #else
+       #include <sys/soundcard.h>