SHA256
1
0
forked from pool/Mesa

Accepting request 565806 from home:michalsrb:branches:X11:XOrg

- U_intel-Add-more-Coffee-Lake-PCI-IDs.patch
  * Add more Coffeelake PCI IDs (request by Intel)

OBS-URL: https://build.opensuse.org/request/show/565806
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=678
This commit is contained in:
Michal Srb 2018-01-15 15:45:22 +00:00 committed by Git OBS Bridge
parent 4055074f2c
commit 54060d0ef7
6 changed files with 76 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 15 15:08:13 UTC 2018 - msrb@suse.com
- U_intel-Add-more-Coffee-Lake-PCI-IDs.patch
* Add more Coffeelake PCI IDs (request by Intel)
-------------------------------------------------------------------
Wed Jan 10 08:28:09 UTC 2018 - msrb@suse.com

View File

@ -141,6 +141,7 @@ Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
# Upstream
Patch43: u_mesa-python3-only.patch
Patch44: U_intel-Add-more-Coffee-Lake-PCI-IDs.patch
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@ -743,6 +744,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%endif
%patch43 -p1
%patch44 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
# disabling libglvnd build; ugly ...
@ -889,6 +891,11 @@ done
%fdupes -s %{buildroot}/%{_mandir}
%if !%{drivers}
# Use dummy README file that can be included in both Mesa and Mesa-32bit. This way Mesa-32bit will be build (otherwise it would be skipped as empty) and it can be used by the other *-32bit packages.
echo "The \"Mesa\" package does not have the ability to render, but is supplemented by \"Mesa-dri\" and \"Mesa-gallium\" which contain the drivers for rendering" > docs/README.package.%{_arch}
%endif
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 15 15:08:13 UTC 2018 - msrb@suse.com
- U_intel-Add-more-Coffee-Lake-PCI-IDs.patch
* Add more Coffeelake PCI IDs (request by Intel)
-------------------------------------------------------------------
Wed Jan 10 08:28:09 UTC 2018 - msrb@suse.com

View File

@ -140,6 +140,7 @@ Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
# Upstream
Patch43: u_mesa-python3-only.patch
Patch44: U_intel-Add-more-Coffee-Lake-PCI-IDs.patch
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@ -742,6 +743,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%endif
%patch43 -p1
%patch44 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
# disabling libglvnd build; ugly ...
@ -888,6 +890,11 @@ done
%fdupes -s %{buildroot}/%{_mandir}
%if !%{drivers}
# Use dummy README file that can be included in both Mesa and Mesa-32bit. This way Mesa-32bit will be build (otherwise it would be skipped as empty) and it can be used by the other *-32bit packages.
echo "The \"Mesa\" package does not have the ability to render, but is supplemented by \"Mesa-dri\" and \"Mesa-gallium\" which contain the drivers for rendering" > docs/README.package.%{_arch}
%endif
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

View File

@ -0,0 +1,45 @@
From fe668b5c155aee4443dde0748065241e09293302 Mon Sep 17 00:00:00 2001
From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Fri, 5 Jan 2018 09:17:36 -0800
Subject: [PATCH] intel: Add more Coffee Lake PCI IDs
More Coffee Lake PCI IDs have been added to the spec.
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
include/pci_ids/i965_pci_ids.h | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h
index 0dd01a4343..9616f7de21 100644
--- a/include/pci_ids/i965_pci_ids.h
+++ b/include/pci_ids/i965_pci_ids.h
@@ -167,15 +167,23 @@ CHIPSET(0x3184, glk, "Intel(R) HD Graphics (Geminilake)")
CHIPSET(0x3185, glk_2x6, "Intel(R) HD Graphics (Geminilake 2x6)")
CHIPSET(0x3E90, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
CHIPSET(0x3E93, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
+CHIPSET(0x3E99, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
+CHIPSET(0x3EA1, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
+CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
CHIPSET(0x3E91, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
CHIPSET(0x3E92, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
+CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
CHIPSET(0x3E9B, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
+CHIPSET(0x3EA0, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
+CHIPSET(0x3EA3, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
+CHIPSET(0x3EA9, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
+CHIPSET(0x3EA2, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
+CHIPSET(0x3EA5, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
CHIPSET(0x3EA6, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
CHIPSET(0x3EA7, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
CHIPSET(0x3EA8, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
-CHIPSET(0x3EA5, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
CHIPSET(0x5A49, cnl_2x8, "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)")
CHIPSET(0x5A4A, cnl_2x8, "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)")
CHIPSET(0x5A41, cnl_3x8, "Intel(R) HD Graphics (Cannonlake 3x8 GT1)")
--
2.13.6

View File

@ -1,7 +1,9 @@
Mesa
# Include this configuration file in every arch version of Mesa, so we
# get dummy Mesa-<targettype> that other arch packages can supplement it.
+/etc/drirc
# Include this special README file so dummy Mesa-<targettype> gets
# build and other arch packages can supplement it.
+/usr/share/doc/packages/Mesa/README.package.*
# Must require the base Mesa package to get /etc/drirc configuration file.
requires Mesa
obsoletes "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>"
provides "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>"
provides "Mesa-libIndirectGL1-<targettype> = <version>"