Hello community, here is the log from the commit of package piglit for openSUSE:Factory checked in at 2018-03-31 15:36:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/piglit (Old) and /work/SRC/openSUSE:Factory/.piglit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "piglit" Sat Mar 31 15:36:54 2018 rev:4 rq:592197 version:1~20170607.bc6ef16df Changes: -------- --- /work/SRC/openSUSE:Factory/piglit/piglit.changes 2017-06-09 15:58:40.280965437 +0200 +++ /work/SRC/openSUSE:Factory/.piglit.new/piglit.changes 2018-03-31 15:36:59.373466553 +0200 @@ -1,0 +2,7 @@ +Tue Mar 27 11:54:22 UTC 2018 - [email protected] + +- Fix SOURCE5 installation +- Handle properly openGL and openGL ES tests +- Enable Build for %arm and AArch64 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ piglit.spec ++++++ --- /var/tmp/diff_new_pack.gztYim/_old 2018-03-31 15:36:59.993444074 +0200 +++ /var/tmp/diff_new_pack.gztYim/_new 2018-03-31 15:36:59.993444074 +0200 @@ -1,7 +1,7 @@ # # spec file for package piglit # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,16 @@ # +%ifarch %arm aarch64 +# Enable openGL ES only +%bcond_with opengl +%bcond_without opengles +%else +# Enable openGL and openGL ES +%bcond_without opengl +%bcond_without opengles +%endif + Name: piglit Version: 1~20170607.bc6ef16df Release: 0 @@ -41,11 +51,20 @@ BuildRequires: python3-xml BuildRequires: waffle-devel BuildRequires: pkgconfig(egl) +%if %{with opengl} BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(glu) +%endif +%if %{with opengles} +BuildRequires: Mesa-libGLESv3-devel +BuildRequires: pkgconfig(glesv1_cm) +BuildRequires: pkgconfig(glesv2) +%endif BuildRequires: pkgconfig(libdrm) +%ifarch x86_64 BuildRequires: pkgconfig(libdrm_intel) +%endif BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) @@ -56,7 +75,7 @@ Requires: python3-numpy Requires: python3-six Requires: python3-xml -ExcludeArch: %{ix86} %{arm} ppc +ExcludeArch: %{ix86} ppc %description Piglit is a collection of automated tests for OpenGL and OpenCL @@ -83,6 +102,14 @@ # CMAKE_BUILD_WITH_INSTALL_RPATH so the individual test binaries in # /usr/lib64/piglit/bin/* can find the libraries in /usr/lib64/piglit/lib %cmake \ +%if %{without opengl} + -DPIGLIT_BUILD_GL_TESTS=OFF \ +%endif +%if %{without opengles} + -DPIGLIT_BUILD_GL_ES1_TESTS=OFF \ + -DPIGLIT_BUILD_GL_ES2_TESTS=OFF \ + -DPIGLIT_BUILD_GL_ES3_TESTS=OFF \ +%endif -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON @@ -94,7 +121,7 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_libdir}/piglit/tests install -D -m 644 %{SOURCE3} %{buildroot}%{_libdir}/piglit/tests install -D -m 644 %{SOURCE4} %{buildroot}%{_libdir}/piglit/tests -install -D -m 644 %{SOURCE4} %{buildroot}%{_libdir}/piglit/tests +install -D -m 644 %{SOURCE5} %{buildroot}%{_libdir}/piglit/tests %fdupes %{buildroot}/%{_libdir}/piglit %post -p /sbin/ldconfig
