Changeset 145997 for trunk/dports/audio


Ignore:
Timestamp:
Feb 24, 2016, 3:07:26 AM (3 years ago)
Author:
ionic@…
Message:

pulseaudio: update to 8.0.

Changes:

  • Drop libsamplerate support, was already deprecated in 6.0 and speex can handle everything libsamplerate did.
  • Add soxr as a normal dependency for resampling support. Disable when using the minimal variant.
  • Refactor patches, drop upstreamed patches, rework the others.
Location:
trunk/dports/audio/pulseaudio
Files:
2 added
5 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/audio/pulseaudio/Portfile

    r139033 r145997  
    99
    1010name                pulseaudio
    11 version             6.0
    12 revision            9
     11version             8.0
     12revision            0
    1313license             LGPL-2.1
    1414categories          audio
     
    2929use_xz              yes
    3030
    31 checksums           rmd160  a3f96cabc2872646c34ba581d6044dc4a6513fd9 \
    32                     sha256  b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6
     31checksums           rmd160  fc2700ec34ae9cbecd85c1ad6253b4c224541c96 \
     32                    sha256  690eefe28633466cfd1ab9d85ebfa9376f6b622deec6bfee5091ac9737cd1989
    3333
    3434depends_build       port:pkgconfig \
     
    4242                    port:json-c \
    4343                    port:libsndfile \
    44                     port:libsamplerate \
    4544                    port:libtool \
    4645                    port:gdbm \
     
    5049                    port:fftw-3-single \
    5150                    path:lib/libspeex.dylib:speex \
    52                     port:orc
     51                    port:orc \
     52                    port:soxr
    5353
    5454# configure falls back to libatomic_ops as last resort
     
    6767#configure.cxxflags-append -g3 -ggdb3 -gdwarf-4 -O0
    6868
    69 # The last three patches make PulseAudio startup correctly.
     69# Some patches make PulseAudio startup correctly.
    7070# Will hopefully be merged upstream soon.
    71 # All work has been sent upstream.
     71# All work has or will be sent upstream.
    7272# C.f. https://bugs.freedesktop.org/show_bug.cgi?id=62987
    7373# and posts on the mailing list.
    7474patchfiles          patch-man-Makefile.am.diff \
    7575                    i386.patch \
    76                     patch-configure.ac-add-HAVE_COREAUDIO.diff \
    7776                    patch-configure.ac-coreservices.diff \
    78                     patch-src_daemon_default.pa.in-load-module-coreaudio-detect.diff \
    79                     patch-src_daemon_system.pa.in-load-module-coreaudio-detect.diff \
     77                    patch-src_modules_macosx_module_coreaudio_device.c-dynamically-allocate-C-string-when-converting-from-CFString.patch \
     78                    patch-src_modules_macosx_module_coreaudio_device.c-skip-unsupported-channels-count.diff \
     79                    patch-src_modules_macosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff \
    8080                    patch-src_daemon_default.pa.in-skip-consolekit-and-systemdlogin.diff \
    81                     patch-src_modules_macosx_module_coreaudio_device.c-fix-device-names.diff \
    82                     patch-src_modules_macosx_module_coreaudio_device.c-fix-channels.diff \
    83                     patch-src_modules_macosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff \
    8481                    patch-src_modules_macosx_module_coreaudio_detect_device.c-add-record-playback-modarg.diff
    8582
     
    9592configure.args      --with-mac-version-min=$macosx_deployment_target \
    9693                    --with-caps \
     94                    --with-soxr \
    9795                    --disable-silent-rules \
    9896                    --disable-tests \
     
    148146variant minimal conflicts jack conflicts x11 description {Builds a minimal version. Do not use if unsure. Please build this ONLY in trace mode.} {
    149147    depends_lib-delete      port:libiconv \
    150                             port:libsamplerate \
    151148                            port:gdbm \
    152149                            path:lib/pkgconfig/glib-2.0.pc:glib2 \
     
    154151                            port:dbus \
    155152                            port:fftw-3-single \
    156                             port:orc
     153                            port:orc \
     154                            port:soxr
     155
     156    configure.args-replace  --with-soxr \
     157                            --without-soxr
    157158
    158159    configure.args-replace  --enable-orc \
  • trunk/dports/audio/pulseaudio/files/patch-configure.ac-coreservices.diff

    r137652 r145997  
    1 --- configure.ac.orig   2015-06-16 02:16:21.000000000 -0700
    2 +++ configure.ac        2015-06-16 02:24:07.000000000 -0700
    3 @@ -521,13 +521,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
     1--- configure.ac.old    2016-01-22 08:33:38.000000000 +0100
     2+++ configure.ac        2016-02-22 21:15:46.000000000 +0100
     3@@ -533,13 +533,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
    44 # Darwin/OS X
    55 if test "x$os_is_darwin" = "x1" ; then
  • trunk/dports/audio/pulseaudio/files/patch-man-Makefile.am.diff

    r135547 r145997  
    1 --- man/Makefile.am.old 2015-04-17 00:22:04.000000000 +0200
    2 +++ man/Makefile.am     2015-04-17 00:23:14.000000000 +0200
    3 @@ -59,7 +59,7 @@
     1--- man/Makefile.am.old 2015-09-10 06:51:41.000000000 +0200
     2+++ man/Makefile.am     2016-02-22 20:59:16.000000000 +0100
     3@@ -57,7 +57,7 @@ CLEANFILES = \
    44        $(dist_man_MANS)
    55 
     
    88+       $(AM_V_GEN) @@MP_PERL@@ $(srcdir)/xmltoman $< > $@ || rm -f $@
    99 
    10  endif
    11  
     10 if OS_IS_WIN32
     11 SYMLINK_PROGRAM=cd $(DESTDIR)$(man1dir) && cp
  • trunk/dports/audio/pulseaudio/files/patch-src_daemon_caps.c-enable-root.diff

    r135548 r145997  
    1 --- src/daemon/caps.c.old       2015-04-19 04:21:39.000000000 +0200
    2 +++ src/daemon/caps.c   2015-04-19 04:31:07.000000000 +0200
     1--- src/daemon/caps.c.old       2015-09-10 06:51:41.000000000 +0200
     2+++ src/daemon/caps.c   2016-02-22 22:08:05.000000000 +0100
    33@@ -54,22 +54,22 @@ void pa_drop_root(void) {
    44     gid = getgid();
  • trunk/dports/audio/pulseaudio/files/patch-src_daemon_default.pa.in-skip-consolekit-and-systemdlogin.diff

    r135547 r145997  
    1 --- src/daemon/default.pa.in.old        2015-04-20 06:24:03.000000000 +0200
    2 +++ src/daemon/default.pa.in    2015-04-21 05:49:35.000000000 +0200
     1--- src/daemon/default.pa.in.old        2016-01-18 11:14:20.000000000 +0100
     2+++ src/daemon/default.pa.in    2016-02-22 21:31:10.000000000 +0100
    33@@ -153,12 +153,14 @@ load-module module-suspend-on-idle
    44 
  • trunk/dports/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_detect_device.c-add-record-playback-modarg.diff

    r135601 r145997  
    1 --- src/modules/macosx/module-coreaudio-detect.c.old    2015-04-27 21:10:17.000000000 +0200
    2 +++ src/modules/macosx/module-coreaudio-detect.c        2015-04-27 22:09:07.000000000 +0200
     1--- src/modules/macosx/module-coreaudio-detect.c.old    2015-09-10 06:51:41.000000000 +0200
     2+++ src/modules/macosx/module-coreaudio-detect.c        2016-02-23 00:59:31.000000000 +0100
    33@@ -39,10 +39,14 @@ PA_MODULE_AUTHOR("Daniel Mack");
    44 PA_MODULE_DESCRIPTION("CoreAudio device detection");
     
    4646     m->userdata = u;
    4747 
    48 @@ -220,6 +227,16 @@ int pa__init(pa_module *m) {
     48@@ -220,6 +227,23 @@ int pa__init(pa_module *m) {
    4949         goto fail;
    5050     }
    5151 
     52+    /*
     53+     * Set default value to true if not given as a modarg.
     54+     * In such a case, pa_modargs_get_value_boolean() will not touch the
     55+     * buffer.
     56+     */
     57+    u->playback = u->record = true;
     58+
    5259+    if (pa_modargs_get_value_boolean(ma, "record", &u->record) < 0 || pa_modargs_get_value_boolean(ma, "playback", &u->playback) < 0) {
    5360+        pa_log("record= and playback= expect boolean argument.");
     
    6370 
    6471     property_address.mSelector = kAudioHardwarePropertyDevices;
    65 --- src/modules/macosx/module-coreaudio-device.c.old    2015-04-27 21:10:17.000000000 +0200
    66 +++ src/modules/macosx/module-coreaudio-device.c        2015-04-27 22:04:21.000000000 +0200
     72--- src/modules/macosx/module-coreaudio-device.c.old    2016-02-23 00:57:43.000000000 +0100
     73+++ src/modules/macosx/module-coreaudio-device.c        2016-02-23 00:59:31.000000000 +0100
    6774@@ -58,11 +58,15 @@ PA_MODULE_DESCRIPTION("CoreAudio device"
    6875 PA_MODULE_VERSION(PACKAGE_VERSION);
  • trunk/dports/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff

    r135547 r145997  
    1 --- src/modules/macosx/module-coreaudio-device.c.old    2015-04-20 01:41:14.000000000 +0200
    2 +++ src/modules/macosx/module-coreaudio-device.c        2015-04-20 01:43:58.000000000 +0200
     1--- src/modules/macosx/module-coreaudio-device.c.old    2016-02-23 23:32:59.000000000 +0100
     2+++ src/modules/macosx/module-coreaudio-device.c        2016-02-23 23:33:34.000000000 +0100
    33@@ -43,6 +43,7 @@
    44 #include <pulsecore/thread.h>
     
    99 #include <CoreAudio/CoreAudio.h>
    1010 #include <CoreAudio/CoreAudioTypes.h>
    11 @@ -416,7 +417,7 @@ static int ca_device_create_sink(pa_modu
     11@@ -408,7 +409,7 @@ static int ca_device_create_sink(pa_modu
    1212     coreaudio_sink *ca_sink;
    1313     pa_sink *sink;
    14      unsigned int i, channels;
    15 -    char tmp[255];
    16 +    char tmp[255], *tmp_clamp;
     14     unsigned int i;
     15-    char *tmp;
     16+    char *tmp, *tmp_clamp;
    1717     pa_strbuf *strbuf;
    1818     AudioObjectPropertyAddress property_address;
    19      CFStringRef tmp_cfstr;
    20 @@ -455,7 +456,14 @@ static int ca_device_create_sink(pa_modu
    21          pa_strbuf_puts(strbuf, tmp);
     19     CFStringRef tmp_cfstr = NULL;
     20@@ -450,7 +451,15 @@ static int ca_device_create_sink(pa_modu
     21         pa_xfree(tmp);
    2222     }
    2323 
    24 -    ca_sink->name = pa_strbuf_tostring_free(strbuf);
     24-    ca_sink->name = pa_strbuf_to_string_free(strbuf);
    2525+    /* Clamp to PA_NAME_MAX and leave a "safety margin" for deduplication
    2626+     * and other appended data. */
    27 +    tmp_clamp = pa_strbuf_tostring_free(strbuf);
     27+    tmp_clamp = pa_strbuf_to_string_free(strbuf);
     28+    tmp = pa_xmalloc0(PA_NAME_MAX);
    2829+    strncpy(tmp, tmp_clamp, PA_NAME_MAX - 20);
    2930+    tmp[PA_NAME_MAX - 20] = 0;
     
    3435     pa_log_debug("Stream name is >%s<", ca_sink->name);
    3536 
    36 @@ -546,7 +554,7 @@ static int ca_device_create_source(pa_mo
     37@@ -541,7 +550,7 @@ static int ca_device_create_source(pa_mo
    3738     coreaudio_source *ca_source;
    3839     pa_source *source;
    39      unsigned int i, channels;
    40 -    char tmp[255];
    41 +    char tmp[255], *tmp_clamp;
     40     unsigned int i;
     41-    char *tmp;
     42+    char *tmp, *tmp_clamp;
    4243     pa_strbuf *strbuf;
    4344     AudioObjectPropertyAddress property_address;
    44      CFStringRef tmp_cfstr;
    45 @@ -585,7 +593,14 @@ static int ca_device_create_source(pa_mo
    46          pa_strbuf_puts(strbuf, tmp);
     45     CFStringRef tmp_cfstr = NULL;
     46@@ -583,7 +592,15 @@ static int ca_device_create_source(pa_mo
     47         pa_xfree(tmp);
    4748     }
    4849 
    49 -    ca_source->name = pa_strbuf_tostring_free(strbuf);
     50-    ca_source->name = pa_strbuf_to_string_free(strbuf);
    5051+    /* Clamp to PA_NAME_MAX and leave a "safety margin" for deduplication
    5152+     * and other appended data. */
    52 +    tmp_clamp = pa_strbuf_tostring_free(strbuf);
     53+    tmp_clamp = pa_strbuf_to_string_free(strbuf);
     54+    tmp = pa_xmalloc0(PA_NAME_MAX);
    5355+    strncpy(tmp, tmp_clamp, PA_NAME_MAX - 20);
    5456+    tmp[PA_NAME_MAX - 20] = 0;
Note: See TracChangeset for help on using the changeset viewer.