Changes - SailfishOS Open Build Service

Changes of Revision 4

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:libdrm.changes
@@ -1,3 +1,4 @@ -* Thu Nov 29 2018 Eugenio Paolantonio (g7) <me@medesimo.eu> - 2.4.96+rebuild2 -- [libdrm] Switch to tar_git format; update to 2.4.96 +* Wed Apr 03 2019 Niels Breet <niels.breet@jolla.com> - 2.4.97 +- [libdrm] Update to 2.4.97. Contributes to JB#45152 +- [Packaging] Update to 2.4.96
[-] [+]	Changed	_service:tar_git:libdrm.spec ^
@@ -1,33 +1,91 @@ -# -# Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.25 -# +%define bcond_meson() %{lua: do + local option = rpm.expand("%{1}") + local with = rpm.expand("%{?with_" .. option .. "}") + local value = (with ~= '') and "true" or "false" + option = option:gsub('_', '-') + print(string.format("-D%s=%s", option, value)) +end} -Name: libdrm - -# >> macros -# << macros +%bcond_without libkms +%ifarch %{ix86} x86_64 +%bcond_without intel +%else +%bcond_with intel +%endif +%bcond_without radeon +%bcond_without amdgpu +%bcond_without nouveau +%bcond_without vmwgfx +%ifarch %{arm} +%bcond_without omap +%else +%bcond_with omap +%endif +%ifarch %{arm} aarch64 +#let's enable when we need to support them +%bcond_with exynos +%bcond_with freedreno +%bcond_with tegra +%bcond_with vc4 +%bcond_with etnaviv +%else +%bcond_with exynos +%bcond_with freedreno +%bcond_with tegra +%bcond_with vc4 +%bcond_with etnaviv +%endif +%bcond_with cairo_tests +%ifarch %{valgrind_arches} +%bcond_without valgrind +%else +%bcond_with valgrind +%endif +%bcond_with freedreno_kgsl +%bcond_with install_test_programs +%bcond_without udev +%bcond_with man_pages +Name: libdrm Summary: Direct Rendering Manager runtime library -Version: 2.4.96+rebuild2 +Version: 2.4.97+update.2.4.100.20191126230320.1.gcd09098 Release: 1 Group: System/Libraries License: MIT URL: http://dri.sourceforge.net -Source0: %{name}-%{version}.tar.bz2 -#Source100: libdrm.yaml +Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2 Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(pciaccess) >= 0.10 -BuildRequires: pkgconfig(pthread-stubs) +BuildRequires: meson >= 0.43 +BuildRequires: gcc +BuildRequires: libatomic_ops-devel +BuildRequires: kernel-headers +%if %{with intel} +BuildRequires: pkgconfig(pciaccess) >= 0.10 +%endif +#BuildRequires: pkgconfig(cunit) >= 2.1 +%if %{with cairo_tests} +BuildRequires: pkgconfig(cairo) +%endif +%if %{with man_pages} +BuildRequires: %{_bindir}/xsltproc +BuildRequires: %{_bindir}/sed +BuildRequires: docbook-style-xsl +%endif +%if %{with valgrind} +BuildRequires: valgrind-devel +%endif +%if %{with udev} BuildRequires: pkgconfig(udev) -BuildRequires: xorg-macros >= 1.12 +%endif +BuildRequires: chrpath %description %{summary} - +%if %{with omap} %package omap Summary: Direct Rendering Manager omap api Group: Development/Libraries @@ -37,7 +95,7 @@ %description omap %{summary}. - +%endif %package radeon Summary: Direct Rendering Manager radeon api @@ -70,6 +128,7 @@ %description amdgpu %{summary}. + %ifarch %{ix86} x86_64 %package intel Summary: Direct Rendering Manager intel api @@ -87,10 +146,11 @@ Summary: Direct Rendering Manager development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} +%if %{with omap} Requires: %{name}-omap = %{version}-%{release} +%endif Requires: %{name}-radeon = %{version}-%{release} Requires: %{name}-nouveau = %{version}-%{release} -Requires: %{name}-amdgpu = %{version}-%{release} %ifarch %{ix86} x86_64 Requires: %{name}-intel = %{version}-%{release} %endif @@ -99,44 +159,54 @@ %description devel %{summary}. +%if %{with install_test_programs} +%package -n drm-utils +Summary: Direct Rendering Manager utilities +Requires: %{name}%{?_isa} = %{version}-%{release} +%description -n drm-utils +Utility programs for the kernel DRM interface. Will void your warranty. +%endif -%prep -%setup -q -n %{name}-%{version}/libdrm -# >> setup -# << setup +%prep +%setup -q -n %{name}-%{version}/upstream %build -unset LD_AS_NEEDED -# >> build pre -# << build pre - -%reconfigure --disable-static \ - --enable-omap-experimental-api - -make %{?jobs:-j%jobs} - -# >> build post -# << build post +%meson \ + %{bcond_meson libkms} \ + %{bcond_meson intel} \ + %{bcond_meson radeon} \ + %{bcond_meson amdgpu} \ + %{bcond_meson nouveau} \ + %{bcond_meson vmwgfx} \ + %{bcond_meson omap} \ + %{bcond_meson exynos} \ + %{bcond_meson freedreno} \ + %{bcond_meson tegra} \ + %{bcond_meson vc4} \ + %{bcond_meson etnaviv} \ + %{bcond_meson cairo_tests} \ + %{bcond_meson man_pages} \ + %{bcond_meson valgrind} \ + %{bcond_meson freedreno_kgsl} \ + %{bcond_meson install_test_programs} \ + %{bcond_meson udev} \ + %{nil} +%meson_build %install -rm -rf %{buildroot} -# >> install pre -# << install pre -%make_install - -# >> install post -# << install post -
[-] [+]	Changed	_service ^
@@ -1,12 +1,11 @@ <services> <service name="webhook"> - <param name="repourl">https://github.com/g7/libdrm.git</param> - <param name="branch">latte-native</param> + <param name="repourl">https://git.sailfishos.org/eugenio/libdrm.git</param> + <param name="branch">update-2.4.100</param> </service> <service name="tar_git"> - <param name="url">https://github.com/g7/libdrm.git</param> - <param name="branch">master</param> - <param name="revision">e4110f6d42cd1c559dd0f6d1fb0563191624a2a3</param> + <param name="url">https://git.sailfishos.org/eugenio/libdrm.git</param> + <param name="branch">update-2.4.100</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
	Deleted	_service:tar_git:libdrm-2.4.96+rebuild2.tar.bz2 ^
	Added	_service:tar_git:libdrm-2.4.97+update.2.4.100.20191126230320.1.gcd09098.tar.bz2 ^