ports/xorg
3
0
Fork 0
Code Issues Pull Requests Activity

xorg-server: update to 1.18.3

Browse Source
This commit is contained in:
Juergen Daubert 2016-04-06 17:48:48 +02:00
parent 44987690e7
commit ccc5bcdc68
3 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xorg-server/.md5sum
View File

@ -1,2 +1 @@
1d485370ebc214844207b1655cd3624b 0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
052fc1b4b12a5df0a3e35a1b46a52db3 xorg-server-1.18.2.tar.bz2
043d720bf2472a65bb8f0daa97f83dfa xorg-server-1.18.3.tar.bz2

32
xorg-server/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
View File

@ -1,32 +0,0 @@
From a288cf58a0dc0f965a6f964c76bb86bb1989d797 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 16 Mar 2016 10:45:54 +1000
Subject: glamor: swizzle RED to 0 for alpha textures
I'm pretty sure Eric suspected this could cause a problem, and we
couldn't find a test. Well loading feedly in firefox seems to trigger
badness that this solves.
bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94554
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
index a531f60..f4f8749 100644
--- a/glamor/glamor_fbo.c
+++ b/glamor/glamor_fbo.c
@@ -352,8 +352,10 @@ _glamor_create_tex(glamor_screen_private *glamor_priv,
glBindTexture(GL_TEXTURE_2D, tex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- if (format == glamor_priv->one_channel_format && format == GL_RED)
+ if (format == glamor_priv->one_channel_format && format == GL_RED) {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_ZERO);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_RED);
+ }
glamor_priv->suppress_gl_out_of_memory_logging = true;
glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0,
format, GL_UNSIGNED_BYTE, NULL);
--
cgit v0.10.2

8
xorg-server/Pkgfile
View File

@ -4,14 +4,12 @@
# Depends on: libepoxy util-linux xorg-bdftopcf xorg-bigreqsproto xorg-libdmx xorg-libpixman xorg-libxaw xorg-libxcomposite xorg-libxcursor xorg-libxft xorg-libxinerama xorg-libxkbfile xorg-libxrandr xorg-libxres xorg-libxtst xorg-libxxf86dga xorg-mkfontdir xorg-mkfontscale xorg-scrnsaverproto xorg-xcb-util-keysyms xorg-xcmiscproto xorg-xf86driproto xorg-xf86vidmodeproto
name=xorg-server
version=1.18.2
release=2
source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2
0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch)
version=1.18.3
release=1
source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2)
build() {
cd $name-$version
patch -p1 -i $SRC/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
./configure --prefix=/usr \
--localstatedir=/var \