pulseaudio-git: Regenerate patches for merged one for paccept(2)

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: pulseaudio-git: Regenerate patches for merged one for paccept(2)
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Sat, 28 Nov 2015 13:10:40 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Nov 28 14:10:40 2015 +0100
Changeset:	2309c27474973449b46ab2194d2a5a2f69c5f832

Modified Files:
	pulseaudio-git/Makefile
	pulseaudio-git/patches/patch-aa
	pulseaudio-git/patches/patch-configure.ac
	pulseaudio-git/patches/patch-src_Makefile.am
	pulseaudio-git/patches/patch-src_daemon_caps.c
	pulseaudio-git/patches/patch-src_daemon_main.c
	pulseaudio-git/patches/patch-src_modules_module-detect.c
	pulseaudio-git/patches/patch-src_modules_module-solaris.c
	pulseaudio-git/patches/patch-src_modules_oss_module-oss.c
	pulseaudio-git/patches/patch-src_pulsecore_core-util.c
	pulseaudio-git/patches/patch-src_pulsecore_mix__neon.c
	pulseaudio-git/patches/patch-src_pulsecore_sample-util.h
	pulseaudio-git/patches/patch-src_pulsecore_svolume__mmx.c
	pulseaudio-git/patches/patch-src_pulsecore_svolume__sse.c
	pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
	pulseaudio-git/patches/patch-src_tests_rtpoll-test.c
Removed Files:
	pulseaudio-git/patches/patch-src_Makefile.in

Log Message:
pulseaudio-git: Regenerate patches for merged one for paccept(2)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2309c27474973449b46ab2194d2a5a2f69c5f832

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pulseaudio-git/Makefile                            |  3 +++
 pulseaudio-git/patches/patch-aa                    |  2 +-
 pulseaudio-git/patches/patch-configure.ac          | 11 +--------
 pulseaudio-git/patches/patch-src_Makefile.am       |  2 +-
 pulseaudio-git/patches/patch-src_Makefile.in       | 28 ----------------------
 pulseaudio-git/patches/patch-src_daemon_caps.c     |  2 +-
 pulseaudio-git/patches/patch-src_daemon_main.c     |  2 +-
 .../patches/patch-src_modules_module-detect.c      |  2 +-
 .../patches/patch-src_modules_module-solaris.c     |  2 +-
 .../patches/patch-src_modules_oss_module-oss.c     |  2 +-
 .../patches/patch-src_pulsecore_core-util.c        | 15 +-----------
 .../patches/patch-src_pulsecore_mix__neon.c        |  2 +-
 .../patches/patch-src_pulsecore_sample-util.h      |  2 +-
 .../patches/patch-src_pulsecore_svolume__mmx.c     |  2 +-
 .../patches/patch-src_pulsecore_svolume__sse.c     |  2 +-
 .../patches/patch-src_tests_mult-s16-test.c        |  2 +-
 .../patches/patch-src_tests_rtpoll-test.c          |  2 +-
 17 files changed, 18 insertions(+), 65 deletions(-)

diffs:
diff --git a/pulseaudio-git/Makefile b/pulseaudio-git/Makefile
index ea2a71a..67f048f 100644
--- a/pulseaudio-git/Makefile
+++ b/pulseaudio-git/Makefile
@@ -5,6 +5,8 @@ CATEGORIES=	audio
 GIT_REPOSITORIES=	pulse
 GIT_REPO.pulse=		git://github.com/pulseaudio/pulseaudio.git
 
+WRKSRC=		${WRKDIR}/pulse
+
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.freedesktop.org/wiki/Software/PulseAudio
 COMMENT=	Sound server for POSIX and Win32 systems
@@ -107,6 +109,7 @@ pre-configure:
 	set -e; cd ${WRKSRC}; \
 	aclocal; autoheader; automake -a --foreign -i; autoconf
 
+.include "../../wip/mk/git-package.mk"
 .if ${OPSYS} != "Darwin"
 .include "../../sysutils/consolekit/buildlink3.mk"
 .endif
diff --git a/pulseaudio-git/patches/patch-aa b/pulseaudio-git/patches/patch-aa
index 5a90847..2b30d6c 100644
--- a/pulseaudio-git/patches/patch-aa
+++ b/pulseaudio-git/patches/patch-aa
@@ -6,7 +6,7 @@ stat() system call has been versioned, use latest version when dlopen()ing.
 Try more typical device names.
 SOUND_PCM_* is not available on SunOS.
 
---- src/utils/padsp.c.orig	2015-09-10 04:51:41.000000000 +0000
+--- src/utils/padsp.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/utils/padsp.c
 @@ -47,6 +47,9 @@
  #ifdef __linux__
