From dc410d58a3ec7bb19e1253806aa2f429cdcfe99c4464c5cfd6f33c9f8f44d5c2 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 11 Apr 2019 10:57:13 +0000 Subject: [PATCH 1/2] - Update to 19.0.2 * Just a few fixes for radeon, a few for nir, a couple for radv, a couple for v3d, and a few other patches here and there. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=827 --- Mesa-drivers.changes | 7 +++++++ Mesa-drivers.spec | 7 +++++-- Mesa.changes | 7 +++++++ Mesa.spec | 7 +++++-- mesa-19.0.2.tar.xz | 3 +++ mesa-19.0.2.tar.xz.sig | Bin 0 -> 119 bytes 6 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 mesa-19.0.2.tar.xz create mode 100644 mesa-19.0.2.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 14693a5..ab06d37 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 11 09:50:31 UTC 2019 - Stefan Dirsch + +- Update to 19.0.2 + * Just a few fixes for radeon, a few for nir, a couple for radv, + a couple for v3d, and a few other patches here and there. + ------------------------------------------------------------------- Thu Mar 28 10:24:11 UTC 2019 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 0ce4894..b68a641 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 19.0.1 +%define _version 19.0.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -110,7 +110,7 @@ %endif Name: Mesa-drivers -Version: 19.0.1 +Version: 19.0.2 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -881,6 +881,9 @@ rm %{buildroot}/%{_libdir}/pkgconfig/gbm.pc # in KHR-devel rm -rf %{buildroot}/%{_includedir}/KHR +# workaround needed since Mesa 19.0.2 +rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so + %else rm -rf %{buildroot}/%{_libdir}/dri/swrast_dri.so diff --git a/Mesa.changes b/Mesa.changes index 14693a5..ab06d37 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 11 09:50:31 UTC 2019 - Stefan Dirsch + +- Update to 19.0.2 + * Just a few fixes for radeon, a few for nir, a couple for radv, + a couple for v3d, and a few other patches here and there. + ------------------------------------------------------------------- Thu Mar 28 10:24:11 UTC 2019 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 5105f6f..76d7275 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 19.0.1 +%define _version 19.0.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -109,7 +109,7 @@ %endif Name: Mesa -Version: 19.0.1 +Version: 19.0.2 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -880,6 +880,9 @@ rm %{buildroot}/%{_libdir}/pkgconfig/gbm.pc # in KHR-devel rm -rf %{buildroot}/%{_includedir}/KHR +# workaround needed since Mesa 19.0.2 +rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so + %else rm -rf %{buildroot}/%{_libdir}/dri/swrast_dri.so diff --git a/mesa-19.0.2.tar.xz b/mesa-19.0.2.tar.xz new file mode 100644 index 0000000..62d50da --- /dev/null +++ b/mesa-19.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a2edc3ce56906a676c91e6851298db45903df1f5cb9827395a922c1452db802 +size 11959876 diff --git a/mesa-19.0.2.tar.xz.sig b/mesa-19.0.2.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..2819da893088ba1a675c7079c8cd3839fb59d4c8af41fa94b4837932fbcbe3a2 GIT binary patch literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7r6tiyIE(R`60howPGb6*s zf+w;|R%|&~cse;u>Qb(!k*1G37k` Date: Thu, 18 Apr 2019 03:51:21 +0000 Subject: [PATCH 2/2] Accepting request 695297 from home:tobijk:X11:XOrg - Drop patches n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch and archlinux_0001-Fix-linkage-against-shared-glapi.patch: These patches only work when building mesa with autotools. As we use meson instead now, these patches do nothing. - Drop version 19.0.1 tarballs - Drop patches n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch and archlinux_0001-Fix-linkage-against-shared-glapi.patch: These patches only work when building mesa with autotools. As we use meson instead now, these patches do nothing. - Drop version 19.0.1 tarballs OBS-URL: https://build.opensuse.org/request/show/695297 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=828 --- Mesa-drivers.changes | 13 +++++ Mesa-drivers.spec | 11 +--- Mesa.changes | 13 +++++ Mesa.spec | 11 +--- ...001-Fix-linkage-against-shared-glapi.patch | 23 -------- mesa-19.0.1.tar.xz | 3 -- mesa-19.0.1.tar.xz.sig | Bin 119 -> 0 bytes ...C-libs-Replace-hardlinks-with-copies.patch | 49 ------------------ 8 files changed, 28 insertions(+), 95 deletions(-) delete mode 100644 archlinux_0001-Fix-linkage-against-shared-glapi.patch delete mode 100644 mesa-19.0.1.tar.xz delete mode 100644 mesa-19.0.1.tar.xz.sig delete mode 100644 n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index ab06d37..cc91f70 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Apr 17 16:10:26 UTC 2019 - Tobias Klausmann + +- Drop patches n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch + and archlinux_0001-Fix-linkage-against-shared-glapi.patch: + These patches only work when building mesa with autotools. As we use meson + instead now, these patches do nothing. + +------------------------------------------------------------------- +Wed Apr 17 16:08:20 UTC 2019 - Tobias Klausmann + +- Drop version 19.0.1 tarballs + ------------------------------------------------------------------- Thu Apr 11 09:50:31 UTC 2019 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index b68a641..e307144 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -129,10 +129,6 @@ Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring # never to be upstreamed -Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch -# currently needed for libglvnd support -Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch - Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch @@ -731,11 +727,6 @@ programs against the XA state tracker. %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch18 -p1 - -%if 0%{?libglvnd} -%patch31 -p1 -%endif %patch54 -p1 %patch58 -p1 diff --git a/Mesa.changes b/Mesa.changes index ab06d37..cc91f70 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Apr 17 16:10:26 UTC 2019 - Tobias Klausmann + +- Drop patches n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch + and archlinux_0001-Fix-linkage-against-shared-glapi.patch: + These patches only work when building mesa with autotools. As we use meson + instead now, these patches do nothing. + +------------------------------------------------------------------- +Wed Apr 17 16:08:20 UTC 2019 - Tobias Klausmann + +- Drop version 19.0.1 tarballs + ------------------------------------------------------------------- Thu Apr 11 09:50:31 UTC 2019 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 76d7275..a7f7b35 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -128,10 +128,6 @@ Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring # never to be upstreamed -Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch -# currently needed for libglvnd support -Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch - Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch @@ -730,11 +726,6 @@ programs against the XA state tracker. %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch18 -p1 - -%if 0%{?libglvnd} -%patch31 -p1 -%endif %patch54 -p1 %patch58 -p1 diff --git a/archlinux_0001-Fix-linkage-against-shared-glapi.patch b/archlinux_0001-Fix-linkage-against-shared-glapi.patch deleted file mode 100644 index 115cdb4..0000000 --- a/archlinux_0001-Fix-linkage-against-shared-glapi.patch +++ /dev/null @@ -1,23 +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(-) - -Index: mesa-18.1.0/src/gallium/targets/osmesa/Makefile.am -=================================================================== ---- mesa-18.1.0.orig/src/gallium/targets/osmesa/Makefile.am -+++ mesa-18.1.0/src/gallium/targets/osmesa/Makefile.am -@@ -61,7 +61,7 @@ lib@OSMESA_LIB@_la_LIBADD = \ - $(top_builddir)/src/gallium/winsys/sw/null/libws_null.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) \ diff --git a/mesa-19.0.1.tar.xz b/mesa-19.0.1.tar.xz deleted file mode 100644 index a04bb91..0000000 --- a/mesa-19.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6884163c0ea9e4c98378ab8fecd72fe7b5f437713a14471beda378df247999d4 -size 11962308 diff --git a/mesa-19.0.1.tar.xz.sig b/mesa-19.0.1.tar.xz.sig deleted file mode 100644 index 9097479f31efb72f1b784680373321c5541f32c4f69a8fad7fdf206fcf9ba83d..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7r6f=A6HU=(E0hma-5+g%n zg1KSdqW9MV7i{MDWoVl$a_aZ$c*!+6#w<#yt1a%PFfz2>+~0hu$@$)dfPWi)7F<0g VD);ow#EwZvBF);;C#03~0{}RAG)Vve diff --git a/n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch b/n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch deleted file mode 100644 index b17f35f..0000000 --- a/n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch +++ /dev/null @@ -1,49 +0,0 @@ -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(-) - -Index: mesa-18.1.0/src/gallium/targets/vdpau/Makefile.am -=================================================================== ---- mesa-18.1.0.orig/src/gallium/targets/vdpau/Makefile.am -+++ mesa-18.1.0/src/gallium/targets/vdpau/Makefile.am -@@ -91,7 +91,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); \ -@@ -116,7 +116,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); \ -Index: mesa-18.1.0/src/gallium/targets/xvmc/Makefile.am -=================================================================== ---- mesa-18.1.0.orig/src/gallium/targets/xvmc/Makefile.am -+++ mesa-18.1.0/src/gallium/targets/xvmc/Makefile.am -@@ -75,7 +75,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); \