Wed Feb 13 18:46:02 2013 UTC ()
Pullup ticket #4064 - requested by he
audio/pulseaudio: build fix

Revisions pulled up:
- audio/pulseaudio/distinfo                                     1.35
- audio/pulseaudio/options.mk                                   1.5
- audio/pulseaudio/patches/patch-configure                      1.2
- audio/pulseaudio/patches/patch-src_Makefile.in                1.2

---
   Module Name:	pkgsrc
   Committed By:	tsutsui
   Date:		Tue Jan 29 15:02:24 UTC 2013

   Modified Files:
   	pkgsrc/audio/pulseaudio/patches: patch-configure

   Log Message:
   Always use atomic_ops(3) on NetBSD even on arm, i.e. kill Linux-ARM'ism.
   Fixes configure failure on NetBSD/arm 6.0.

   Also add patch comment.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Jan 29 15:34:47 UTC 2013

   Modified Files:
   	pkgsrc/audio/pulseaudio/patches: patch-src_Makefile.in

   Log Message:
   Add comment.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Jan 29 15:34:55 UTC 2013

   Modified Files:
   	pkgsrc/audio/pulseaudio: distinfo

   Log Message:
   regen

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Jan 29 15:35:04 UTC 2013

   Modified Files:
   	pkgsrc/audio/pulseaudio: options.mk

   Log Message:
   Whitespace cleanup for pkglint.


(tron)
diff -r1.34 -r1.34.2.1 pkgsrc/audio/pulseaudio/distinfo
diff -r1.4 -r1.4.2.1 pkgsrc/audio/pulseaudio/options.mk
diff -r1.1 -r1.1.2.1 pkgsrc/audio/pulseaudio/patches/patch-configure
diff -r1.1 -r1.1.2.1 pkgsrc/audio/pulseaudio/patches/patch-src_Makefile.in
cvs diff -r1.34 -r1.34.2.1 pkgsrc/audio/pulseaudio/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/distinfo 2012/11/03 01:54:55 1.34
+++ pkgsrc/audio/pulseaudio/distinfo 2013/02/13 18:46:02 1.34.2.1
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.34 2012/11/03 01:54:55 ryoon Exp $ 1$NetBSD: distinfo,v 1.34.2.1 2013/02/13 18:46:02 tron Exp $
2 2
3SHA1 (pulseaudio-2.1.tar.xz) = 56b4ad9207ea3aec0ad1b8be4b55793b426a4f01 3SHA1 (pulseaudio-2.1.tar.xz) = 56b4ad9207ea3aec0ad1b8be4b55793b426a4f01
4RMD160 (pulseaudio-2.1.tar.xz) = 87f6051bbbe59c26e505a9765f388d3ee4d3a485 4RMD160 (pulseaudio-2.1.tar.xz) = 87f6051bbbe59c26e505a9765f388d3ee4d3a485
5Size (pulseaudio-2.1.tar.xz) = 1355004 bytes 5Size (pulseaudio-2.1.tar.xz) = 1355004 bytes
6SHA1 (patch-aa) = 59dbd4e6670bc401d2254226b6ba1f4549f35ff7 6SHA1 (patch-aa) = 59dbd4e6670bc401d2254226b6ba1f4549f35ff7
7SHA1 (patch-configure) = 8f0b923470bd41d0c8495e88b8dfff59628261a1 7SHA1 (patch-configure) = 74eb6cbc606103c9a7c1a9e196a0fd58abc839d3
8SHA1 (patch-dc) = 48baff12528f09940d63c6bdaf4369cab7e56de3 8SHA1 (patch-dc) = 48baff12528f09940d63c6bdaf4369cab7e56de3
9SHA1 (patch-src_Makefile.in) = 9f1ba78d232cc56c69009245f2eaa6d6c6cf349c 9SHA1 (patch-src_Makefile.in) = 50f5903cf93e2b59318be177e38bd49a7a34557e
cvs diff -r1.4 -r1.4.2.1 pkgsrc/audio/pulseaudio/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/options.mk 2012/11/03 01:54:55 1.4
+++ pkgsrc/audio/pulseaudio/options.mk 2013/02/13 18:46:02 1.4.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.4 2012/11/03 01:54:55 ryoon Exp $ 1# $NetBSD: options.mk,v 1.4.2.1 2013/02/13 18:46:02 tron Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio 3PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio
4PKG_SUPPORTED_OPTIONS= avahi x11 4PKG_SUPPORTED_OPTIONS= avahi x11
5PKG_SUGGESTED_OPTIONS= avahi x11 5PKG_SUGGESTED_OPTIONS= avahi x11
6PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 6PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### avahi 10### avahi
11### 11###
12.if !empty(PKG_OPTIONS:Mavahi) 12.if !empty(PKG_OPTIONS:Mavahi)
13.include "../../net/avahi/buildlink3.mk" 13.include "../../net/avahi/buildlink3.mk"
14PLIST.avahi= yes 14PLIST.avahi= yes
@@ -19,14 +19,13 @@ CONFIGURE_ARGS+= --disable-avahi @@ -19,14 +19,13 @@ CONFIGURE_ARGS+= --disable-avahi
19### 19###
20### X11 20### X11
21### 21###
22.if !empty(PKG_OPTIONS:Mx11) 22.if !empty(PKG_OPTIONS:Mx11)
23.include "../../x11/libICE/buildlink3.mk" 23.include "../../x11/libICE/buildlink3.mk"
24.include "../../x11/libSM/buildlink3.mk" 24.include "../../x11/libSM/buildlink3.mk"
25.include "../../x11/libX11/buildlink3.mk" 25.include "../../x11/libX11/buildlink3.mk"
26.include "../../x11/libXtst/buildlink3.mk" 26.include "../../x11/libXtst/buildlink3.mk"
27.include "../../x11/xextproto/buildlink3.mk" 27.include "../../x11/xextproto/buildlink3.mk"
28PLIST.x11= yes 28PLIST.x11= yes
29.else 29.else
30CONFIGURE_ARGS+= --disable-x11 30CONFIGURE_ARGS+= --disable-x11
31.endif 31.endif
32 
cvs diff -r1.1 -r1.1.2.1 pkgsrc/audio/pulseaudio/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-configure 2012/11/03 01:54:55 1.1
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-configure 2013/02/13 18:46:02 1.1.2.1
@@ -1,26 +1,45 @@ @@ -1,26 +1,45 @@
1$NetBSD: patch-configure,v 1.1 2012/11/03 01:54:55 ryoon Exp $ 1$NetBSD: patch-configure,v 1.1.2.1 2013/02/13 18:46:02 tron Exp $
 2
 3- use ${EGDIR} for config file
 4- always use atomic_ops(3) on NetBSD, even on arm
 5- kill test(1) bash'ism
