Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at 2012-02-17 12:01:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdrm (Old) and /work/SRC/openSUSE:Factory/.libdrm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdrm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libdrm/libdrm.changes 2012-02-10 17:16:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdrm.new/libdrm.changes 2012-02-17 12:01:04.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Feb 11 16:37:39 UTC 2012 - [email protected] + +- Update to new upstream release 2.4.31 +* radeon: add surface allocator helper v10 +* intel: add sprite ioctl defines and struct for i915 sprite code +- Remove autoreconf call for now, there are no patches that + would necessitate this +- Remove redundant tags/sections from specfile +- Parallel build with %_smp_mflags +- Package shlibs separately according to policy +- Package description updates + +------------------------------------------------------------------- Old: ---- libdrm-2.4.30.tar.bz2 New: ---- libdrm-2.4.31.tar.bz2 libdrm-implicit-defs.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.iKmRvI/_old 2012-02-17 12:01:06.000000000 +0100 +++ /var/tmp/diff_new_pack.iKmRvI/_new 2012-02-17 12:01:06.000000000 +0100 @@ -15,18 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libdrm -BuildRequires: libpciaccess0-devel pkgconfig xorg-x11-proto-devel -BuildRequires: libtool -Url: http://dri.sf.net -License: MIT -Group: System/Libraries -AutoReqProv: on -Version: 2.4.30 -Release: 1 +Url: http://dri.freedesktop.org/ +Version: 2.4.31 +Release: 0 Provides: libdrm23 = %{version} Obsoletes: libdrm23 < %{version} # bug437293 @@ -36,20 +30,40 @@ %endif # Summary: Userspace Interface for Kernel DRM Services +License: MIT +Group: System/Libraries + +#Git-Clone: git://anongit.freedesktop.org/git/mesa/drm +#Git-Web: http://cgit.freedesktop.org/mesa/drm/ Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf +Patch1: libdrm-implicit-defs.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +#git#BuildRequires: autoconf >= 2.63, automake >= 1.10 +BuildRequires: libtool >= 2.2 +BuildRequires: pkgconfig +BuildRequires: pkgconfig(pciaccess) >= 0.10 +BuildRequires: pkgconfig(pthread-stubs) %description The package contains the userspace interface to the kernel DRM services. +%package tools +Summary: Diagnostic utilities for DRI and DRM +Group: System/Base +# O/P added in 12.2 +Obsoletes: libdrm < %version-%release +Provides: libdrm = %version-%release + +%description tools +(Upstream has not provided a description) %package devel -License: MIT Summary: Libraries, includes and more to develop libdrm applications Group: Development/Libraries/X11 -Requires: libdrm = %{version} glibc-devel +Requires: libdrm2 = %version, libdrm_intel1 = %version +Requires: libdrm_nouveau1 = %version, libdrm_radeon1 = %version # bug437293 %ifarch ppc64 Obsoletes: libdrm-devel-64bit < %{version} @@ -58,26 +72,83 @@ # %description devel -The package contains the userspace interface to the kernel DRM -services. +libdrm is a library for accessing the Direct Rendering Manager on +Linux, BSD and other operating systes that support the ioctl +interface, and for chipsets with DRM memory manager, support for +tracking relocations and buffers. libdrm is a low-level library, +typically used by graphics drivers such as the Mesa DRI and X +drivers. + +This package contains the development headers for the library found +in libdrm2. + +%package -n libdrm2 +Summary: Userspace Interface for Kernel DRM Services +Group: System/Libraries + +%description -n libdrm2 +libdrm is a library for accessing the Direct Rendering Manager on +Linux, BSD and other operating systes that support the ioctl +interface, and for chipsets with DRM memory manager, support for +tracking relocations and buffers. libdrm is a low-level library, +typically used by graphics drivers such as the Mesa DRI and X +drivers. + +%package -n libdrm_intel1 +Summary: Userspace interface for Kernel DRM services for Intel chips +Group: System/Libraries + +%description -n libdrm_intel1 +(Upstream has not provided a description) + +%package -n libdrm_nouveau1 +Summary: Userspace interface for Kernel DRM services for NVIDIA chips +Group: System/Libraries + +%description -n libdrm_nouveau1 +(Upstream has not provided a description) + +%package -n libdrm_radeon1 +Summary: Userspace interface for Kernel DRM services for AMD Radeon chips +Group: System/Libraries + +%description -n libdrm_radeon1 +(Upstream has not provided a description) + +%package -n libkms-devel +Summary: Development files for the KMS MM abstraction library +Group: Development/Libraries/C and C++ +Requires: libkms1 = %version + +%description -n libkms-devel +This package contains the development headers for the library found +in libkms1. + +%package -n libkms1 +Summary: Userspace interface to kernel DRM buffer management +Group: System/Libraries + +%description -n libkms1 +The KMS Memory Management abstraction library. %prep -%setup -q -n %{name}-%{version} +%setup -q +%patch -P 1 -p1 %build -autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api --enable-udev -%{__make} %{?jobs:-j%jobs} -%{__make} %{?jobs:-j%jobs} -C tests dristat drmstat +make %{?_smp_mflags} +make %{?_smp_mflags} -C tests dristat drmstat %check -%{__make} %{?jobs:-j%jobs} -C tests check-am +make %{?_smp_mflags} -C tests check-am %install make install DESTDIR=$RPM_BUILD_ROOT make -C tests/modeprint install DESTDIR=$RPM_BUILD_ROOT make -C tests/modetest install DESTDIR=$RPM_BUILD_ROOT +rm -f "%buildroot/%_libdir"/*.la %{__mkdir} -p $RPM_BUILD_ROOT/usr/bin %{__install} \ tests/.libs/dristat \ @@ -85,51 +156,66 @@ tests/modeprint/.libs/modeprint \ tests/modetest/.libs/modetest $RPM_BUILD_ROOT/usr/bin -%clean -rm -rf $RPM_BUILD_ROOT +%post -n libdrm2 -p /sbin/ldconfig + +%postun -n libdrm2 -p /sbin/ldconfig + +%post -n libdrm_intel1 -p /sbin/ldconfig -%post -p /sbin/ldconfig +%postun -n libdrm_intel1 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post -n libdrm_nouveau1 -p /sbin/ldconfig -%files +%postun -n libdrm_nouveau1 -p /sbin/ldconfig + +%post -n libdrm_radeon1 -p /sbin/ldconfig + +%postun -n libdrm_radeon1 -p /sbin/ldconfig + +%post -n libkms1 -p /sbin/ldconfig + +%postun -n libkms1 -p /sbin/ldconfig + +%files tools %defattr(-,root,root) -/usr/%{_lib}/libdrm.so.2 -/usr/%{_lib}/libdrm.so.2.4.0 -/usr/%{_lib}/libdrm_intel.so.1 -/usr/%{_lib}/libdrm_intel.so.1.0.0 -/usr/%{_lib}/libdrm_nouveau.so.1 -/usr/%{_lib}/libdrm_nouveau.so.1.0.0 -/usr/%{_lib}/libdrm_radeon.so.1 -/usr/%{_lib}/libdrm_radeon.so.1.0.0 -/usr/%{_lib}/libkms.so.1 -/usr/%{_lib}/libkms.so.1.0.0 -/usr/bin/dristat -/usr/bin/drmstat -/usr/bin/modeprint -/usr/bin/modetest +%_bindir/dristat +%_bindir/drmstat +%_bindir/modeprint +%_bindir/modetest %files devel %defattr(-,root,root) -/usr/include/libdrm/ -/usr/include/nouveau/ -/usr/include/libkms/ -/usr/include/xf86drm.h -/usr/include/xf86drmMode.h -/usr/%{_lib}/libdrm.so -/usr/%{_lib}/libdrm_intel.so -/usr/%{_lib}/libdrm_nouveau.so -/usr/%{_lib}/libdrm_radeon.so -/usr/%{_lib}/libkms.so -/usr/%{_lib}/pkgconfig/libdrm.pc -/usr/%{_lib}/pkgconfig/libdrm_intel.pc -/usr/%{_lib}/pkgconfig/libdrm_nouveau.pc -/usr/%{_lib}/pkgconfig/libdrm_radeon.pc -/usr/%{_lib}/pkgconfig/libkms.pc -%exclude %{_libdir}/libdrm.la -%exclude %{_libdir}/libdrm_intel.la -%exclude %{_libdir}/libdrm_nouveau.la -%exclude %{_libdir}/libdrm_radeon.la -%exclude %{_libdir}/libkms.la +%_includedir/libdrm +%_includedir/nouveau +%_includedir/xf86drm.h +%_includedir/xf86drmMode.h +%_libdir/libdrm*.so +%_libdir/pkgconfig/libdrm*.pc + +%files -n libdrm2 +%defattr(-,root,root) +%_libdir/libdrm.so.2* + +%files -n libdrm_intel1 +%defattr(-,root,root) +%_libdir/libdrm_intel.so.1* + +%files -n libdrm_nouveau1 +%defattr(-,root,root) +%_libdir/libdrm_nouveau.so.1* + +%files -n libdrm_radeon1 +%defattr(-,root,root) +%_libdir/libdrm_radeon.so.1* + +%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 %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.iKmRvI/_old 2012-02-17 12:01:06.000000000 +0100 +++ /var/tmp/diff_new_pack.iKmRvI/_new 2012-02-17 12:01:06.000000000 +0100 @@ -1,2 +1,14 @@ -libdrm +libdrm2 +libdrm_intel1 +libdrm_nouveau1 +libdrm_radeon1 libdrm-devel + requires -libdrm-<targettype> + requires "libdrm2-<targettype> = <version>" + requires "libdrm_intel1-<targettype> = <version>" + requires "libdrm_nouveau1-<targettype> = <version>" + requires "libdrm_radeon1-<targettype> = <version>" +libkms1 +libkms-devel + requires -libkms-<targettype> + requires "libkms1-<targettype> = <version>" ++++++ libdrm-2.4.30.tar.bz2 -> libdrm-2.4.31.tar.bz2 ++++++ ++++ 22651 lines of diff (skipped) ++++++ libdrm-implicit-defs.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2012-02-11 18:30:33.770195708 +0100 Resolve compiler warnings about use of implicit declared-functions. radeon_ttm.c: In function 'radeon_open_fd': radeon_ttm.c:58:5: warning: implicit declaration of function 'drmOpen' [-Wimplicit-function-declaration] radeon_ttm.c: In function 'main': radeon_ttm.c:73:5: warning: implicit declaration of function 'close' [-Wimplicit-function-declaration] radeon_ttm.c: At top level: --- tests/radeon/radeon_ttm.c | 2 ++ 1 file changed, 2 insertions(+) Index: libdrm-2.4.31/tests/radeon/radeon_ttm.c =================================================================== --- libdrm-2.4.31.orig/tests/radeon/radeon_ttm.c +++ libdrm-2.4.31/tests/radeon/radeon_ttm.c @@ -25,7 +25,9 @@ */ #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #include "rbo.h" +#include "xf86drm.h" /* allocate as many single page bo to try to starve the kernel * memory zone (below highmem) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
