Accepting request 578816 from X11:XOrg

- Remove unneeded defattr stanza

- Remove pthread-stubs dependency

- Remove unneeded autotool dependencies

- Update to version 2.4.90:
   + Add meson build system
   + always define HAVE_FREEDRENO_KGSL
   + always define HAVE_CAIRO
   + always define HAVE_VALGRIND
   + amdgpu: Update deadlock test to not assert on ECANCELED
   + amdgpu: Fix segfault in deadlock test.
   + amdgpu: fix 32bit VA manager max address
   + amdgpu: use the high VA range if possible v2
   + amdgpu: fix high VA mask
   + amdgpu: fix inefficient vamgr algorithm
   + amdgpu: clean up non list code path for vamgr v2
   + amdgpu: add amdgpu_query_sw_info for querying high bits of 32-bit address space
   + amdgpu: Don't print error message if parse_one_line returned -EAGAIN
   + amdgpu: Don't dereference device_handle after amdgpu_device_deinitialize
   + amdgpu: Symlink .editorconfig to tests/amdgpu
   + amdgpu: Disable deadlock test suite by default for SI ASICs
   + amdgpu: Disable VM test suite by default for SI ASICs
   + amdgpu: Add amdgpu_query_sw_info to amdgpu-symbol-check
   + amdgpu: fix not to add amdgpu.ids when building without amdgpu
   + android: Move gralloc handle struct to libdrm
   + android: Add version variable to gralloc_handle_t
   + android: Mark gralloc_handle_t magic variable as const
   + android: Remove member name from gralloc_handle_t
   + android: Change gralloc_handle_t members to be fixed width
   + autotools: Include meson.build files in tarball
   + configure: remove unused HAVE_CUNIT define
   + configure: remove unused HAVE_INSTALL_TESTS define
   + configure: always define HAVE_LIBDRM_ATOMIC_PRIMITIVES and HAVE_LIB_ATOMIC_OPS
   + drm: Fix 32-bit drmSyncobjWait.
   + exynos/tests: use #ifdef for never-defined token
   + fix return value for syncobj wait
   + freedreno: clamp priority based on # of rings
   + headers: sync up amdgpu_drm.h with drm-next
   + intel: Add more Coffeelake PCI IDs
   + meson: fix the install path of amdgpu.ids
   + meson: set proper pkg-config version for libdrm_freedreno
   + meson: set the minimum version correctly
   + meson: fix libdrm_nouveau pkgconfig include directories
   + meson: include headers in root directory in ext_libdrm
   + meson: cleanup whitespace
   + meson: add missing HAVE_RADEON
   + meson: sort HAVE_* defines
   + meson,configure: remove unused HAVE_OMAP define
   + meson,configure: remove unused HAVE_TEGRA define
   + meson,configure: remove unused HAVE_FREEDRENO define
   + meson,configure: remove unused HAVE_ETNAVIV define
   + meson,configure: always define HAVE_{INTEL,VMWGFX,NOUVEAU,EXYNOS,VC4,RADEON}
   + meson,configure: turn undefined preprocessor tokens warnings into errors
   + meson,configure: add warning when using undefined preprocessor tokens
   + modetest: Fix to check return value of asprintf()
   + remove unnecessary double-semicolon
   + README: Add note about meson
   + test/amdgpu: fix compiler warnings
   + tests/amdgpu: add bo eviction test
   + tests/amdgpu: add missing config.h include
   + tests/amdgpu: add parentheses to make operation priority explicit
   + tests/amdgpu: drop unused variables
   + tests/amdgpu: execute write linear on all the available rings
   + tests/amdgpu: execute const fill on all the available rings
   + tests/amdgpu: execute copy linear on all the available rings
   + tests/etnaviv: drop unused `return 0`
   + tests/util: fix signed/unsigned comparisons
   + tests/util: drop unused parameters
   + xf86drmHash: remove always-false #if guards
   + xf86atomic: fix -Wundef warning

- Remove upstreamed patch U_intel-Add-more-Coffeelake-PCI-IDs.patch

OBS-URL: https://build.opensuse.org/request/show/578816
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdrm?expand=0&rev=134
This commit is contained in:
Dominique Leuenberger 2018-02-22 13:57:15 +00:00 committed by Git OBS Bridge
commit 66f410d930
5 changed files with 90 additions and 104 deletions

