From 0027f10d787fb2676b0c4b9806df13e6eeaa73aa9107b4fc0fe8ac0c2b9c0210 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 18 Jan 2016 18:29:59 +0000 Subject: [PATCH 1/3] Accepting request 353493 from home:mimi_vx:branches:X11:XOrg - update to 11.1.1 * Bugfix release and adding KB Lake PCI id's + fdo#91806 - configure does not test whether assembler supports sse4.1 + fdo#92229 - [APITRACE] SOMA have serious graphical errors + fdo#92233 - Unigine Heaven 4.0 silhuette run + fdo#93004 - Guild Wars 2 crash on nouveau DX11 cards + fdo#93215 - [Regression bisected] Ogles1conform Automatic mipmap generation test is fail + fdo#93257 - [SKL, bisected] ASTC dEQP tests segfault + fixes for r600,nv*,glx,glsl,radeonsi and i965 OBS-URL: https://build.opensuse.org/request/show/353493 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=496 --- Mesa.changes | 14 ++++++++++++++ Mesa.spec | 4 ++-- mesa-11.1.0.tar.xz | 3 --- mesa-11.1.0.tar.xz.sig | Bin 543 -> 0 bytes mesa-11.1.1.tar.xz | 3 +++ mesa-11.1.1.tar.xz.sig | Bin 0 -> 543 bytes 6 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 mesa-11.1.0.tar.xz delete mode 100644 mesa-11.1.0.tar.xz.sig create mode 100644 mesa-11.1.1.tar.xz create mode 100644 mesa-11.1.1.tar.xz.sig diff --git a/Mesa.changes b/Mesa.changes index 5dae495..2af5332 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Jan 13 23:14:33 UTC 2016 - mimi.vx@gmail.com + +- update to 11.1.1 +* Bugfix release and adding KB Lake PCI id's ++ fdo#91806 - configure does not test whether assembler supports sse4.1 ++ fdo#92229 - [APITRACE] SOMA have serious graphical errors ++ fdo#92233 - Unigine Heaven 4.0 silhuette run ++ fdo#93004 - Guild Wars 2 crash on nouveau DX11 cards ++ fdo#93215 - [Regression bisected] Ogles1conform Automatic mipmap + generation test is fail ++ fdo#93257 - [SKL, bisected] ASTC dEQP tests segfault ++ fixes for r600,nv*,glx,glsl,radeonsi and i965 + ------------------------------------------------------------------- Wed Jan 6 14:00:51 UTC 2016 - schwab@suse.de diff --git a/Mesa.spec b/Mesa.spec index b26efc6..92ba8a7 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -18,7 +18,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 11.1.0 +%define _version 11.1.1 %define with_opencl 0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %define gallium_loader 1 @@ -42,7 +42,7 @@ %endif %endif Name: Mesa -Version: 11.1.0 +Version: 11.1.1 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT diff --git a/mesa-11.1.0.tar.xz b/mesa-11.1.0.tar.xz deleted file mode 100644 index e3eb980..0000000 --- a/mesa-11.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9befe03b04223eb1ede177fa8cac001e2850292c8c12a3ec9929106afad9cf1f -size 7557948 diff --git a/mesa-11.1.0.tar.xz.sig b/mesa-11.1.0.tar.xz.sig deleted file mode 100644 index 062c8ab3ec5ff21c54bd671de33c274de3c9aa4e29d837fe003737309bd06725..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-!ZDY*a&2@vhBH?S=0Neu{%5CDh!3lDH<(V0rBa7BgQ z8O=9@M>uvLt9YjL=hJsLd9MMhos;yIdu!GtWe!D^7Xhs$^{2M;Ja3lxw-ZPe>yI<7 z@RDtY&)KX1v$(Pvjk=nLFS)vBwFkF@t9~?vDOH4Cp7UgN`{$PTJRe|v%KMSg@$&0T zPnB0py}?&`<_spyKwvdHWnW{uSFkQ1-2m1Jurud9*${3QUiZ-P10eW)p_0Po@VJNM zUYuLq+qQfDIJR%6e>!!w*Ofx!F$(77YXFn(37_rp%}!GLoq4DZs*RK|@EzsW`NL z!ANd5ZrSg1T^cv*s{w$i@wzHk6$j{Xfb8l_zaf$Q@zyvdtarPp+o4eduDuf>B&|*y zufOwO~*u_0ZwK_&Mj8Z>AhS6c8fkn1=2ob8x>owNnY%GZaAJ&KCosTL<3(1 z6QhW2|IoXTJrwop#=;#Kdb-?Ka8IS_Snnc&buGLTw&mWWq1L(79YX<_#a3{tVQEdm-5?6WSagDx>7RXpSs#Sh z5?KuM^{-?PhIiBH*-A=r(N5mlZI+9oi}lfY+3MI??(0G~3Vco2i`w;a&JEXgTDUv2 z0-(rokPgZ^rx}}&htFm#6IX$*+xfm`T~ttUq8EVrp--_>j}vUi{x!-K#FLPdTRZsZ z7>_7rE&E+3Dmp`40+*yV-ZUFNLtG3uM1#83dY|U8J>USw1bf_>MkFg ze6Z3*AK)S;}%C zE6J@L%1JIzlLt8ff!+OjAL=-XrY;&V=GrU1c9|?;+VScj{Mie@p<;!0{;fBvefbtq zro&;0Ym4W9nxJCk(H(fH=f}Rya8-V6CCQTJVgHOLot}4H(Q-@7Gh@3J;vf#sTUspf hi|9n+RbaPS3SHazt>l@M{n{+pJ~$G!xw&|_vW?>^3eo@o literal 0 HcmV?d00001 From 0cf94e0d8c9dba437ea760a33ca5aa030195fffd4343592503798488d0ea33eb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 20 Jan 2016 16:01:53 +0000 Subject: [PATCH 2/3] - n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch * Since these are packaged separately in (open)SUSE anyway, one can use copies as well. This makes debug packages possible again. (bnc #962609) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=497 --- Mesa.changes | 8 +++ Mesa.spec | 3 ++ ...C-libs-Replace-hardlinks-with-copies.patch | 52 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch diff --git a/Mesa.changes b/Mesa.changes index 2af5332..03f0690 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 20 15:16:11 UTC 2016 - sndirsch@suse.com + +- n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch + * Since these are packaged separately in (open)SUSE anyway, one + can use copies as well. This makes debug packages possible + again. (bnc #962609) + ------------------------------------------------------------------- Wed Jan 13 23:14:33 UTC 2016 - mimi.vx@gmail.com diff --git a/Mesa.spec b/Mesa.spec index 92ba8a7..883c3c1 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -65,6 +65,8 @@ Patch13: u_mesa-8.0.1-fix-16bpp.patch Patch15: u_mesa-8.0-llvmpipe-shmget.patch # to be upstreamed Patch17: u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch +# never to be upstreamed +Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: bison @@ -555,6 +557,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} #%patch15 -p1 #%patch13 -p1 %patch17 -p1 +%patch18 -p1 %build %if 0%{?suse_version} >= 1310 diff --git a/n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch b/n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch new file mode 100644 index 0000000..9eb00d2 --- /dev/null +++ b/n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch @@ -0,0 +1,52 @@ +From a9af1af5f1f9aa9fdea9e73135a92f053478f849 Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Wed, 20 Jan 2016 16:10:15 +0100 +Subject: [PATCH] VDPAU/XVMC libs: Replace hardlinks with copies + +Since these are packaged separately in (open)SUSE anyway, one can use +copies as well. This makes debug packages possible again. (bnc #962609) + +Signed-off-by: Stefan Dirsch +--- + src/gallium/targets/vdpau/Makefile.am | 4 ++-- + src/gallium/targets/xvmc/Makefile.am | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am +index d388f8b..c9cc534 100644 +--- a/src/gallium/targets/vdpau/Makefile.am ++++ b/src/gallium/targets/vdpau/Makefile.am +@@ -86,7 +86,7 @@ all-local: $(vdpau_LTLIBRARIES) + j=libvdpau_gallium.$(LIB_EXT); \ + k=libvdpau_$${i}.$(LIB_EXT); \ + l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \ +- ln -f .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ ++ cp -a .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ + $${link_dir}/$${l}; \ + ln -sf $${l} \ + $${link_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \ +@@ -111,7 +111,7 @@ install-data-hook: + j=libvdpau_gallium.$(LIB_EXT); \ + k=libvdpau_$${i}.$(LIB_EXT); \ + l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \ +- ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ ++ cp -a $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ + $${dest_dir}/$${l}; \ + ln -sf $${l} \ + $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \ +diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am +index fdc5f4b..93ef230 100644 +--- a/src/gallium/targets/xvmc/Makefile.am ++++ b/src/gallium/targets/xvmc/Makefile.am +@@ -73,7 +73,7 @@ install-data-hook: + j=libXvMCgallium.$(LIB_EXT); \ + k=libXvMC$${i}.$(LIB_EXT); \ + l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \ +- ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ ++ cp -a $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ + $${dest_dir}/$${l}; \ + ln -sf $${l} \ + $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \ +-- +2.6.2 + From 420f67df5210b8f4e3e88ac428fe2614b3a9b7972bc17ecff6adbcd7839a8535 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 20 Jan 2016 16:41:04 +0000 Subject: [PATCH 3/3] - u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch Check for dummyContext to see if the glx_context is valid (boo#962609). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=498 --- Mesa.changes | 6 ++++ Mesa.spec | 2 ++ ...t-to-see-if-the-glx_context-is-valid.patch | 30 +++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch diff --git a/Mesa.changes b/Mesa.changes index 03f0690..47c82af 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 20 16:40:10 UTC 2016 - eich@suse.com + +- u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch + Check for dummyContext to see if the glx_context is valid (boo#962609). + ------------------------------------------------------------------- Wed Jan 20 15:16:11 UTC 2016 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 883c3c1..7824792 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -57,6 +57,7 @@ Source6: %{name}-rpmlintrc Source7: Mesa.keyring # required for building against wayland of openSUSE 13.1 Patch0: n_Fixed-build-against-wayland-1.2.1.patch +Patch1: u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch # to be upstreamed Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch # Patch from Fedora, fix 16bpp in llvmpipe @@ -550,6 +551,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} # required for building against wayland of openSUSE 13.1 %patch0 -p1 %endif +%patch1 -p1 ### disabled, but not dropped yet; these still need investigation in ### order to figure out whether the issue is still reproducable and ### hence a fix is required diff --git a/u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch b/u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch new file mode 100644 index 0000000..e938294 --- /dev/null +++ b/u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch @@ -0,0 +1,30 @@ +From: Egbert Eich +Date: Wed Jan 20 13:51:11 2016 +0100 +Subject: [PATCH]dri2: Check for dummyContext to see if the glx_context is valid +Patch-mainline: to be upstreamed + +References: boo#962609 +Signed-off-by: Egbert Eich + +According to the comments in src/glx/glxcurrent.c __glXGetCurrentContext() +always returns a valid pointer. If no context is made current, it will +contain dummyContext. Thus a test for NULL will always fail. + +Signed-off-by: Egbert Eich +--- + src/glx/dri2_glx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c +index 27ea952..6a5f964 100644 +--- a/src/glx/dri2_glx.c ++++ b/src/glx/dri2_glx.c +@@ -520,7 +520,7 @@ dri2GetCurrentContext() + struct glx_context *gc = __glXGetCurrentContext(); + struct dri2_context *dri2Ctx = (struct dri2_context *)gc; + +- return dri2Ctx ? dri2Ctx->driContext : NULL; ++ return (gc != &dummyContext) ? dri2Ctx->driContext : NULL; + } + + /**