pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pulseaudio-git: Eliminate merged patches
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Jan 22 20:50:06 2016 +0100
Changeset: fd135dfd4080841c611adc7ec7171334a16e94de
Modified Files:
pulseaudio-git/distinfo
pulseaudio-git/patches/patch-aa
pulseaudio-git/patches/patch-configure.ac
Removed Files:
pulseaudio-git/patches/patch-src_modules_module-solaris.c
Log Message:
pulseaudio-git: Eliminate merged patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fd135dfd4080841c611adc7ec7171334a16e94de
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
pulseaudio-git/distinfo | 5 ++-
pulseaudio-git/patches/patch-aa | 40 ++--------------------
pulseaudio-git/patches/patch-configure.ac | 24 +++----------
.../patches/patch-src_modules_module-solaris.c | 35 -------------------
4 files changed, 9 insertions(+), 95 deletions(-)
diffs:
diff --git a/pulseaudio-git/distinfo b/pulseaudio-git/distinfo
index 829aa34..f6122f0 100644
--- a/pulseaudio-git/distinfo
+++ b/pulseaudio-git/distinfo
@@ -4,11 +4,10 @@ SHA1 (pulseaudio-7.1.tar.gz) = e7b8e2d3e3a384379f3d99458f9ff9cff56b709b
RMD160 (pulseaudio-7.1.tar.gz) = f6138695f1cfddfcb72654e8b204b0731c8a2234
SHA512 (pulseaudio-7.1.tar.gz) = c2b8946a4dfb4fa2a8c7a504d9375bd51086c0f2f40aa6ddbb56115815a01665f491507d367baa375bc9595e31bb0d88f15208a1c2ad507bfa40e1bde1213091
Size (pulseaudio-7.1.tar.gz) = 2686090 bytes
-SHA1 (patch-aa) = bef8282af4a2051d9421c2bdc8e652254beeddd7
-SHA1 (patch-configure.ac) = 8982063a47ef70c272e84425be0cdf7315a9e6d2
+SHA1 (patch-aa) = cd444f13dcee5eb76165c2a4379fe622776e2d6a
+SHA1 (patch-configure.ac) = a71aa8af8ebd8e894e2dd16e2ed6e7543a8cd287
SHA1 (patch-src_Makefile.am) = 4533c3123d4beba08165e40137b73ae37ce62b31
SHA1 (patch-src_modules_module-detect.c) = 4e1db6d3b3224c097ecd981d3f055880ecff780a
-SHA1 (patch-src_modules_module-solaris.c) = 814fefd672f9db75ef3209b50538e2a71aceaf01
SHA1 (patch-src_modules_oss_module-oss.c) = 6199e48a842dc076b14d039c249295566bcb2c03
SHA1 (patch-src_pulsecore_mix__neon.c) = a0810584e0271b0e6ac019e0716e99f6022872ef
SHA1 (patch-src_pulsecore_svolume__mmx.c) = d94c619ce46f56d55a4964c2626b29cab097418a
diff --git a/pulseaudio-git/patches/patch-aa b/pulseaudio-git/patches/patch-aa
index ce98d4a..ea0fad3 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-12-05 22:03:14.000000000 +0000
+--- src/utils/padsp.c.orig 2016-01-22 10:15:37.000000000 +0000
+++ src/utils/padsp.c
@@ -47,6 +47,9 @@
#ifdef __linux__
@@ -76,43 +76,7 @@ SOUND_PCM_* is not available on SunOS.
pthread_mutex_unlock(&func_mutex); \
} while(0)
-@@ -2278,6 +2304,7 @@ static int dsp_ioctl(fd_info *i, unsigne
- break;
- }
-
-+#if HAVE_DECL_SOUND_PCM_READ_RATE
- case SOUND_PCM_READ_RATE:
- debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n");
-
-@@ -2285,7 +2312,9 @@ static int dsp_ioctl(fd_info *i, unsigne
- *(int*) argp = i->sample_spec.rate;
- pa_threaded_mainloop_unlock(i->mainloop);
- break;
-+#endif
-
-+#if HAVE_DECL_SOUND_PCM_READ_CHANNELS
- case SOUND_PCM_READ_CHANNELS:
- debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_CHANNELS\n");
-
-@@ -2293,7 +2322,9 @@ static int dsp_ioctl(fd_info *i, unsigne
- *(int*) argp = i->sample_spec.channels;
- pa_threaded_mainloop_unlock(i->mainloop);
- break;
-+#endif
-
-+#if HAVE_DECL_SOUND_PCM_READ_BITS
- case SOUND_PCM_READ_BITS:
- debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_BITS\n");
-
-@@ -2301,6 +2332,7 @@ static int dsp_ioctl(fd_info *i, unsigne
- *(int*) argp = pa_sample_size(&i->sample_spec)*8;
- pa_threaded_mainloop_unlock(i->mainloop);
- break;
-+#endif
-
- case SNDCTL_DSP_GETOPTR: {
- count_info *info;
-@@ -2371,21 +2403,35 @@ fail:
+@@ -2377,21 +2403,35 @@ fail:
return ret;
}
diff --git a/pulseaudio-git/patches/patch-configure.ac b/pulseaudio-git/patches/patch-configure.ac
index e4e1e06..c6c9d73 100644
--- a/pulseaudio-git/patches/patch-configure.ac
+++ b/pulseaudio-git/patches/patch-configure.ac
@@ -6,7 +6,7 @@ $NetBSD$
file framework will install them in the right place.
* Avoid hardcoded SDK paths on Darwin.
---- configure.ac.orig 2016-01-08 22:26:44.000000000 +0000
+--- configure.ac.orig 2016-01-22 10:15:37.000000000 +0000
+++ configure.ac
@@ -21,7 +21,7 @@
@@ -43,21 +43,7 @@ $NetBSD$
AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement])
HAVE_BONJOUR=1
fi
-@@ -780,6 +773,13 @@ AM_CONDITIONAL([HAVE_OSS_WRAPPER], [test
- AS_IF([test "x$HAVE_OSS_OUTPUT" = "x1"], AC_DEFINE([HAVE_OSS_OUTPUT], 1, [Have OSS output?]))
- AS_IF([test "x$HAVE_OSS_WRAPPER" = "x1"], AC_DEFINE([HAVE_OSS_WRAPPER], 1, [Have OSS wrapper (padsp)?]))
-
-+# Some platforms like SunOS (Illumos) may ship without SOUND_PCM_* functionality
-+if test "x$HAVE_OSS" = "x1"; then
-+ AC_CHECK_DECLS([SOUND_PCM_READ_RATE], [], [], [[#include <sys/soundcard.h>]])
-+ AC_CHECK_DECLS([SOUND_PCM_READ_CHANNELS], [], [], [[#include <sys/soundcard.h>]])
-+ AC_CHECK_DECLS([SOUND_PCM_READ_BITS], [], [], [[#include <sys/soundcard.h>]])
-+fi
-+
- #### CoreAudio support (optional) ####
-
- AC_ARG_ENABLE([coreaudio-output],
-@@ -1016,7 +1016,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+@@ -1023,7 +1016,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
PA_MACHINE_ID="${sysconfdir}/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
@@ -66,7 +52,7 @@ $NetBSD$
AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
[Fallback machine-id file])
-@@ -1339,9 +1339,9 @@ fi
+@@ -1346,9 +1339,9 @@ fi
PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
@@ -78,7 +64,7 @@ $NetBSD$
AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir])
PA_BINARY=${bindir}/pulseaudio${EXEEXT}
-@@ -1353,8 +1353,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
+@@ -1360,8 +1353,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
AC_SUBST(PA_SOEXT, [.so])
AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
@@ -90,7 +76,7 @@ $NetBSD$
#### Mac OSX specific stuff #####
-@@ -1370,17 +1371,6 @@ AC_ARG_WITH(mac-sysroot,
+@@ -1377,17 +1371,6 @@ AC_ARG_WITH(mac-sysroot,
AS_HELP_STRING([--with-mac-sysroot=<path>], [SDK basedir to use as the logical root directory for headers and libraries.]),
mac_sysroot=$withval, mac_sysroot="/Developer/SDKs/MacOSX10.5.sdk")
diff --git a/pulseaudio-git/patches/patch-src_modules_module-solaris.c b/pulseaudio-git/patches/patch-src_modules_module-solaris.c
deleted file mode 100644
index 0e2daf9..0000000
--- a/pulseaudio-git/patches/patch-src_modules_module-solaris.c
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-src_modules_module-solaris.c,v 1.1 2015/03/16 14:57:49 jperkin Exp $
-
-Catch up with newer API.
-
---- 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);
-
- if (!u->source || u->source_suspended) {
-+ bool mute;
- if (unsuspend(u) < 0)
- return -1;
- u->sink->get_volume(u->sink);
-- u->sink->get_mute(u->sink);
-+ if (u->sink->get_mute(u->sink, &mute) >= 0)
-+ pa_sink_set_mute(u->sink, mute, false);
- }
- u->sink_suspended = false;
- }
-@@ -1033,8 +1035,12 @@ int pa__init(pa_module *m) {
-
- if (sink_new_data.muted_is_set)
- u->sink->set_mute(u->sink);
-- else
-- u->sink->get_mute(u->sink);
-+ else {
-+ bool mute;
-+
-+ if (u->sink->get_mute(u->sink, &mute) >= 0)
-+ pa_sink_set_mute(u->sink, mute, false);
-+ }
-
- pa_sink_put(u->sink);
- }
Home |
Main Index |
Thread Index |
Old Index