Control: tags 830145 + patch
Control: tags 830145 + pending
Dear maintainer,
I've prepared an NMU for piglit (versioned as 0~git20170210-508210dc1-1.1)
and uploaded it to DELAYED/10. Please feel free to tell me if I should
cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru piglit-0~git20170210-508210dc1/debian/changelog piglit-0~git20170210-508210dc1/debian/changelog
--- piglit-0~git20170210-508210dc1/debian/changelog 2017-02-10 23:51:50.000000000 +0200
+++ piglit-0~git20170210-508210dc1/debian/changelog 2017-10-14 18:26:57.000000000 +0300
@@ -1,3 +1,15 @@
+piglit (0~git20170210-508210dc1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Dependency fixes:
+ - remove ${misc:Pre-Depends} from Depends
+ - add ${python3:Depends} instead of manual python3
+ - add python3-mako (Closes: #830145)
+ * Workaround gcc-7 memory usage regression by building
+ with -O1 on i386.
+
+ -- Adrian Bunk <[email protected]> Sat, 14 Oct 2017 18:26:57 +0300
+
piglit (0~git20170210-508210dc1-1) unstable; urgency=low
* Update piglit upstream version to 508210dc1
diff -Nru piglit-0~git20170210-508210dc1/debian/control piglit-0~git20170210-508210dc1/debian/control
--- piglit-0~git20170210-508210dc1/debian/control 2017-02-10 23:51:50.000000000 +0200
+++ piglit-0~git20170210-508210dc1/debian/control 2017-10-14 18:26:57.000000000 +0300
@@ -25,7 +25,7 @@
Package: piglit
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Pre-Depends}, ${misc:Depends},
- python3-six, python3
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ ${python3:Depends}, python3-six, python3-mako
Description: Open-source test suite for OpenGL and OpenCL implementations
Piglit is an open-source test suite for OpenGL and OpenCL implementations.
diff -Nru piglit-0~git20170210-508210dc1/debian/rules piglit-0~git20170210-508210dc1/debian/rules
--- piglit-0~git20170210-508210dc1/debian/rules 2017-02-10 23:51:50.000000000 +0200
+++ piglit-0~git20170210-508210dc1/debian/rules 2017-10-14 18:26:57.000000000 +0300
@@ -6,6 +6,23 @@
%:
dh $@ --parallel --buildsystem cmake --with python3
+# workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82364
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifneq (,$(filter $(DEB_HOST_ARCH), i386))
+export DEB_CFLAGS_MAINT_APPEND=-O1 -DNDEBUG
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ -DPIGLIT_BUILD_GLES1_TESTS=1 \
+ -DPIGLIT_BUILD_GLES2_TESTS=1 \
+ -DPIGLIT_BUILD_GLES3_TESTS=1 \
+ -DPIGLIT_BUILD_CL_TESTS=1 \
+ -DPIGLIT_USE_WAFFLE=1
+
+else
+
override_dh_auto_configure:
dh_auto_configure -- \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -17,6 +34,8 @@
-DPIGLIT_BUILD_CL_TESTS=1 \
-DPIGLIT_USE_WAFFLE=1
+endif
+
override_dh_auto_install:
dh_auto_install
find $(DEB_DESTDIR) -type d -name __pycache__ -exec rm -r {} +