View File

@ -1,78 +0,0 @@
From d3cb58831517d4d42869a7c1f518c861baafdc8e Mon Sep 17 00:00:00 2001
From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Wed, 10 Jan 2018 15:51:02 -0800
Subject: [PATCH] intel: Add more Coffeelake PCI IDs
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
intel/intel_chipset.h | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index d81b1646..3818e71e 100644
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -223,15 +223,23 @@
#define PCI_CHIP_COFFEELAKE_S_GT1_1 0x3E90
#define PCI_CHIP_COFFEELAKE_S_GT1_2 0x3E93
+#define PCI_CHIP_COFFEELAKE_S_GT1_3 0x3E99
#define PCI_CHIP_COFFEELAKE_S_GT2_1 0x3E91
#define PCI_CHIP_COFFEELAKE_S_GT2_2 0x3E92
#define PCI_CHIP_COFFEELAKE_S_GT2_3 0x3E96
+#define PCI_CHIP_COFFEELAKE_S_GT2_4 0x3E9A
#define PCI_CHIP_COFFEELAKE_H_GT2_1 0x3E9B
#define PCI_CHIP_COFFEELAKE_H_GT2_2 0x3E94
-#define PCI_CHIP_COFFEELAKE_U_GT3_1 0x3EA5
-#define PCI_CHIP_COFFEELAKE_U_GT3_2 0x3EA6
-#define PCI_CHIP_COFFEELAKE_U_GT3_3 0x3EA7
-#define PCI_CHIP_COFFEELAKE_U_GT3_4 0x3EA8
+#define PCI_CHIP_COFFEELAKE_U_GT1_1 0x3EA1
+#define PCI_CHIP_COFFEELAKE_U_GT1_2 0x3EA4
+#define PCI_CHIP_COFFEELAKE_U_GT2_1 0x3EA0
+#define PCI_CHIP_COFFEELAKE_U_GT2_2 0x3EA3
+#define PCI_CHIP_COFFEELAKE_U_GT2_3 0x3EA9
+#define PCI_CHIP_COFFEELAKE_U_GT3_1 0x3EA2
+#define PCI_CHIP_COFFEELAKE_U_GT3_2 0x3EA5
+#define PCI_CHIP_COFFEELAKE_U_GT3_3 0x3EA6
+#define PCI_CHIP_COFFEELAKE_U_GT3_4 0x3EA7
+#define PCI_CHIP_COFFEELAKE_U_GT3_5 0x3EA8
#define PCI_CHIP_CANNONLAKE_U_GT2_0 0x5A52
#define PCI_CHIP_CANNONLAKE_U_GT2_1 0x5A5A
@@ -477,17 +485,25 @@
#define IS_CFL_S(devid) ((devid) == PCI_CHIP_COFFEELAKE_S_GT1_1 || \
(devid) == PCI_CHIP_COFFEELAKE_S_GT1_2 || \
+ (devid) == PCI_CHIP_COFFEELAKE_S_GT1_3 || \
(devid) == PCI_CHIP_COFFEELAKE_S_GT2_1 || \
(devid) == PCI_CHIP_COFFEELAKE_S_GT2_2 || \
- (devid) == PCI_CHIP_COFFEELAKE_S_GT2_3)
+ (devid) == PCI_CHIP_COFFEELAKE_S_GT2_3 || \
+ (devid) == PCI_CHIP_COFFEELAKE_S_GT2_4)
#define IS_CFL_H(devid) ((devid) == PCI_CHIP_COFFEELAKE_H_GT2_1 || \
(devid) == PCI_CHIP_COFFEELAKE_H_GT2_2)
-#define IS_CFL_U(devid) ((devid) == PCI_CHIP_COFFEELAKE_U_GT3_1 || \
+#define IS_CFL_U(devid) ((devid) == PCI_CHIP_COFFEELAKE_U_GT1_1 || \
+ (devid) == PCI_CHIP_COFFEELAKE_U_GT1_2 || \
+ (devid) == PCI_CHIP_COFFEELAKE_U_GT2_1 || \
+ (devid) == PCI_CHIP_COFFEELAKE_U_GT2_2 || \
+ (devid) == PCI_CHIP_COFFEELAKE_U_GT2_3 || \
+ (devid) == PCI_CHIP_COFFEELAKE_U_GT3_1 || \
(devid) == PCI_CHIP_COFFEELAKE_U_GT3_2 || \
(devid) == PCI_CHIP_COFFEELAKE_U_GT3_3 || \
- (devid) == PCI_CHIP_COFFEELAKE_U_GT3_4)
+ (devid) == PCI_CHIP_COFFEELAKE_U_GT3_4 || \
+ (devid) == PCI_CHIP_COFFEELAKE_U_GT3_5)
#define IS_COFFEELAKE(devid) (IS_CFL_S(devid) || \
IS_CFL_H(devid) || \
--
2.13.6

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e
size 792940

