Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c73b26d18c518e2fc96f455beffe9eacf95a9d64
commit c73b26d18c518e2fc96f455beffe9eacf95a9d64 Author: DeX77 <[email protected]> Date: Wed Mar 16 14:31:20 2016 +0100 xorg-server-1.18.2-1-x86_64 * version bump diff --git a/source/x11/xorg-server/Fix-XineramaQueryScreens-for-reverse-prime.patch b/source/x11/xorg-server/Fix-XineramaQueryScreens-for-reverse-prime.patch deleted file mode 100644 index fe2c947..0000000 --- a/source/x11/xorg-server/Fix-XineramaQueryScreens-for-reverse-prime.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c -index c37dcf8..58041bb 100644 ---- a/randr/rrmonitor.c -+++ b/randr/rrmonitor.c -@@ -326,7 +326,7 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret, - RRMonitorSetFromClient(pScrPriv->monitors[list.client_primary], mon); - mon++; - } else if (list.server_primary >= 0) { -- RRMonitorSetFromServer(pScrPriv->crtcs[list.server_primary], mon); -+ RRMonitorSetFromServer(list.server_crtc[list.server_primary], mon); - mon++; - } - -@@ -354,8 +354,8 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret, - - /* And finish with the list of crtc-inspired monitors - */ -- for (c = 0; c < pScrPriv->numCrtcs; c++) { -- RRCrtcPtr crtc = pScrPriv->crtcs[c]; -+ for (c = 0; c < list.num_crtcs; c++) { -+ RRCrtcPtr crtc = list.server_crtc[c]; - if (c == list.server_primary && list.client_primary < 0) - continue; - -diff --git a/randr/rroutput.c b/randr/rroutput.c -index d12b9ba..2ba62fa 100644 ---- a/randr/rroutput.c -+++ b/randr/rroutput.c -@@ -543,6 +543,7 @@ ProcRRSetOutputPrimary(ClientPtr client) - WindowPtr pWin; - rrScrPrivPtr pScrPriv; - int ret; -+ ScreenPtr slave; - - REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq); - -@@ -565,7 +566,18 @@ ProcRRSetOutputPrimary(ClientPtr client) - - pScrPriv = rrGetScrPriv(pWin->drawable.pScreen); - if (pScrPriv) -+ { - RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output); -+ -+ xorg_list_for_each_entry(slave, -+ &pWin->drawable.pScreen->output_slave_list, -+ output_head) { -+ rrScrPrivPtr pSlavePriv; -+ pSlavePriv = rrGetScrPriv(slave); -+ -+ RRSetPrimaryOutput(slave, pSlavePriv, output); -+ } -+ } - - return Success; - } diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index 4add132..103d9da 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -9,7 +9,7 @@ : ${USE_SERVERDMX="y"} pkgname=xorg-server -pkgver=1.18.1 +pkgver=1.18.2 pkgrel=1 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') @@ -25,10 +25,7 @@ conflicts=('libdri' 'xf86-video-modesetting' 'glamor') _F_archive_grepv="99" Finclude xorg -source=(${source[@]} \ - Fix-XineramaQueryScreens-for-reverse-prime.patch) -sha1sums=('968fe85773a41296199f8733c7235c8623d7c460' \ - '9cedad7f4e06b745f7b3b6126861c2ae35550154') +sha1sums=('d0c5e4f6bba68ad58e74be69c520887695adb132') if Fuse $USE_DEVEL; then pkgver=1.6.3.901.151.g120286a _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
