[arch-commits] Commit in mesa/trunk (4 files)

2012-10-05 Thread andyrtr 
Date: Friday, October 5, 2012 @ 11:17:44
  Author: andyrtr
Revision: 168062

upgpkg: mesa 8.99.git_20121005-1

update to todays snapshot + add a new build fix; fix deps to match the *.pc 
files

Added:
  mesa/trunk/pthread_fix.diff
Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/mesa-8.0.3-llvm-3.1-fixes.patch
  mesa/trunk/mesa-radeon-parallel-make.diff

-+
 PKGBUILD|   31 +
 mesa-8.0.3-llvm-3.1-fixes.patch |   46 -
 mesa-radeon-parallel-make.diff  |  129 --
 pthread_fix.diff|   23 ++
 4 files changed, 42 insertions(+), 187 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-05 15:07:13 UTC (rev 168061)
+++ PKGBUILD2012-10-05 15:17:44 UTC (rev 168062)
@@ -6,7 +6,7 @@
 pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 
'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri')
 
 _git=true
-_gitdate=20121002
+_gitdate=20121005
 #_git=false
 
 if [ "${_git}" = "true" ]; then
@@ -22,26 +22,25 @@
 license=('custom')
 options=('!libtool')
 source=(LICENSE
-mesa-radeon-parallel-make.diff)
+pthread_fix.diff)
 if [ "${_git}" = "true" ]; then
# mesa git shot from 9.0 branch - see for state: 
http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
#source=(${source[@]} 
'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
-   source=(${source[@]} 
"MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-604cd6b966d060334fdaa11ae8444797d54d3142.tar.gz";)
+   source=(${source[@]} 
"MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz";)
   else
source=(${source[@]} 
"ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2";
#source=(${source[@]} 
"ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2";
 )
 fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- '5dca6edbe6b636c59c2e64f77271f12a'
- '71af5320af6873920384d245f103b892')
+ '03956ac54a44467678120f485b626633'
+ '52760839a596df5058fcbb63a2bb10da')
 
 build() {
 cd ${srcdir}/?esa-*
 
-# fix parallel build - 
http://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/radeon/Makefile?id=cebbdd4ac23725963207bf6f8fc7101150e6065f
-# and the next commit - 
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2baaa5c7eb21517f0197bfd91154e9b4886fbb1b
-patch -Np1 -i ${srcdir}/mesa-radeon-parallel-make.diff
+# build fix from master 
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b
+patch -Np1 -i ${srcdir}/pthread_fix.diff
 
 COMMONOPTS="--prefix=/usr \
 --sysconfdir=/etc \
@@ -119,7 +118,8 @@
 }
 
 package_mesa() {
-  depends=('libgl' 'libx11>=1.5.0' 'libxt>=1.1.3' 'gcc-libs>=4.7.1-6') # check 
pkg/mesa/usr/lib/pkgconfig/gl.pc
+  # check also gl.pc
+  depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 
'libxcb' 'libxxf86vm')
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   pkgdesc="Mesa 3-D graphics libraries and include files"
 
@@ -136,12 +136,18 @@
 }
 
 package_osmesa() {
-  depends=('gcc-libs')
+  depends=('libglapi' 'gcc-libs')
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   pkgdesc="Mesa 3D off-screen rendering library"
-  
+
+  # fix linking because of splitted package
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
   make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
 
+  # fix linking because of splitted package - cleanup
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+
   install -m755 -d "${pkgdir}/usr/share/licenses/osmesa"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/"
 }
@@ -180,7 +186,8 @@
 }
 
 package_libegl() {
-  depends=('libxext' 'libxfixes' 'libgbm' 'khrplatform-devel')
+  # check also egl.pc
+  depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 
'libgbm' 'khrplatform-devel')
   pkgdesc="Mesa EGL libraries and headers"
 
   make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" 
install

Deleted: mesa-8.0.3-llvm-3.1-fixes.patch
===
--- mesa-8.0.3-llvm-3.1-fixes.patch 2012-10-05 15:07:13 UTC (rev 168061)
+++ mesa-8.0.3-llvm-3.1-fixes.patch 2012-10-05 15:17:44 UTC (rev 168062)
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp 
b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
 a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-in

[arch-commits] Commit in mesa/trunk (4 files)

2014-09-20 Thread Laurent Carlier 
Date: Saturday, September 20, 2014 @ 23:14:22
  Author: lcarlier
Revision: 222523

upgpkg: mesa 10.3.0-2

update dependencies

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch
  mesa/trunk/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch
  mesa/trunk/llvm35.patch

-+
 0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch   |   33 
 0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch |   77 
--
 PKGBUILD|   24 +--
 llvm35.patch|   26 ---
 4 files changed, 11 insertions(+), 149 deletions(-)

Deleted: 0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch
===
--- 0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch   
2014-09-20 19:24:27 UTC (rev 222522)
+++ 0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch   
2014-09-20 21:14:22 UTC (rev 222523)
@@ -1,33 +0,0 @@
-From 22c970946535956abac321585598425ad5cc82c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= 
-Date: Wed, 14 May 2014 12:55:50 +0100
-Subject: [PATCH 1/2] gallivm: Disable workaround for PR12833 on LLVM 3.2+.
-
-Fixed upstream.
-
-(cherry picked from commit 172ef0c5a5a97c211702eb4033eeaac20993350e)

- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 
b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index d85adfb..45c985d 100644
 a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -321,11 +321,11 @@ 
lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
-builder.setJITMemoryManager(JITMemoryManager::CreateDefaultMemManager());
- 
-ExecutionEngine *JIT;
--#if 0
-+#if HAVE_LLVM >= 0x0302
-JIT = builder.create();
- #else
-/*
--* Workaround http://llvm.org/bugs/show_bug.cgi?id=12833
-+* Workaround http://llvm.org/PR12833
- */
-StringRef MArch = "";
-StringRef MCPU = "";
--- 
-2.1.0
-

