- 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)
- back to libdrm 2.4.33, since 2.4.34 currently requires Mesa git

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=110
This commit is contained in:
Stefan Dirsch 2012-06-29 11:54:18 +00:00 committed by Git OBS Bridge
parent efcebbd946
commit a91b2259b2
3 changed files with 10 additions and 29 deletions

View File

@ -1,14 +1,12 @@
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

View File

@ -1,18 +1,21 @@
-------------------------------------------------------------------
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 currentlz requires Mesa git
- back to libdrm 2.4.33, since 2.4.34 currently requires Mesa git
master changes for nouveau Mesa driver build
-------------------------------------------------------------------

View File

@ -67,9 +67,6 @@ 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
@ -140,14 +137,6 @@ 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
@ -155,7 +144,7 @@ Group: System/Libraries
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api --enable-udev --enable-omap-experimental-api
%configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api --enable-udev
make %{?_smp_mflags}
make %{?_smp_mflags} -C tests dristat drmstat
@ -194,10 +183,6 @@ 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
@ -209,7 +194,6 @@ rm -f "%buildroot/%_libdir"/*.la
%defattr(-,root,root)
%_includedir/libdrm
%_includedir/nouveau
%_includedir/omap
%_includedir/xf86drm.h
%_includedir/xf86drmMode.h
%_libdir/libdrm*.so
@ -244,8 +228,4 @@ 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