X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=libdrm.spec;h=f2601618c82e780fc32648653c7fa55049abf2ae;hb=8aa01895190964ffed76901bcd56c0fc6691a818;hp=fd874b1a356d8a1ed35f6552f9bff033f860768e;hpb=0e106314f4276c757e196bb46f118d8833f9d468;p=packages%2Flibdrm.git

diff --git a/libdrm.spec b/libdrm.spec
index fd874b1..f260161 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -1,26 +1,40 @@
+#
+# Conditional build:
+%bcond_without	static_libs	# static libraries
+%bcond_with	valgrind	# valgrind support in libdrm
+
 Summary:	Userspace interface to kernel DRM services
 Summary(pl.UTF-8):	Interfejs przestrzeni użytkownika do usług DRM jądra
 Name:		libdrm
-Version:	2.4.68
+Version:	2.4.116
 Release:	1
 License:	MIT
 Group:		Libraries
-Source0:	https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
-# Source0-md5:	bcc96848d969cecf28223f668eeff354
+Source0:	https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.xz
+# Source0-md5:	1e4e75070b8c5cb1e828cef1d704f734
 URL:		https://dri.freedesktop.org/
-BuildRequires:	autoconf >= 2.63
-BuildRequires:	automake >= 1:1.10
 BuildRequires:	docbook-dtd42-xml
-BuildRequires:	docbook-style-xsl
-BuildRequires:	libpthread-stubs
-BuildRequires:	libtool >= 2:2.2
+BuildRequires:	docbook-style-xsl-nons
+BuildRequires:	docutils
+BuildRequires:	gcc >= 6:4.9
+%ifarch i386
+BuildRequires:	libatomic_ops-devel
+%endif
 BuildRequires:	libxslt-progs
+BuildRequires:	meson >= 0.53
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	sed >= 4.0
-BuildRequires:	valgrind
+BuildRequires:	tar >= 1:1.22
+%{?with_valgrind:BuildRequires:	valgrind}
+%ifarch %{ix86} %{x8664} x32
 BuildRequires:	xorg-lib-libpciaccess-devel >= 0.10
-BuildRequires:	xorg-util-util-macros >= 1.12
+%endif
+BuildRequires:	xz
+%ifarch %{ix86} %{x8664} x32
 Requires:	xorg-lib-libpciaccess >= 0.10
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,29 +70,28 @@ Statyczna biblioteka libdrm.
 %prep
 %setup -q
 
+%if %{with static_libs}
+%{__sed} -i -e '/^lib.* = shared_library/ s/shared_library/library/' \
+	meson.build \
+	{amdgpu,etnaviv,exynos,freedreno,intel,nouveau,omap,radeon,tegra}/meson.build
+%endif
+
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-silent-rules \
-	--enable-static \
-%ifarch arm aarch64
-	--enable-exynos-experimental-api \
-	--enable-freedreno-experimental-api \
-	--enable-omap-experimental-api \
-	--enable-tegra-experimental-api
+%meson build \
+	%{!?with_valgrind:-Dvalgrind=disabled} \
+%ifarch %{arm} aarch64
+	-Detnaviv=enabled \
+	-Dexynos=enabled \
+	-Domap=enabled \
+	-Dtegra=enabled
 %endif
 
-%{__make}
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,13 +105,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libdrm.so.2
 %attr(755,root,root) %{_libdir}/libdrm_amdgpu.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdrm_amdgpu.so.1
+%ifarch %{ix86} %{x8664} x32
 %attr(755,root,root) %{_libdir}/libdrm_intel.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdrm_intel.so.1
+%endif
 %attr(755,root,root) %{_libdir}/libdrm_nouveau.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdrm_nouveau.so.2
 %attr(755,root,root) %{_libdir}/libdrm_radeon.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdrm_radeon.so.1
-%ifarch arm aarch64
+%ifarch %{arm} aarch64
+%attr(755,root,root) %{_libdir}/libdrm_etnaviv.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdrm_etnaviv.so.1
 %attr(755,root,root) %{_libdir}/libdrm_exynos.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdrm_exynos.so.1
 %attr(755,root,root) %{_libdir}/libdrm_freedreno.so.*.*.*
