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

- enable omapdrm support

Browse Source 
- back to libdrm 2.4.33, since 2.4.34 currentlz requires Mesa git

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=111
This commit is contained in:
Stefan Dirsch 2012-06-29 12:49:09 +00:00 committed by Git OBS Bridge
parent a91b2259b2
commit a95babf50b
4 changed files with 66 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
U_intel-add-Ivy-Bridge-GT2-server-variant.patch
View File

@ -35,3 +35,40 @@ index 435d01a..9c1abc8 100644
--
1.7.3.4
From e057a56448e2e785f74bc13dbd6ead8572ebed91 Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni@dodonov.net>
Date: Thu, 29 Mar 2012 21:03:29 -0300
Subject: [PATCH] intel: add Ivy Bridge GT2 server variant
We were missing this one and it is being used by Bromolow.
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
---
intel/intel_chipset.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 435d01a..9c1abc8 100644
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -44,6 +44,7 @@
#define PCI_CHIP_IVYBRIDGE_M_GT1 0x0156 /* mobile */
#define PCI_CHIP_IVYBRIDGE_M_GT2 0x0166
#define PCI_CHIP_IVYBRIDGE_S 0x015a /* server */
+#define PCI_CHIP_IVYBRIDGE_S_GT2 0x016a /* server */
#define PCI_CHIP_HASWELL_GT1 0x0402 /* Desktop */
#define PCI_CHIP_HASWELL_GT2 0x0412
@@ -128,7 +129,8 @@
dev == PCI_CHIP_IVYBRIDGE_GT2 || \
dev == PCI_CHIP_IVYBRIDGE_M_GT1 || \
dev == PCI_CHIP_IVYBRIDGE_M_GT2 || \
- dev == PCI_CHIP_IVYBRIDGE_S)
+ dev == PCI_CHIP_IVYBRIDGE_S || \
+ dev == PCI_CHIP_IVYBRIDGE_S_GT2)
#define IS_HSW_GT1(devid) (devid == PCI_CHIP_HASWELL_GT1 || \
devid == PCI_CHIP_HASWELL_M_GT1)
--
1.7.3.4

2
baselibs.conf
View File

@ -1,12 +1,14 @@
libdrm2
libdrm_intel1
libdrm_nouveau1
libdrm_omap1
libdrm_radeon1
libdrm-devel
requires -libdrm-<targettype>
requires "libdrm2-<targettype> = <version>"
requires "libdrm_intel1-<targettype> = <version>"
requires "libdrm_nouveau1-<targettype> = <version>"
requires "libdrm_omap1-<targettype> = <version>"
requires "libdrm_radeon1-<targettype> = <version>"
libkms1
libkms-devel

15
libdrm.changes
View File

@ -1,21 +1,18 @@
-------------------------------------------------------------------
Fri Jun 29 11:51:39 UTC 2012 - sndirsch@suse.com
- disabled omapdrm support again, since there is a GPL licensed
file in the omap component. This has been addressed with
release 2.3.34, but we can't update to 2.3.34 with the current
stable Mesa version ... (see changelog below)
-------------------------------------------------------------------
Fri Jun 29 09:27:32 UTC 2012 - sndirsch@suse.com
- U_intel-add-Ivy-Bridge-GT2-server-variant.patch
* intel: add Ivy Bridge GT2 server variant (bnc#769209)
-------------------------------------------------------------------
Wed Jun 27 20:04:08 UTC 2012 - guillaume@opensuse.org
- enable omapdrm support
-------------------------------------------------------------------
Tue May 29 09:47:00 UTC 2012 - sndirsch@suse.com
- back to libdrm 2.4.33, since 2.4.34 currently requires Mesa git
- back to libdrm 2.4.33, since 2.4.34 currentlz requires Mesa git
master changes for nouveau Mesa driver build
-------------------------------------------------------------------

22
libdrm.spec
View File

@ -67,6 +67,9 @@ Group: Development/Libraries/X11
Requires: libdrm2 = %version
Requires: libdrm_nouveau1 = %version
Requires: libdrm_radeon1 = %version
%ifarch %arm
Requires: libdrm_omap1 = %version
%endif
%ifarch %ix86 x86_64
Requires: libdrm_intel1 = %version
%endif
@ -137,6 +140,14 @@ Group: System/Libraries
%description -n libkms1
The KMS Memory Management abstraction library.
%package -n libdrm_omap1
Summary: Userspace interface to kernel DRM services for omap chips
Group: System/Libraries
%description -n libdrm_omap1
(Upstream has not provided a description)
%prep
%setup -q
%patch -P 1 -p1
@ -144,7 +155,7 @@ The KMS Memory Management abstraction library.
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api --enable-udev
%configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api --enable-udev --enable-omap-experimental-api
make %{?_smp_mflags}
make %{?_smp_mflags} -C tests dristat drmstat
@ -183,6 +194,10 @@ rm -f "%buildroot/%_libdir"/*.la
%postun -n libkms1 -p /sbin/ldconfig
%post -n libdrm_omap1 -p /sbin/ldconfig
%postun -n libdrm_omap1 -p /sbin/ldconfig
%files tools
%defattr(-,root,root)
%_bindir/dristat
@ -194,6 +209,7 @@ rm -f "%buildroot/%_libdir"/*.la
%defattr(-,root,root)
%_includedir/libdrm
%_includedir/nouveau
%_includedir/omap
%_includedir/xf86drm.h
%_includedir/xf86drmMode.h
%_libdir/libdrm*.so
@ -228,4 +244,8 @@ rm -f "%buildroot/%_libdir"/*.la
%_libdir/libkms.so
%_libdir/pkgconfig/libkms.pc
%files -n libdrm_omap1
%defattr(-,root,root)
%_libdir/libdrm_omap.so.1*
%changelog