3
libdrm-2.4.90.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db37ec8f1dbaa2c192ad9903c8d0988b858ae88031e96f169bf76aaf705db68b
size 822164

View File

@ -1,3 +1,89 @@
-------------------------------------------------------------------
Wed Feb 21 18:06:08 UTC 2018 - emil.l.velikov@gmail.com
- Remove unneeded defattr stanza
-------------------------------------------------------------------
Wed Feb 21 18:03:18 UTC 2018 - emil.l.velikov@gmail.com
- Remove pthread-stubs dependency
-------------------------------------------------------------------
Wed Feb 21 17:56:06 UTC 2018 - emil.l.velikov@gmail.com
- Remove unneeded autotool dependencies
-------------------------------------------------------------------
Sat Feb 17 18:14:22 UTC 2018 - tobias.johannes.klausmann@mni.thm.de
- Update to version 2.4.90:
+ Add meson build system
+ always define HAVE_FREEDRENO_KGSL
+ always define HAVE_CAIRO
+ always define HAVE_VALGRIND
+ amdgpu: Update deadlock test to not assert on ECANCELED
+ amdgpu: Fix segfault in deadlock test.
+ amdgpu: fix 32bit VA manager max address
+ amdgpu: use the high VA range if possible v2
+ amdgpu: fix high VA mask
+ amdgpu: fix inefficient vamgr algorithm
+ amdgpu: clean up non list code path for vamgr v2
+ amdgpu: add amdgpu_query_sw_info for querying high bits of 32-bit address space
+ amdgpu: Don't print error message if parse_one_line returned -EAGAIN
+ amdgpu: Don't dereference device_handle after amdgpu_device_deinitialize
+ amdgpu: Symlink .editorconfig to tests/amdgpu
+ amdgpu: Disable deadlock test suite by default for SI ASICs
+ amdgpu: Disable VM test suite by default for SI ASICs
+ amdgpu: Add amdgpu_query_sw_info to amdgpu-symbol-check
+ amdgpu: fix not to add amdgpu.ids when building without amdgpu
+ android: Move gralloc handle struct to libdrm
+ android: Add version variable to gralloc_handle_t
+ android: Mark gralloc_handle_t magic variable as const
+ android: Remove member name from gralloc_handle_t
+ android: Change gralloc_handle_t members to be fixed width
+ autotools: Include meson.build files in tarball
+ configure: remove unused HAVE_CUNIT define
+ configure: remove unused HAVE_INSTALL_TESTS define
+ configure: always define HAVE_LIBDRM_ATOMIC_PRIMITIVES and HAVE_LIB_ATOMIC_OPS
+ drm: Fix 32-bit drmSyncobjWait.
+ exynos/tests: use #ifdef for never-defined token
+ fix return value for syncobj wait
+ freedreno: clamp priority based on # of rings
+ headers: sync up amdgpu_drm.h with drm-next
+ intel: Add more Coffeelake PCI IDs
+ meson: fix the install path of amdgpu.ids
+ meson: set proper pkg-config version for libdrm_freedreno
+ meson: set the minimum version correctly
+ meson: fix libdrm_nouveau pkgconfig include directories
+ meson: include headers in root directory in ext_libdrm
+ meson: cleanup whitespace
+ meson: add missing HAVE_RADEON
+ meson: sort HAVE_* defines
+ meson,configure: remove unused HAVE_OMAP define
+ meson,configure: remove unused HAVE_TEGRA define
+ meson,configure: remove unused HAVE_FREEDRENO define
+ meson,configure: remove unused HAVE_ETNAVIV define
+ meson,configure: always define HAVE_{INTEL,VMWGFX,NOUVEAU,EXYNOS,VC4,RADEON}
+ meson,configure: turn undefined preprocessor tokens warnings into errors
+ meson,configure: add warning when using undefined preprocessor tokens
+ modetest: Fix to check return value of asprintf()
+ remove unnecessary double-semicolon
+ README: Add note about meson
+ test/amdgpu: fix compiler warnings
+ tests/amdgpu: add bo eviction test
+ tests/amdgpu: add missing config.h include
+ tests/amdgpu: add parentheses to make operation priority explicit
+ tests/amdgpu: drop unused variables
+ tests/amdgpu: execute write linear on all the available rings
+ tests/amdgpu: execute const fill on all the available rings
+ tests/amdgpu: execute copy linear on all the available rings
+ tests/etnaviv: drop unused `return 0`
+ tests/util: fix signed/unsigned comparisons
+ tests/util: drop unused parameters
+ xf86drmHash: remove always-false #if guards
+ xf86atomic: fix -Wundef warning
- Remove upstreamed patch U_intel-Add-more-Coffeelake-PCI-IDs.patch
-------------------------------------------------------------------
Mon Jan 15 13:38:22 UTC 2018 - sndirsch@suse.com

