From owner-svn-ports-head@FreeBSD.ORG Sat Jun 13 21:32:15 2015 Return-Path: Delivered-To: svn-ports-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4513785; Sat, 13 Jun 2015 21:32:15 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1812250; Sat, 13 Jun 2015 21:32:15 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5DLWFRb011300; Sat, 13 Jun 2015 21:32:15 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5DLWEZJ011297; Sat, 13 Jun 2015 21:32:14 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201506132132.t5DLWEZJ011297@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sat, 13 Jun 2015 21:32:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r389555 - in head/audio/pulseaudio: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jun 2015 21:32:16 -0000 Author: kwm Date: Sat Jun 13 21:32:14 2015 New Revision: 389555 URL: https://svnweb.freebsd.org/changeset/ports/389555 Log: * Fix segfault on HEAD part 2. * Make sure that linux/kFreeBSD code isn't run on FreeBSD itself. * Pass the correct value back via the argument of the calling function. [1] * Fix white space to match the rest of the file, so upstream can't complain about that. * Drop freedesktop-sound-theme it isn't used by default. Add line to pkg-message to mention that it needs to be installed if enabled in default.pa. * Don't use ETCDIR in pkg-message.in, it gets expanded to ${LOCALBASE}/etc/pulseaudio which isn't correct since pulseaudio uses etc/pulse/ [1] I have no idea what I did to break this in the first version, while it worked at the time localy. Modified: head/audio/pulseaudio/Makefile head/audio/pulseaudio/files/patch-src_pulse_util.c head/audio/pulseaudio/files/pkg-message.in Modified: head/audio/pulseaudio/Makefile ============================================================================== --- head/audio/pulseaudio/Makefile Sat Jun 13 20:55:08 2015 (r389554) +++ head/audio/pulseaudio/Makefile Sat Jun 13 21:32:14 2015 (r389555) @@ -6,7 +6,7 @@ PORTNAME= pulseaudio PORTVERSION= 6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ @@ -25,7 +25,6 @@ LIB_DEPENDS= libsndfile.so:${PORTSDIR}/a libdbus-1.so:${PORTSDIR}/devel/dbus \ libltdl.so:${PORTSDIR}/devel/libltdl \ libck-connector.so:${PORTSDIR}/sysutils/consolekit -RUN_DEPENDS= freedesktop-sound-theme>=0:${PORTSDIR}/audio/freedesktop-sound-theme USE_GNOME= glib20 intltool USE_XORG= x11 sm xtst ice Modified: head/audio/pulseaudio/files/patch-src_pulse_util.c ============================================================================== --- head/audio/pulseaudio/files/patch-src_pulse_util.c Sat Jun 13 20:55:08 2015 (r389554) +++ head/audio/pulseaudio/files/patch-src_pulse_util.c Sat Jun 13 21:32:14 2015 (r389555) @@ -1,5 +1,5 @@ ---- src/pulse/util.c.orig 2015-02-12 15:10:35.000000000 +0100 -+++ src/pulse/util.c 2015-05-31 17:50:08.221242000 +0200 +--- src/pulse/util.c.orig 2015-02-12 09:10:35.000000000 -0500 ++++ src/pulse/util.c 2015-06-13 17:15:14.603153000 -0400 @@ -30,6 +30,10 @@ #include #include @@ -11,7 +11,16 @@ #ifdef HAVE_PWD_H #include -@@ -215,13 +219,14 @@ char *pa_get_binary_name(char *s, size_t +@@ -200,7 +204,7 @@ char *pa_get_binary_name(char *s, size_t + } + #endif + +-#if defined(__linux__) || defined(__FreeBSD_kernel__) ++#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) + { + char *rp; + /* This works on Linux and Debian/kFreeBSD */ +@@ -215,13 +219,17 @@ char *pa_get_binary_name(char *s, size_t #ifdef __FreeBSD__ { @@ -21,13 +30,15 @@ - pa_strlcpy(s, pa_path_get_filename(rp), l); - pa_xfree(rp); - return s; -- } + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()}; + struct kinfo_proc kp; + size_t sz = sizeof(kp); + -+ if (sysctl(mib, 4, &kp, &sz, NULL, 0) == 0) ++ if (sysctl(mib, 4, &kp, &sz, NULL, 0) == 0) ++ { ++ pa_strlcpy(s, kp.ki_comm, l); + return kp.ki_comm; + } + else + return NULL; } Modified: head/audio/pulseaudio/files/pkg-message.in ============================================================================== --- head/audio/pulseaudio/files/pkg-message.in Sat Jun 13 20:55:08 2015 (r389554) +++ head/audio/pulseaudio/files/pkg-message.in Sat Jun 13 21:32:14 2015 (r389555) @@ -9,7 +9,10 @@ To change the default sink (output): To change the default source (input): # pacmd set-default-source 3 -This can also be set in %%ETCDIR%%/pulse/default.pa +This can also be set in %%LOCALBASE%%/etc/pulse/default.pa Replace the number '3' with the new default your want to set. + +The audio/freedesktop-sound-theme is needed if the default sound files +are uncommented in the %%LOCALBASE%%/etc/pulse/default.pa file.