debian/changelog | 14 ++++- debian/control | 3 - debian/mesa-utils-extra.install | 1 debian/mesa-utils-extra.install.linux | 7 ++ debian/mesa-utils-extra.links | 1 debian/mesa-utils-extra.links.linux | 6 ++ debian/patches/configure.ac-Auto-detect-wayland-support.diff | 27 +++++++++++ debian/patches/series | 1 debian/source/local-options | 11 ++++ debian/watch | 2 10 files changed, 68 insertions(+), 5 deletions(-)
New commits: commit d0f5e3d000023965aabc3aadb986410a1a343bb8 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Sep 6 17:40:39 2016 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index e9bcaaf..2cd955e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa-demos (8.3.0-2) UNRELEASED; urgency=medium +mesa-demos (8.3.0-2) unstable; urgency=medium [ Sven Joachim ] * Build mesa-utils-extra on all architectures (Closes: #835270). @@ -12,7 +12,7 @@ mesa-demos (8.3.0-2) UNRELEASED; urgency=medium - Add configure.ac-Auto-detect-wayland-support.diff. - Add build-dep on libwayland-dev. - -- Sven Joachim <svenj...@gmx.de> Sat, 27 Aug 2016 09:06:38 +0200 + -- Andreas Boll <andreas.boll....@gmail.com> Tue, 06 Sep 2016 17:40:28 +0200 mesa-demos (8.3.0-1) unstable; urgency=medium commit 0f44ba7efd7a0c5bde9f40d0da4ad3a1e85629be Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Sep 6 17:26:19 2016 +0200 Enable and ship es2gears_wayland on Linux (Closes: #829276) - Add configure.ac-Auto-detect-wayland-support.diff. - Add build-dep on libwayland-dev. diff --git a/debian/changelog b/debian/changelog index 41b0aec..e9bcaaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ mesa-demos (8.3.0-2) UNRELEASED; urgency=medium * control: Bump Standards-Version to 3.9.8 (no changes). * source/local-options: Add more files to extend-diff-ignore option. Fixes 31 patch-system-but-direct-changes-in-diff lintian warnings. + * Enable and ship es2gears_wayland on Linux (Closes: #829276) + - Add configure.ac-Auto-detect-wayland-support.diff. + - Add build-dep on libwayland-dev. -- Sven Joachim <svenj...@gmx.de> Sat, 27 Aug 2016 09:06:38 +0200 diff --git a/debian/control b/debian/control index 2a5ddfa..768e51a 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 9), libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev, + libwayland-dev [linux-any], Homepage: http://mesa3d.org/ Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/mesa-demos.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/mesa-demos.git diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install index f98169f..a913c7e 100644 --- a/debian/mesa-utils-extra.install +++ b/debian/mesa-utils-extra.install @@ -1,3 +1,4 @@ +# This file gets tweaked in an OS-specific fashion (see mesa-utils-extra.install.linux) usr/bin/es2_info usr/bin/es2gears_x11 usr/bin/es2tri diff --git a/debian/mesa-utils-extra.install.linux b/debian/mesa-utils-extra.install.linux new file mode 100644 index 0000000..ecfdd20 --- /dev/null +++ b/debian/mesa-utils-extra.install.linux @@ -0,0 +1,7 @@ +# OS-independent part (from mesa-utils-extra.install): +usr/bin/es2_info +usr/bin/es2gears_x11 +usr/bin/es2tri + +# Wayland support, only on Linux: +usr/bin/es2gears_wayland diff --git a/debian/mesa-utils-extra.links b/debian/mesa-utils-extra.links index f2e18c0..0dc4e9f 100644 --- a/debian/mesa-utils-extra.links +++ b/debian/mesa-utils-extra.links @@ -1,2 +1,3 @@ +# This file gets tweaked in an OS-specific fashion (see mesa-utils-extra.links.linux) /usr/bin/es2gears_x11 /usr/bin/es2gears /usr/share/man/man1/es2gears.1 /usr/share/man/man1/es2gears_x11.1 diff --git a/debian/mesa-utils-extra.links.linux b/debian/mesa-utils-extra.links.linux new file mode 100644 index 0000000..a9892c7 --- /dev/null +++ b/debian/mesa-utils-extra.links.linux @@ -0,0 +1,6 @@ +# OS-independent part (from mesa-utils-extra.links): +/usr/bin/es2gears_x11 /usr/bin/es2gears +/usr/share/man/man1/es2gears.1 /usr/share/man/man1/es2gears_x11.1 + +# Wayland support, only on Linux: +/usr/share/man/man1/es2gears.1 /usr/share/man/man1/es2gears_wayland.1 diff --git a/debian/patches/configure.ac-Auto-detect-wayland-support.diff b/debian/patches/configure.ac-Auto-detect-wayland-support.diff new file mode 100644 index 0000000..c5ca77e --- /dev/null +++ b/debian/patches/configure.ac-Auto-detect-wayland-support.diff @@ -0,0 +1,27 @@ +commit ddd5565849e3a5cb83bf5d3c70bc6222e3828423 +Author: Andreas Boll <andreas.boll....@gmail.com> +Date: Tue Sep 6 16:53:56 2016 +0200 + + configure.ac: Auto-detect wayland support + + Automatically enables building of wayland demo(s) if the required + build dependencies are available. + + Signed-off-by: Andreas Boll <andreas.boll....@gmail.com> + +diff --git a/configure.ac b/configure.ac +index ddc68b5..517d196 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -208,9 +208,9 @@ fi + + AC_ARG_ENABLE([wayland], + [AS_HELP_STRING([--enable-wayland], +- [enable support for wayland @<:@default=no@:>@])], ++ [enable support for wayland @<:@default=auto@:>@])], + [wayland_enabled="$enableval"], +- [wayland_enabled=no]) ++ [wayland_enabled=auto]) + + if test "x$wayland_enabled" != "xno"; then + PKG_CHECK_MODULES(WAYLAND, [wayland-client wayland-egl], [wayland_enabled=yes], [wayland_enabled=no]) diff --git a/debian/patches/series b/debian/patches/series index 39ce469..b1c85b8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ no_eglfbdev.diff configure.ac-Fix-default-behavior-of-AC_ARG_WITH-glut.patch +configure.ac-Auto-detect-wayland-support.diff commit 7b2d1d5ec5df3e20c08943ec78df66b145177ec5 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Sep 6 16:12:29 2016 +0200 source/local-options: Add more files to extend-diff-ignore option. Fixes 31 patch-system-but-direct-changes-in-diff lintian warnings. diff --git a/debian/changelog b/debian/changelog index 51afd0c..41b0aec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ mesa-demos (8.3.0-2) UNRELEASED; urgency=medium [ Andreas Boll ] * watch: Update url to use https instead of ftp. * control: Bump Standards-Version to 3.9.8 (no changes). + * source/local-options: Add more files to extend-diff-ignore option. + Fixes 31 patch-system-but-direct-changes-in-diff lintian warnings. -- Sven Joachim <svenj...@gmx.de> Sat, 27 Aug 2016 09:06:38 +0200 diff --git a/debian/source/local-options b/debian/source/local-options index 06f336e..9e80d22 100644 --- a/debian/source/local-options +++ b/debian/source/local-options @@ -1 +1,10 @@ ---extend-diff-ignore=src/egl/opengles2/es2_info.c +# ignore symlinks from git, use source files from the tarball +extend-diff-ignore = src/egl/opengles2/es2_info.c + +## The following files aren't shipped in the upstream tarball + +# CMake files +extend-diff-ignore = CMakeLists.txt + +# misc. files and scripts used by Mesa-demos developers but not required for the build +extend-diff-ignore = \.emacs-dirvars|autogen\.sh commit d387f4cb82e78600e32ee29c20e0d3f2aa8c2952 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Sep 6 15:25:28 2016 +0200 control: Bump Standards-Version to 3.9.8 (no changes). diff --git a/debian/changelog b/debian/changelog index 8f432bb..51afd0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mesa-demos (8.3.0-2) UNRELEASED; urgency=medium [ Andreas Boll ] * watch: Update url to use https instead of ftp. + * control: Bump Standards-Version to 3.9.8 (no changes). -- Sven Joachim <svenj...@gmx.de> Sat, 27 Aug 2016 09:06:38 +0200 diff --git a/debian/control b/debian/control index 5537d90..2a5ddfa 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Maarten Lankhorst <maarten.lankho...@ubuntu.com>, Andreas Boll <andreas.boll....@gmail.com> -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Build-Depends: debhelper (>= 9), quilt, pkg-config, commit 957dcb0dff991ebb071133cb88ad4934224ed7a6 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Sep 6 15:19:52 2016 +0200 watch: Update url to use https instead of ftp. diff --git a/debian/changelog b/debian/changelog index c9debed..8f432bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ mesa-demos (8.3.0-2) UNRELEASED; urgency=medium + [ Sven Joachim ] * Build mesa-utils-extra on all architectures (Closes: #835270). + [ Andreas Boll ] + * watch: Update url to use https instead of ftp. + -- Sven Joachim <svenj...@gmx.de> Sat, 27 Aug 2016 09:06:38 +0200 mesa-demos (8.3.0-1) unstable; urgency=medium diff --git a/debian/watch b/debian/watch index 66675ee..095d6fb 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ #git=git://anongit.freedesktop.org/mesa/demos version=3 opts="uversionmangle=s/-rc/~rc/,pgpsigurlmangle=s/$/.sig/" \ -ftp://freedesktop.org/pub/mesa/demos/([\d\.]*)/ mesa-demos-(.*)\.tar\.gz +https://mesa.freedesktop.org/archive/demos/([\d\.]*)/ mesa-demos-(.*)\.tar\.gz