Deleted: 0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch
===
--- 0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch 
2014-09-20 19:24:27 UTC (rev 222522)
+++ 0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch 
2014-09-20 21:14:22 UTC (rev 222523)
@@ -1,77 +0,0 @@
-From ebe30fd4d4a90219431b6947f233473b2cf518a5 Mon Sep 17 00:00:00 2001
-From: Roland Scheidegger 
-Date: Thu, 19 Jun 2014 03:27:26 +0200
-Subject: [PATCH 2/2] gallivm: set mcpu when initializing llvm execution engine
-
-Previously llvm detected cpu features automatically when the execution engine
-was created (based on host cpu). This is no longer the case, which meant llvm
-was then not able to emit some of the intrinsics we used as we didn't specify
-any sse attributes (only on avx supporting systems this was not a problem since
-despite at least some llvm versions enabling it anyway we always set this
-manually). So, instead of trying to figure out which MAttrs to set just set
-MCPU.
-
-This fixes https://bugs.freedesktop.org/show_bug.cgi?id=77493.
-
-Reviewed-by: Jose Fonseca 
-Tested-by: Vinson Lee 
-(cherry picked from commit cad60420d5ea36a4b6fa2e6c91317f71423aa63e)

- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 24 ++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 
b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 45c985d..395ac7b 100644
 a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -59,6 +59,7 @@
