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 context 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 @@
-$NetBSD: distinfo,v 1.34 2012/11/03 01:54:55 ryoon Exp $
+$NetBSD: distinfo,v 1.34.2.1 2013/02/13 18:46:02 tron Exp $
 
 SHA1 (pulseaudio-2.1.tar.xz) = 56b4ad9207ea3aec0ad1b8be4b55793b426a4f01
 RMD160 (pulseaudio-2.1.tar.xz) = 87f6051bbbe59c26e505a9765f388d3ee4d3a485
 Size (pulseaudio-2.1.tar.xz) = 1355004 bytes
 SHA1 (patch-aa) = 59dbd4e6670bc401d2254226b6ba1f4549f35ff7
-SHA1 (patch-configure) = 8f0b923470bd41d0c8495e88b8dfff59628261a1
+SHA1 (patch-configure) = 74eb6cbc606103c9a7c1a9e196a0fd58abc839d3
 SHA1 (patch-dc) = 48baff12528f09940d63c6bdaf4369cab7e56de3
-SHA1 (patch-src_Makefile.in) = 9f1ba78d232cc56c69009245f2eaa6d6c6cf349c
+SHA1 (patch-src_Makefile.in) = 50f5903cf93e2b59318be177e38bd49a7a34557e
cvs diff -r1.4 -r1.4.2.1 pkgsrc/audio/pulseaudio/options.mk (expand / switch to context 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,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2012/11/03 01:54:55 ryoon Exp $
+# $NetBSD: options.mk,v 1.4.2.1 2013/02/13 18:46:02 tron Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pulseaudio
 PKG_SUPPORTED_OPTIONS=	avahi x11
@@ -29,4 +29,3 @@
 .else
 CONFIGURE_ARGS+=	--disable-x11
 .endif
-
cvs diff -r1.1 -r1.1.2.1 pkgsrc/audio/pulseaudio/patches/Attic/patch-configure (expand / switch to context 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,16 +1,35 @@
-$NetBSD: patch-configure,v 1.1 2012/11/03 01:54:55 ryoon Exp $
+$NetBSD: patch-configure,v 1.1.2.1 2013/02/13 18:46:02 tron Exp $
 
+- use ${EGDIR} for config file
+- always use atomic_ops(3) on NetBSD, even on arm
+- kill test(1) bash'ism
+
 --- configure.orig	2012-07-19 11:30:11.000000000 +0000
 +++ configure
-@@ -8062,7 +8062,7 @@ $as_echo "#define ATOMIC_ARM_INLINE_ASM 
+@@ -7995,6 +7995,11 @@ else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking architecture for native atomic operations" >&5
+ $as_echo_n "checking architecture for native atomic operations... " >&6; }
+     case $host in
++        *-netbsd*)
++            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++            need_libatomic_ops=no
++        ;;
+         arm*)
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: arm" >&5
+ $as_echo "arm" >&6; }
+@@ -8062,11 +8067,6 @@ $as_echo "#define ATOMIC_ARM_INLINE_ASM 
  fi
              fi
          ;;
 -        *-netbsdelf5*)
-+        *-netbsd*)
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-            need_libatomic_ops=no
+-        ;;
+         *-freebsd*)
              { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
-             need_libatomic_ops=no
 @@ -19748,7 +19748,7 @@ _ACEOF
  
  fi
cvs diff -r1.1 -r1.1.2.1 pkgsrc/audio/pulseaudio/patches/Attic/patch-src_Makefile.in (expand / switch to context 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,4 +1,6 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2012/11/03 01:54:55 ryoon Exp $
+$NetBSD: patch-src_Makefile.in,v 1.1.2.1 2013/02/13 18:46:02 tron Exp $
+
+Use pkgsrc infrastructure for config files.
 
 --- src/Makefile.in.orig	2012-07-19 11:30:13.000000000 +0000
 +++ src/Makefile.in