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 9097479..0000000 Binary files a/mesa-19.0.1.tar.xz.sig and /dev/null differ 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); \