[piglit] Update of piglit to the current upstream master.
Matej Cepl
mcepl at fedoraproject.org
Sat Jan 3 20:31:52 UTC 2015
commit 7312bd002a9a15db49bda89540ef3391fd5e0693
Author: Matěj Cepl <mcepl at cepl.eu>
Date: Sat Jan 3 21:31:21 2015 +0100
Update of piglit to the current upstream master.
Unfortunately, it crashes on my system and make install is broken
(see https://bugzilla.redhat.com/show_bug.cgi?id=1177151 for details).
piglit.spec | 71 ++++++++++++++++++++++++++++++-----------------------------
sources | 2 +-
2 files changed, 37 insertions(+), 36 deletions(-)
---
diff --git a/piglit.spec b/piglit.spec
index 7b8c588..6013d1c 100644
--- a/piglit.spec
+++ b/piglit.spec
@@ -1,6 +1,6 @@
Name: piglit
Version: 1
-Release: 0.20.20140414GIT8775223%{?dist}
+Release: 0.20.20150103GIT4adb082%{?dist}
Summary: Collection of automated tests for OpenGL implementations
Group: Development/Tools
@@ -17,7 +17,7 @@ BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, freeglut-devel
BuildRequires: waffle-devel
%endif
BuildRequires: libX11-devel, libpng-devel, libtiff-devel, libXrender-devel
-BuildRequires: python-mako
+BuildRequires: python-mako, python-nose, python-lxml
# Only for python < 2.7
%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
@@ -47,43 +47,44 @@ make VERBOSE=1 %{?_smp_mflags}
#TODO /usr/lib64/piglit/tests/glslparsertest/glsl2/xonotic-vs-generic-diffuse.vert
-chmod +x framework/{gtest,opencv}.py \
- generated_tests/{gen_builtin_packing_tests,generate-cl-math-builtins}.py \
- generated_tests/{generate-cl-store-tests,gen_shader_bit_encoding_tests}.py \
- generated_tests/generate-cl-relational-builtins.py \
- tests/{all_cl,cl,oglconform,quick_cl}.py
-
-chmod -x generated_tests/generate-cl-int-builtins.py \
- tests/cl/program/build/{other-data-types,scalar-data-types}.cl \
- tests/cl/program/execute/scalar-arithmetic-ushort.cl
+#chmod +x framework/opencv.py \
+# generated_tests/{gen_builtin_packing_tests,generate-cl-math-builtins}.py \
+# generated_tests/{generate-cl-store-tests,gen_shader_bit_encoding_tests}.py \
+# generated_tests/generate-cl-relational-builtins.py \
+# tests/{all_cl,cl,oglconform,quick_cl}.py
+#
+#chmod -x generated_tests/generate-cl-int-builtins.py \
+# tests/cl/program/build/{other-data-types,scalar-data-types}.cl \
+# tests/cl/program/execute/scalar-arithmetic-ushort.cl
%install
rm -rf $RPM_BUILD_ROOT
-
-# remove superfluous cruft
-find . \( -name CMakeLists\*.txt -o -name \*.cmake \) -delete
-find . -name \*.hpp -delete
-
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/
-cp -p -r {bin,framework,generated_tests,lib,templates,tests} piglit*.py \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/
-install -d $RPM_BUILD_ROOT%{_bindir}
-for srcfile in piglit*.py ; do
- ln -sf %{_libdir}/%{name}/${srcfile} \
- $RPM_BUILD_ROOT%{_bindir}/$(basename ${srcfile} .py)
-done
-
-# Remove .o objects and C source code
-find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.[coh] -delete
-find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.cpp -delete
-find $RPM_BUILD_ROOT%{_libdir}/%{name} -name .git\* -delete
-
-# Remove spurious script
-rm -fv documentation/build-results.sh
-
-# Remove rpath
-chrpath -d -k $RPM_BUILD_ROOT%{_libdir}/%{name}/{bin,lib}/*
+make install DESTDIR=$RPM_BUILD_ROOT
+
+## # remove superfluous cruft
+## find . \( -name CMakeLists\*.txt -o -name \*.cmake \) -delete
+## find . -name \*.hpp -delete
+##
+## install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/
+## cp -p -r {bin,framework,generated_tests,lib,templates,tests} piglit*.py \
+## $RPM_BUILD_ROOT%{_libdir}/%{name}/
+## install -d $RPM_BUILD_ROOT%{_bindir}
+## for srcfile in piglit*.py ; do
+## ln -sf %{_libdir}/%{name}/${srcfile} \
+## $RPM_BUILD_ROOT%{_bindir}/$(basename ${srcfile} .py)
+## done
+##
+## # Remove .o objects and C source code
+## find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.[coh] -delete
+## find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.cpp -delete
+## find $RPM_BUILD_ROOT%{_libdir}/%{name} -name .git\* -delete
+##
+## # Remove spurious script
+## rm -fv documentation/build-results.sh
+##
+## # Remove rpath
+## chrpath -d -k $RPM_BUILD_ROOT%{_libdir}/%{name}/{bin,lib}/*
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/sources b/sources
index bb50e3a..11bc2d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c7369f7ef5dcf7f6106839beab74321 piglit.tar.bz2
+0867f5abc91d7328df7ded60d68ac4c0 piglit.tar.bz2
More information about the scm-commits
mailing list