SHA256
1
0
forked from pool/Mesa

Accepting request 516907 from home:jberry:branches:X11:XOrg

- Replace uses of arch directive with targettype within a package
  declaration to resolve incorrect dependencies placed on -32bit
  packages.

OBS-URL: https://build.opensuse.org/request/show/516907
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=636
This commit is contained in:
Stefan Dirsch 2017-08-15 10:22:17 +00:00 committed by Git OBS Bridge
parent 32282c512b
commit 68b1e7965c
2 changed files with 36 additions and 11 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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 Mon Aug 14 14:06:35 UTC 2017 - msrb@suse.com

View File

@ -55,9 +55,12 @@ libOSMesa-devel
libgbm1 libgbm1
libgbm-devel libgbm-devel
requires "libgbm1-<targettype> = <version>" 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-libglapi0
Mesa-libglapi-devel Mesa-libglapi-devel
requires "Mesa-libglapi0-<targettype> = <version>" requires "Mesa-libglapi0-<targettype> = <version>"
@ -65,13 +68,29 @@ Mesa-libd3d
provides "d3dadapter9.so.1" provides "d3dadapter9.so.1"
Mesa-libd3d-devel Mesa-libd3d-devel
requires "Mesa-libd3d-<targettype> = <version>" 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_nouveau
libXvMC_r600 libXvMC_r600
libvdpau_nouveau libvdpau_nouveau
@ -79,5 +98,4 @@ libvdpau_r300
libvdpau_r600 libvdpau_r600
libvdpau_radeonsi libvdpau_radeonsi
libwayland-egl1 libwayland-egl1
arch aarch64 ppc64 ppc64le s390x x86_64 package Mesa-libOpenCL
Mesa-dri-nouveau Mesa-dri-nouveau