Wed Feb 20 15:46:53 2008 UTC ()
Fix the audio device now that cmake is used as build system. PKGREVISION++


(xtraeme)
diff -r1.45 -r1.46 pkgsrc/multimedia/avidemux/Makefile
diff -r1.14 -r1.15 pkgsrc/multimedia/avidemux/distinfo
diff -r1.6 -r1.7 pkgsrc/multimedia/avidemux/patches/patch-aa
cvs diff -r1.45 -r1.46 pkgsrc/multimedia/avidemux/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/avidemux/Makefile 2008/02/19 09:11:43 1.45
+++ pkgsrc/multimedia/avidemux/Makefile 2008/02/20 15:46:53 1.46
@@ -1,38 +1,43 @@ @@ -1,38 +1,43 @@
1# $NetBSD: Makefile,v 1.45 2008/02/19 09:11:43 xtraeme Exp $ 1# $NetBSD: Makefile,v 1.46 2008/02/20 15:46:53 xtraeme Exp $
2# 2#
3 3
4DISTNAME= avidemux_2.4.1 4DISTNAME= avidemux_2.4.1
5PKGNAME= ${DISTNAME:S/_/-/} 5PKGNAME= ${DISTNAME:S/_/-/}
6#PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= http://download.berlios.de/avidemux/ 8MASTER_SITES= http://download.berlios.de/avidemux/
9 9
10MAINTAINER= xtraeme@NetBSD.org 10MAINTAINER= xtraeme@NetBSD.org
11HOMEPAGE= http://fixounet.free.fr/avidemux/ 11HOMEPAGE= http://fixounet.free.fr/avidemux/
12COMMENT= Graphical video editing program 12COMMENT= Graphical video editing program
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GCC_REQD+= 3.0 16GCC_REQD+= 3.0
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_PKGLOCALEDIR= yes 19USE_PKGLOCALEDIR= yes
20USE_TOOLS+= cmake pkg-config msgfmt 20USE_TOOLS+= msgfmt pkg-config
21USE_CMAKE= yes 21USE_CMAKE= yes
22 22
23CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" 
24LIBS+= ${LIBOSSAUDIO} 23LIBS+= ${LIBOSSAUDIO}
25 24
 25SUBST_CLASSES= audio
 26SUBST_STAGE.audio= post-patch
 27SUBST_FILES.audio= avidemux/ADM_audiodevice/ADM_deviceoss.cpp
 28SUBST_SED.audio= -e "s|\\/dev\\/dsp|${DEVOSSAUDIO}|g"
 29SUBST_MESSAGE.audio= Fixing hardcoded audio device.
 30
