[pkgsrc/trunk]: pkgsrc/multimedia/avidemux Fix the audio device now that cmak...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff25e6e7c295
branches:  trunk
changeset: 538900:ff25e6e7c295
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Feb 20 15:46:53 2008 +0000

description:
Fix the audio device now that cmake is used as build system. PKGREVISION++

diffstat:

 multimedia/avidemux/Makefile         |  13 +++++++++----
 multimedia/avidemux/distinfo         |   4 ++--
 multimedia/avidemux/patches/patch-aa |  12 +++++++-----
 3 files changed, 18 insertions(+), 11 deletions(-)

diffs (72 lines):

diff -r c0b545dd12f7 -r ff25e6e7c295 multimedia/avidemux/Makefile
--- a/multimedia/avidemux/Makefile      Wed Feb 20 14:34:07 2008 +0000
+++ b/multimedia/avidemux/Makefile      Wed Feb 20 15:46:53 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2008/02/19 09:11:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.46 2008/02/20 15:46:53 xtraeme Exp $
 #
 
 DISTNAME=      avidemux_2.4.1
 PKGNAME=       ${DISTNAME:S/_/-/}
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    multimedia
 MASTER_SITES=  http://download.berlios.de/avidemux/
 
@@ -17,12 +17,17 @@
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            cmake pkg-config msgfmt
+USE_TOOLS+=            msgfmt pkg-config
 USE_CMAKE=             yes
 
-CPPFLAGS+=             -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 LIBS+=                 ${LIBOSSAUDIO}
 
+SUBST_CLASSES=         audio
+SUBST_STAGE.audio=     post-patch
+SUBST_FILES.audio=     avidemux/ADM_audiodevice/ADM_deviceoss.cpp
+SUBST_SED.audio=       -e "s|\\/dev\\/dsp|${DEVOSSAUDIO}|g"
+SUBST_MESSAGE.audio=   Fixing hardcoded audio device.
+
 .include "../../audio/faac/buildlink3.mk"
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
diff -r c0b545dd12f7 -r ff25e6e7c295 multimedia/avidemux/distinfo
--- a/multimedia/avidemux/distinfo      Wed Feb 20 14:34:07 2008 +0000
+++ b/multimedia/avidemux/distinfo      Wed Feb 20 15:46:53 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2008/02/19 09:11:43 xtraeme Exp $
+$NetBSD: distinfo,v 1.15 2008/02/20 15:46:53 xtraeme Exp $
 
 SHA1 (avidemux_2.4.1.tar.gz) = 6bbf542bab73d91cb73f198d2d8afe10d83b2821
 RMD160 (avidemux_2.4.1.tar.gz) = 8149eb62cb4f3196d98b8c2707a4252f06e198cf
 Size (avidemux_2.4.1.tar.gz) = 5788014 bytes
-SHA1 (patch-aa) = eeee381ed62b8a2c81963f5e5d6adbf69acdf642
+SHA1 (patch-aa) = e8cc1abda5aff8c6484dbba8f4803d96749db53b
 SHA1 (patch-ab) = 1b9fc51354c60584205b23f6d6425e09074f6303
 SHA1 (patch-as) = 9d8edeac752b0e08cec7b37e9357ec49d259b5d6
 SHA1 (patch-at) = 3b31ca6eaddbaffa37d05eee1f889b2d8b73407b
diff -r c0b545dd12f7 -r ff25e6e7c295 multimedia/avidemux/patches/patch-aa
--- a/multimedia/avidemux/patches/patch-aa      Wed Feb 20 14:34:07 2008 +0000
+++ b/multimedia/avidemux/patches/patch-aa      Wed Feb 20 15:46:53 2008 +0000
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2008/02/19 09:11:43 xtraeme Exp $
+$NetBSD: patch-aa,v 1.7 2008/02/20 15:46:53 xtraeme Exp $
 
---- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig    2008-02-18 21:20:28.000000000 +0100
-+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp 2008-02-18 21:21:09.000000000 +0100
-@@ -29,6 +29,7 @@
+--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig    2007-09-25 21:01:54.000000000 +0200
++++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp 2008-02-20 16:32:29.000000000 +0100
+@@ -28,7 +28,8 @@
+ 
  #if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
        #include <soundcard.h>
-       const char *dsp = DEVOSSAUDIO;;
+-      const char *dsp = DEVOSSAUDIO;;
++      const char *dsp = "/dev/dsp";
 +      const char *device_mixer = "/dev/mixer";
  
  #elif defined(__OpenBSD__)