summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorwiz <wiz>2010-12-02 21:17:43 +0000
committerwiz <wiz>2010-12-02 21:17:43 +0000
commit5a56e95fc6db8e7aee9bc8f05058b9ec52c31197 (patch)
tree8d55d32d420b9a99aff9b3406301b380001de952 /audio
parent4f961706159989e1e74b188b2ee02144e7bef8eb (diff)
downloadpkgsrc-5a56e95fc6db8e7aee9bc8f05058b9ec52c31197.tar.gz
Fix path to dbus machine-id file. Bump PKGREVISION.
From Chuck Silvers.
Diffstat (limited to 'audio')
-rw-r--r--audio/pulseaudio/Makefile4
-rw-r--r--audio/pulseaudio/distinfo4
-rw-r--r--audio/pulseaudio/patches/patch-ad15
3 files changed, 16 insertions, 7 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 76af4a80707..ec9736b0232 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2010/11/15 22:56:20 abs Exp $
+# $NetBSD: Makefile,v 1.41 2010/12/02 21:17:43 wiz Exp $
# NOTE: Please send a copy of any patches that are not pkgsrc-specific
# to <pulseaudio-discuss@mail.0pointer.de>
PULSEAUDIO_VER= 0.9.21
-PKGREVISION= 5
+PKGREVISION= 6
DISTNAME= pulseaudio-${PULSEAUDIO_VER}
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 801acf6d0a9..dc0bc589cc4 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2010/08/10 05:42:33 tsutsui Exp $
+$NetBSD: distinfo,v 1.23 2010/12/02 21:17:43 wiz Exp $
SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22
RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed
@@ -6,7 +6,7 @@ Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes
SHA1 (patch-aa) = 078dd540b56f2db5d676835ab37cd4e8bbe33650
SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f
SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0
-SHA1 (patch-ad) = ae06ccadef3f7a0e685a2b8d0235ea3629f3680f
+SHA1 (patch-ad) = 5c7b5254233c8e0d36c6659454af0780af872cc3
SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30
SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e
SHA1 (patch-ag) = 523743b49476a219f76b108a605b2b57ea63098a
diff --git a/audio/pulseaudio/patches/patch-ad b/audio/pulseaudio/patches/patch-ad
index 7ed07b969d7..7ff62cf4320 100644
--- a/audio/pulseaudio/patches/patch-ad
+++ b/audio/pulseaudio/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.5 2010/07/04 17:41:58 tron Exp $
+$NetBSD: patch-ad,v 1.6 2010/12/02 21:17:43 wiz Exp $
---- src/Makefile.am.orig 2009-11-23 03:57:04.000000000 +0000
-+++ src/Makefile.am 2010-07-04 18:05:42.000000000 +0100
+--- src/Makefile.am.orig 2009-11-22 19:57:04.000000000 -0800
++++ src/Makefile.am 2010-10-01 10:11:05.000000000 -0700
@@ -26,13 +26,17 @@
pulseincludedir=$(includedir)/pulse
@@ -32,6 +32,15 @@ $NetBSD: patch-ad,v 1.5 2010/07/04 17:41:58 tron Exp $
endif
###################################
+@@ -83,7 +87,7 @@
+ -DPA_SYSTEM_STATE_PATH=\"$(PA_SYSTEM_STATE_PATH)\" \
+ -DAO_REQUIRE_CAS \
+ -DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \
+- -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" \
++ -DPA_MACHINE_ID=\"$(localstatedir)/db/dbus/machine-id\" \
+ -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
+ -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
+
@@ -1419,7 +1423,7 @@
# OSS