diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2008-02-20 15:46:53 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2008-02-20 15:46:53 +0000 |
| commit | 82db4c46f40fbc5ac019cdc8f0cfd9b27f4a3800 (patch) | |
| tree | 8b7ed4a568e00cfe7c11091e65eef8d8c1144a34 /multimedia | |
| parent | ab35962528d399df528f15c6c727e1cfaddfd60f (diff) | |
| download | pkgsrc-82db4c46f40fbc5ac019cdc8f0cfd9b27f4a3800.tar.gz | |
Fix the audio device now that cmake is used as build system. PKGREVISION++
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/avidemux/Makefile | 13 | ||||
| -rw-r--r-- | multimedia/avidemux/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/avidemux/patches/patch-aa | 12 |
3 files changed, 18 insertions, 11 deletions
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index 0f629e197be..3350d5459ec 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -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 @@ GCC_REQD+= 3.0 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 --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo index 1c9f670b8c9..fdb0b4aec98 100644 --- a/multimedia/avidemux/distinfo +++ b/multimedia/avidemux/distinfo @@ -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 --git a/multimedia/avidemux/patches/patch-aa b/multimedia/avidemux/patches/patch-aa index b486536f023..9bbd841190e 100644 --- a/multimedia/avidemux/patches/patch-aa +++ b/multimedia/avidemux/patches/patch-aa @@ -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__) |