commit b28f76992e612c0e953f36f58788b2866ffeac74 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Sat Mar 19 23:02:41 2016 +0100 xorg-server: added patch for glamor regression diff --git a/xorg-server/.md5sum b/xorg-server/.md5sum index 918020e..4f33d81 100644 --- a/xorg-server/.md5sum +++ b/xorg-server/.md5sum @@ -1 +1,2 @@ +1d485370ebc214844207b1655cd3624b 0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch 052fc1b4b12a5df0a3e35a1b46a52db3 xorg-server-1.18.2.tar.bz2 diff --git a/xorg-server/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch b/xorg-server/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch new file mode 100644 index 0000000..deaabe4 --- /dev/null +++ b/xorg-server/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch @@ -0,0 +1,32 @@ +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 diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile index 62d935f..ccb00f8 100644 --- a/xorg-server/Pkgfile +++ b/xorg-server/Pkgfile @@ -5,11 +5,13 @@ name=xorg-server version=1.18.2 -release=1 -source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.b...) +release=2 +source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.b... + 0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch) build() { cd $name-$version + patch -p1 -i $SRC/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch ./configure --prefix=/usr \ --localstatedir=/var \