From owner-svn-ports-head@FreeBSD.ORG Sat Nov 17 20:26:58 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C5580F39; Sat, 17 Nov 2012 20:26:58 +0000 (UTC) (envelope-from nox@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 90C508FC08; Sat, 17 Nov 2012 20:26:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAHKQwCh077018; Sat, 17 Nov 2012 20:26:58 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAHKQwX5077017; Sat, 17 Nov 2012 20:26:58 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201211172026.qAHKQwX5077017@svn.freebsd.org> From: Juergen Lock Date: Sat, 17 Nov 2012 20:26:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307524 - head/multimedia/vlc/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.14 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, 17 Nov 2012 20:26:58 -0000 Author: nox Date: Sat Nov 17 20:26:58 2012 New Revision: 307524 URL: http://svnweb.freebsd.org/changeset/ports/307524 Log: - Fix pulseaudio segfault. [1] - No PORTREVISION bump as PULSEAUDIO isn't a default option. Reported by: Rainer Hurling on -multimedia [1] Feature safe: yes Added: head/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c (contents, props changed) Added: head/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c Sat Nov 17 20:26:58 2012 (r307524) @@ -0,0 +1,32 @@ +--- modules/audio_output/vlcpulse.c.orig ++++ modules/audio_output/vlcpulse.c +@@ -113,10 +113,12 @@ pa_context *vlc_pa_connect (vlc_object_t + struct passwd pwbuf, *pw; + char buf[len]; + +- if (getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw) == 0 +- && pw != NULL) +- pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_USER, +- pw->pw_name); ++ if (getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw) == 0) { ++ if (pw != NULL) ++ pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_USER, ++ pw->pw_name); ++ break; ++ } + } + + for (size_t max = sysconf (_SC_HOST_NAME_MAX), len = max % 1024 + 1024; +@@ -124,9 +126,11 @@ pa_context *vlc_pa_connect (vlc_object_t + { + char hostname[len]; + +- if (gethostname (hostname, sizeof (hostname)) == 0) ++ if (gethostname (hostname, sizeof (hostname)) == 0) { + pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_HOST, + hostname); ++ break; ++ } + } + + const char *session = getenv ("XDG_SESSION_COOKIE");