svn commit: r307658 - branches/RELENG_9_1_0/multimedia/vlc/files

[Juergen Lock]

Author: nox
Date: Thu Nov 22 17:42:13 2012
New Revision: 307658
URL: http://svnweb.freebsd.org/changeset/ports/307658

Log:
  MFH 307524:
  
  - Fix pulseaudio segfault. [1]
  - No PORTREVISION bump as PULSEAUDIO isn't a default option.
  
  Reported by:	Rainer Hurling <rhurlin at gwdg.de> on -multimedia [1]
  Feature safe:	yes
  Approved by:	portmgr (beat)

Added:
  branches/RELENG_9_1_0/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c
     - copied unchanged from r307524, head/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c
Modified:
Directory Properties:
  branches/RELENG_9_1_0/   (props changed)

Copied: branches/RELENG_9_1_0/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c (from r307524, head/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/RELENG_9_1_0/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c	Thu Nov 22 17:42:13 2012	(r307658, copy of r307524, head/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c)
@@ -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");