diff --git a/pulseaudio-git/patches/patch-configure.ac b/pulseaudio-git/patches/patch-configure.ac
index ba8308a..7fafd41 100644
--- a/pulseaudio-git/patches/patch-configure.ac
+++ b/pulseaudio-git/patches/patch-configure.ac
@@ -8,7 +8,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
   file framework will install them in the right place.
 * Avoid hardcoded SDK paths on Darwin.
 
---- configure.ac.orig	2015-10-30 12:22:13.000000000 +0000
+--- configure.ac.orig	2015-11-28 09:05:41.000000000 +0000
 +++ configure.ac
 @@ -21,7 +21,7 @@
  
@@ -93,15 +93,6 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
      AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement])
      HAVE_BONJOUR=1
  fi
-@@ -572,7 +567,7 @@ AC_CHECK_FUNCS_ONCE([strerror_r])
- AC_CHECK_FUNCS_ONCE([lstat])
- 
- # Non-standard
--AC_CHECK_FUNCS_ONCE([setresuid setresgid setreuid setregid seteuid setegid ppoll strsignal sig2str strtod_l pipe2 accept4])
-+AC_CHECK_FUNCS_ONCE([setresuid setresgid setreuid setregid seteuid setegid ppoll strsignal sig2str strtod_l pipe2 accept4 paccept])
- 
- AC_FUNC_ALLOCA
- 
 @@ -1001,7 +996,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
  
  PA_MACHINE_ID="${sysconfdir}/machine-id"
diff --git a/pulseaudio-git/patches/patch-src_Makefile.am b/pulseaudio-git/patches/patch-src_Makefile.am
index 3b58db9..a015897 100644
--- a/pulseaudio-git/patches/patch-src_Makefile.am
+++ b/pulseaudio-git/patches/patch-src_Makefile.am
@@ -3,7 +3,7 @@ $NetBSD: patch-src_Makefile.am,v 1.1 2014/06/09 13:08:19 ryoon Exp $
 Install files into pkgsrc example paths; will be correctly
 installed by pkgsrc configuration file framework.
 
---- src/Makefile.am.orig	2015-10-30 12:14:56.000000000 +0000
+--- src/Makefile.am.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/Makefile.am
 @@ -25,14 +25,14 @@ pulseincludedir=$(includedir)/pulse
  pulsecoreincludedir=$(includedir)/pulsecore
diff --git a/pulseaudio-git/patches/patch-src_Makefile.in b/pulseaudio-git/patches/patch-src_Makefile.in
deleted file mode 100644
index 3b430f0..0000000
--- a/pulseaudio-git/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.4 2014/08/07 07:43:48 spz Exp $
-
-Use pkgsrc infrastructure for config files.
-
---- src/Makefile.in.orig	2015-10-30 12:27:07.000000000 +0000
-+++ src/Makefile.in
-@@ -3486,7 +3486,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
--pulseconfdir = @pulseconfdir@
-+pulseconfdir = ${EGDIR}
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-@@ -3501,10 +3501,10 @@ zshcompletiondir = @zshcompletiondir@
- pulseincludedir = $(includedir)/pulse
- pulsecoreincludedir = $(includedir)/pulsecore
- pulselibexecdir = $(libexecdir)/pulse
--@HAVE_X11_TRUE@xdgautostartdir = $(sysconfdir)/xdg/autostart
-+@HAVE_X11_TRUE@xdgautostartdir = ${EGDIR}
- @HAVE_ALSA_TRUE@alsaprofilesetsdir = $(datadir)/pulseaudio/alsa-mixer/profile-sets
- @HAVE_ALSA_TRUE@alsapathsdir = $(datadir)/pulseaudio/alsa-mixer/paths
--@HAVE_DBUS_TRUE@dbuspolicydir = $(sysconfdir)/dbus-1/system.d
-+@HAVE_DBUS_TRUE@dbuspolicydir = ${EGDIR}
- 
- ###################################
- #     Compiler/linker flags       #
diff --git a/pulseaudio-git/patches/patch-src_daemon_caps.c b/pulseaudio-git/patches/patch-src_daemon_caps.c
index deb4954..48e63c4 100644
--- a/pulseaudio-git/patches/patch-src_daemon_caps.c
+++ b/pulseaudio-git/patches/patch-src_daemon_caps.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_daemon_caps.c,v 1.1 2014/06/09 13:08:19 ryoon Exp $
 
 Disable warning about capabilities that only makes sense on Linux.
 
