[arch-commits] Commit in lib32-mesa/trunk (4 files)
Date: Saturday, June 2, 2018 @ 09:50:33 Author: lcarlier Revision: 337277 upgpkg: lib32-mesa 18.1.1-1 upstream update 18.1.1 Modified: lib32-mesa/trunk/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch lib32-mesa/trunk/PKGBUILD Deleted: lib32-mesa/trunk/0002-meson-Add-library-versions-to-swr-drivers.patch lib32-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| 30 +--- 4 files changed, 28 insertions(+), 155 deletions(-) Deleted: 0002-meson-Add-library-versions-to-swr-drivers.patch === --- 0002-meson-Add-library-versions-to-swr-drivers.patch2018-06-02 09:46:28 UTC (rev 337276) +++ 0002-meson-Add-library-versions-to-swr-drivers.patch2018-06-02 09:50:33 UTC (rev 337277) @@ -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-06-02 09:46:28 UTC (rev 337276) +++ 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch 2018-06-02 09:50:33 UTC (rev 337277) @@ -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 :
[arch-commits] Commit in lib32-mesa/trunk (4 files)
Date: Friday, May 25, 2018 @ 21:36:11 Author: lcarlier Revision: 329611 upgpkg: lib32-mesa 18.0.4-2 now wayland-egl belongs to lib32-wayland package Added: lib32-mesa/trunk/0002-meson-Add-library-versions-to-swr-drivers.patch (from rev 324263, lib32-mesa/trunk/0002-meson-Add-library-versions-to-swr-drivers.patch) lib32-mesa/trunk/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch (from rev 324263, lib32-mesa/trunk/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch) Modified: lib32-mesa/trunk/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch lib32-mesa/trunk/PKGBUILD -+ 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, 146 insertions(+), 26 deletions(-) Copied: lib32-mesa/trunk/0002-meson-Add-library-versions-to-swr-drivers.patch (from rev 324263, lib32-mesa/trunk/0002-meson-Add-library-versions-to-swr-drivers.patch) === --- 0002-meson-Add-library-versions-to-swr-drivers.patch (rev 0) +++ 0002-meson-Add-library-versions-to-swr-drivers.patch2018-05-25 21:36:11 UTC (rev 329611) @@ -0,0 +1,71 @@ +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 + Copied: lib32-mesa/trunk/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch (from rev 324263, lib32-mesa/trunk/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch) === --- 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch (rev 0) +++ 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch 2018-05-25 21:36:11 UTC (rev 329611) @@ -0,0 +1,43 @@ +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
[arch-commits] Commit in lib32-mesa/trunk (4 files)
Date: Tuesday, May 22, 2018 @ 08:29:08 Author: lcarlier Revision: 326874 upgpkg: lib32-mesa 18.1.0-1 upstream update 18.1.0 Modified: lib32-mesa/trunk/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch lib32-mesa/trunk/PKGBUILD Deleted: lib32-mesa/trunk/0002-meson-Add-library-versions-to-swr-drivers.patch lib32-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:30:53 UTC (rev 326873) +++ 0002-meson-Add-library-versions-to-swr-drivers.patch2018-05-22 08:29:08 UTC (rev 326874) @@ -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:30:53 UTC (rev 326873) +++ 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch 2018-05-22 08:29:08 UTC (rev 326874) @@ -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
[arch-commits] Commit in lib32-mesa/trunk (4 files)
Date: Wednesday, April 18, 2018 @ 17:21:04 Author: foutrelis Revision: 316910 upgpkg: lib32-mesa 18.0.1-1 New upstream release. Modified: lib32-mesa/trunk/PKGBUILD Deleted: lib32-mesa/trunk/0001-meson-fix-megadriver-symlinking.patch lib32-mesa/trunk/0002-meson-Set-.so-version-for-xa-like-autotools-does.patch lib32-mesa/trunk/0003-meson-Define-NDEBUG-for-non-debug-builds.patch -+ 0001-meson-fix-megadriver-symlinking.patch | 34 - 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch | 59 -- 0003-meson-Define-NDEBUG-for-non-debug-builds.patch | 34 - PKGBUILD| 16 -- 4 files changed, 4 insertions(+), 139 deletions(-) Deleted: 0001-meson-fix-megadriver-symlinking.patch === --- 0001-meson-fix-megadriver-symlinking.patch 2018-04-18 17:11:47 UTC (rev 316909) +++ 0001-meson-fix-megadriver-symlinking.patch 2018-04-18 17:21:04 UTC (rev 316910) @@ -1,34 +0,0 @@ -From ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd Mon Sep 17 00:00:00 2001 -Message-Id:-From: Dylan Baker -Date: Wed, 4 Apr 2018 10:23:02 -0700 -Subject: [PATCH 1/5] meson: fix megadriver symlinking - -Which should be relative instead of absolute. - -Fixes: f7f1b30f81e842db6057591470ce3cb6d4fb2795 - ("meson: extend install_megadrivers script to handle symmlinking") -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105567 -Signed-off-by: Dylan Baker -Reviewed-and-Tested-by: Eric Engestrom -Reviewed-by: Emil Velikov - bin/install_megadrivers.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py -index 86bfa35918..7931a544bd 100755 a/bin/install_megadrivers.py -+++ b/bin/install_megadrivers.py -@@ -58,7 +58,7 @@ def main(): - while ext != '.so': - if os.path.exists(name): - os.unlink(name) --os.symlink(driver, name) -+os.symlink(each, name) - name, ext = os.path.splitext(name) - finally: - os.chdir(ret) --- -2.16.2 - Deleted: 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch === --- 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch 2018-04-18 17:11:47 UTC (rev 316909) +++ 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch 2018-04-18 17:21:04 UTC (rev 316910) @@ -1,59 +0,0 @@ -From bc13bd64008dc32586a0b4d41189b74a2ab27265 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: -From: Dylan Baker -Date: Wed, 4 Apr 2018 10:53:16 -0700 -Subject: [PATCH 2/5] meson: Set .so version for xa like autotools does - -Fixes: 0ba909f0f111824223bc38563d1a6bc73e69c2cc - ("meson: build gallium xa state tracker") -Signed-off-by: Dylan Baker -Reviewed-by: Eric Engestrom -Reviewed-by: Emil Velikov - src/gallium/targets/xa/meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build -index ea6e1296da..733ef54ff8 100644 a/src/gallium/targets/xa/meson.build -+++ b/src/gallium/targets/xa/meson.build -@@ -30,31 +30,33 @@ if with_ld_version_script - xa_link_depends += files('xa.sym') - endif - -+_xa_version = '.'.join(xa_version) - - libxatracker = shared_library( - 'xatracker', - 'target.c', - c_args : c_vis_args, - cpp_args : cpp_vis_args, - link_args : [xa_link_args, ld_args_gc_sections], - include_directories : [ - inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, - ], - link_whole : [libxa_st], - link_with : [ - libgalliumvl_stub, libgallium, libmesa_util, libpipe_loader_static, - libws_null, libwsw, libswdri, libswkmsdri, - ], - link_depends : xa_link_depends, - dependencies : [ - dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedreno, - ], -+ version : _xa_version, - install : true, - ) - - pkg.generate( - name : 'xatracker', - description : 'Xorg gallium3D acceleration library', -- version : '.'.join(xa_version), -+ version : _xa_version, - libraries : libxatracker, - ) --- -2.16.2 - Deleted: 0003-meson-Define-NDEBUG-for-non-debug-builds.patch
[arch-commits] Commit in lib32-mesa/trunk (4 files)
Date: Saturday, March 31, 2018 @ 08:40:48 Author: lcarlier Revision: 313590 upgpkg: lib32-mesa 18.0.0-1 upstream update 18.0.0 Added: lib32-mesa/trunk/fix-install.diff lib32-mesa/trunk/fix-versions.diff Modified: lib32-mesa/trunk/LICENSE lib32-mesa/trunk/PKGBUILD ---+ LICENSE | 87 +++--- PKGBUILD | 198 fix-install.diff | 29 +++ fix-versions.diff | 74 +++ 4 files changed, 256 insertions(+), 132 deletions(-) Modified: LICENSE === --- LICENSE 2018-03-31 04:23:42 UTC (rev 313589) +++ LICENSE 2018-03-31 08:40:48 UTC (rev 313590) @@ -1,33 +1,34 @@ +The Mesa 3D Graphics Library + Disclaimer -Mesa is a 3-D graphics library with an API which is very similar to -that of OpenGL* -To the extent that Mesa utilizes the OpenGL command syntax or state -machine, it is being used with authorization from Silicon Graphics, -Inc.(SGI). However, the author does not possess an OpenGL license -from SGI, and makes no claim that Mesa is in any way a compatible -replacement for OpenGL or associated with SGI. Those who want a -licensed implementation of OpenGL should contact a licensed -vendor. + Mesa is a 3-D graphics library with an API which is very similar to + that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command + syntax or state machine, it is being used with authorization from + [2]Silicon Graphics, Inc.(SGI). However, the author does not possess an + OpenGL license from SGI, and makes no claim that Mesa is in any way a + compatible replacement for OpenGL or associated with SGI. Those who + want a licensed implementation of OpenGL should contact a licensed + vendor. -Please do not refer to the library as MesaGL (for legal -reasons). It's just Mesa or The Mesa 3-D graphics -library + Please do not refer to the library as MesaGL (for legal reasons). It's + just Mesa or The Mesa 3-D graphics library. -* OpenGL is a trademark of Silicon Graphics Incorporated. + * OpenGL is a trademark of [3]Silicon Graphics Incorporated. License / Copyright Information -The Mesa distribution consists of several components. Different copyrights -and licenses apply to different components. For example, GLUT is copyrighted -by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa -device drivers are copyrighted by their authors. See below for a list of -Mesa's main components and the license for each. + The Mesa distribution consists of several components. Different + copyrights and licenses apply to different components. For example, the + GLX client code uses the SGI Free Software License B, and some of the + Mesa device drivers are copyrighted by their authors. See below for a + list of Mesa's main components and the license for each. -The core Mesa library is licensed according to the terms of the MIT license. -This allows integration with the XFree86, Xorg and DRI projects. + The core Mesa library is licensed according to the terms of the MIT + license. This allows integration with the XFree86, Xorg and DRI + projects. -The default Mesa license is as follows: + The default Mesa license is as follows: Copyright (C) 1999-2007 Brian Paul All Rights Reserved. @@ -44,39 +45,39 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. Attention, Contributors -When contributing to the Mesa project you must agree to the licensing terms -of the component to which you're contributing. -The following section lists the primary components of the Mesa distribution -and their respective licenses. + When contributing to the Mesa project you must agree to the licensing + terms of the component to which you're contributing. The following + section lists the primary components of the Mesa distribution and their + respective licenses. - Mesa Component Licenses -Component Location Primary Author License - -Main Mesa codesrc/mesa/ Brian Paul Mesa (MIT) +Component Location License +--
[arch-commits] Commit in lib32-mesa/trunk (4 files)
Date: Friday, May 26, 2017 @ 12:34:02 Author: lcarlier Revision: 230464 upgpkg: lib32-mesa 17.1.1-1 upstream update 17.1.1 Added: lib32-mesa/trunk/0002-glvnd-fix-gl-dot-pc.patch (from rev 230463, lib32-mesa/trunk/glvnd-fix-gl-dot-pc.patch) Modified: lib32-mesa/trunk/PKGBUILD Deleted: lib32-mesa/trunk/0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch lib32-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| 30 ++- glvnd-fix-gl-dot-pc.patch | 12 - 4 files changed, 31 insertions(+), 111 deletions(-) Deleted: 0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch === --- 0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch 2017-05-26 12:15:33 UTC (rev 230463) +++ 0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch 2017-05-26 12:34:02 UTC (rev 230464) @@ -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: lib32-mesa/trunk/0002-glvnd-fix-gl-dot-pc.patch (from rev 230463, lib32-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 12:34:02 UTC (rev 230464) @@ -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
[arch-commits] Commit in lib32-mesa/trunk (4 files)
Date: Thursday, October 27, 2016 @ 15:55:24 Author: lcarlier Revision: 193785 upgpkg: lib32-mesa 13.0.0rc2-1 upstream update 13.0.0-rc2 - and llvm-3.9.0 rebuild Modified: lib32-mesa/trunk/PKGBUILD lib32-mesa/trunk/remove-libpthread-stubs.patch Deleted: lib32-mesa/trunk/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch lib32-mesa/trunk/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch -+ 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch | 91 -- 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch | 59 -- PKGBUILD| 55 +++--- remove-libpthread-stubs.patch | 25 +- 4 files changed, 43 insertions(+), 187 deletions(-) Deleted: 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch === --- 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch 2016-10-27 14:07:23 UTC (rev 193784) +++ 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch 2016-10-27 15:55:24 UTC (rev 193785) @@ -1,91 +0,0 @@ -From 0247e5ee3edd546b8598082d5b45d110f61853d0 Mon Sep 17 00:00:00 2001 -From: Martin Peres-Date: Thu, 6 Oct 2016 17:07:22 +0300 -Subject: [PATCH 1/2] loader/dri3: add get_dri_screen() to the vtable - -This allows querying the current active screen from the -loader's common code. - -Cc: mesa-sta...@lists.freedesktop.org -Reviewed-by: Emil Velikov -Signed-off-by: Martin Peres - src/egl/drivers/dri2/platform_x11_dri3.c | 12 - src/glx/dri3_glx.c | 11 +++ - src/loader/loader_dri3_helper.h | 1 + - 3 files changed, 24 insertions(+) - -diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c -index 31649fe..d93f5bc 100644 a/src/egl/drivers/dri2/platform_x11_dri3.c -+++ b/src/egl/drivers/dri2/platform_x11_dri3.c -@@ -103,6 +103,17 @@ egl_dri3_get_dri_context(struct loader_dri3_drawable *draw) -return dri2_ctx->dri_context; - } - -+static __DRIscreen * -+egl_dri3_get_dri_screen(struct loader_dri3_drawable *draw) -+{ -+ _EGLContext *ctx = _eglGetCurrentContext(); -+ struct dri2_egl_context *dri2_ctx; -+ if (!ctx) -+ return NULL; -+ dri2_ctx = dri2_egl_context(ctx); -+ return dri2_egl_display(dri2_ctx->base.Resource.Display)->dri_screen; -+} -+ - static void - egl_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags) - { -@@ -119,6 +130,7 @@ static struct loader_dri3_vtable egl_dri3_vtable = { -.set_drawable_size = egl_dri3_set_drawable_size, -.in_current_context = egl_dri3_in_current_context, -.get_dri_context = egl_dri3_get_dri_context, -+ .get_dri_screen = egl_dri3_get_dri_screen, -.flush_drawable = egl_dri3_flush_drawable, -.show_fps = NULL, - }; -diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c -index 90d7bba..51b6b1c 100644 a/src/glx/dri3_glx.c -+++ b/src/glx/dri3_glx.c -@@ -132,6 +132,16 @@ glx_dri3_get_dri_context(struct loader_dri3_drawable *draw) -return (gc != ) ? dri3Ctx->driContext : NULL; - } - -+static __DRIscreen * -+glx_dri3_get_dri_screen(struct loader_dri3_drawable *draw) -+{ -+ struct glx_context *gc = __glXGetCurrentContext(); -+ struct dri3_context *pcp = (struct dri3_context *) gc; -+ struct dri3_screen *psc = (struct dri3_screen *) pcp->base.psc; -+ -+ return (gc != && psc) ? psc->driScreen : NULL; -+} -+ - static void - glx_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags) - { -@@ -169,6 +179,7 @@ static struct loader_dri3_vtable glx_dri3_vtable = { -.set_drawable_size = glx_dri3_set_drawable_size, -.in_current_context = glx_dri3_in_current_context, -.get_dri_context = glx_dri3_get_dri_context, -+ .get_dri_screen = glx_dri3_get_dri_screen, -.flush_drawable = glx_dri3_flush_drawable, -.show_fps = glx_dri3_show_fps, - }; -diff --git a/src/loader/loader_dri3_helper.h b/src/loader/loader_dri3_helper.h -index 5b8fd1d..658e190 100644 a/src/loader/loader_dri3_helper.h -+++ b/src/loader/loader_dri3_helper.h -@@ -103,6 +103,7 @@ struct loader_dri3_vtable { -void (*set_drawable_size)(struct loader_dri3_drawable *, int, int); -bool (*in_current_context)(struct loader_dri3_drawable *); -__DRIcontext *(*get_dri_context)(struct loader_dri3_drawable *); -+ __DRIscreen *(*get_dri_screen)(struct loader_dri3_drawable *); -void (*flush_drawable)(struct loader_dri3_drawable *, unsigned); -void (*show_fps)(struct loader_dri3_drawable *, uint64_t); - }; --- -2.10.0 - Deleted: 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch === --- 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
[arch-commits] Commit in lib32-mesa/trunk (4 files)
Date: Monday, September 5, 2016 @ 18:59:36 Author: lcarlier Revision: 188596 upgpkg: lib32-mesa 12.0.2-1 upstream update 12.0.2 Modified: lib32-mesa/trunk/PKGBUILD Deleted: lib32-mesa/trunk/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch lib32-mesa/trunk/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch lib32-mesa/trunk/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch ---+ 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch | 17 -- 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch | 76 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch| 38 -- PKGBUILD | 22 --- 4 files changed, 5 insertions(+), 148 deletions(-) Deleted: 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch === --- 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch2016-09-05 18:10:31 UTC (rev 188595) +++ 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch2016-09-05 18:59:36 UTC (rev 188596) @@ -1,17 +0,0 @@ -diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp -index 7564119..38e2c4a 100644 a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp -+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp -@@ -6058,7 +6058,11 @@ st_translate_program( - inputSemanticName[i], inputSemanticIndex[i], - interpMode[i], 0, interpLocation[i], - array_id, array_size); --i += array_size - 1; -+ -+GLuint base_attr = inputSlotToAttr[i]; -+while (i + 1 < numInputs && -+ inputSlotToAttr[i + 1] < base_attr + array_size) -+ ++i; - } - else { - t->inputs[i] = ureg_DECL_fs_input_cyl_centroid(ureg, Deleted: 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch === --- 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch 2016-09-05 18:10:31 UTC (rev 188595) +++ 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch 2016-09-05 18:59:36 UTC (rev 188596) @@ -1,76 +0,0 @@ -From 9ce52baf7f479d506bcea17a371dcf2fad92f139 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?=-Date: Wed, 13 Jul 2016 14:54:31 +0200 -Subject: [PATCH] st/mesa: fix reference counting bug in st_vdpau -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise we leak the resources created for the DMA-buf descriptors. - -Signed-off-by: Christian König -Cc: 12.0 -Tested-and-Reviewed by: Leo Liu -Ack-by: Tom St Denis - src/mesa/state_tracker/st_vdpau.c | 10 -- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/mesa/state_tracker/st_vdpau.c b/src/mesa/state_tracker/st_vdpau.c -index dffa52f..4f599dd 100644 a/src/mesa/state_tracker/st_vdpau.c -+++ b/src/mesa/state_tracker/st_vdpau.c -@@ -65,6 +65,7 @@ st_vdpau_video_surface_gallium(struct gl_context *ctx, const void *vdpSurface, - -struct pipe_video_buffer *buffer; -struct pipe_sampler_view **samplers; -+ struct pipe_resource *res = NULL; - -getProcAddr = (void *)ctx->vdpGetProcAddress; -if (getProcAddr(device, VDP_FUNC_ID_VIDEO_SURFACE_GALLIUM, (void**))) -@@ -82,7 +83,8 @@ st_vdpau_video_surface_gallium(struct gl_context *ctx, const void *vdpSurface, -if (!sv) - return NULL; - -- return sv->texture; -+ pipe_resource_reference(, sv->texture); -+ return res; - } - - static struct pipe_resource * -@@ -90,13 +92,15 @@ st_vdpau_output_surface_gallium(struct gl_context *ctx, const void *vdpSurface) - { -int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr); -uint32_t device = (uintptr_t)ctx->vdpDevice; -+ struct pipe_resource *res = NULL; -VdpOutputSurfaceGallium *f; - -getProcAddr = (void *)ctx->vdpGetProcAddress; -if (getProcAddr(device, VDP_FUNC_ID_OUTPUT_SURFACE_GALLIUM, (void**))) - return NULL; - -- return f((uintptr_t)vdpSurface); -+ pipe_resource_reference(, f((uintptr_t)vdpSurface)); -+ return res; - } - - static struct pipe_resource * -@@ -208,6 +212,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access, -/* do we have different screen objects ? */ -if (res->screen != st->pipe->screen) { - _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV"); -+ pipe_resource_reference(, NULL); - return; -} - -@@ -241,6 +246,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access, -stObj->surface_format = res->format; - -_mesa_dirty_texobj(ctx, texObj); -+ pipe_resource_reference(, NULL); - } - - static