From a322fe8296a46d3d6fbfe7a4521752a9fc801093 Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: May 16 2017 10:39:47 +0000 Subject: New release required for testing of Vulcan. --- diff --git a/.gitignore b/.gitignore index 19a5344..4607075 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/piglit.tar.bz2 +piglit-*.tar.xz +piglit.tar.bz2 diff --git a/piglit.spec b/piglit.spec index 50bb828..73a98de 100644 --- a/piglit.spec +++ b/piglit.spec @@ -1,6 +1,6 @@ Name: piglit -Version: 1 -Release: 0.25.20150206GITi9c8b329%{?dist} +Version: 1.0.20170515 +Release: 4.GITa969d23f%{?dist} Summary: Collection of automated tests for OpenGL implementations Group: Development/Tools @@ -11,21 +11,36 @@ URL: http://cgit.freedesktop.org/piglit/ Source0: piglit.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python >= 2.7 -BuildRequires: numpy > 1.6.2 BuildRequires: cmake +BuildRequires: gcc BuildRequires: chrpath -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -BuildRequires: libX11-devel BuildRequires: waffle-devel -BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libXrender-devel +BuildRequires: pkgconfig(dri), pkgconfig(gl) +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(libpng) +BuildRequires: ocl-icd-devel opencl-headers +%if 0%{?rhel} && 0%{?rhel} < 8 +BuildRequires: python >= 2.7 +BuildRequires: numpy >= 1.7.0 BuildRequires: python-mako >= 0.7.3 BuildRequires: python-nose BuildRequires: python-lxml -Requires: python-mako >= 0.7.3 +BuildRequires: python-six >= 1.5.2 +Requires: python-mako >= 0.8.0 +%else +BuildRequires: python3 >= 3.5 +BuildRequires: python3-numpy >= 1.7.0 +BuildRequires: python3-mako >= 0.8.0 +BuildRequires: python3-nose +BuildRequires: python3-lxml +BuildRequires: python3-six >= 1.5.2 +Requires: python3-mako >= 0.8.0 +%endif +Requires: /usr/bin/clinfo %description @@ -36,21 +51,40 @@ OpenGL drivers by providing developers with a simple means to perform regression tests. %prep -%setup -q -n %{name} +%autosetup -n %{name} + +rm -rf build +mkdir build %build -%cmake -DCMAKE_BUILD_TYPE:STRING=Debug \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} . -make VERBOSE=1 %{?_smp_mflags} +pushd build + +%cmake ../ \ +%ifarch i686 + -DCMAKE_C_FLAGS_DEBUG:STRING=-O0 -DCMAKE_CXX_FLAGS_DEBUG:STRING=-O0 \ +%endif + -DCMAKE_BUILD_TYPE:STRING=Debug \ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ + -DPIGLIT_BUILD_CL_TESTS=1 + make VERBOSE=1 %{?_smp_mflags} + +popd %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +pushd build + %make_install +popd -# We don't want this in its own doc directory. -rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} +# # We don't want this in its own doc directory. +# rm -rf %{buildroot}%{_defaultdocdir}/%{name} +%files +%license COPYING licences/* +%doc README HACKING RELEASE examples +%{_bindir}/%{name} +%{_datadir}/bash-completion/completions/%{name} +%{_libdir}/%{name}/ %clean rm -rf $RPM_BUILD_ROOT @@ -64,6 +98,19 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 15 2017 Matěj Cepl - 1.0.20170515-4.GITa969d23f +- New release required for testing of Vulcan. + +* Tue Feb 21 2017 Matěj Cepl - 1.0.20170221-4.git2e97840 +- Upgrading to the latest checkout. + +* Sat Feb 11 2017 Fedora Release Engineering - 1.0.20160901-3.git2401e47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Sep 02 2016 Adam Jackson - 1.0.20160831-2.git2401e479 +- Spell python3-mako correctly + + * Thu Jul 30 2015 Matej Cepl - 1-0.25.20150206GITi9c8b329 - Add python-mako Requires (RHBZ# 1247936) diff --git a/sources b/sources index afd4354..45c9720 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c8d7385933df9231f3adc06bd81c100 piglit.tar.bz2 +SHA512 (piglit.tar.bz2) = bb2c4be1c01b6dbc7fcb4230f8ad9bac9714e28ba724f9bc96a84eed62bfbe0672dc6e2af35f39d8321c23051e2de91f5e0bb876eeccc401ffeac125b16ccf7b