Date: Wednesday, April 18, 2018 @ 17:07:07 Author: foutrelis Revision: 322189
upgpkg: mesa 18.0.1-1 New upstream release. Modified: mesa/trunk/PKGBUILD Deleted: mesa/trunk/0001-meson-fix-megadriver-symlinking.patch mesa/trunk/0002-meson-Set-.so-version-for-xa-like-autotools-does.patch -------------------------------------------------------------+ 0001-meson-fix-megadriver-symlinking.patch | 34 ----- 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch | 59 ---------- PKGBUILD | 12 -- 3 files changed, 3 insertions(+), 102 deletions(-) Deleted: 0001-meson-fix-megadriver-symlinking.patch =================================================================== --- 0001-meson-fix-megadriver-symlinking.patch 2018-04-18 14:58:52 UTC (rev 322188) +++ 0001-meson-fix-megadriver-symlinking.patch 2018-04-18 17:07:07 UTC (rev 322189) @@ -1,34 +0,0 @@ -From ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd Mon Sep 17 00:00:00 2001 -Message-Id: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com> -From: Dylan Baker <dy...@pnwbakers.com> -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 <dylan.c.ba...@intel.com> -Reviewed-and-Tested-by: Eric Engestrom <eric.engest...@imgtec.com> -Reviewed-by: Emil Velikov <emil.veli...@collabora.com> ---- - 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 14:58:52 UTC (rev 322188) +++ 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch 2018-04-18 17:07:07 UTC (rev 322189) @@ -1,59 +0,0 @@ -From bc13bd64008dc32586a0b4d41189b74a2ab27265 Mon Sep 17 00:00:00 2001 -Message-Id: <bc13bd64008dc32586a0b4d41189b74a2ab27265.1523725229.git.jan.steff...@gmail.com> -In-Reply-To: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com> -References: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com> -From: Dylan Baker <dy...@pnwbakers.com> -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 <dylan.c.ba...@intel.com> -Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> -Reviewed-by: Emil Velikov <emil.veli...@collabora.com> ---- - 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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-18 14:58:52 UTC (rev 322188) +++ PKGBUILD 2018-04-18 17:07:07 UTC (rev 322189) @@ -5,8 +5,8 @@ pkgbase=mesa pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') pkgdesc="An open-source implementation of the OpenGL specification" -pkgver=18.0.0 -pkgrel=4 +pkgver=18.0.1 +pkgrel=1 arch=('x86_64') makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' @@ -18,17 +18,13 @@ "meson_get_version.py::https://cgit.freedesktop.org/mesa/mesa/plain/bin/meson_get_version.py?h=mesa-18.0.0" LICENSE 0001-glvnd-fix-gl-dot-pc.patch - 0001-meson-fix-megadriver-symlinking.patch - 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch 0004-meson-Add-library-versions-to-swr-drivers.patch 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch) -sha512sums=('1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396' +sha512sums=('b0d610904b6f179a27b42aee5f479339e341926915cdc6adb08ac999a4a12539abc3776577e86af83e10381d9703ef1bca70bab81b43daf2c000622c9c3612d2' 'SKIP' 'cdc608d7b7de9e6eb6f1b2b4faef4864ac213d379b9dedc7c06e71726c2a1b88a0035d6ec50812a14ba4639e100158c6dff3a1d9456ab36c0a52988287c0d4bd' 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7' '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028' - '9dc2098f98694fb0f3d0b1d3d8c2bed43a8e6379ee73f6638b691a6823baaa28712ffddbae90d06b9295ae0536aa1091a0415ee72207ec3621acfb72f7d22f32' - '81d374421ba036a45699bc2a84006f5359fe914d25af6c0f23d2a86d1a6a9f61e909faaad11f0191517b4eed7d8dba42fd8c596cffe70b917544d502bf57396b' '0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff' 'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.veli...@gmail.com> @@ -43,8 +39,6 @@ patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch # Upstreamed meson fixes - patch -Np1 -i ../0001-meson-fix-megadriver-symlinking.patch - patch -Np1 -i ../0002-meson-Set-.so-version-for-xa-like-autotools-does.patch patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch