From 920e1f384f4decb7195f421a59f736e4269e2421b5aee8acd54d42ed014dc00c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 4 Oct 2016 10:49:05 +0000 Subject: [PATCH] Accepting request 433074 from home:mimi_vx:branches:X11:XOrg - update to 2.4.71 * amdgpu: expose the AMDGPU_GEM_CREATE_VRAM_CLEARED flag * Add drmModeAddFB2WithModifiers() which takes format modifiers * tests/amdgpu: update vce encRefPic addr mode to tiled * radeon: sync radeon_drm.h with the kernel * amdgpu: sync amdgpu_drm.h with the kernel * amdgpu: fix valgrind warnings caused by amdgpu_query_firmware_version * intel: Add new symbols to intel-symbol-check * amdgpu: add SI support * modetest: Also print the pixel clock * intel: Export pooled EU and min no. of eus in a pool * modetest: Adding amdgpu to module list OBS-URL: https://build.opensuse.org/request/show/433074 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=219 --- libdrm-2.4.70.tar.bz2 | 3 - libdrm-2.4.71.tar.bz2 | 3 + libdrm.changes | 16 +++++ libdrm.spec | 155 ++++++++++++++++++------------------------ 4 files changed, 86 insertions(+), 91 deletions(-) delete mode 100644 libdrm-2.4.70.tar.bz2 create mode 100644 libdrm-2.4.71.tar.bz2 diff --git a/libdrm-2.4.70.tar.bz2 b/libdrm-2.4.70.tar.bz2 deleted file mode 100644 index 3676f7c..0000000 --- a/libdrm-2.4.70.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b17d4b39ed97ca0e4cffa0db06ff609e617bac94646ec38e8e0579d530540e7b -size 692277 diff --git a/libdrm-2.4.71.tar.bz2 b/libdrm-2.4.71.tar.bz2 new file mode 100644 index 0000000..f2716de --- /dev/null +++ b/libdrm-2.4.71.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8 +size 722278 diff --git a/libdrm.changes b/libdrm.changes index 67b01b3..f417d36 100644 --- a/libdrm.changes +++ b/libdrm.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Oct 4 08:21:19 UTC 2016 - mimi.vx@gmail.com + +- update to 2.4.71 +* amdgpu: expose the AMDGPU_GEM_CREATE_VRAM_CLEARED flag +* Add drmModeAddFB2WithModifiers() which takes format modifiers +* tests/amdgpu: update vce encRefPic addr mode to tiled +* radeon: sync radeon_drm.h with the kernel +* amdgpu: sync amdgpu_drm.h with the kernel +* amdgpu: fix valgrind warnings caused by amdgpu_query_firmware_version +* intel: Add new symbols to intel-symbol-check +* amdgpu: add SI support +* modetest: Also print the pixel clock +* intel: Export pooled EU and min no. of eus in a pool +* modetest: Adding amdgpu to module list + ------------------------------------------------------------------- Mon Jul 25 11:56:07 UTC 2016 - tobias.johannes.klausmann@mni.thm.de diff --git a/libdrm.spec b/libdrm.spec index 1c6f1a5..ca59cee 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -17,29 +17,17 @@ Name: libdrm -Url: http://dri.freedesktop.org/ -Version: 2.4.70 +Version: 2.4.71 Release: 0 -Provides: libdrm23 = %{version} -Obsoletes: libdrm23 < %{version} -# bug437293 -%ifarch ppc64 -Obsoletes: libdrm-64bit < %{version} -Provides: libdrm-64bit = %{version} -%endif -# Summary: Userspace Interface for Kernel DRM Services License: MIT Group: System/Libraries - +Url: http://dri.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/git/mesa/drm #Git-Web: http://cgit.freedesktop.org/mesa/drm/ # Source URL: http://dri.freedesktop.org/libdrm/ Source: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2 Source2: baselibs.conf -# PATCH-FIX-UPSTREAM libdrm-implicit-defs.diff fdo#48599 -- Fix compiler warnings in tests/radeon/radeon_ttm.c - -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1.10 BuildRequires: libtool >= 2.2 @@ -47,8 +35,16 @@ BuildRequires: pkgconfig BuildRequires: util-macros-devel BuildRequires: pkgconfig(pciaccess) >= 0.10 BuildRequires: pkgconfig(pthread-stubs) +Provides: libdrm23 = %{version} +Obsoletes: libdrm23 < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# bug437293 +%ifarch ppc64 +Obsoletes: libdrm-64bit < %{version} +Provides: libdrm-64bit = %{version} +%endif %if 0%{?with_valgrind_support:1} -%ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x %arm +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} BuildRequires: pkgconfig(valgrind) %endif %endif @@ -60,9 +56,8 @@ 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 +Obsoletes: libdrm < %{version}-%{release} +Provides: libdrm = %{version}-%{release} %description tools (Upstream has not provided a description) @@ -70,19 +65,19 @@ Provides: libdrm = %version-%release %package devel Summary: Libraries, includes and more to develop libdrm applications Group: Development/Libraries/X11 -Requires: libdrm2 = %version -Requires: libdrm_amdgpu1 = %version -Requires: libdrm_nouveau2 = %version -Requires: libdrm_radeon1 = %version -%ifarch %arm aarch64 -Requires: libdrm_freedreno1 = %version +Requires: libdrm2 = %{version} +Requires: libdrm_amdgpu1 = %{version} +Requires: libdrm_nouveau2 = %{version} +Requires: libdrm_radeon1 = %{version} +%ifarch %{arm} aarch64 +Requires: libdrm_freedreno1 = %{version} %endif -%ifarch %arm -Requires: libdrm_omap1 = %version -Requires: libdrm_tegra0 = %version +%ifarch %{arm} +Requires: libdrm_omap1 = %{version} +Requires: libdrm_tegra0 = %{version} %endif -%ifarch %ix86 x86_64 -Requires: libdrm_intel1 = %version +%ifarch %{ix86} x86_64 +Requires: libdrm_intel1 = %{version} %endif # bug437293 %ifarch ppc64 @@ -144,7 +139,7 @@ Group: System/Libraries %package -n libkms-devel Summary: Development files for the KMS MM abstraction library Group: Development/Libraries/C and C++ -Requires: libkms1 = %version +Requires: libkms1 = %{version} %description -n libkms-devel This package contains the development headers for the library found @@ -182,149 +177,133 @@ Group: System/Libraries %setup -q %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" autoreconf -fi %configure --with-pic \ -%ifnarch %ix86 x86_64 ppc ppc64 ppc64le s390x %arm +%ifnarch %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} --disable-valgrind \ %else %if 0%{!?with_valgrind_support:1} --disable-valgrind \ %endif %endif -%ifarch %arm +%ifarch %{arm} --enable-omap-experimental-api \ --enable-freedreno-experimental-api \ --enable-tegra-experimental-api \ %endif --enable-udev -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 make %{?_smp_mflags} -C tests dristat drmstat %check -make %{?_smp_mflags} -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} \ +make %{?_smp_mflags} DESTDIR=%{buildroot} install +make -C tests/modeprint install DESTDIR=%{buildroot} +make -C tests/modetest install DESTDIR=%{buildroot} +find %{buildroot} -type f -name "*.la" -delete -print +mkdir -p %{buildroot}%{_prefix}/bin +install \ tests/dristat \ tests/.libs/drmstat \ tests/modeprint/.libs/modeprint \ - tests/modetest/.libs/modetest $RPM_BUILD_ROOT/usr/bin + tests/modetest/.libs/modetest %{buildroot}%{_prefix}/bin %post -n libdrm2 -p /sbin/ldconfig - %postun -n libdrm2 -p /sbin/ldconfig - %post -n libdrm_intel1 -p /sbin/ldconfig - %postun -n libdrm_intel1 -p /sbin/ldconfig - %post -n libdrm_nouveau2 -p /sbin/ldconfig - %postun -n libdrm_nouveau2 -p /sbin/ldconfig - %post -n libdrm_radeon1 -p /sbin/ldconfig - %postun -n libdrm_radeon1 -p /sbin/ldconfig - %post -n libdrm_amdgpu1 -p /sbin/ldconfig - %postun -n libdrm_amdgpu1 -p /sbin/ldconfig - %post -n libkms1 -p /sbin/ldconfig - %postun -n libkms1 -p /sbin/ldconfig -%ifarch %arm +%ifarch %{arm} %post -n libdrm_omap1 -p /sbin/ldconfig - %postun -n libdrm_omap1 -p /sbin/ldconfig - %post -n libdrm_tegra0 -p /sbin/ldconfig - %postun -n libdrm_tegra0 -p /sbin/ldconfig %endif -%ifarch %arm aarch64 +%ifarch %{arm} aarch64 %post -n libdrm_freedreno1 -p /sbin/ldconfig - %postun -n libdrm_freedreno1 -p /sbin/ldconfig %endif %files tools %defattr(-,root,root) -%_bindir/dristat -%_bindir/drmstat -%_bindir/modeprint -%_bindir/modetest +%{_bindir}/dristat +%{_bindir}/drmstat +%{_bindir}/modeprint +%{_bindir}/modetest %files devel %defattr(-,root,root) -%_includedir/libdrm -%ifarch %arm -%_includedir/omap +%{_includedir}/libdrm +%ifarch %{arm} +%{_includedir}/omap %endif -%ifarch %arm aarch64 -%_includedir/freedreno +%ifarch %{arm} aarch64 +%{_includedir}/freedreno %endif -%_includedir/xf86drm.h -%_includedir/xf86drmMode.h -%_libdir/libdrm*.so -%_libdir/pkgconfig/libdrm*.pc +%{_includedir}/xf86drm.h +%{_includedir}/xf86drmMode.h +%{_libdir}/libdrm*.so +%{_libdir}/pkgconfig/libdrm*.pc %files -n libdrm2 %defattr(-,root,root) -%_libdir/libdrm.so.2* - -%ifarch %ix86 x86_64 +%{_libdir}/libdrm.so.2* +%ifarch %{ix86} x86_64 %files -n libdrm_intel1 %defattr(-,root,root) -%_libdir/libdrm_intel.so.1* +%{_libdir}/libdrm_intel.so.1* %endif %files -n libdrm_nouveau2 %defattr(-,root,root) -%_libdir/libdrm_nouveau.so.2* +%{_libdir}/libdrm_nouveau.so.2* %files -n libdrm_radeon1 %defattr(-,root,root) -%_libdir/libdrm_radeon.so.1* +%{_libdir}/libdrm_radeon.so.1* %files -n libdrm_amdgpu1 %defattr(-,root,root) -%_libdir/libdrm_amdgpu.so.1* +%{_libdir}/libdrm_amdgpu.so.1* %files -n libkms1 %defattr(-,root,root) -%_libdir/libkms.so.1* +%{_libdir}/libkms.so.1* %files -n libkms-devel %defattr(-,root,root) -%_includedir/libkms -%_libdir/libkms.so -%_libdir/pkgconfig/libkms.pc +%{_includedir}/libkms +%{_libdir}/libkms.so +%{_libdir}/pkgconfig/libkms.pc -%ifarch %arm +%ifarch %{arm} %files -n libdrm_omap1 %defattr(-,root,root) -%_libdir/libdrm_omap.so.1* +%{_libdir}/libdrm_omap.so.1* %files -n libdrm_tegra0 %defattr(-,root,root) -%_libdir/libdrm_tegra.so.0* +%{_libdir}/libdrm_tegra.so.0* %endif -%ifarch %arm aarch64 +%ifarch %{arm} aarch64 %files -n libdrm_freedreno1 %defattr(-,root,root) -%_libdir/libdrm_freedreno.so.1* +%{_libdir}/libdrm_freedreno.so.1* %endif %changelog