pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/pulseaudio Fix build on SunOS 5.10 (and probably...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3208b2b4f07f
branches:  trunk
changeset: 593720:3208b2b4f07f
user:      hans <hans%pkgsrc.org@localhost>
date:      Wed Oct 12 16:46:15 2011 +0000

description:
Fix build on SunOS 5.10 (and probably older versions, too).

SunOS 5.10 doesn't have SO_TIMESTAMP, and it also lacks oss. For some
reason the lack of oss also causes hal support to be disabled.

diffstat:

 audio/pulseaudio/Makefile |  12 +++++++-----
 audio/pulseaudio/PLIST    |   4 ++--
 audio/pulseaudio/distinfo |   5 ++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diffs (67 lines):

diff -r 8e972d928b89 -r 3208b2b4f07f audio/pulseaudio/Makefile
--- a/audio/pulseaudio/Makefile Wed Oct 12 16:10:48 2011 +0000
+++ b/audio/pulseaudio/Makefile Wed Oct 12 16:46:15 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2011/09/14 15:53:35 hans Exp $
+# $NetBSD: Makefile,v 1.50 2011/10/12 16:46:15 hans Exp $
 
 # NOTE: Please send a copy of any patches that are not pkgsrc-specific
 # to <pulseaudio-discuss%mail.0pointer.de@localhost>
@@ -78,15 +78,17 @@
 BUILDLINK_TRANSFORM+=  rm:-Wl,-version-script=./map-file
 BUILDLINK_TRANSFORM+=  rm:-Wl,-no-undefined
 BUILDLINK_TRANSFORM+=  rm:-Wl,-z rm:-Wl,nodelete
+.elif ${OPSYS} == "SunOS"
+PLIST.sun=             yes
+.  if ${OS_VERSION} == "5.11"
+PLIST.hal=             yes
+PLIST.oss=             yes
+.  endif
 .else
 PLIST.hal=             yes
 PLIST.oss=             yes
 .endif
 
-.if ${OPSYS} == "SunOS"
-PLIST.sun=             yes
-.endif
-
 CFLAGS.SunOS+=         -std=c99
 
 PKG_GROUPS=             ${PULSE_GROUP}
diff -r 8e972d928b89 -r 3208b2b4f07f audio/pulseaudio/PLIST
--- a/audio/pulseaudio/PLIST    Wed Oct 12 16:10:48 2011 +0000
+++ b/audio/pulseaudio/PLIST    Wed Oct 12 16:46:15 2011 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2011/09/14 15:53:35 hans Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/10/12 16:46:15 hans Exp $
 bin/esdcompat
 bin/pacat
 bin/pacmd
@@ -55,7 +55,7 @@
 lib/pulse-${PULSEAUDIO_VER}/modules/libcli.a
 lib/pulse-${PULSEAUDIO_VER}/modules/libcli.so
 ${PLIST.oss}lib/pulse-${PULSEAUDIO_VER}/modules/liboss-util.a
-lib/pulse-${PULSEAUDIO_VER}/modules/liboss-util.so
+${PLIST.oss}lib/pulse-${PULSEAUDIO_VER}/modules/liboss-util.so
 lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-cli.a
 lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-cli.so
 lib/pulse-${PULSEAUDIO_VER}/modules/libprotocol-esound.a
diff -r 8e972d928b89 -r 3208b2b4f07f audio/pulseaudio/distinfo
--- a/audio/pulseaudio/distinfo Wed Oct 12 16:10:48 2011 +0000
+++ b/audio/pulseaudio/distinfo Wed Oct 12 16:46:15 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2011/09/14 15:53:35 hans Exp $
+$NetBSD: distinfo,v 1.28 2011/10/12 16:46:15 hans Exp $
 
 SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22
 RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed
@@ -20,5 +20,8 @@
 SHA1 (patch-dd) = bfccd97ecf3be1ae9ac41a642b356743e055550f
 SHA1 (patch-de) = 3b8423a5936b8434de22fdd04ff2057dde09a2b8
 SHA1 (patch-poll_c-build-fix) = f9a2e86275431c53257c596974a6973c8034b1f0
+SHA1 (patch-src_modules_bluetooth_module-bluetooth-device.c) = 2c107e60772d53970365ab60a3d2fc52a6df2034
+SHA1 (patch-src_modules_rtp_module-rtp-recv.c) = 4119c37ac184bc6794304c50fd57e6c8a69fdd31
+SHA1 (patch-src_modules_rtp_rtp.c) = 00973c7a08f1809d35f9b61b569888bbed14ce6b
 SHA1 (patch-src_pulsecore_macro.h) = 635629d334529021d0dca2defe9c757c4cd20c5b
 SHA1 (patch-src_pulsecore_svolume_mmx.c) = ad1a1be7c1acf52c41447b2fb7d7dcd4c2da204b



Home | Main Index | Thread Index | Old Index