View File

@ -17,7 +17,7 @@
Name: libdrm
Version: 2.4.89
Version: 2.4.90
Release: 0
Summary: Userspace Interface for Kernel DRM Services
License: MIT
@ -28,16 +28,8 @@ Url: http://dri.freedesktop.org/
# Source URL: http://dri.freedesktop.org/libdrm/
Source: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
Source2: baselibs.conf
Patch0: U_intel-Add-more-Coffeelake-PCI-IDs.patch
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1.10
BuildRequires: libtool >= 2.2
BuildRequires: pkgconfig
%if 0%{?is_opensuse} || 0%{?suse_version} > 1320
BuildRequires: util-macros-devel
%endif
BuildRequires: pkgconfig(pciaccess) >= 0.10
BuildRequires: pkgconfig(pthread-stubs)
# Required for building manpages
BuildRequires: docbook-xsl-stylesheets
BuildRequires: xsltproc
@ -181,11 +173,9 @@ Group: System/Libraries
%prep
%setup -q
%patch0 -p1
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
autoreconf -fi
%configure \
%ifnarch %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm}
--disable-valgrind \
@ -244,12 +234,10 @@ install \
%endif
%files tools
%defattr(-,root,root)
%{_bindir}/modeprint
%{_bindir}/modetest
%files devel
%defattr(-,root,root)
%dir %{_mandir}/man3
%dir %{_mandir}/man7
%{_mandir}/man3/*
@ -268,52 +256,42 @@ install \
%{_libdir}/pkgconfig/libdrm*.pc
%files -n libdrm2
%defattr(-,root,root)
%{_libdir}/libdrm.so.2*
%dir %{_datarootdir}/libdrm
%ifarch %{ix86} x86_64
%files -n libdrm_intel1
%defattr(-,root,root)
%{_libdir}/libdrm_intel.so.1*
%endif
%files -n libdrm_nouveau2
%defattr(-,root,root)
%{_libdir}/libdrm_nouveau.so.2*
%files -n libdrm_radeon1
%defattr(-,root,root)
%{_libdir}/libdrm_radeon.so.1*
%files -n libdrm_amdgpu1
%defattr(-,root,root)
%{_libdir}/libdrm_amdgpu.so.1*
%{_datarootdir}/libdrm/amdgpu.ids
%files -n libkms1
%defattr(-,root,root)
%{_libdir}/libkms.so.1*
%files -n libkms-devel
%defattr(-,root,root)
%{_includedir}/libkms
%{_libdir}/libkms.so
%{_libdir}/pkgconfig/libkms.pc
%ifarch %{arm}
%files -n libdrm_omap1
%defattr(-,root,root)
%{_libdir}/libdrm_omap.so.1*
%files -n libdrm_tegra0
%defattr(-,root,root)
%{_libdir}/libdrm_tegra.so.0*
%endif
%ifarch %{arm} aarch64
%files -n libdrm_freedreno1
%defattr(-,root,root)
%{_libdir}/libdrm_freedreno.so.1*
%endif