@@ -108,66 +125,65 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libdrm_tegra.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdrm_tegra.so.0
 %endif
-%attr(755,root,root) %{_libdir}/libkms.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkms.so.1
+%{_datadir}/libdrm
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdrm.so
 %attr(755,root,root) %{_libdir}/libdrm_amdgpu.so
-%attr(755,root,root) %{_libdir}/libdrm_intel.so
 %attr(755,root,root) %{_libdir}/libdrm_nouveau.so
 %attr(755,root,root) %{_libdir}/libdrm_radeon.so
-%attr(755,root,root) %{_libdir}/libkms.so
-%{_libdir}/libdrm.la
-%{_libdir}/libdrm_amdgpu.la
-%{_libdir}/libdrm_intel.la
-%{_libdir}/libdrm_nouveau.la
-%{_libdir}/libdrm_radeon.la
-%{_libdir}/libkms.la
 %{_includedir}/libdrm
-%{_includedir}/libkms
+%{_includedir}/libsync.h
 %{_includedir}/xf86drm.h
 %{_includedir}/xf86drmMode.h
 %{_pkgconfigdir}/libdrm.pc
 %{_pkgconfigdir}/libdrm_amdgpu.pc
-%{_pkgconfigdir}/libdrm_intel.pc
 %{_pkgconfigdir}/libdrm_nouveau.pc
 %{_pkgconfigdir}/libdrm_radeon.pc
-%{_pkgconfigdir}/libkms.pc
-%ifarch arm aarch64
+%ifarch %{ix86} %{x8664} x32
+%attr(755,root,root) %{_libdir}/libdrm_intel.so
+%{_pkgconfigdir}/libdrm_intel.pc
+%endif
+%ifarch %{arm} aarch64
+%attr(755,root,root) %{_libdir}/libdrm_etnaviv.so
 %attr(755,root,root) %{_libdir}/libdrm_exynos.so
 %attr(755,root,root) %{_libdir}/libdrm_freedreno.so
 %attr(755,root,root) %{_libdir}/libdrm_omap.so
 %attr(755,root,root) %{_libdir}/libdrm_tegra.so
-%{_libdir}/libdrm_exynos.la
-%{_libdir}/libdrm_freedreno.la
-%{_libdir}/libdrm_omap.la
-%{_libdir}/libdrm_tegra.la
 %{_includedir}/exynos
 %{_includedir}/freedreno
 %{_includedir}/omap
 # already included above
+#%{_includedir}/libdrm/etnaviv_drmif.h
 #%{_includedir}/libdrm/tegra.h
+#%{_includedir}/libdrm/vc4_packet.h
+#%{_includedir}/libdrm/vc4_qpu_defines.h
+%{_pkgconfigdir}/libdrm_etnaviv.pc
 %{_pkgconfigdir}/libdrm_exynos.pc
 %{_pkgconfigdir}/libdrm_freedreno.pc
 %{_pkgconfigdir}/libdrm_omap.pc
 %{_pkgconfigdir}/libdrm_tegra.pc
+%{_pkgconfigdir}/libdrm_vc4.pc
 %endif
 %{_mandir}/man3/drm*.3*
 %{_mandir}/man7/drm*.7*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libdrm.a
 %{_libdir}/libdrm_amdgpu.a
+%ifarch %{ix86} %{x8664} x32
 %{_libdir}/libdrm_intel.a
+%endif
 %{_libdir}/libdrm_nouveau.a
 %{_libdir}/libdrm_radeon.a
-%ifarch arm aarch64
+%ifarch %{arm} aarch64
+%{_libdir}/libdrm_etnaviv.a
 %{_libdir}/libdrm_exynos.a
 %{_libdir}/libdrm_freedreno.a
 %{_libdir}/libdrm_omap.a
 %{_libdir}/libdrm_tegra.a
 %endif
-%{_libdir}/libkms.a
+%endif