From 60bbd40cff1417ceddba637bb215f9354f17bff80d8782047a59d84a19cc3b36 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 18 Apr 2016 09:59:43 +0000 Subject: [PATCH 1/2] Accepting request 390465 from home:mimi_vx:branches:X11:XOrg - update to 11.2.1 * It fixes crashes in VAAPI, some build problems in Nine has been addressed, adds a drirc workaround for Warsow and resolves issues in the nouveau, radeonsi and i965 drivers. * fdo#93962 ES2-CTS.gtf.GL2FixedTests.scissor.scissor - segfault/asserts OBS-URL: https://build.opensuse.org/request/show/390465 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=510 --- Mesa.changes | 9 +++++++++ Mesa.spec | 4 ++-- mesa-11.2.0.tar.xz | 3 --- mesa-11.2.0.tar.xz.sig | Bin 543 -> 0 bytes mesa-11.2.1.tar.xz | 3 +++ mesa-11.2.1.tar.xz.sig | Bin 0 -> 543 bytes 6 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 mesa-11.2.0.tar.xz delete mode 100644 mesa-11.2.0.tar.xz.sig create mode 100644 mesa-11.2.1.tar.xz create mode 100644 mesa-11.2.1.tar.xz.sig diff --git a/Mesa.changes b/Mesa.changes index 291c97d..f8f96a9 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Apr 17 19:13:12 UTC 2016 - mimi.vx@gmail.com + +- update to 11.2.1 +* It fixes crashes in VAAPI, some build problems in Nine has been addressed, + adds a drirc workaround for Warsow and resolves issues in the nouveau, + radeonsi and i965 drivers. +* fdo#93962 ES2-CTS.gtf.GL2FixedTests.scissor.scissor - segfault/asserts + ------------------------------------------------------------------- Mon Apr 4 19:57:06 UTC 2016 - mimi.vx@gmail.com diff --git a/Mesa.spec b/Mesa.spec index 042b8ef..16330fa 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -18,7 +18,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 11.2.0 +%define _version 11.2.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.2.0 +Version: 11.2.1 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT diff --git a/mesa-11.2.0.tar.xz b/mesa-11.2.0.tar.xz deleted file mode 100644 index 13640c6..0000000 --- a/mesa-11.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c1fed2674abf3f16ed2623e9a5694d6752c293194e18462ebc644a19cfaafb2 -size 7856132 diff --git a/mesa-11.2.0.tar.xz.sig b/mesa-11.2.0.tar.xz.sig deleted file mode 100644 index 99ad2fbf2d64cb5a2763eb62b4ac27387b55ced8cfc715b09795eba33b362123..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-$BRQdo42@vhBH?S=0Neu|>5B(EYvS|>G%fZrv(<3b9 zrUxQMNMA+}Xwan>^qWhyzd7Xr$g|e^5VVqJc<*Yi>=r@!EE--%m*O1+fsI|9>>g(s zB)Jnxp#{JTP)5eS&ND({WpR9OyPG__5AA3FNG;<;{~a84vw#j033`GUtuv@+&W2B- zpGEX_cSNoH_6%Dd7OpxG{Ha!`%8RqhLwU2rqN>S3j@^F1kG&+f-BIDqxIiQIBynJz z{Q7k6u&`=;!{ogJO>4MTzBPSB4b^3*0y~zyaV6x#Y%62vp09MJmOzRK^2@@Sl&&* zw*s-eM1i+`*Jt3?UlDlWzd1s`)!;zR-(pl6G6xg}$xS>;p@#McF>do7>gyRgg#nnaxW}^fR%txN@XHsA0Y*19lWg(y~`4i6zq9p2WrQ)>Ambgmhtn}kXS z!nsLHE#7Hx)&p5HKxlrz+f>M}018C$O5jZLFnIxiAlsbpU>#m^z_qdB7+BSvoZe9k0kVwX^>i#p1_oyyp@6tq7QxdF& zwwWb}M~k2{?0X=u)u|f~wviYyLK!+)rZHK>l>HZk=mFt|4_RiO7B54(+Hiq#y(@zW zt(VNeO@h?2aL2~+U^||_b@SCR5++H@;v-xhG~R@UULFWPe4!gji~TNiV9FG#z7I5% zd8t900+@LnBOw?mDKq*Lr?iBB9P6{Lvi^k0LDvBw0&6Ozz-^-{auVt{cuVe&Gl@hP z*oiY*s;?BSTrqg)tNV3QbY*8#iFeNuW;Ks>)+u3bToSi-O@1!OMr}l&#h#BPin~c6 zMUdssrL#Thh76KF55-VZUK5nl0VzCmJ_V?e3%aN6ivT%TN8M@SrrcwySb0eS!c literal 0 HcmV?d00001 From 0c1b9be49a97531723ce12a89da5db13b4b4bd618a075442f7af13abe505bfb5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 21 Apr 2016 09:49:50 +0000 Subject: [PATCH 2/2] - u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch * dri3: Check for dummyContext to see if the glx_context is valid 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. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=511 --- Mesa.changes | 10 +++++ Mesa.spec | 2 + ...ummyContext-to-see-if-the-glx_contex.patch | 40 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch diff --git a/Mesa.changes b/Mesa.changes index f8f96a9..800aec1 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Apr 21 09:36:08 UTC 2016 - sndirsch@suse.com + +- u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch + * dri3: Check for dummyContext to see if the glx_context is valid + 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. + ------------------------------------------------------------------- Sun Apr 17 19:13:12 UTC 2016 - mimi.vx@gmail.com diff --git a/Mesa.spec b/Mesa.spec index 16330fa..7933376 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -58,6 +58,7 @@ 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 +Patch2: u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.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 @@ -555,6 +556,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch0 -p1 %endif %patch1 -p1 +%patch2 -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_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch b/u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch new file mode 100644 index 0000000..42d1f1e --- /dev/null +++ b/u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch @@ -0,0 +1,40 @@ +From 2be941ebf55e9533652634b180fdbdd0c24075ea Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Thu, 21 Apr 2016 11:26:07 +0200 +Subject: [PATCH] dri3: Check for dummyContext to see if the glx_context is + valid + +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. + +https://lists.freedesktop.org/archives/mesa-dev/2016-April/113962.html + +Signed-off-by: Stefan Dirsch +--- + src/glx/dri3_glx.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c +index 6054ffc..e7c2ec1 100644 +--- a/src/glx/dri3_glx.c ++++ b/src/glx/dri3_glx.c +@@ -127,13 +127,9 @@ static __DRIcontext * + glx_dri3_get_dri_context(struct loader_dri3_drawable *draw) + { + struct glx_context *gc = __glXGetCurrentContext(); ++ struct dri3_context *dri3Ctx = (struct dri3_context *) gc; + +- if (gc) { +- struct dri3_context *dri3Ctx = (struct dri3_context *) gc; +- return dri3Ctx->driContext; +- } +- +- return NULL; ++ return (gc != &dummyContext) ? dri3Ctx->driContext : NULL; + } + + static void +-- +2.6.2 +