Accepting request 516979 from X11:XOrg

1

OBS-URL: https://build.opensuse.org/request/show/516979
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=298

Mesa.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Aug 14 17:16:34 UTC 2017 - jberry@suse.com
+
+- Replace uses of arch directive with targettype within a package
+  declaration to resolve incorrect dependencies placed on -32bit
+  packages.
+
+-------------------------------------------------------------------
+Mon Aug 14 14:06:35 UTC 2017 - msrb@suse.com
+
+- Removed n_glesv2.pc-Add-lGL-for-libglvnd-builds-boo-1052776.patch
+  * The issue was in libglvnd which is fixed now. (boo#1052776)
+
 -------------------------------------------------------------------
 Tue Aug  8 14:12:45 UTC 2017 - sndirsch@suse.com
 

Mesa.spec

@@ -84,7 +84,6 @@ Patch21:        n_Define-GLAPIVAR-separate-from-GLAPI.patch
 # currently needed for libglvnd support
 Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
-Patch33:        n_glesv2.pc-Add-lGL-for-libglvnd-builds-boo-1052776.patch
 Patch40:        u_gallivm-correct-channel-shift-logic-on-big-endian.patch
 Patch41:        u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch
 Patch42:        u_r600-Add-support-for-B5G5R5A1.patch
@@ -657,7 +656,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %if 0%{?libglvnd}
 %patch31 -p1
 %patch32 -p1
-%patch33 -p1
 %endif
 
 %patch40 -p1

baselibs.conf

@@ -55,9 +55,12 @@ libOSMesa-devel
 libgbm1
 libgbm-devel
 	requires "libgbm1-<targettype> = <version>"
-arch aarch64 ppc64 ppc64le s390x x86_64 package libwayland-egl1
+libwayland-egl-devel
-arch aarch64 ppc64 ppc64le s390x x86_64 package libwayland-egl-devel
+	targetarch aarch64 requires "libwayland-egl1-<targettype> = <version>"
-	requires "libwayland-egl1-<targettype> = <version>"
+	targetarch ppc64 requires "libwayland-egl1-<targettype> = <version>"
+	targetarch ppc64le requires "libwayland-egl1-<targettype> = <version>"
+	targetarch s390x requires "libwayland-egl1-<targettype> = <version>"
+	targetarch x86_64 requires "libwayland-egl1-<targettype> = <version>"
 Mesa-libglapi0
 Mesa-libglapi-devel
 	requires "Mesa-libglapi0-<targettype> = <version>"
@@ -65,13 +68,29 @@ Mesa-libd3d
 	provides "d3dadapter9.so.1"
 Mesa-libd3d-devel
 	requires "Mesa-libd3d-<targettype> = <version>"
-arch aarch64 ppc64 ppc64le s390x x86_64 package libvulkan_intel
+libvulkan_intel
-	+/usr/share/vulkan/icd.d/intel_icd.*.json
+	targetarch aarch64 +/usr/share/vulkan/icd.d/intel_icd.*.json
-arch aarch64 ppc64 ppc64le s390x x86_64 package libvulkan_radeon
+	targetarch ppc64 +/usr/share/vulkan/icd.d/intel_icd.*.json
-	+/usr/share/vulkan/icd.d/radeon_icd.*.json
+	targetarch ppc64le +/usr/share/vulkan/icd.d/intel_icd.*.json
-arch aarch64 ppc64 ppc64le s390x x86_64 package Mesa-libVulkan-devel
+	targetarch s390x +/usr/share/vulkan/icd.d/intel_icd.*.json
-	requires "libvulkan_intel-<targettype> = <version>"
+	targetarch x86_64 +/usr/share/vulkan/icd.d/intel_icd.*.json
-	requires "libvulkan_radeon-<targettype> = <version>"
+libvulkan_radeon
+	targetarch aarch64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
+	targetarch ppc64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
+	targetarch ppc64le +/usr/share/vulkan/icd.d/radeon_icd.*.json
+	targetarch s390x +/usr/share/vulkan/icd.d/radeon_icd.*.json
+	targetarch x86_64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
+Mesa-libVulkan-devel
+	targetarch aarch64 requires "libvulkan_intel-<targettype> = <version>"
+	targetarch aarch64 requires "libvulkan_radeon-<targettype> = <version>"
+	targetarch ppc64 requires "libvulkan_intel-<targettype> = <version>"
+	targetarch ppc64 requires "libvulkan_radeon-<targettype> = <version>"
+	targetarch ppc64le requires "libvulkan_intel-<targettype> = <version>"
+	targetarch ppc64le requires "libvulkan_radeon-<targettype> = <version>"
+	targetarch s390x requires "libvulkan_intel-<targettype> = <version>"
+	targetarch s390x requires "libvulkan_radeon-<targettype> = <version>"
+	targetarch x86_64 requires "libvulkan_intel-<targettype> = <version>"
+	targetarch x86_64 requires "libvulkan_radeon-<targettype> = <version>"
 libXvMC_nouveau
 libXvMC_r600
 libvdpau_nouveau
@@ -79,5 +98,4 @@ libvdpau_r300
 libvdpau_r600
 libvdpau_radeonsi
 libwayland-egl1
-arch aarch64 ppc64 ppc64le s390x x86_64 package Mesa-libOpenCL
 Mesa-dri-nouveau

n_glesv2.pc-Add-lGL-for-libglvnd-builds-boo-1052776.patch

@@ -1,25 +0,0 @@
-From 1902aaa97ec2d7919cc48dcde2b6ca165ca00a2f Mon Sep 17 00:00:00 2001
-From: Stefan Dirsch <sndirsch@suse.de>
-Date: Tue, 8 Aug 2017 16:07:46 +0200
-Subject: [PATCH glx/glxglvnd] glesv2.pc: Add "-lGL" for libglvnd builds
- (boo#1052776)
-
----
- src/mapi/es2api/glesv2.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mapi/es2api/glesv2.pc.in b/src/mapi/es2api/glesv2.pc.in
-index e5bf12f878..8b5fb84fd8 100644
---- a/src/mapi/es2api/glesv2.pc.in
-+++ b/src/mapi/es2api/glesv2.pc.in
-@@ -7,6 +7,6 @@ Name: glesv2
- Description: Mesa OpenGL ES 2.0 library
- Requires.private:
- Version: @VERSION@
--Libs: -L${libdir} -lGLESv2
-+Libs: -L${libdir} -lGLESv2 -lGL
- Libs.private: @GLESv2_PC_LIB_PRIV@
- Cflags: -I${includedir}
--- 
-2.13.1
-