Revision: 149073 https://trac.macports.org/changeset/149073 Author: jeremyhu@macports.org Date: 2016-05-28 14:28:50 -0700 (Sat, 28 May 2016) Log Message: ----------- xinit: Add support for enabling IGLX and fix support for TCP connections Modified Paths: -------------- trunk/dports/x11/xinit/Portfile trunk/dports/x11/xinit/files/0001-launchd-Install-binaries-into-libexecdir.patch Added Paths: ----------- trunk/dports/x11/xinit/files/0002-startx-Add-listen-tcp-if-nolisten_tcp-is-disabled-fo.patch trunk/dports/x11/xinit/files/0003-startx-Add-support-for-enabling-IGLX-for-XQuartz.patch Modified: trunk/dports/x11/xinit/Portfile =================================================================== --- trunk/dports/x11/xinit/Portfile 2016-05-28 14:58:20 UTC (rev 149072) +++ trunk/dports/x11/xinit/Portfile 2016-05-28 21:28:50 UTC (rev 149073) @@ -5,7 +5,7 @@ name xinit version 1.3.4 -revision 2 +revision 3 categories x11 platforms darwin maintainers jeremyhu openmaintainer @@ -37,7 +37,9 @@ depends_lib port:xorg-libX11 patchfiles-append \ - 0001-launchd-Install-binaries-into-libexecdir.patch + 0001-launchd-Install-binaries-into-libexecdir.patch \ + 0002-startx-Add-listen-tcp-if-nolisten_tcp-is-disabled-fo.patch \ + 0003-startx-Add-support-for-enabling-IGLX-for-XQuartz.patch if {[vercmp ${os.version} 10.3.0] < 0} { patchfiles-append disable-launchagent.patch Modified: trunk/dports/x11/xinit/files/0001-launchd-Install-binaries-into-libexecdir.patch =================================================================== --- trunk/dports/x11/xinit/files/0001-launchd-Install-binaries-into-libexecdir.patch 2016-05-28 14:58:20 UTC (rev 149072) +++ trunk/dports/x11/xinit/files/0001-launchd-Install-binaries-into-libexecdir.patch 2016-05-28 21:28:50 UTC (rev 149073) @@ -1,7 +1,7 @@ From 72160c42bea2073bf95c01aca59a12f0ca7ab707 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Tue, 29 Dec 2015 17:03:43 -0800 -Subject: [PATCH] launchd: Install binaries into libexecdir +Subject: [PATCH 1/3] launchd: Install binaries into libexecdir Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> --- @@ -101,5 +101,5 @@ if [ x`defaults read $X11_PREFS_DOMAIN no_auth` = x0 ] ; then -- -2.6.4 +2.8.3 Added: trunk/dports/x11/xinit/files/0002-startx-Add-listen-tcp-if-nolisten_tcp-is-disabled-fo.patch =================================================================== --- trunk/dports/x11/xinit/files/0002-startx-Add-listen-tcp-if-nolisten_tcp-is-disabled-fo.patch (rev 0) +++ trunk/dports/x11/xinit/files/0002-startx-Add-listen-tcp-if-nolisten_tcp-is-disabled-fo.patch 2016-05-28 21:28:50 UTC (rev 149073) @@ -0,0 +1,29 @@ +From 208a47e0d8f62e7c77fa42137511de890feea7fe Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 28 May 2016 13:47:01 -0700 +Subject: [PATCH 2/3] startx: Add -listen tcp if nolisten_tcp is disabled for + XQuartz + +https://bugs.freedesktop.org/show_bug.cgi?id=95379 + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + startx.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/startx.cpp b/startx.cpp +index 2dda9e1..92e5bad 100644 +--- a/startx.cpp ++++ b/startx.cpp +@@ -105,6 +105,8 @@ fi + + if [ x`defaults read $X11_PREFS_DOMAIN nolisten_tcp` = x1 ] ; then + defaultserverargs="$defaultserverargs -nolisten tcp" ++else ++ defaultserverargs="$defaultserverargs -listen tcp" + fi + + XCOMM The second check is the real one. The first is to hopefully avoid +-- +2.8.3 + Added: trunk/dports/x11/xinit/files/0003-startx-Add-support-for-enabling-IGLX-for-XQuartz.patch =================================================================== --- trunk/dports/x11/xinit/files/0003-startx-Add-support-for-enabling-IGLX-for-XQuartz.patch (rev 0) +++ trunk/dports/x11/xinit/files/0003-startx-Add-support-for-enabling-IGLX-for-XQuartz.patch 2016-05-28 21:28:50 UTC (rev 149073) @@ -0,0 +1,43 @@ +From 4525e14fcfeaaf526227e3addec67d0ce4632270 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 28 May 2016 14:00:58 -0700 +Subject: [PATCH 3/3] startx: Add support for enabling IGLX for XQuartz + +https://bugs.freedesktop.org/show_bug.cgi?id=96260 + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + startx.cpp | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/startx.cpp b/startx.cpp +index 92e5bad..dbc4cae 100644 +--- a/startx.cpp ++++ b/startx.cpp +@@ -80,6 +80,10 @@ if ! defaults read $X11_PREFS_DOMAIN nolisten_tcp > /dev/null 2>&1 ; then + defaults write $X11_PREFS_DOMAIN nolisten_tcp -bool true + fi + ++if ! defaults read $X11_PREFS_DOMAIN enable_iglx > /dev/null 2>&1 ; then ++ defaults write $X11_PREFS_DOMAIN enable_iglx -bool false ++fi ++ + XCOMM First, start caching fonts + if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then + if [ -x $bindir/font_cache ] ; then +@@ -109,6 +113,12 @@ else + defaultserverargs="$defaultserverargs -listen tcp" + fi + ++if [ x`defaults read $X11_PREFS_DOMAIN enable_iglx` = x1 ] ; then ++ defaultserverargs="$defaultserverargs +iglx" ++else ++ defaultserverargs="$defaultserverargs -iglx" ++fi ++ + XCOMM The second check is the real one. The first is to hopefully avoid + XCOMM needless syslog spamming. + if defaults read $X11_PREFS_DOMAIN 2> /dev/null | grep -q 'dpi' && defaults read $X11_PREFS_DOMAIN dpi > /dev/null 2>&1 ; then +-- +2.8.3 +