pool/Mesa
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 581007 from X11:XOrg

Browse Source 
- removed more unneeded buildrequires: libudev, openssl, bison, 
  flex (boo#1082312)

- removed u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
  which is no longer needed due to changed LLVM build (boo#1082307)

- merge content of new rpmlintrc into existing Mesa-rpmlintrc file

- no longer run ldconfig for the follwing backend (ICD) drivers,
  since it's considered wrong: xvmc, vdpau, va, opencl, and vulkan;
  required adding a rpmlintrc file with appropriate rules
  (boo#1082316)

OBS-URL: https://build.opensuse.org/request/show/581007
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=317
This commit is contained in:
Dominique Leuenberger 2018-03-01 11:02:48 +00:00 committed by Git OBS Bridge
commit d2fd33c01b
7 changed files with 68 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Mesa-drivers-rpmlintrc
View File

@ -1,2 +1,11 @@
# This line is mandatory to access the configuration functions
from Config import *
# Want to allow for multiple vendors # Want to allow for multiple vendors
addFilter("shlib-policy-name-error") addFilter("shlib-policy-name-error")
addFilter("Mesa-libOpenCL.*library-without-ldconfig-postin")
addFilter("Mesa-libOpenCL.*library-without-ldconfig-postun")
addFilter("libXvMC_nouveau.*library-without-ldconfig-postin")
addFilter("libXvMC_nouveau.*library-without-ldconfig-postun")
addFilter("libXvMC_r600.*library-without-ldconfig-postin")
addFilter("libXvMC_r600.*library-without-ldconfig-postun")

25
Mesa-drivers.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Feb 28 14:57:00 UTC 2018 - sndirsch@suse.com
- removed more unneeded buildrequires: libudev, openssl, bison,
flex (boo#1082312)
-------------------------------------------------------------------
Tue Feb 27 18:17:53 UTC 2018 - sndirsch@suse.com
- removed u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
which is no longer needed due to changed LLVM build (boo#1082307)
-------------------------------------------------------------------
Tue Feb 27 09:58:06 UTC 2018 - sndirsch@suse.com
- merge content of new rpmlintrc into existing Mesa-rpmlintrc file
-------------------------------------------------------------------
Fri Feb 23 13:36:23 UTC 2018 - sndirsch@suse.com
- no longer run ldconfig for the follwing backend (ICD) drivers,
since it's considered wrong: xvmc, vdpau, va, opencl, and vulkan;
required adding a rpmlintrc file with appropriate rules
(boo#1082316)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 23 13:25:16 UTC 2018 - sndirsch@suse.com Fri Feb 23 13:25:16 UTC 2018 - sndirsch@suse.com

38
Mesa-drivers.spec
View File

@ -133,7 +133,6 @@ Source6: %{name}-rpmlintrc
Source7: Mesa.keyring Source7: Mesa.keyring
# to be upstreamed # to be upstreamed
Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
Patch12: u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
# never to be upstreamed # never to be upstreamed
Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
# currently needed for libglvnd support # currently needed for libglvnd support
@ -146,9 +145,7 @@ Patch46: u_glsl-linker-error.patch
BuildRequires: autoconf >= 2.60 BuildRequires: autoconf >= 2.60
BuildRequires: automake BuildRequires: automake
BuildRequires: bison
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: imake BuildRequires: imake
BuildRequires: libtool BuildRequires: libtool
@ -168,9 +165,7 @@ BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.71
BuildRequires: pkgconfig(libglvnd) >= 0.1.0 BuildRequires: pkgconfig(libglvnd) >= 0.1.0
%endif %endif
BuildRequires: pkgconfig(libkms) >= 1.0.0 BuildRequires: pkgconfig(libkms) >= 1.0.0
BuildRequires: pkgconfig(libudev) > 151
BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(presentproto) BuildRequires: pkgconfig(presentproto)
BuildRequires: pkgconfig(vdpau) >= 1.1 BuildRequires: pkgconfig(vdpau) >= 1.1
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
@ -747,7 +742,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
### order to figure out whether the issue is still reproducable and ### order to figure out whether the issue is still reproducable and
### hence a fix is required ### hence a fix is required
#%patch11 -p1 #%patch11 -p1
%patch12 -p1
%patch18 -p1 %patch18 -p1
%if 0%{?libglvnd} %if 0%{?libglvnd}
@ -941,26 +935,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%postun -n libxatracker2 -p /sbin/ldconfig %postun -n libxatracker2 -p /sbin/ldconfig
%post -n libXvMC_nouveau -p /sbin/ldconfig
%postun -n libXvMC_nouveau -p /sbin/ldconfig
%post -n libXvMC_r600 -p /sbin/ldconfig
%postun -n libXvMC_r600 -p /sbin/ldconfig
%post -n libvdpau_r300 -p /sbin/ldconfig
%postun -n libvdpau_r300 -p /sbin/ldconfig
%post -n libvdpau_r600 -p /sbin/ldconfig
%postun -n libvdpau_r600 -p /sbin/ldconfig
%post -n libvdpau_radeonsi -p /sbin/ldconfig
%postun -n libvdpau_radeonsi -p /sbin/ldconfig
%post libglapi0 -p /sbin/ldconfig %post libglapi0 -p /sbin/ldconfig
%postun libglapi0 -p /sbin/ldconfig %postun libglapi0 -p /sbin/ldconfig
@ -973,18 +947,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%postun -n Mesa-libd3d -p /sbin/ldconfig %postun -n Mesa-libd3d -p /sbin/ldconfig
%post -n Mesa-libOpenCL -p /sbin/ldconfig
%postun -n Mesa-libOpenCL -p /sbin/ldconfig
%post -n Mesa-libva -p /sbin/ldconfig
%postun -n Mesa-libva -p /sbin/ldconfig
%post -n libvulkan_intel -p /sbin/ldconfig
%postun -n libvulkan_intel -p /sbin/ldconfig
%if !%{drivers} %if !%{drivers}
%files %files
%defattr(-,root,root) %defattr(-,root,root)

9
Mesa-rpmlintrc
View File

@ -1,2 +1,11 @@
# This line is mandatory to access the configuration functions
from Config import *
# Want to allow for multiple vendors # Want to allow for multiple vendors
addFilter("shlib-policy-name-error") addFilter("shlib-policy-name-error")
addFilter("Mesa-libOpenCL.*library-without-ldconfig-postin")
addFilter("Mesa-libOpenCL.*library-without-ldconfig-postun")
addFilter("libXvMC_nouveau.*library-without-ldconfig-postin")
addFilter("libXvMC_nouveau.*library-without-ldconfig-postun")
addFilter("libXvMC_r600.*library-without-ldconfig-postin")
addFilter("libXvMC_r600.*library-without-ldconfig-postun")

25
Mesa.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Feb 28 14:57:00 UTC 2018 - sndirsch@suse.com
- removed more unneeded buildrequires: libudev, openssl, bison,
flex (boo#1082312)
-------------------------------------------------------------------
Tue Feb 27 18:17:53 UTC 2018 - sndirsch@suse.com
- removed u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
which is no longer needed due to changed LLVM build (boo#1082307)
-------------------------------------------------------------------
Tue Feb 27 09:58:06 UTC 2018 - sndirsch@suse.com
- merge content of new rpmlintrc into existing Mesa-rpmlintrc file
-------------------------------------------------------------------
Fri Feb 23 13:36:23 UTC 2018 - sndirsch@suse.com
- no longer run ldconfig for the follwing backend (ICD) drivers,
since it's considered wrong: xvmc, vdpau, va, opencl, and vulkan;
required adding a rpmlintrc file with appropriate rules
(boo#1082316)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 23 13:25:16 UTC 2018 - sndirsch@suse.com Fri Feb 23 13:25:16 UTC 2018 - sndirsch@suse.com

38
Mesa.spec
View File

@ -132,7 +132,6 @@ Source6: %{name}-rpmlintrc
Source7: Mesa.keyring Source7: Mesa.keyring
# to be upstreamed # to be upstreamed
Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
Patch12: u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
# never to be upstreamed # never to be upstreamed
Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
# currently needed for libglvnd support # currently needed for libglvnd support
@ -145,9 +144,7 @@ Patch46: u_glsl-linker-error.patch
BuildRequires: autoconf >= 2.60 BuildRequires: autoconf >= 2.60
BuildRequires: automake BuildRequires: automake
BuildRequires: bison
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: imake BuildRequires: imake
BuildRequires: libtool BuildRequires: libtool
@ -167,9 +164,7 @@ BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.71
BuildRequires: pkgconfig(libglvnd) >= 0.1.0 BuildRequires: pkgconfig(libglvnd) >= 0.1.0
%endif %endif
BuildRequires: pkgconfig(libkms) >= 1.0.0 BuildRequires: pkgconfig(libkms) >= 1.0.0
BuildRequires: pkgconfig(libudev) > 151
BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(presentproto) BuildRequires: pkgconfig(presentproto)
BuildRequires: pkgconfig(vdpau) >= 1.1 BuildRequires: pkgconfig(vdpau) >= 1.1
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
@ -746,7 +741,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
### order to figure out whether the issue is still reproducable and ### order to figure out whether the issue is still reproducable and
### hence a fix is required ### hence a fix is required
#%patch11 -p1 #%patch11 -p1
%patch12 -p1
%patch18 -p1 %patch18 -p1
%if 0%{?libglvnd} %if 0%{?libglvnd}
@ -940,26 +934,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%postun -n libxatracker2 -p /sbin/ldconfig %postun -n libxatracker2 -p /sbin/ldconfig
%post -n libXvMC_nouveau -p /sbin/ldconfig
%postun -n libXvMC_nouveau -p /sbin/ldconfig
%post -n libXvMC_r600 -p /sbin/ldconfig
%postun -n libXvMC_r600 -p /sbin/ldconfig
%post -n libvdpau_r300 -p /sbin/ldconfig
%postun -n libvdpau_r300 -p /sbin/ldconfig
%post -n libvdpau_r600 -p /sbin/ldconfig
%postun -n libvdpau_r600 -p /sbin/ldconfig
%post -n libvdpau_radeonsi -p /sbin/ldconfig
%postun -n libvdpau_radeonsi -p /sbin/ldconfig
%post libglapi0 -p /sbin/ldconfig %post libglapi0 -p /sbin/ldconfig
%postun libglapi0 -p /sbin/ldconfig %postun libglapi0 -p /sbin/ldconfig
@ -972,18 +946,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%postun -n Mesa-libd3d -p /sbin/ldconfig %postun -n Mesa-libd3d -p /sbin/ldconfig
%post -n Mesa-libOpenCL -p /sbin/ldconfig
%postun -n Mesa-libOpenCL -p /sbin/ldconfig
%post -n Mesa-libva -p /sbin/ldconfig
%postun -n Mesa-libva -p /sbin/ldconfig
%post -n libvulkan_intel -p /sbin/ldconfig
%postun -n libvulkan_intel -p /sbin/ldconfig
%if !%{drivers} %if !%{drivers}
%files %files
%defattr(-,root,root) %defattr(-,root,root)

27
u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
View File

@ -1,27 +0,0 @@
From 1431fecda9cd4c38eecb6bdc172a7af9ff72c056 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Fri, 23 Feb 2018 14:15:19 +0100
Subject: [PATCH] configure.ac: Link to libLLVMCodegen to fix cyclic linking
problems
Patch by "Ismail Doenmez" <idonmez@suse.com>
https://bugzilla.suse.com/show_bug.cgi?id=1082307
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index 8a9172690a..a23eb844d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1032,6 +1032,7 @@ llvm_add_default_components() {
# Required default components
llvm_add_component "bitwriter" $driver_name
+ llvm_add_component "codegen" $driver_name
llvm_add_component "engine" $driver_name
llvm_add_component "mcdisassembler" $driver_name
llvm_add_component "mcjit" $driver_name
--
2.13.6