---- src/daemon/caps.c.orig	2015-09-10 04:51:41.000000000 +0000
+--- src/daemon/caps.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/daemon/caps.c
 @@ -92,8 +92,10 @@ void pa_drop_caps(void) {
  #error "Don't know how to do capabilities on your system.  Please send a patch."
diff --git a/pulseaudio-git/patches/patch-src_daemon_main.c b/pulseaudio-git/patches/patch-src_daemon_main.c
index 78055ca..1b5f48e 100644
--- a/pulseaudio-git/patches/patch-src_daemon_main.c
+++ b/pulseaudio-git/patches/patch-src_daemon_main.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_daemon_main.c,v 1.3 2015/09/25 14:37:27 ryoon Exp $
 
 Only display Linux-specific warning on Linux.
 
---- src/daemon/main.c.orig	2015-10-30 12:16:48.000000000 +0000
+--- src/daemon/main.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/daemon/main.c
 @@ -997,10 +997,12 @@ int main(int argc, char *argv[]) {
  
diff --git a/pulseaudio-git/patches/patch-src_modules_module-detect.c b/pulseaudio-git/patches/patch-src_modules_module-detect.c
index 8e8a9f4..3cab2f5 100644
--- a/pulseaudio-git/patches/patch-src_modules_module-detect.c
+++ b/pulseaudio-git/patches/patch-src_modules_module-detect.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_modules_module-detect.c,v 1.2 2014/06/25 15:26:40 ryoon Exp $
 
 Hack to set proper sound device on NetBSD.
 
---- src/modules/module-detect.c.orig	2015-09-10 04:51:41.000000000 +0000
+--- src/modules/module-detect.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/modules/module-detect.c
 @@ -120,6 +120,17 @@ static int detect_oss(pa_core *c, int ju
      FILE *f;
diff --git a/pulseaudio-git/patches/patch-src_modules_module-solaris.c b/pulseaudio-git/patches/patch-src_modules_module-solaris.c
index 28e897c..0e2daf9 100644
--- a/pulseaudio-git/patches/patch-src_modules_module-solaris.c
+++ b/pulseaudio-git/patches/patch-src_modules_module-solaris.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_modules_module-solaris.c,v 1.1 2015/03/16 14:57:49 jperkin Ex
 
 Catch up with newer API.
 
---- src/modules/module-solaris.c.orig	2015-09-10 04:51:41.000000000 +0000
+--- src/modules/module-solaris.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/modules/module-solaris.c
 @@ -412,10 +412,12 @@ static int sink_process_msg(pa_msgobject
                          pa_smoother_resume(u->smoother, pa_rtclock_now(), true);
diff --git a/pulseaudio-git/patches/patch-src_modules_oss_module-oss.c b/pulseaudio-git/patches/patch-src_modules_oss_module-oss.c
index e98e3b1..564e322 100644
--- a/pulseaudio-git/patches/patch-src_modules_oss_module-oss.c
+++ b/pulseaudio-git/patches/patch-src_modules_oss_module-oss.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_modules_oss_module-oss.c,v 1.2 2014/06/25 15:26:40 ryoon Exp
 
 Set proper sound device default on NetBSD.
 
---- src/modules/oss/module-oss.c.orig	2015-09-10 04:51:41.000000000 +0000
+--- src/modules/oss/module-oss.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/modules/oss/module-oss.c
 @@ -96,7 +96,11 @@ PA_MODULE_USAGE(
  PA_MODULE_DEPRECATED("Please use module-alsa-card instead of module-oss!");
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_core-util.c b/pulseaudio-git/patches/patch-src_pulsecore_core-util.c
index 4d306ed..26f5f8d 100644
--- a/pulseaudio-git/patches/patch-src_pulsecore_core-util.c
+++ b/pulseaudio-git/patches/patch-src_pulsecore_core-util.c
@@ -1,6 +1,6 @@
 $NetBSD: patch-src_pulsecore_core-util.c,v 1.1 2015/09/25 14:37:27 ryoon Exp $
 
---- src/pulsecore/core-util.c.orig	2015-10-30 12:14:56.000000000 +0000
+--- src/pulsecore/core-util.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/pulsecore/core-util.c
 @@ -52,8 +52,11 @@
  #include <pcreposix.h>
@@ -23,16 +23,3 @@ $NetBSD: patch-src_pulsecore_core-util.c,v 1.1 2015/09/25 14:37:27 ryoon Exp $
  #include <mach/mach_init.h>
  #include <mach/thread_act.h>
  #include <mach/thread_policy.h>
-@@ -3501,6 +3503,12 @@ int pa_accept_cloexec(int sockfd, struct
- 
- #endif
- 
-+#ifdef HAVE_PACCEPT
-+    errno = 0;
-+    if ((fd = paccept(sockfd, addr, addrlen, NULL, SOCK_CLOEXEC)) >= 0)
-+        goto finish;
-+#endif
-+
-     if ((fd = accept(sockfd, addr, addrlen)) >= 0)
-         goto finish;
- 
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_mix__neon.c b/pulseaudio-git/patches/patch-src_pulsecore_mix__neon.c
index 82bc77b..c9e67ca 100644
--- a/pulseaudio-git/patches/patch-src_pulsecore_mix__neon.c
+++ b/pulseaudio-git/patches/patch-src_pulsecore_mix__neon.c
@@ -1,6 +1,6 @@
 $NetBSD: patch-src_pulsecore_mix__neon.c,v 1.1 2015/02/28 23:41:58 joerg Exp $
 
---- src/pulsecore/mix_neon.c.orig	2015-07-28 03:30:52.000000000 +0000
+--- src/pulsecore/mix_neon.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/pulsecore/mix_neon.c
 @@ -175,6 +175,10 @@ static void pa_mix2_ch4_s16ne_neon(pa_mi
  
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_sample-util.h b/pulseaudio-git/patches/patch-src_pulsecore_sample-util.h
index 5c58c67..5de36b3 100644
--- a/pulseaudio-git/patches/patch-src_pulsecore_sample-util.h
+++ b/pulseaudio-git/patches/patch-src_pulsecore_sample-util.h
@@ -2,7 +2,7 @@ $NetBSD: patch-src_pulsecore_sample-util.h,v 1.1 2014/06/09 13:08:19 ryoon Exp $
 
 Define glibc-specific (?) __WORDSIZE.
 
---- src/pulsecore/sample-util.h.orig	2015-09-10 04:51:41.000000000 +0000
+--- src/pulsecore/sample-util.h.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/pulsecore/sample-util.h
 @@ -32,6 +32,14 @@
  #include <pulsecore/memblock.h>
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_svolume__mmx.c b/pulseaudio-git/patches/patch-src_pulsecore_svolume__mmx.c
index b3d8d1a..763ce35 100644
--- a/pulseaudio-git/patches/patch-src_pulsecore_svolume__mmx.c
+++ b/pulseaudio-git/patches/patch-src_pulsecore_svolume__mmx.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_pulsecore_svolume__mmx.c,v 1.4 2015/02/21 23:13:10 ryoon Exp
 
 Avoid bad register usage on OSX 32-bit.
 
---- src/pulsecore/svolume_mmx.c.orig	2015-09-10 04:51:41.000000000 +0000
+--- src/pulsecore/svolume_mmx.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/pulsecore/svolume_mmx.c
 @@ -32,7 +32,7 @@
  
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_svolume__sse.c b/pulseaudio-git/patches/patch-src_pulsecore_svolume__sse.c
index d71c391..063c910 100644
--- a/pulseaudio-git/patches/patch-src_pulsecore_svolume__sse.c
+++ b/pulseaudio-git/patches/patch-src_pulsecore_svolume__sse.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_pulsecore_svolume__sse.c,v 1.4 2015/02/21 23:13:10 ryoon Exp
 
 Avoid bad register usage on OSX 32-bit.
 
---- src/pulsecore/svolume_sse.c.orig	2015-09-10 04:51:41.000000000 +0000
+--- src/pulsecore/svolume_sse.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/pulsecore/svolume_sse.c
 @@ -32,7 +32,7 @@
  
diff --git a/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c b/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
index 3f081e4..cf4c255 100644
--- a/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
+++ b/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_tests_mult-s16-test.c,v 1.1 2014/06/09 13:08:19 ryoon Exp $
 
 Define glibc-specific (?) __WORDSIZE.
 
---- src/tests/mult-s16-test.c.orig	2015-09-10 04:51:41.000000000 +0000
+--- src/tests/mult-s16-test.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/tests/mult-s16-test.c
 @@ -28,6 +28,14 @@
  #include <pulsecore/random.h>
diff --git a/pulseaudio-git/patches/patch-src_tests_rtpoll-test.c b/pulseaudio-git/patches/patch-src_tests_rtpoll-test.c
index 27aa90a..4418f69 100644
--- a/pulseaudio-git/patches/patch-src_tests_rtpoll-test.c
+++ b/pulseaudio-git/patches/patch-src_tests_rtpoll-test.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_tests_rtpoll-test.c,v 1.1 2014/06/09 13:08:19 ryoon Exp $
 
 Build fix for systems without real-time signals.
 
---- src/tests/rtpoll-test.c.orig	2015-09-10 04:51:41.000000000 +0000
+--- src/tests/rtpoll-test.c.orig	2015-11-28 09:05:41.000000000 +0000
 +++ src/tests/rtpoll-test.c
 @@ -83,6 +83,7 @@ START_TEST (rtpoll_test) {
  END_TEST
Prev by Date: pulseaudio-git: Regenerate distinfo
Next by Date: Update py-yenc to 0.4.0.
Previous by Thread: pulseaudio-git: Regenerate distinfo
Next by Thread: Update py-yenc to 0.4.0.
Indexes:
Home | Main Index | Thread Index | Old Index