- #include 
- #endif
- #include 
-+#include 
- #include 
- 
- #if HAVE_LLVM >= 0x0300
-@@ -309,8 +310,8 @@ 
lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
-   /*
-* AVX feature is not automatically detected from CPUID by the X86 
target
-* yet, because the old (yet default) JIT engine is not capable of
--   * emitting the opcodes.  But as we're using MCJIT here, it is safe to
--   * add set this attribute.
-+   * emitting the opcodes. On newer llvm versions it is and at least some
-+   * versions (tested with 3.3) will emit avx opcodes without this anyway.
-*/
-   MAttrs.push_back("+avx");
-   if (util_cpu_caps.has_f16c) {
-@@ -318,9 +319,28 @@ 
lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
-   }
-   builder.setMAttrs(MAttrs);
-}
-+
-+#if HAVE_LLVM >= 0x0305
-+   StringRef MCPU = llvm::sys::getHostCPUName();
-+   /*
-+* The cpu bits are no longer set automatically, so need to set mcpu 
manually.

[arch-commits] Commit in mesa/trunk (4 files)

2010-05-26 Thread Jan de Groot 
Date: Wednesday, May 26, 2010 @ 14:21:58
  Author: jgc
Revision: 81113

Remove obsolete patches, add fixes from git (up to 2eb5bc5ad)

Added:
  mesa/trunk/7.8-git-fixes.patch
Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/intel-revert-vbl.patch
  mesa/trunk/mesa-7.1-link-shared.patch

+
 7.8-git-fixes.patch|70088 +++
 PKGBUILD   |   14 
 intel-revert-vbl.patch |   21 
 mesa-7.1-link-shared.patch |  101 
 4 files changed, 70097 insertions(+), 127 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 81112:81113 to see the changes.

[arch-commits] Commit in mesa/trunk (4 files)

2010-08-26 Thread Jan de Groot 
Date: Thursday, August 26, 2010 @ 03:39:28
  Author: jgc
Revision: 88903

upgpkg: mesa 7.8.2-3
Add patch from https://bugs.freedesktop.org/show_bug.cgi?id=29091 to fix 
crashes with xorg-server 1.9 and GLX 1.3 apps
Update patch to b7cea230

Added:
  mesa/trunk/fix-glx1.3-crash-xorg19.patch
  mesa/trunk/mesa-7.8-git.patch
Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/mesa-7.8-4adff471.patch

---+
 PKGBUILD  |   12 
 fix-glx1.3-crash-xorg19.patch |   73 +
 mesa-7.8-4adff471.patch   | 2294 -
 mesa-7.8-git.patch| 2423 
 4 files changed, 2503 insertions(+), 2299 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 88902:88903 to see the changes.

[arch-commits] Commit in mesa/trunk (4 files)

2017-09-19 Thread Laurent Carlier 
Date: Tuesday, September 19, 2017 @ 07:13:53
  Author: lcarlier
Revision: 305828

upgpkg: mesa 17.2.1-1

upstream update 17.2.1

Added:
  mesa/trunk/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-Fix-linkage-against-shared-glapi.patch
  mesa/trunk/glibc_dropped_xlocale.h.diff

+
 0001-Fix-linkage-against-shared-glapi.patch|   26 -
 PKGBUILD   |   16 -
 glibc_dropped_xlocale.h.diff   |  143 
--
 swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch |   14 
 4 files changed, 22 insertions(+), 177 deletions(-)

Deleted: 0001-Fix-linkage-against-shared-glapi.patch
===
--- 0001-Fix-linkage-against-shared-glapi.patch 2017-09-19 06:59:36 UTC (rev 
305827)
+++ 0001-Fix-linkage-against-shared-glapi.patch 2017-09-19 07:13:53 UTC (rev 
305828)
@@ -1,26 +0,0 @@
-From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001
-From: Adam Jackson 
-Date: Wed, 12 Oct 2016 13:41:33 -0400
-Subject: [PATCH] Fix linkage against shared glapi
-
-Signed-off-by: Adam Jackson 

- src/gallium/targets/osmesa/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/gallium/targets/osmesa/Makefile.am 
b/src/gallium/targets/osmesa/Makefile.am
-index 5d39486..04add87 100644
 a/src/gallium/targets/osmesa/Makefile.am
-+++ b/src/gallium/targets/osmesa/Makefile.am
-@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \
-   $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
-   $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
-   $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \
--  $(top_builddir)/src/mapi/glapi/libglapi.la \
-+  $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
-   $(SHARED_GLAPI_LIB) \
-   $(OSMESA_LIB_DEPS) \
-   $(CLOCK_LIB)
--- 
-2.9.3
-

Modified: PKGBUILD
===
--- PKGBUILD2017-09-19 06:59:36 UTC (rev 305827)
+++ PKGBUILD2017-09-19 07:13:53 UTC (rev 305828)
@@ -4,8 +4,8 @@
 
 pkgbase=mesa
 pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 
'mesa-vdpau' 'mesa')
-pkgver=17.2.0
-pkgrel=3
+pkgver=17.2.1
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
  'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 
'wayland' 'wayland-protocols'
@@ -15,12 +15,12 @@
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
 LICENSE
 0002-glvnd-fix-gl-dot-pc.patch
-glibc_dropped_xlocale.h.diff)
-sha256sums=('3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943'
+swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch)
+sha256sums=('77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e'
 'SKIP'
 '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
 '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966'
-'6de2adc3dde36d098bfe9977f5052c13e1b2e80a913e4c83d520b2e5349ddbd0')
+'2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov 

 validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez 

 validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio 
Suárez Romero (Igalia, S.L.) "
@@ -32,9 +32,9 @@
   # non-upstreamed ones
   patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch
   
-  # glibc 2.26 dropped xlocale.h leading to corrupted video
-  # https://bugs.archlinux.org/task/55244 / 
https://bugs.freedesktop.org/show_bug.cgi?id=102454
-  patch -Np1 -i ../glibc_dropped_xlocale.h.diff
+  # swr driver
+  # but currently broken with llvm-5.0.0 
https://bugs.freedesktop.org/show_bug.cgi?id=102847
+  patch -Np1 -i 
../swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
 
   autoreconf -fiv
 }

Deleted: glibc_dropped_xlocale.h.diff
===
--- glibc_dropped_xlocale.h.diff2017-09-19 06:59:36 UTC (rev 305827)
+++ glibc_dropped_xlocale.h.diff2017-09-19 07:13:53 UTC (rev 305828)
@@ -1,143 +0,0 @@
-From 49b428470e28ae6ab22083e43fa41abf622f3b0d Mon Sep 17 00:00:00 2001
-From: Eric Engestrom 
-Date: Thu, 31 Aug 2017 16:55:56 +
-Subject: util: improve compiler guard
-
-Glibc 2.26 has dropped xlocale.h, but the functions needed (strtod_l()
-and strdof_l()) can be found in stdlib.h.
-Improve the detection method to allow newer builds to still make use of
-the locale-setting.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102454
-Cc: Laurent Carlier

[arch-commits] Commit in mesa/trunk (4 files)

2017-05-26 Thread Laurent Carlier 
Date: Friday, May 26, 2017 @ 10:00:40
  Author: lcarlier
Revision: 296646

upgpkg: mesa 17.1.1-1

upstream update 17.1.1

Added:
  mesa/trunk/0002-glvnd-fix-gl-dot-pc.patch
(from rev 296645, mesa/trunk/glvnd-fix-gl-dot-pc.patch)
Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch
  mesa/trunk/glvnd-fix-gl-dot-pc.patch

-+
 0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch |   88 
--
 0002-glvnd-fix-gl-dot-pc.patch  |   12 +
 PKGBUILD|   11 -
 glvnd-fix-gl-dot-pc.patch   |   12 -
 4 files changed, 16 insertions(+), 107 deletions(-)

Deleted: 0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch
===
--- 0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch 
2017-05-26 09:01:50 UTC (rev 296645)
+++ 0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch 
2017-05-26 10:00:40 UTC (rev 296646)
@@ -1,88 +0,0 @@
-From efa4f2ebc1e788c3f1cfcf3842058cf838171653 Mon Sep 17 00:00:00 2001
-From: Hans de Goede 
-Date: Mon, 20 Mar 2017 08:41:26 +0100
-Subject: [PATCH] glxglvnddispatch: Add missing dispatch for GetDriverConfig
-
-Together with some fixes to xdriinfo this fixes xdriinfo not working
-with glvnd.
-
-Since apps (xdriinfo) expect GetDriverConfig to work without going to
-need through the dance to setup a glxcontext (which is a reasonable
-expectation IMHO), the dispatch for this ends up significantly different
-then any other dispatch function.
-
-This patch gets the job done, but I'm not really happy with how this
-patch turned out, suggestions for a better fix are welcome.
-
-Cc: Kyle Brenneman 
-Signed-off-by: Hans de Goede 

- src/glx/g_glxglvnddispatchfuncs.c   | 18 ++
- src/glx/g_glxglvnddispatchindices.h |  1 +
- 2 files changed, 19 insertions(+)
-
-diff --git a/src/glx/g_glxglvnddispatchfuncs.c 
b/src/glx/g_glxglvnddispatchfuncs.c
-index b5e3398..040cdf8 100644
 a/src/glx/g_glxglvnddispatchfuncs.c
-+++ b/src/glx/g_glxglvnddispatchfuncs.c
-@@ -4,6 +4,7 @@
-  */
- #include 
- 
-+#include "glxclient.h"
- #include "glxglvnd.h"
- #include "glxglvnddispatchfuncs.h"
- #include "g_glxglvnddispatchindices.h"
-@@ -50,6 +51,7 @@ const char * const __glXDispatchTableStrings[DI_LAST_INDEX] 
= {
- __ATTRIB(GetCurrentDisplayEXT),
- // glXGetCurrentDrawable implemented by libglvnd
- // glXGetCurrentReadDrawable implemented by libglvnd
-+__ATTRIB(GetDriverConfig),
- // glXGetFBConfigAttrib implemented by libglvnd
- __ATTRIB(GetFBConfigAttribSGIX),
- __ATTRIB(GetFBConfigFromVisualSGIX),
-@@ -334,6 +336,21 @@ static Display *dispatch_GetCurrentDisplayEXT(void)
- 
- 
- 
-+static const char *dispatch_GetDriverConfig(const char *driverName)
-+{
-+/*
-+ * The options are constant for a given driverName, so we do not need
-+ * a context (and apps expect to be able to call this without one).
-+ */
-+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
-+return glXGetDriverConfig(driverName);
-+#else
-+return NULL;
-+#endif
-+}
-+
-+
-+
- static int dispatch_GetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX 
config,
-   int attribute, int *value_return)
- {
-@@ -939,6 +956,7 @@ const void * const __glXDispatchFunctions[DI_LAST_INDEX + 
1] = {
- __ATTRIB(DestroyGLXPbufferSGIX),
- __ATTRIB(GetContextIDEXT),
- __ATTRIB(GetCurrentDisplayEXT),
-+__ATTRIB(GetDriverConfig),
- __ATTRIB(GetFBConfigAttribSGIX),
- __ATTRIB(GetFBConfigFromVisualSGIX),
- __ATTRIB(GetMscRateOML),
-diff --git a/src/glx/g_glxglvnddispatchindices.h 
b/src/glx/g_glxglvnddispatchindices.h
-index 05a2c8c..3ba50a7 100644
 a/src/glx/g_glxglvnddispatchindices.h
-+++ b/src/glx/g_glxglvnddispatchindices.h
-@@ -39,6 +39,7 @@ typedef enum __GLXdispatchIndex {
- DI_GetCurrentDisplayEXT,
- // GetCurrentDrawable implemented by libglvnd
- // GetCurrentReadDrawable implemented by libglvnd
-+DI_GetDriverConfig,
- // GetFBConfigAttrib implemented by libglvnd
- DI_GetFBConfigAttribSGIX,
- DI_GetFBConfigFromVisualSGIX,
--- 
-2.9.3
-

Copied: mesa/trunk/0002-glvnd-fix-gl-dot-pc.patch (from rev 296645, 
mesa/trunk/glvnd-fix-gl-dot-pc.patch)
===
--- 0002-glvnd-fix-gl-dot-pc.patch  (rev 0)
+++ 0002-glvnd-fix-gl-dot-pc.patch  2017-05-26 10:00:40 UTC (rev 296646)
@@ -0,0 +1,12 @@
+diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in
+--- mesa-12.0.3/src/mesa/gl.pc.in.jx   2016-01-18 02:39:26.0 -0500
 mesa-12.0.3/src/mesa/gl.pc.in  2016-10-25 13:06:44.013159358 -0400
+@@ -7,7 +7,7 @@ Name: gl
+ Des

[arch-commits] Commit in mesa/trunk (4 files)

2020-05-30 Thread Jan Steffens via arch-commits 
Date: Saturday, May 30, 2020 @ 14:02:18
  Author: heftig
Revision: 387900

20.1.0-4: drop patches; cause issues with Xorg

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-iris-fix-BO-destruction-in-error-path.patch
  mesa/trunk/0002-iris-fix-export-of-GEM-handles.patch
  mesa/trunk/0003-i965-fix-export-of-GEM-handles.patch

--+
 0001-iris-fix-BO-destruction-in-error-path.patch |   41 --
 0002-iris-fix-export-of-GEM-handles.patch|  364 -
 0003-i965-fix-export-of-GEM-handles.patch|  343 ---
 PKGBUILD |   36 --
 4 files changed, 14 insertions(+), 770 deletions(-)

Deleted: 0001-iris-fix-BO-destruction-in-error-path.patch
===
--- 0001-iris-fix-BO-destruction-in-error-path.patch2020-05-30 13:57:22 UTC 
(rev 387899)
+++ 0001-iris-fix-BO-destruction-in-error-path.patch2020-05-30 14:02:18 UTC 
(rev 387900)
@@ -1,41 +0,0 @@
-From eac7681c13f127d762474a8207399c2eb0c76f30 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin 
-Date: Sat, 2 May 2020 22:43:22 +0300
-Subject: [PATCH 1/3] iris: fix BO destruction in error path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Lionel Landwerlin 
-Cc: 
-Tested-by: Tapani Pälli 
-Signed-off-by: Laurent Carlier 

- src/gallium/drivers/iris/iris_bufmgr.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/gallium/drivers/iris/iris_bufmgr.c 
b/src/gallium/drivers/iris/iris_bufmgr.c
-index c8e6d0c654b..9064647d0e5 100644
 a/src/gallium/drivers/iris/iris_bufmgr.c
-+++ b/src/gallium/drivers/iris/iris_bufmgr.c
-@@ -589,6 +589,7 @@ iris_bo_create_userptr(struct iris_bufmgr *bufmgr, const 
char *name,
-void *ptr, size_t size,
-enum iris_memory_zone memzone)
- {
-+   struct drm_gem_close close = { 0, };
-struct iris_bo *bo;
- 
-bo = bo_calloc();
-@@ -634,7 +635,8 @@ iris_bo_create_userptr(struct iris_bufmgr *bufmgr, const 
char *name,
-return bo;
- 
- err_close:
--   gen_ioctl(bufmgr->fd, DRM_IOCTL_GEM_CLOSE, &bo->gem_handle);
-+   close.handle = bo->gem_handle;
-+   gen_ioctl(bufmgr->fd, DRM_IOCTL_GEM_CLOSE, &close);
- err_free:
-free(bo);
-return NULL;
--- 
-2.26.2
-

Deleted: 0002-iris-fix-export-of-GEM-handles.patch
===
--- 0002-iris-fix-export-of-GEM-handles.patch   2020-05-30 13:57:22 UTC (rev 
387899)
+++ 0002-iris-fix-export-of-GEM-handles.patch   2020-05-30 14:02:18 UTC (rev 
387900)
@@ -1,364 +0,0 @@
-From e01e146e35681dbdc68d70a2118b71a78ef67e6a Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin 
-Date: Sat, 2 May 2020 16:46:47 +0300
-Subject: [PATCH 2/3] iris: fix export of GEM handles
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We reuse DRM file descriptors internally. Therefore when we export a
-GEM handle we must do so in the file descriptor used externally.
-
-v2: Don't bother checking fd equals, they're always different
-Fix dmabuf leak
-Fix GEM handle leaks by tracking exported handles
-
-v3: Check os_same_file_description error (Michel)
-Don't create multiple exports for a given GEM table
-
-v4: Add WARN_ONCE (Ken)
-Rename external_fd to winsys_fd
-
-v5: Remove export lock in favor of bufmgr's
-
-Signed-off-by: Lionel Landwerlin 
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2882
-Fixes: 7557f1605968 ("iris: share buffer managers accross screens")
-Tested-by: Eric Engestrom 
-Tested-by: Tapani Pälli 
-Signed-off-by: Laurent Carlier 

- src/gallium/drivers/iris/iris_bufmgr.c   | 108 ++-
- src/gallium/drivers/iris/iris_bufmgr.h   |  16 
- src/gallium/drivers/iris/iris_resource.c |  33 +--
- src/gallium/drivers/iris/iris_screen.c   |   2 +
- src/gallium/drivers/iris/iris_screen.h   |   8 +-
- 5 files changed, 157 insertions(+), 10 deletions(-)
-
-diff --git a/src/gallium/drivers/iris/iris_bufmgr.c 
b/src/gallium/drivers/iris/iris_bufmgr.c
-index 9064647d0e5..3c39769b9cb 100644
 a/src/gallium/drivers/iris/iris_bufmgr.c
-+++ b/src/gallium/drivers/iris/iris_bufmgr.c
-@@ -63,6 +63,7 @@
- #include "util/macros.h"
- #include "util/hash_table.h"
- #include "util/list.h"
-+#include "util/os_file.h"
- #include "util/u_dynarray.h"
- #include "util/vma.h"
- #include "iris_bufmgr.h"
-@@ -91,6 +92,17 @@
- 
- #define PAGE_SIZE 4096
- 
-+#define WARN_ONCE(cond, fmt...) do {\
-+   if (unlikely(cond)) {\
-+  static bool _warned = false;  \
-+  if (!_warned) {   \
-+ fprintf(stderr, "WARNING: ");  \
-+ fprintf(stderr, fmt);

[arch-commits] Commit in mesa/trunk (4 files)

2020-05-27 Thread Laurent Carlier via arch-commits 
Date: Thursday, May 28, 2020 @ 06:08:28
  Author: lcarlier
Revision: 387747

upgpkg: mesa 20.1.0-1: upstream update 2.1.0

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch
  mesa/trunk/0001-omx-fix-build-with-gcc-10.patch
  mesa/trunk/0001-swr-Fix-build-with-GCC-10.patch

-+
 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch |   53 
-
 0001-omx-fix-build-with-gcc-10.patch|   40 ---
 0001-swr-Fix-build-with-GCC-10.patch|   56 
--
 PKGBUILD|   24 
 4 files changed, 4 insertions(+), 169 deletions(-)

Deleted: 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch
===
--- 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch 
2020-05-28 00:31:57 UTC (rev 387746)
+++ 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch 
2020-05-28 06:08:28 UTC (rev 387747)
@@ -1,53 +0,0 @@
-From 979ae78318c3e37cc0e0579b8d1f05c46bb76e7d Mon Sep 17 00:00:00 2001
-From: Danylo Piliaiev 
-Date: Tue, 19 May 2020 20:35:49 +0300
-Subject: [PATCH] meson: Disable GCC's dead store elimination for memory
- zeroing custom new
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some classes use custom new operator which zeroes memory, however gcc does
-aggressive dead-store elimination which threats all writes to the memory
-before the constructor as "dead stores".
-
-For now we disable this optimization.
-
-The new operators in question are declared via:
- DECLARE_RZALLOC_CXX_OPERATORS
- DECLARE_LINEAR_ZALLOC_CXX_OPERATORS
-
-The issue was found with lto builds, however there is no guarantee that
-it didn't happen with ordinary ones.
-
-CC: 
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2977
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1358
-Signed-off-by: Danylo Piliaiev 
-Reviewed-by: Marek Olšák 
-Part-of: 
-(cherry picked from commit 5500a2b7fc558217bbd4c2a966ab6fcadaed8b3b)
-Signed-off-by: Laurent Carlier 

- meson.build   | 5 +
- 1 files changed, 5 insertions(+), 0 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index ba4fdb2a59f..434684c8bcc 100644
 a/meson.build
-+++ b/meson.build
-@@ -980,6 +980,11 @@ else
- '-fno-math-errno',
- '-fno-trapping-math',
- '-Qunused-arguments',
-+# Some classes use custom new operator which zeroes memory, however
-+# gcc does aggressive dead-store elimination which threats all writes
-+# to the memory before the constructor as "dead stores".
-+# For now we disable this optimization.
-+'-flifetime-dse=1',
-   ]
-   # MinGW chokes on format specifiers and I can't get it all working
-   if not (cc.get_id() == 'gcc' and host_machine.system() == 'windows')
--- 
-2.26.2
-

Deleted: 0001-omx-fix-build-with-gcc-10.patch
===
--- 0001-omx-fix-build-with-gcc-10.patch2020-05-28 00:31:57 UTC (rev 
387746)
+++ 0001-omx-fix-build-with-gcc-10.patch2020-05-28 06:08:28 UTC (rev 
387747)
@@ -1,40 +0,0 @@
-From 283e815339a15fa99039c69f1e225269790ae955 Mon Sep 17 00:00:00 2001
-From: Pierre-Eric Pelloux-Prayer 
-Date: Thu, 5 Mar 2020 09:37:58 +0100
-Subject: [PATCH] omx: fix build with gcc 10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-bellagio/omx header files reference a global variable without the
-extern keyworkd.
-Now that gcc-10 enables the '-fno-common' by default the build fails.
-Since these are external headers we can't easily fix them, so for
-now build the omx module with the '-fcommon' flag to keep the
-previous behavior.
-
-See https://gitlab.freedesktop.org/mesa/mesa/issues/2385
-
-Reviewed-by: Michel Dänzer 
-Part-of: 
-Signed-off-by: Laurent Carlier 

- src/gallium/state_trackers/omx/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gallium/state_trackers/omx/meson.build 
b/src/gallium/state_trackers/omx/meson.build
-index 3aa82090c91..987d3e23c84 100644
 a/src/gallium/state_trackers/omx/meson.build
-+++ b/src/gallium/state_trackers/omx/meson.build
-@@ -65,7 +65,7 @@ endif
- libomx_st = static_library(
-   'omx_st',
-   files_omx,
--  c_args : [c_vis_args],
-+  c_args : [c_vis_args, '-fcommon'],
-   include_directories : inc_st_omx,
-   dependencies : dep_st_omx,
- )
--- 
-2.26.2
-

Deleted: 0001-swr-Fix-build-with-GCC-10.patch
===
--- 0001-swr-Fix-build-with-GCC-10.patch2020-05-28 00:31:57 UTC (rev 
387746)
+++ 0001-swr-Fix-build

[arch-commits] Commit in mesa/trunk (4 files)

2020-05-28 Thread Laurent Carlier via arch-commits 
Date: Thursday, May 28, 2020 @ 13:04:15
  Author: lcarlier
Revision: 387767

upgpkg: mesa 20.1.0-2: Add upstream i965 fix

Added:
  mesa/trunk/0001-iris-fix-BO-destruction-in-error-path.patch
  mesa/trunk/0002-iris-fix-export-of-GEM-handles.patch
  mesa/trunk/0003-i965-fix-export-of-GEM-handles.patch
Modified:
  mesa/trunk/PKGBUILD

--+
 0001-iris-fix-BO-destruction-in-error-path.patch |   41 ++
 0002-iris-fix-export-of-GEM-handles.patch|  364 +
 0003-i965-fix-export-of-GEM-handles.patch|  343 +++
 PKGBUILD |   17 
 4 files changed, 764 insertions(+), 1 deletion(-)

Added: 0001-iris-fix-BO-destruction-in-error-path.patch
===
--- 0001-iris-fix-BO-destruction-in-error-path.patch
(rev 0)
+++ 0001-iris-fix-BO-destruction-in-error-path.patch2020-05-28 13:04:15 UTC 
(rev 387767)
@@ -0,0 +1,41 @@
+From eac7681c13f127d762474a8207399c2eb0c76f30 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin 
+Date: Sat, 2 May 2020 22:43:22 +0300
+Subject: [PATCH 1/3] iris: fix BO destruction in error path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Lionel Landwerlin 
+Cc: 
+Tested-by: Tapani Pälli 
+Signed-off-by: Laurent Carlier 
+---
+ src/gallium/drivers/iris/iris_bufmgr.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/gallium/drivers/iris/iris_bufmgr.c 
b/src/gallium/drivers/iris/iris_bufmgr.c
+index c8e6d0c654b..9064647d0e5 100644
+--- a/src/gallium/drivers/iris/iris_bufmgr.c
 b/src/gallium/drivers/iris/iris_bufmgr.c
+@@ -589,6 +589,7 @@ iris_bo_create_userptr(struct iris_bufmgr *bufmgr, const 
char *name,
+void *ptr, size_t size,
+enum iris_memory_zone memzone)
+ {
++   struct drm_gem_close close = { 0, };
+struct iris_bo *bo;
+ 
+bo = bo_calloc();
+@@ -634,7 +635,8 @@ iris_bo_create_userptr(struct iris_bufmgr *bufmgr, const 
char *name,
+return bo;
+ 
+ err_close:
+-   gen_ioctl(bufmgr->fd, DRM_IOCTL_GEM_CLOSE, &bo->gem_handle);
++   close.handle = bo->gem_handle;
++   gen_ioctl(bufmgr->fd, DRM_IOCTL_GEM_CLOSE, &close);
+ err_free:
+free(bo);
+return NULL;
+-- 
+2.26.2
+

Added: 0002-iris-fix-export-of-GEM-handles.patch
===
--- 0002-iris-fix-export-of-GEM-handles.patch   (rev 0)
+++ 0002-iris-fix-export-of-GEM-handles.patch   2020-05-28 13:04:15 UTC (rev 
387767)
@@ -0,0 +1,364 @@
+From e01e146e35681dbdc68d70a2118b71a78ef67e6a Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin 
+Date: Sat, 2 May 2020 16:46:47 +0300
+Subject: [PATCH 2/3] iris: fix export of GEM handles
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We reuse DRM file descriptors internally. Therefore when we export a
+GEM handle we must do so in the file descriptor used externally.
+
+v2: Don't bother checking fd equals, they're always different
+Fix dmabuf leak
+Fix GEM handle leaks by tracking exported handles
+
+v3: Check os_same_file_description error (Michel)
+Don't create multiple exports for a given GEM table
+
+v4: Add WARN_ONCE (Ken)
+Rename external_fd to winsys_fd
+
+v5: Remove export lock in favor of bufmgr's
+
+Signed-off-by: Lionel Landwerlin 
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2882
+Fixes: 7557f1605968 ("iris: share buffer managers accross screens")
+Tested-by: Eric Engestrom 
+Tested-by: Tapani Pälli 
+Signed-off-by: Laurent Carlier 
+---
+ src/gallium/drivers/iris/iris_bufmgr.c   | 108 ++-
+ src/gallium/drivers/iris/iris_bufmgr.h   |  16 
+ src/gallium/drivers/iris/iris_resource.c |  33 +--
+ src/gallium/drivers/iris/iris_screen.c   |   2 +
+ src/gallium/drivers/iris/iris_screen.h   |   8 +-
+ 5 files changed, 157 insertions(+), 10 deletions(-)
+
+diff --git a/src/gallium/drivers/iris/iris_bufmgr.c 
b/src/gallium/drivers/iris/iris_bufmgr.c
+index 9064647d0e5..3c39769b9cb 100644
+--- a/src/gallium/drivers/iris/iris_bufmgr.c
 b/src/gallium/drivers/iris/iris_bufmgr.c
+@@ -63,6 +63,7 @@
+ #include "util/macros.h"
+ #include "util/hash_table.h"
+ #include "util/list.h"
++#include "util/os_file.h"
+ #include "util/u_dynarray.h"
+ #include "util/vma.h"
+ #include "iris_bufmgr.h"
+@@ -91,6 +92,17 @@
+ 
+ #define PAGE_SIZE 4096
+ 
++#define WARN_ONCE(cond, fmt...) do {\
++   if (unlikely(cond)) {\
++  static bool _warned = false;  \
++  if (!_warned) {   \
++ fprintf(stderr, "WARNING: ");  \
++ fprintf(stderr, fmt);  \
++ _

[arch-commits] Commit in mesa/trunk (4 files)

2018-02-15 Thread Laurent Carlier via arch-commits 
Date: Thursday, February 15, 2018 @ 14:45:16
  Author: lcarlier
Revision: 317096

upgpkg: mesa 17.3.4-1

upstream update 17.3.4

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-radeon-vcn-add-and-manage-render-picture-list.patch
  mesa/trunk/0002-radeon-uvd-add-and-manage-render-picture-list.patch
  mesa/trunk/winsys-radeon-Compute-is_displayable-in-surf_drm_to_winsys.patch

--+
 0001-radeon-vcn-add-and-manage-render-picture-list.patch |   95 
-
 0002-radeon-uvd-add-and-manage-render-picture-list.patch |   96 
--
 PKGBUILD |   21 --
 winsys-radeon-Compute-is_displayable-in-surf_drm_to_winsys.patch |   14 -
 4 files changed, 5 insertions(+), 221 deletions(-)

Deleted: 0001-radeon-vcn-add-and-manage-render-picture-list.patch
===
--- 0001-radeon-vcn-add-and-manage-render-picture-list.patch2018-02-15 
13:26:57 UTC (rev 317095)
+++ 0001-radeon-vcn-add-and-manage-render-picture-list.patch2018-02-15 
14:45:16 UTC (rev 317096)
@@ -1,95 +0,0 @@
-From: Boyuan Zhang 
-
-Create a list in decoder to store all render picture buffer pointers that
-currently being used in reference picture lists.
-
-During get message buffer call, check each pointer in render_pic_list[]
-within given pic->ref[] list, remove pointer that no longer being used by
-pic->ref[]. Then add current render surface pointer to the render_pic_list[]
-and assign the associated index to result.curr_idx.
-
-As a result, result.curr_idx will have the correct index to represent the
-current render picture, instead of the previous increamenting values.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104745
-
-Signed-off-by: Boyuan Zhang 
-Reviewed-by: Christian König 
-Cc: mesa-stable at lists.freedesktop.org
-(cherry picked from commit f2bfd1cbb7e72945ca192845a1ad28426c7aea89)

- src/gallium/drivers/radeon/radeon_vcn_dec.c | 28 
- 1 file changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c 
b/src/gallium/drivers/radeon/radeon_vcn_dec.c
-index 2ece4a3..8010010 100644
 a/src/gallium/drivers/radeon/radeon_vcn_dec.c
-+++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c
-@@ -78,6 +78,7 @@ struct radeon_decoder {
- 
-   unsignedbs_size;
-   unsignedcur_buffer;
-+  void*render_pic_list[16];
- };
- 
- static rvcn_dec_message_avc_t get_h264_msg(struct radeon_decoder *dec,
-@@ -186,7 +187,7 @@ static rvcn_dec_message_hevc_t get_h265_msg(struct 
radeon_decoder *dec,
-   struct pipe_h265_picture_desc *pic)
- {
-   rvcn_dec_message_hevc_t result;
--  unsigned i;
-+  unsigned i, j;
- 
-   memset(&result, 0, sizeof(result));
-   result.sps_info_flags = 0;
-@@ -273,11 +274,28 @@ static rvcn_dec_message_hevc_t get_h265_msg(struct 
radeon_decoder *dec,
-   result.row_height_minus1[i] = pic->pps->row_height_minus1[i];
- 
-   result.num_delta_pocs_ref_rps_idx = pic->NumDeltaPocsOfRefRpsIdx;
--  result.curr_idx = pic->CurrPicOrderCntVal;
-   result.curr_poc = pic->CurrPicOrderCntVal;
- 
-+  for (i = 0 ; i < 16 ; i++) {
-+  for (j = 0; (pic->ref[j] != NULL) && (j < 16) ; j++) {
-+  if (dec->render_pic_list[i] == pic->ref[j])
-+  break;
-+  if (j == 15)
-+  dec->render_pic_list[i] = NULL;
-+  else if (pic->ref[j+1] == NULL)
-+  dec->render_pic_list[i] = NULL;
-+  }
-+  }
-+  for (i = 0 ; i < 16 ; i++) {
-+  if (dec->render_pic_list[i] == NULL) {
-+  dec->render_pic_list[i] = target;
-+  result.curr_idx = i;
-+  break;
-+  }
-+  }
-+
-   vl_video_buffer_set_associated_data(target, &dec->base,
--  (void 
*)(uintptr_t)pic->CurrPicOrderCntVal,
-+  (void *)(uintptr_t)result.curr_idx,
-   
&radeon_dec_destroy_associated_data);
- 
-   for (i = 0; i < 16; ++i) {
-@@ -320,7 +338,7 @@ static rvcn_dec_message_hevc_t get_h265_msg(struct 
radeon_decoder *dec,
-   memcpy(dec->it + 864, pic->pps->sps->ScalingList32x32, 2 * 64);
- 
-   for (i = 0 ; i < 2 ; i++) {
--  for (int j = 0 ; j < 15 ; j++)
-+  for (j = 0 ; j < 15 ; j++)
-   result.direct_reflist[i][j] = pic->RefPicList[i][j];
-   }
- 
-@@ -1236,6 +1254,8 @@ struct pipe_video_codec *radeon_create_decoder(struct 
pipe_context *context,
-   goto error;
-   }
- 
-+  for (i = 0; i < 16; i+

[arch-commits] Commit in mesa/trunk (4 files)

2018-05-22 Thread Laurent Carlier via arch-commits 
Date: Tuesday, May 22, 2018 @ 08:11:29
  Author: lcarlier
Revision: 324717

upgpkg: mesa 18.1.0-1

upstream update 18.1.0

Modified:
  mesa/trunk/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0002-meson-Add-library-versions-to-swr-drivers.patch
  mesa/trunk/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch

-+
 0002-meson-Add-library-versions-to-swr-drivers.patch|   71 
--
 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch  |   43 --
 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch |   39 ++---
 PKGBUILD|   19 --
 4 files changed, 26 insertions(+), 146 deletions(-)

Deleted: 0002-meson-Add-library-versions-to-swr-drivers.patch
===
--- 0002-meson-Add-library-versions-to-swr-drivers.patch2018-05-22 
07:45:12 UTC (rev 324716)
+++ 0002-meson-Add-library-versions-to-swr-drivers.patch2018-05-22 
08:11:29 UTC (rev 324717)
@@ -1,71 +0,0 @@
-From 4edc0c6290ea4e848c5142b6807ebc5c809fecef Mon Sep 17 00:00:00 2001
-Message-Id: 
<4edc0c6290ea4e848c5142b6807ebc5c809fecef.1526409254.git.jan.steff...@gmail.com>
-In-Reply-To: 

-References: 

-From: "Jan Alexander Steffens (heftig)" 
-Date: Sat, 14 Apr 2018 18:43:23 +0200
-Subject: [PATCH 2/4] meson: Add library versions to swr drivers
-
-This is for parity with autotools.
-
-Signed-off-by: Jan Alexander Steffens (heftig) 

- src/gallium/drivers/swr/meson.build | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/swr/meson.build 
b/src/gallium/drivers/swr/meson.build
-index 43e1c5cc50..a6dbd7a3f6 100644
 a/src/gallium/drivers/swr/meson.build
-+++ b/src/gallium/drivers/swr/meson.build
-@@ -198,6 +198,7 @@ if with_swr_arches.contains('avx')
- link_args : [ld_args_gc_sections],
- include_directories : [swr_incs],
- dependencies : [dep_thread, dep_llvm],
-+version : '0.0.0',
- install : true,
-   )
- endif
-@@ -230,6 +231,7 @@ if with_swr_arches.contains('avx2')
- link_args : [ld_args_gc_sections],
- include_directories : [swr_incs],
- dependencies : [dep_thread, dep_llvm],
-+version : '0.0.0',
- install : true,
-   )
- endif
-@@ -257,30 +259,32 @@ if with_swr_arches.contains('knl')
- link_args : [ld_args_gc_sections],
- include_directories : [swr_incs],
- dependencies : [dep_thread, dep_llvm],
-+version : '0.0.0',
- install : true,
-   )
- endif
- 
- if with_swr_arches.contains('skx')
-   swr_skx_args = cpp.first_supported_argument(
- '-target-cpu=x86-skylake', '-march=skylake-avx512', '-xCORE-AVX512',
- prefix : '''
-   #if !defined(__AVX512F__) || !defined(__AVX512BW__)
-   # error
-   #endif ''',
-   )
-   if swr_skx_args == []
- error('Cannot find SKX support for swr.')
-   endif
- 
-   swr_arch_defines += '-DHAVE_SWR_SKX'
-   swr_arch_libs += shared_library(
- 'swrSKX',
- [files_swr_common, files_swr_arch],
- cpp_args : [swr_cpp_args, swr_skx_args, '-DKNOB_ARCH=KNOB_ARCH_AVX512'],
- link_args : [ld_args_gc_sections],
- include_directories : [swr_incs],
- dependencies : [dep_thread, dep_llvm],
-+version : '0.0.0',
- install : true,
-   )
- endif
--- 
-2.17.0
-

Deleted: 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch
===
--- 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch  2018-05-22 
07:45:12 UTC (rev 324716)
+++ 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch  2018-05-22 
08:11:29 UTC (rev 324717)
@@ -1,43 +0,0 @@
-From 7bafcb1b39b03110ba5a375635d7b6b5ecf98bc4 Mon Sep 17 00:00:00 2001
-Message-Id: 
<7bafcb1b39b03110ba5a375635d7b6b5ecf98bc4.1526409254.git.jan.steff...@gmail.com>
-In-Reply-To: 

-References: 

-From: "Jan Alexander Steffens (heftig)" 
-Date: Sat, 14 Apr 2018 18:49:14 +0200
-Subject: [PATCH 3/4] meson: Version libMesaOpenCL like autotools does
-
-This is for parity with autotools. It names the library
-libMesaOpenCL.so.1.0.0 and points mesa.icd to the .1 symlink.
-
-opencl_version now matches configure.ac's OPENCL_VERSION.
-
-Signed-off-by: Jan Alexander Steffens (heftig) 

- src/gallium/targets/opencl/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/targets/opencl/meson.build 
b/src/gallium/targets/opencl/meson.build
-index bebe0547d4..317ad8dab4 100644
 a/src/gallium/targets/opencl/meson.build
-+++ b/src/gallium/targets/opencl/meson.build
-@@ -20,7 +20,7 @@
- 
- opencl_link_args = []
- opencl_link_deps = []
--opencl_version = '1.0'
-+opencl_version = '1'
- 
- if with_ld_version_script
-   opencl_link_args += [
-@@ -55,7 +55,7 @@ libopencl = shared_library(
- cpp.find_library('clangLex', dirs : llvm_libdir),
- cpp.find_library