2 6
3--- configure.orig 2012-07-19 11:30:11.000000000 +0000 7--- configure.orig 2012-07-19 11:30:11.000000000 +0000
4+++ configure 8+++ configure
5@@ -8062,7 +8062,7 @@ $as_echo "#define ATOMIC_ARM_INLINE_ASM  9@@ -7995,6 +7995,11 @@ else
 10 { $as_echo "$as_me:${as_lineno-$LINENO}: checking architecture for native atomic operations" >&5
 11 $as_echo_n "checking architecture for native atomic operations... " >&6; }
 12 case $host in
 13+ *-netbsd*)
 14+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 15+$as_echo "yes" >&6; }
 16+ need_libatomic_ops=no
 17+ ;;
 18 arm*)
 19 { $as_echo "$as_me:${as_lineno-$LINENO}: result: arm" >&5
 20 $as_echo "arm" >&6; }
 21@@ -8062,11 +8067,6 @@ $as_echo "#define ATOMIC_ARM_INLINE_ASM
6 fi 22 fi
7 fi 23 fi
8 ;; 24 ;;
9- *-netbsdelf5*) 25- *-netbsdelf5*)
10+ *-netbsd*) 26- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 27-$as_echo "yes" >&6; }
 28- need_libatomic_ops=no
 29- ;;
 30 *-freebsd*)
11 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 31 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12 $as_echo "yes" >&6; } 32 $as_echo "yes" >&6; }
13 need_libatomic_ops=no 
14@@ -19748,7 +19748,7 @@ _ACEOF 33@@ -19748,7 +19748,7 @@ _ACEOF
15  34
16 fi 35 fi
17  36
18-if test "$ac_cv_tls" == "__thread"; then : 37-if test "$ac_cv_tls" == "__thread"; then :
19+if test "$ac_cv_tls" = "__thread"; then : 38+if test "$ac_cv_tls" = "__thread"; then :
20  39
21 $as_echo "#define SUPPORT_TLS___THREAD 1" >>confdefs.h 40 $as_echo "#define SUPPORT_TLS___THREAD 1" >>confdefs.h
22  41
23@@ -20146,7 +20146,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu 42@@ -20146,7 +20146,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
24  43
25 fi 44 fi
26  45
cvs diff -r1.1 -r1.1.2.1 pkgsrc/audio/pulseaudio/patches/Attic/patch-src_Makefile.in (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-src_Makefile.in 2012/11/03 01:54:55 1.1
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-src_Makefile.in 2013/02/13 18:46:02 1.1.2.1
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-src_Makefile.in,v 1.1 2012/11/03 01:54:55 ryoon Exp $ 1$NetBSD: patch-src_Makefile.in,v 1.1.2.1 2013/02/13 18:46:02 tron Exp $
 2
 3Use pkgsrc infrastructure for config files.
2 4
3--- src/Makefile.in.orig 2012-07-19 11:30:13.000000000 +0000 5--- src/Makefile.in.orig 2012-07-19 11:30:13.000000000 +0000
4+++ src/Makefile.in 6+++ src/Makefile.in
5@@ -2943,7 +2943,7 @@ pulselibexecdir = $(libexecdir)/pulse 7@@ -2943,7 +2943,7 @@ pulselibexecdir = $(libexecdir)/pulse
6 @HAVE_X11_TRUE@xdgautostartdir = $(sysconfdir)/xdg/autostart 8 @HAVE_X11_TRUE@xdgautostartdir = $(sysconfdir)/xdg/autostart
7 @HAVE_ALSA_TRUE@alsaprofilesetsdir = $(datadir)/pulseaudio/alsa-mixer/profile-sets 9 @HAVE_ALSA_TRUE@alsaprofilesetsdir = $(datadir)/pulseaudio/alsa-mixer/profile-sets
8 @HAVE_ALSA_TRUE@alsapathsdir = $(datadir)/pulseaudio/alsa-mixer/paths 10 @HAVE_ALSA_TRUE@alsapathsdir = $(datadir)/pulseaudio/alsa-mixer/paths
9-@HAVE_DBUS_TRUE@dbuspolicydir = $(sysconfdir)/dbus-1/system.d 11-@HAVE_DBUS_TRUE@dbuspolicydir = $(sysconfdir)/dbus-1/system.d
10+@HAVE_DBUS_TRUE@dbuspolicydir = ${EGDIR} 12+@HAVE_DBUS_TRUE@dbuspolicydir = ${EGDIR}
11  13
12 ################################### 14 ###################################
13 # Compiler/linker flags # 15 # Compiler/linker flags #