diff options
Diffstat (limited to 'audio/pulseaudio/patches/patch-ad')
| -rw-r--r-- | audio/pulseaudio/patches/patch-ad | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/audio/pulseaudio/patches/patch-ad b/audio/pulseaudio/patches/patch-ad index 1bc53aa8bf5..a295331c9ab 100644 --- a/audio/pulseaudio/patches/patch-ad +++ b/audio/pulseaudio/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2008/12/25 21:53:30 ahoka Exp $ +$NetBSD: patch-ad,v 1.4 2010/02/01 15:00:20 jmcneill Exp $ ---- src/Makefile.am.orig 2008-12-20 11:45:28.000000000 -0500 -+++ src/Makefile.am 2008-12-20 11:47:47.000000000 -0500 -@@ -26,9 +26,9 @@ +--- src/Makefile.am.orig 2009-11-23 03:57:04.000000000 +0000 ++++ src/Makefile.am +@@ -26,13 +26,13 @@ pulseincludedir=$(includedir)/pulse pulsecoreincludedir=$(includedir)/pulsecore @@ -11,10 +11,15 @@ $NetBSD: patch-ad,v 1.3 2008/12/25 21:53:30 ahoka Exp $ pulselibexecdir=$(libexecdir)/pulse -xdgautostartdir=$(sysconfdir)/xdg/autostart +xdgautostartdir=$(PREFIX)/share/gnome/autostart + alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets + alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths + udevrulesdir=/lib/udev/rules.d +-dbuspolicydir=$(sysconfdir)/dbus-1/system.d ++dbuspolicydir=$(EGDIR) ################################### # Defines # -@@ -38,7 +38,7 @@ +@@ -42,7 +42,7 @@ PA_BINARY=$(bindir)/pulseaudio$(EXEEXT) if OS_IS_WIN32 PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT% else @@ -23,12 +28,12 @@ $NetBSD: patch-ad,v 1.3 2008/12/25 21:53:30 ahoka Exp $ endif ################################### -@@ -1396,7 +1396,7 @@ +@@ -1419,7 +1419,7 @@ module_x11_cork_request_la_LIBADD = $(AM # OSS - liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h + liboss_util_la_SOURCES = modules/oss/oss-util.c modules/oss/oss-util.h -liboss_util_la_LDFLAGS = -avoid-version +liboss_util_la_LDFLAGS = -avoid-version $(LIBOSSAUDIO) - liboss_util_la_LIBADD = libpulsecore.la + liboss_util_la_LIBADD = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la - module_oss_la_SOURCES = modules/module-oss.c + module_oss_la_SOURCES = modules/oss/module-oss.c |