26.include "../../audio/faac/buildlink3.mk" 31.include "../../audio/faac/buildlink3.mk"
27.include "../../audio/faad2/buildlink3.mk" 32.include "../../audio/faad2/buildlink3.mk"
28.include "../../audio/lame/buildlink3.mk" 33.include "../../audio/lame/buildlink3.mk"
29.include "../../audio/liba52/buildlink3.mk" 34.include "../../audio/liba52/buildlink3.mk"
30.include "../../audio/libsamplerate/buildlink3.mk" 35.include "../../audio/libsamplerate/buildlink3.mk"
31.include "../../audio/libmad/buildlink3.mk" 36.include "../../audio/libmad/buildlink3.mk"
32.include "../../audio/libvorbis/buildlink3.mk" 37.include "../../audio/libvorbis/buildlink3.mk"
33.include "../../devel/SDL/buildlink3.mk" 38.include "../../devel/SDL/buildlink3.mk"
34.include "../../devel/gettext-lib/buildlink3.mk" 39.include "../../devel/gettext-lib/buildlink3.mk"
35.include "../../graphics/freetype2/buildlink3.mk" 40.include "../../graphics/freetype2/buildlink3.mk"
36.include "../../lang/spidermonkey/buildlink3.mk" 41.include "../../lang/spidermonkey/buildlink3.mk"
37.include "../../multimedia/xvidcore/buildlink3.mk" 42.include "../../multimedia/xvidcore/buildlink3.mk"
38.include "../../multimedia/x264-devel/buildlink3.mk" 43.include "../../multimedia/x264-devel/buildlink3.mk"
cvs diff -r1.14 -r1.15 pkgsrc/multimedia/avidemux/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/avidemux/distinfo 2008/02/19 09:11:43 1.14
+++ pkgsrc/multimedia/avidemux/distinfo 2008/02/20 15:46:53 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.14 2008/02/19 09:11:43 xtraeme Exp $ 1$NetBSD: distinfo,v 1.15 2008/02/20 15:46:53 xtraeme Exp $
2 2
3SHA1 (avidemux_2.4.1.tar.gz) = 6bbf542bab73d91cb73f198d2d8afe10d83b2821 3SHA1 (avidemux_2.4.1.tar.gz) = 6bbf542bab73d91cb73f198d2d8afe10d83b2821
4RMD160 (avidemux_2.4.1.tar.gz) = 8149eb62cb4f3196d98b8c2707a4252f06e198cf 4RMD160 (avidemux_2.4.1.tar.gz) = 8149eb62cb4f3196d98b8c2707a4252f06e198cf
5Size (avidemux_2.4.1.tar.gz) = 5788014 bytes 5Size (avidemux_2.4.1.tar.gz) = 5788014 bytes
6SHA1 (patch-aa) = eeee381ed62b8a2c81963f5e5d6adbf69acdf642 6SHA1 (patch-aa) = e8cc1abda5aff8c6484dbba8f4803d96749db53b
7SHA1 (patch-ab) = 1b9fc51354c60584205b23f6d6425e09074f6303 7SHA1 (patch-ab) = 1b9fc51354c60584205b23f6d6425e09074f6303
8SHA1 (patch-as) = 9d8edeac752b0e08cec7b37e9357ec49d259b5d6 8SHA1 (patch-as) = 9d8edeac752b0e08cec7b37e9357ec49d259b5d6
9SHA1 (patch-at) = 3b31ca6eaddbaffa37d05eee1f889b2d8b73407b 9SHA1 (patch-at) = 3b31ca6eaddbaffa37d05eee1f889b2d8b73407b
10SHA1 (patch-au) = 98fd766da4424cfd183e4a4b4e1892f2ab17c491 10SHA1 (patch-au) = 98fd766da4424cfd183e4a4b4e1892f2ab17c491
11SHA1 (patch-av) = 68e40fff1eaa735b9ac36556f308ed9a45316911 11SHA1 (patch-av) = 68e40fff1eaa735b9ac36556f308ed9a45316911
12SHA1 (patch-aw) = 2f89f7d2beb7863a831bb7ae6e539ecc2cadcb21 12SHA1 (patch-aw) = 2f89f7d2beb7863a831bb7ae6e539ecc2cadcb21
13SHA1 (patch-ax) = 42b2d2bbc57a6979fd0858a1eef671545682276b 13SHA1 (patch-ax) = 42b2d2bbc57a6979fd0858a1eef671545682276b
14SHA1 (patch-ay) = 7bfde827e20a9546d9a533293e6d9519b166bb95 14SHA1 (patch-ay) = 7bfde827e20a9546d9a533293e6d9519b166bb95
cvs diff -r1.6 -r1.7 pkgsrc/multimedia/avidemux/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/multimedia/avidemux/patches/Attic/patch-aa 2008/02/19 09:11:43 1.6
+++ pkgsrc/multimedia/avidemux/patches/Attic/patch-aa 2008/02/20 15:46:53 1.7
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-aa,v 1.6 2008/02/19 09:11:43 xtraeme Exp $ 1$NetBSD: patch-aa,v 1.7 2008/02/20 15:46:53 xtraeme Exp $
2 2
3--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig 2008-02-18 21:20:28.000000000 +0100 3--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig 2007-09-25 21:01:54.000000000 +0200
4+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp 2008-02-18 21:21:09.000000000 +0100 4+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp 2008-02-20 16:32:29.000000000 +0100
5@@ -29,6 +29,7 @@ 5@@ -28,7 +28,8 @@
 6
6 #if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__) 7 #if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
7 #include <soundcard.h> 8 #include <soundcard.h>
8 const char *dsp = DEVOSSAUDIO;; 9- const char *dsp = DEVOSSAUDIO;;
 10+ const char *dsp = "/dev/dsp";
9+ const char *device_mixer = "/dev/mixer"; 11+ const char *device_mixer = "/dev/mixer";
10  12
11 #elif defined(__OpenBSD__) 13 #elif defined(__OpenBSD__)
12 #include <soundcard.h> 14 #include <soundcard.h>