--- wayland-1.18.0.orig/.editorconfig +++ wayland-1.18.0/.editorconfig @@ -0,0 +1,19 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = tab +indent_size = 8 +max_line_length = 80 + +[*.xml] +indent_style = space +indent_size = 2 +tab_width = 8 + +[*.py] +indent_style = space +indent_size = 4 --- wayland-1.18.0.orig/.gitlab-ci.yml +++ wayland-1.18.0/.gitlab-ci.yml @@ -0,0 +1,55 @@ +image: debian:stretch + +stages: + - build + +before_script: + - echo 'path-exclude=/usr/share/doc/*' > /etc/dpkg/dpkg.cfg.d/99-exclude-cruft + - echo 'path-exclude=/usr/share/man/*' >> /etc/dpkg/dpkg.cfg.d/99-exclude-cruft + - echo '#!/bin/sh' > /usr/sbin/policy-rc.d + - echo 'exit 101' >> /usr/sbin/policy-rc.d + - chmod +x /usr/sbin/policy-rc.d + - echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list + - apt-get update + - apt-get -y --no-install-recommends install build-essential automake autoconf libtool pkg-config libexpat1-dev libffi-dev libxml2-dev doxygen graphviz xmlto xsltproc docbook-xsl meson/stretch-backports + +build-native-autotools: + stage: build + script: + - export BUILD_ID="wayland-$CI_JOB_NAME_$CI_COMMIT_SHA-$CI_JOB_ID" + - export PREFIX="$(pwd)/prefix-$BUILD_ID" + - export BUILDDIR="$(pwd)/build-$BUILD_ID" + - export MAKEFLAGS="-j4" + - mkdir "$BUILDDIR" "$PREFIX" + - cd "$BUILDDIR" + - ../autogen.sh --prefix="$PREFIX" --with-icondir=/usr/share/X11/icons + - make all + - make check + - make install + - make distcheck + artifacts: + name: wayland-$CI_COMMIT_SHA-$CI_JOB_ID + when: always + paths: + - build-*/wayland-*.tar.xz + - build-*/wayland*/_build/sub/*.log + - build-*/*.log + - prefix-* + +build-native-meson: + stage: build + script: + - export BUILD_ID="wayland-$CI_JOB_NAME_$CI_COMMIT_SHA-$CI_JOB_ID" + - export PREFIX="$(pwd)/prefix-$BUILD_ID" + - export BUILDDIR="$(pwd)/build-$BUILD_ID" + - mkdir "$BUILDDIR" "$PREFIX" + - cd "$BUILDDIR" + - meson --prefix="$PREFIX" -Dicon_directory=/usr/share/X11/icons .. + - ninja -k0 test + - ninja clean + artifacts: + name: wayland-meson-$CI_COMMIT_SHA-$CI_JOB_ID + when: always + paths: + - build-meson/meson-logs + - prefix-* --- wayland-1.18.0.orig/debian/README.source +++ wayland-1.18.0/debian/README.source @@ -0,0 +1,61 @@ +Useful upstream remote: +git remote add upstream https://gitlab.freedesktop.org/wayland/wayland.git + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- wayland-1.18.0.orig/debian/changelog +++ wayland-1.18.0/debian/changelog @@ -0,0 +1,459 @@ +wayland (1.18.0-2~exp1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add missing dependency on libffi-dev (closes: #969284). + + -- Julien Cristau Mon, 31 Aug 2020 10:10:12 +0200 + +wayland (1.18.0-2~exp1) unstable; urgency=medium + + * Switch build system to meson + + -- Héctor Orón Martínez Wed, 12 Aug 2020 13:38:40 +0200 + +wayland (1.18.0-1) unstable; urgency=medium + + * New upstream release. + + -- Héctor Orón Martínez Wed, 12 Feb 2020 11:08:11 +0100 + +wayland (1.17.93-1~exp1) experimental; urgency=medium + + * RC1 for Wayland 1.18 + * debian/control: bump Standards-Version, no changes + * debian/*.symbols: update + + -- Héctor Orón Martínez Sun, 09 Feb 2020 20:56:23 +0100 + +wayland (1.17.0-1) unstable; urgency=medium + + [ Timo Aaltonen ] + * control: Bump breaks/replaces on libwayland-egl-mesa/libegl1-mesa- + dev, which got updated on Ubuntu. + + [ Héctor Orón Martínez ] + * New upstream release + * debian/README.source: add upstream remote information + * debian/libwayland-server0.symbols: update symbols file + + -- Héctor Orón Martínez Sun, 21 Jul 2019 20:30:10 +0200 + +wayland (1.16.0-1) unstable; urgency=medium + + [ Emilio Pozuelo Monfort ] + * Update the watch file for the new upstream website layout. + + [ Salvatore Bonaccorso ] + * Add debian/changelog entry for 1.14.0-2 (Closes: #903748) + + [ Timo Aaltonen ] + * New upstream release. + + -- Timo Aaltonen Wed, 05 Sep 2018 20:20:03 +0300 + +wayland (1.15.0-2) unstable; urgency=medium + + * debian/copyright: add missing copyright holders. Closes: #897362. + * Update Vcs-* for salsa. + + -- Emilio Pozuelo Monfort Sat, 19 May 2018 12:34:01 +0200 + +wayland (1.15.0-1) unstable; urgency=medium + + * New upstream release. + * Put wayland-egl-backend.* to a separate dev-package. + * libwayland-egl1.symbols: Fixed. + * control: Bump Breaks/Replaces on libegl1-mesa-dev, so that this can + be synced to Ubuntu. + + -- Timo Aaltonen Wed, 18 Apr 2018 10:41:38 +0300 + +wayland (1.14.93-1) experimental; urgency=medium + + * New upstrem release candidate. + + -- Timo Aaltonen Tue, 03 Apr 2018 10:53:33 +0300 + +wayland (1.14.92-1) experimental; urgency=medium + + [ Timo Aaltonen ] + * New upstream pre-release. + * signing-keys.asc: Updated. + * libwayland-dev.install: Drop static libs, they're not provided + anymore. + * libwayland-egl1.symbols: Updated. + * control: Adjust Breaks/Provides for libwayland-egl migration. + + [ Héctor Orón Martínez ] + * control: Fix uninstallability issues. (Closes: #893366) + + -- Timo Aaltonen Wed, 21 Mar 2018 21:42:58 +0200 + +wayland (1.14.91-1) experimental; urgency=medium + + [ Helmut Grohne ] + * Use wayland-scanner from libwayland-bin (Closes: #836687) + - Fixes cross builds + + [ Héctor Orón Martínez ] + * New upstream pre-release + * debian/control: libwayland-dev suggests libwayland-doc (Closes: #857139) + * debian/libwayland-server0.symbols: update + * debian/control: update priority from extra to optional + * libwayland-egl1: add new package + * debian/control: bump standards version + + -- Héctor Orón Martínez Tue, 13 Mar 2018 16:01:40 +0100 + +wayland (1.14.0-2) unstable; urgency=medium + + * debian/patches/CVE-2017-16612.patch: (Closes: #889681) + - libXcursor before 1.1.15 has various integer overflows that could lead + to heap buffer overflows when processing malicious cursors, e.g., with + programs like GIMP. It is also possible that an attack vector exists + against the related code in cursor/xcursor.c in Wayland through + 1.14.0. + * switch back to use upstream tarball + * debian/control: bump standards version, drop priority stanzas + + -- Héctor Orón Martínez Sun, 04 Mar 2018 11:56:31 +0100 + +wayland (1.14.0-1) unstable; urgency=medium + + * New upstream release. + * libwayland-{client,server}0.symbols: Updated. + + -- Timo Aaltonen Thu, 10 Aug 2017 11:09:15 +0300 + +wayland (1.13.0-1) unstable; urgency=medium + + * New upstream release. (Closes: #870566) + * libwayland-server0.symbols: Updated. + + -- Timo Aaltonen Thu, 03 Aug 2017 11:25:29 +0300 + +wayland (1.12.0-1) unstable; urgency=medium + + * New upstream release. Closes: #840752. + * Update various links to https. + * Verify upstream tarball signatures. Thanks Hideki Yamane. + * Bump debhelper compat to 10. + + debhelper now calls dh-autoreconf by default. + + -- Emilio Pozuelo Monfort Wed, 07 Dec 2016 18:54:57 +0100 + +wayland (1.11.94-1) experimental; urgency=medium + + * New upstream pre-release. + * Standards-Version is 3.9.8, no changes needed. + + -- Emilio Pozuelo Monfort Wed, 14 Sep 2016 12:10:19 +0200 + +wayland (1.11.91-1) experimental; urgency=medium + + * New upstream pre-release + + -- Héctor Orón Martínez Thu, 18 Aug 2016 17:18:52 +0200 + +wayland (1.11.0-2) unstable; urgency=medium + + * d/control: libwayland-dev depends on libwayland-bin + * d/control: libwayland-bin replaces libwayland-dev + + -- Héctor Orón Martínez Mon, 06 Jun 2016 11:28:46 +0200 + +wayland (1.11.0-1) unstable; urgency=medium + + * New upstream release + * d/control: make libwayland-dev multiarch aware + - based on a patch from Dima Kogan. + (Closes: #739400) + * d/libwayland-client0.symbols: update with new symbols + + -- Héctor Orón Martínez Thu, 02 Jun 2016 11:37:00 +0200 + +wayland (1.10.0-2) unstable; urgency=medium + + * Don't build the documentation on binary-arch only builds. Move the + build-dependencies needed for the documentation to build-depends-indep. + Closes: #821170. + * Move the manpages to libwayland-doc. + * Switch to dbgsym packages. + + -- Emilio Pozuelo Monfort Wed, 20 Apr 2016 21:38:58 +0200 + +wayland (1.10.0-1) unstable; urgency=medium + + * New upstream release + + -- Héctor Orón Martínez Thu, 31 Mar 2016 13:13:12 +0200 + +wayland (1.9.92-1) experimental; urgency=medium + + * New upstream release, experimental upload. + + [ Hideki Yamane ] + * debian/control + - add Build-Depends: libxml2-dev + * update debian/libwayland-{client,server}0.symbols + * update debian/watch (Closes: #813484) + + -- Héctor Orón Martínez Thu, 04 Feb 2016 23:22:27 +0100 + +wayland (1.9.0-1) unstable; urgency=medium + + * New upstream release + + -- Héctor Orón Martínez Sun, 27 Sep 2015 00:08:11 +0200 + +wayland (1.8.1-1) unstable; urgency=medium + + * New upstream release + + -- Hector Oron Sat, 13 Jun 2015 02:00:30 +0200 + +wayland (1.7.0-2) unstable; urgency=medium + + * Remove Cyril from Uploaders. Thanks for your past work! + * Upload to unstable. + + -- Emilio Pozuelo Monfort Wed, 27 May 2015 00:35:08 +0200 + +wayland (1.7.0-1) experimental; urgency=medium + + [ Timo Aaltonen ] + * New upstream release. + * control: Add xmlto and graphviz to build-depends to build the + new documentation. + * libwayland-doc: Add a new package for documentation files. + + [ Hector Oron ] + * Upload to experimental. + + -- Hector Oron Wed, 06 May 2015 12:35:23 +0200 + +wayland (1.6.1-2) experimental; urgency=medium + + * Rebuild against upstream tarball. + + -- Hector Oron Sat, 24 Jan 2015 10:39:19 +0100 + +wayland (1.6.1-1) experimental; urgency=medium + + * New bugfix upstream release: + - documentation: fix several typoes. + - scanner, client: several improvements. + - tests: fix memory leak + * d/control: update VCS URL + * d/control: bump standards version, no changes needed. + + -- Hector Oron Wed, 24 Sep 2014 01:01:26 +0200 + +wayland (1.6.0-2) unstable; urgency=medium + + * Switch back to use upstream tarball. + + -- Hector Oron Tue, 23 Sep 2014 18:09:53 +0200 + +wayland (1.6.0-1) unstable; urgency=medium + + * New upstream release. + + -- Hector Oron Fri, 19 Sep 2014 16:28:13 +0200 + +wayland (1.5.93-2) unstable; urgency=medium + + * Upload to unstable. + + -- Emilio Pozuelo Monfort Tue, 16 Sep 2014 22:42:06 +0200 + +wayland (1.5.93-1) experimental; urgency=medium + + * New upstream development release. + * Upload to experimental. + + -- Hector Oron Fri, 12 Sep 2014 16:17:43 +0200 + +wayland (1.5.91-1) experimental; urgency=medium + + [ Andreas Henriksson ] + * New upstream development release. + * Update debian/libwayland-client0.symbols with two additions + * Update debian/libwayland-server0.symbols with one addition + + [ Emilio Pozuelo Monfort ] + * Upload to experimental. + + -- Emilio Pozuelo Monfort Fri, 05 Sep 2014 03:10:22 +0200 + +wayland (1.5.0-1) unstable; urgency=medium + + * New upstream release. + * Switch back to source format 1.0 for now. + * debian/libwayland-dev.install: + + Update path for wayland-scanner.pc. + + -- Emilio Pozuelo Monfort Sat, 24 May 2014 02:54:40 +0200 + +wayland (1.4.0-1) unstable; urgency=medium + + * New upstream release 1.4.0: + - SHM Buffer SIBGUS protection. + - Subsurfaces protocol moved to wayland repo and promoted to official + wayland protocol + - wl_proxy_set_queue() can take a NULL queue to reset back to default + queue. + - Fix race between wl_proxy_create() and wl_proxy_marshal() + - scanner error message improvements and documentation improvements + * d/control: Further bump the libwayland0 C/R to cover Collabora version. + Thanks Peter Green for patch. + (Closes: #731607) + * d/control: update standards version + + -- Hector Oron Thu, 30 Jan 2014 23:49:42 +0100 + +wayland (1.3.92-1) unstable; urgency=medium + + * New upstream release (1.3.92) + * d/libwayland-dev.install: + - add wayland DTD and XML under default dtddir. + + -- Hector Oron Sat, 18 Jan 2014 18:16:17 +0100 + +wayland (1.3.0-1) unstable; urgency=low + + [ Timo Aaltonen ] + * control: Bump the libwayland0 C/R to (<< 1.1.0) so that it covers + the ubuntu version too, and add it to -cursor. + + [ Hector Oron ] + * New upstream stable release (1.3.0). + * Add myself to Uploaders. + * Switch to Debian source format 3.0 quilt. + * d/libwayland-dev.install: + - install wayland documentation + + -- Hector Oron Fri, 11 Oct 2013 11:23:38 +0200 + +wayland (1.2.1-1) unstable; urgency=low + + [ Sven Joachim ] + * New upstream release (1.2.0). + * Update symbols files and bump shlibs of libwayland-{client,server}0. + - ABI break: libwayland-server0 removed several symbols used by + weston releases prior to 1.2, add a Breaks to accommodate that. + + [ Emilio Pozuelo Monfort ] + * New upstream stable release (1.2.1). + * Add myself to Uploaders. + + -- Emilio Pozuelo Monfort Sun, 08 Sep 2013 19:46:04 +0200 + +wayland (1.1.0-2) unstable; urgency=low + + * Team upload. + * Upload to unstable. + + -- Emilio Pozuelo Monfort Thu, 06 Jun 2013 23:22:34 +0200 + +wayland (1.1.0-1) experimental; urgency=low + + * Team upload. + * New upstream release. + * debian/libwayland-client0.symbols + debian/libwayland-server0.symbols: + + Add a couple of new symbols. + * debian/rules: + + Bump SHVER accordingly. + + -- Emilio Pozuelo Monfort Mon, 03 Jun 2013 08:44:14 +0200 + +wayland (1.0.5-2) experimental; urgency=low + + * Team upload. + * Add missing conflict/replaces for the library split. + + -- Emilio Pozuelo Monfort Tue, 21 May 2013 09:39:01 +0200 + +wayland (1.0.5-1) experimental; urgency=low + + * Team upload. + + [ Robert Ancell ] + * debian/libwayland-dev.install: + - Install development man pages + * debian/control: + - Build-depend on doxygen + - Build-depend on xsltproc + + [ Timo Aaltonen ] + * New upstream release. + * Migrate to multiarch (Closes: #690081). + * copyright: Refresh. + * control: Update Standards-Version to 3.9.4, no changes. + * rules: Make it non-fatal to fail the tests, which don't all succeed + when ran in headless mode. + * rules: Drop the creation of hard dependencies, wayland should be + mostly API stable now. + * rules: Drop dh_auto_install override. dh_auto_install automatically + installs to debian/tmp whenever there are multiple binary packages. + * libwayland*.install: Add missing files. + * rules: Temporarily disable installing the protocol docs, decide where + to put them first. + * Add README.source + + [ Sven Joachim ] + * Update symbols file, bumping minver of all symbols to at least 1.0.2. + * Add docbook-xsl to Build-Depends. + * Add Homepage field to debian/control. + * Update debian/copyright. + + [ Emilio Pozuelo Monfort ] + * Split the shared libraries into separate packages. + * Add Build-Depends-Package to symbol files. + + -- Emilio Pozuelo Monfort Tue, 21 May 2013 00:34:22 +0200 + +wayland (0.85.0-2) unstable; urgency=low + + * Upload to unstable. + * Wayland/Weston aren't quite ready to replace Xorg yet, but let's + upload those to unstable anyway, so that people can find out by + themselves. On the plus side, mesa can stop getting wayland support + enabled in experimental, then disabled back when uploaded to unstable. + * Update long description, wayland-demos got replaced by weston. + + -- Cyril Brulebois Sun, 29 Apr 2012 22:34:18 +0200 + +wayland (0.85.0-1) experimental; urgency=low + + * First upstream release: + - http://article.gmane.org/gmane.comp.freedesktop.wayland.devel/1770 + * Update watch file, even if that's only useful for notifications: + upstream releases xz tarballs, and the 1.0 source format only suports + gz. + + -- Cyril Brulebois Fri, 10 Feb 2012 11:51:36 +0100 + +wayland (0.1.0~2-1) experimental; urgency=low + + * New upstream snapshot. + * Update symbols file. + + -- Cyril Brulebois Mon, 30 Jan 2012 22:37:54 +0100 + +wayland (0.1.0~1-1) experimental; urgency=low + + * New upstream snapshot. + * Update symbols file. + + -- Cyril Brulebois Fri, 23 Dec 2011 14:45:10 +0100 + +wayland (0.1.0~0-1) experimental; urgency=low + + * Initial release (Closes: #611400). + * debian/rules contains a gentarball target to create a tarball from the + upstream-experimental branch, to be used until some upstream release + happens. + + -- Cyril Brulebois Sat, 18 Jun 2011 13:38:40 +0200 --- wayland-1.18.0.orig/debian/compat +++ wayland-1.18.0/debian/compat @@ -0,0 +1 @@ +10 --- wayland-1.18.0.orig/debian/control +++ wayland-1.18.0/debian/control @@ -0,0 +1,196 @@ +Source: wayland +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Uploaders: Emilio Pozuelo Monfort , + Héctor Orón Martínez +Build-Depends: + debhelper (>= 10), + quilt, + pkg-config, + libexpat1-dev, + libffi-dev, + libxml2-dev, + libwayland-bin , + meson, +Build-Depends-Indep: + doxygen, + graphviz, + xmlto, + xsltproc, + docbook-xsl, +Standards-Version: 4.5.0 +Vcs-Git: https://salsa.debian.org/xorg-team/wayland/wayland.git +Vcs-Browser: https://salsa.debian.org/xorg-team/wayland/wayland +Homepage: https://wayland.freedesktop.org/ + +Package: libwayland-client0 +Section: libs +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Conflicts: libwayland0 (<< 1.1.0-1) +Replaces: libwayland0 (<< 1.1.0-1) +Description: wayland compositor infrastructure - client library + Wayland is a protocol for a compositor to talk to its clients as well + as a C library implementation of that protocol. The compositor can be + a standalone display server running on Linux kernel modesetting and + evdev input devices, an X application, or a wayland client + itself. The clients can be traditional applications, X servers + (rootless or fullscreen) or other display servers. + . + This package ships the library that implements the client side of + the Wayland protocol. + +Package: libwayland-egl1 +Section: libs +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Breaks: libwayland-egl1-mesa (<< 18.0.5-0) +Replaces: libwayland-egl1-mesa (<< 18.0.5-0) +Provides: libwayland-egl1-mesa +Description: wayland compositor infrastructure - EGL library + Wayland is a protocol for a compositor to talk to its clients as well + as a C library implementation of that protocol. The compositor can be + a standalone display server running on Linux kernel modesetting and + evdev input devices, an X application, or a wayland client + itself. The clients can be traditional applications, X servers + (rootless or fullscreen) or other display servers. + . + This package ships the library that implements the Wayland EGL platform + of the Wayland protocol. + +Package: libwayland-server0 +Section: libs +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Conflicts: libwayland0 (<< 1.1.0-1) +Replaces: libwayland0 (<< 1.1.0-1) +Breaks: weston (<< 1.2.0) +Description: wayland compositor infrastructure - server library + Wayland is a protocol for a compositor to talk to its clients as well + as a C library implementation of that protocol. The compositor can be + a standalone display server running on Linux kernel modesetting and + evdev input devices, an X application, or a wayland client + itself. The clients can be traditional applications, X servers + (rootless or fullscreen) or other display servers. + . + This package ships the library that implements the server side of + the Wayland protocol. + +Package: libwayland-cursor0 +Section: libs +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Conflicts: libwayland0 (<< 1.1.0-1) +Replaces: libwayland0 (<< 1.1.0-1) +Description: wayland compositor infrastructure - cursor library + Wayland is a protocol for a compositor to talk to its clients as well + as a C library implementation of that protocol. The compositor can be + a standalone display server running on Linux kernel modesetting and + evdev input devices, an X application, or a wayland client + itself. The clients can be traditional applications, X servers + (rootless or fullscreen) or other display servers. + . + This package ships a helper library to manage cursors. + +Package: libwayland-dev +Section: libdevel +Architecture: any +Suggests: libwayland-doc +Depends: + libwayland-client0 (= ${binary:Version}), + libwayland-server0 (= ${binary:Version}), + libwayland-cursor0 (= ${binary:Version}), + libwayland-egl1 (= ${binary:Version}), + libwayland-bin (= ${binary:Version}), + libffi-dev, + ${shlibs:Depends}, + ${misc:Depends}, +Breaks: libegl1-mesa-dev (<< 18.0.5-0), +Replaces: libegl1-mesa-dev (<< 18.0.5-0), +Multi-Arch: same +Description: wayland compositor infrastructure - development files + Wayland is a protocol for a compositor to talk to its clients as well + as a C library implementation of that protocol. The compositor can be + a standalone display server running on Linux kernel modesetting and + evdev input devices, an X application, or a wayland client + itself. The clients can be traditional applications, X servers + (rootless or fullscreen) or other display servers. + . + This package contains the development headers for the Wayland libraries. + Non-developers likely have little use for this package. + +Package: libwayland-egl-backend-dev +Section: libdevel +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Breaks: libegl1-mesa-dev (<< 18.0.5-0), + libwayland-dev (<< 1.15.0) +Replaces: libegl1-mesa-dev (<< 18.0.5-0), + libwayland-dev (<< 1.15.0) +Multi-Arch: same +Description: wayland compositor infrastructure - EGL backend development files + Wayland is a protocol for a compositor to talk to its clients as well + as a C library implementation of that protocol. The compositor can be + a standalone display server running on Linux kernel modesetting and + evdev input devices, an X application, or a wayland client + itself. The clients can be traditional applications, X servers + (rootless or fullscreen) or other display servers. + . + This package contains the development headers for the Wayland EGL backend. + +Package: libwayland-doc +Section: doc +Architecture: all +Depends: + ${misc:Depends}, +Multi-Arch: foreign +Conflicts: libwayland-dev (<< 1.10.0-2) +Replaces: libwayland-dev (<< 1.10.0-2) +Description: wayland compositor infrastructure - documentation files + Wayland is a protocol for a compositor to talk to its clients as well + as a C library implementation of that protocol. The compositor can be + a standalone display server running on Linux kernel modesetting and + evdev input devices, an X application, or a wayland client + itself. The clients can be traditional applications, X servers + (rootless or fullscreen) or other display servers. + . + This package contains the documentation for the Wayland libraries. + Non-developers likely have little use for this package. + +Package: libwayland-bin +Section: libdevel +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Conflicts: libwayland-dev (<< 1.11.0-1) +Replaces: libwayland-dev (<< 1.11.0-1) +Multi-Arch: foreign +Description: wayland compositor infrastructure - binary utilities + Wayland is a protocol for a compositor to talk to its clients as well + as a C library implementation of that protocol. The compositor can be + a standalone display server running on Linux kernel modesetting and + evdev input devices, an X application, or a wayland client + itself. The clients can be traditional applications, X servers + (rootless or fullscreen) or other display servers. + . + This package contains the development binary utilities --- wayland-1.18.0.orig/debian/copyright +++ wayland-1.18.0/debian/copyright @@ -0,0 +1,46 @@ +Upstream-Name: wayland +Upstream-Contact: Kristian Høgsberg +Source: https://wayland.freedesktop.org/releases/ + +Files: debian/* +Copyright: © 2011 Cyril Brulebois +License: X11 + +Files: * +Copyright: + © 1999 SuSE, Inc. + © 2002 Keith Packard + © 2006, 2008 Junio C Hamano + © 2008-2012 Kristian Høgsberg + © 2010-2012 Intel Corporation + © 2011 Benjamin Franzke + © 2012-2013, 2016 Collabora, Ltd + © 2012-2013 Jason Ekstrand + © 2012-2014 Jonas Ådahl + © 2013 Marek Chalupa + © 2014-2015 Red Hat, Inc. + © 2015 Giulio Camuffo + © 2016 Klarälvdalens Datakonsult AB + © 2016 Yong Bakos + © 2017 NVIDIA CORPORATION + © 2017 Samsung Electronics Co., Ltd +License: X11 + +License: X11 + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting documentation, and + that the name of the copyright holders not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. The copyright holders make no representations + about the suitability of this software for any purpose. It is provided "as + is" without express or implied warranty. + . + THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + OF THIS SOFTWARE. --- wayland-1.18.0.orig/debian/libwayland-bin.install +++ wayland-1.18.0/debian/libwayland-bin.install @@ -0,0 +1,4 @@ +# Tool to build various other packages: +usr/bin/wayland-scanner +usr/share/aclocal/wayland-scanner.m4 +usr/share/wayland/wayland-scanner.mk --- wayland-1.18.0.orig/debian/libwayland-client0.install +++ wayland-1.18.0/debian/libwayland-client0.install @@ -0,0 +1,2 @@ +# Be careful with wildcards to ensure we spot any ABI bump: +usr/lib/*/libwayland-client.so.0* --- wayland-1.18.0.orig/debian/libwayland-client0.symbols +++ wayland-1.18.0/debian/libwayland-client0.symbols @@ -0,0 +1,75 @@ +libwayland-client.so.0 libwayland-client0 #MINVER# +* Build-Depends-Package: libwayland-dev + wl_array_add@Base 1.0.2 + wl_array_copy@Base 1.0.2 + wl_array_init@Base 1.0.2 + wl_array_release@Base 1.0.2 + wl_buffer_interface@Base 1.0.2 + wl_callback_interface@Base 1.0.2 + wl_compositor_interface@Base 1.0.2 + wl_data_device_interface@Base 1.0.2 + wl_data_device_manager_interface@Base 1.0.2 + wl_data_offer_interface@Base 1.0.2 + wl_data_source_interface@Base 1.0.2 + wl_display_cancel_read@Base 1.2.0 + wl_display_connect@Base 1.0.2 + wl_display_connect_to_fd@Base 1.0.2 + wl_display_create_queue@Base 1.0.2 + wl_display_disconnect@Base 1.0.2 + wl_display_dispatch@Base 1.0.2 + wl_display_dispatch_pending@Base 1.0.2 + wl_display_dispatch_queue@Base 1.0.2 + wl_display_dispatch_queue_pending@Base 1.0.2 + wl_display_flush@Base 1.0.2 + wl_display_get_error@Base 1.0.2 + wl_display_get_fd@Base 1.0.2 + wl_display_get_protocol_error@Base 1.5.91 + wl_display_interface@Base 1.0.2 + wl_display_prepare_read@Base 1.2.0 + wl_display_prepare_read_queue@Base 1.2.0 + wl_display_read_events@Base 1.2.0 + wl_display_roundtrip@Base 1.0.2 + wl_display_roundtrip_queue@Base 1.5.91 + wl_event_queue_destroy@Base 1.0.2 + wl_keyboard_interface@Base 1.0.2 + wl_list_empty@Base 1.0.2 + wl_list_init@Base 1.0.2 + wl_list_insert@Base 1.0.2 + wl_list_insert_list@Base 1.0.2 + wl_list_length@Base 1.0.2 + wl_list_remove@Base 1.0.2 + wl_log_set_handler_client@Base 1.0.2 + wl_output_interface@Base 1.0.2 + wl_pointer_interface@Base 1.0.2 + wl_proxy_add_dispatcher@Base 1.3.0 + wl_proxy_add_listener@Base 1.0.2 + wl_proxy_create@Base 1.0.2 + wl_proxy_create_wrapper@Base 1.11.0 + wl_proxy_destroy@Base 1.0.2 + wl_proxy_get_class@Base 1.1.0 + wl_proxy_get_id@Base 1.0.2 + wl_proxy_get_listener@Base 1.3.0 + wl_proxy_get_tag@Base 1.17.93 + wl_proxy_get_user_data@Base 1.0.2 + wl_proxy_get_version@Base 1.9.91 + wl_proxy_marshal@Base 1.0.2 + wl_proxy_marshal_array@Base 1.3.0 + wl_proxy_marshal_array_constructor@Base 1.3.92 + wl_proxy_marshal_array_constructor_versioned@Base 1.9.91 + wl_proxy_marshal_constructor@Base 1.3.92 + wl_proxy_marshal_constructor_versioned@Base 1.9.91 + wl_proxy_set_queue@Base 1.0.2 + wl_proxy_set_tag@Base 1.17.93 + wl_proxy_set_user_data@Base 1.0.2 + wl_proxy_wrapper_destroy@Base 1.11.0 + wl_region_interface@Base 1.0.2 + wl_registry_interface@Base 1.0.2 + wl_seat_interface@Base 1.0.2 + wl_shell_interface@Base 1.0.2 + wl_shell_surface_interface@Base 1.0.2 + wl_shm_interface@Base 1.0.2 + wl_shm_pool_interface@Base 1.0.2 + wl_subcompositor_interface@Base 1.3.92 + wl_subsurface_interface@Base 1.3.92 + wl_surface_interface@Base 1.0.2 + wl_touch_interface@Base 1.0.2 --- wayland-1.18.0.orig/debian/libwayland-cursor0.install +++ wayland-1.18.0/debian/libwayland-cursor0.install @@ -0,0 +1,2 @@ +# Be careful with wildcards to ensure we spot any ABI bump: +usr/lib/*/libwayland-cursor.so.0* --- wayland-1.18.0.orig/debian/libwayland-cursor0.symbols +++ wayland-1.18.0/debian/libwayland-cursor0.symbols @@ -0,0 +1,8 @@ +libwayland-cursor.so.0 libwayland-cursor0 #MINVER# +* Build-Depends-Package: libwayland-dev + wl_cursor_frame@Base 1.0.2 + wl_cursor_frame_and_duration@Base 1.8.1 + wl_cursor_image_get_buffer@Base 1.0.2 + wl_cursor_theme_destroy@Base 1.0.2 + wl_cursor_theme_get_cursor@Base 1.0.2 + wl_cursor_theme_load@Base 1.0.2 --- wayland-1.18.0.orig/debian/libwayland-dev.install +++ wayland-1.18.0/debian/libwayland-dev.install @@ -0,0 +1,23 @@ +# Headers: +usr/include/wayland-client* +usr/include/wayland-cursor.h +usr/include/wayland-egl.h +usr/include/wayland-egl-core.h +usr/include/wayland-server* +usr/include/wayland-util.h +usr/include/wayland-version.h + +# Use no wildcards to ensure we spot any update: +usr/lib/*/libwayland-client.so +usr/lib/*/libwayland-cursor.so +usr/lib/*/libwayland-egl.so +usr/lib/*/libwayland-server.so +usr/lib/*/pkgconfig/wayland-client.pc +usr/lib/*/pkgconfig/wayland-cursor.pc +usr/lib/*/pkgconfig/wayland-egl.pc +usr/lib/*/pkgconfig/wayland-server.pc +usr/lib/*/pkgconfig/wayland-scanner.pc + +# Documentation +usr/share/wayland/wayland.xml +usr/share/wayland/wayland.dtd --- wayland-1.18.0.orig/debian/libwayland-doc.install +++ wayland-1.18.0/debian/libwayland-doc.install @@ -0,0 +1,4 @@ +usr/share/doc/wayland/Wayland/en-US/html/ + +# Man pages +usr/share/man/man3 --- wayland-1.18.0.orig/debian/libwayland-egl-backend-dev.install +++ wayland-1.18.0/debian/libwayland-egl-backend-dev.install @@ -0,0 +1,2 @@ +usr/include/wayland-egl-backend.h +usr/lib/*/pkgconfig/wayland-egl-backend.pc --- wayland-1.18.0.orig/debian/libwayland-egl1.install +++ wayland-1.18.0/debian/libwayland-egl1.install @@ -0,0 +1,2 @@ +# Be careful with wildcards to ensure we spot any ABI bump: +usr/lib/*/libwayland-egl.so.1* --- wayland-1.18.0.orig/debian/libwayland-egl1.symbols +++ wayland-1.18.0/debian/libwayland-egl1.symbols @@ -0,0 +1,6 @@ +libwayland-egl.so.1 libwayland-egl1 #MINVER# +* Build-Depends-Package: libwayland-dev + wl_egl_window_create@Base 1.15.0 + wl_egl_window_destroy@Base 1.15.0 + wl_egl_window_get_attached_size@Base 1.15.0 + wl_egl_window_resize@Base 1.15.0 --- wayland-1.18.0.orig/debian/libwayland-server0.install +++ wayland-1.18.0/debian/libwayland-server0.install @@ -0,0 +1,2 @@ +# Be careful with wildcards to ensure we spot any ABI bump: +usr/lib/*/libwayland-server.so.0* --- wayland-1.18.0.orig/debian/libwayland-server0.symbols +++ wayland-1.18.0/debian/libwayland-server0.symbols @@ -0,0 +1,131 @@ +libwayland-server.so.0 libwayland-server0 #MINVER# +* Build-Depends-Package: libwayland-dev + wl_array_add@Base 1.0.2 + wl_array_copy@Base 1.0.2 + wl_array_init@Base 1.0.2 + wl_array_release@Base 1.0.2 + wl_buffer_interface@Base 1.0.2 + wl_callback_interface@Base 1.0.2 + wl_client_add_destroy_listener@Base 1.0.2 + wl_client_add_object@Base 1.0.2 + wl_client_add_resource@Base 1.0.2 + wl_client_add_resource_created_listener@Base 1.11.91 + wl_client_create@Base 1.0.2 + wl_client_destroy@Base 1.0.2 + wl_client_flush@Base 1.0.2 + wl_client_for_each_resource@Base 1.11.91 + wl_client_from_link@Base 1.11.91 + wl_client_get_credentials@Base 1.0.2 + wl_client_get_destroy_listener@Base 1.0.2 + wl_client_get_display@Base 1.0.2 + wl_client_get_fd@Base 1.9.91 + wl_client_get_link@Base 1.11.91 + wl_client_get_object@Base 1.0.2 + wl_client_new_object@Base 1.0.2 + wl_client_post_implementation_error@Base 1.17.0 + wl_client_post_no_memory@Base 1.2.0 + wl_compositor_interface@Base 1.0.2 + wl_data_device_interface@Base 1.0.2 + wl_data_device_manager_interface@Base 1.0.2 + wl_data_offer_interface@Base 1.0.2 + wl_data_source_interface@Base 1.0.2 + wl_display_add_client_created_listener@Base 1.11.91 + wl_display_add_destroy_listener@Base 1.0.4 + wl_display_add_global@Base 1.0.2 + wl_display_add_protocol_logger@Base 1.11.91 + wl_display_add_shm_format@Base 1.3.0 + wl_display_add_socket@Base 1.0.2 + wl_display_add_socket_auto@Base 1.5.91 + wl_display_add_socket_fd@Base 1.9.91 + wl_display_create@Base 1.0.2 + wl_display_destroy@Base 1.0.2 + wl_display_destroy_clients@Base 1.14.91 + wl_display_flush_clients@Base 1.0.2 + wl_display_get_client_list@Base 1.11.91 + wl_display_get_destroy_listener@Base 1.0.4 + wl_display_get_event_loop@Base 1.0.2 + wl_display_get_serial@Base 1.0.2 + wl_display_init_shm@Base 1.0.2 + wl_display_interface@Base 1.0.2 + wl_display_next_serial@Base 1.0.2 + wl_display_remove_global@Base 1.0.2 + wl_display_run@Base 1.0.2 + wl_display_set_global_filter@Base 1.13.0 + wl_display_terminate@Base 1.0.2 + wl_event_loop_add_destroy_listener@Base 1.0.4 + wl_event_loop_add_fd@Base 1.0.2 + wl_event_loop_add_idle@Base 1.0.2 + wl_event_loop_add_signal@Base 1.0.2 + wl_event_loop_add_timer@Base 1.0.2 + wl_event_loop_create@Base 1.0.2 + wl_event_loop_destroy@Base 1.0.2 + wl_event_loop_dispatch@Base 1.0.2 + wl_event_loop_dispatch_idle@Base 1.0.2 + wl_event_loop_get_destroy_listener@Base 1.0.4 + wl_event_loop_get_fd@Base 1.0.2 + wl_event_source_check@Base 1.0.2 + wl_event_source_fd_update@Base 1.0.2 + wl_event_source_remove@Base 1.0.2 + wl_event_source_timer_update@Base 1.0.2 + wl_global_create@Base 1.2.0 + wl_global_destroy@Base 1.2.0 + wl_global_get_interface@Base 1.13.0 + wl_global_get_user_data@Base 1.13.0 + wl_global_remove@Base 1.17.93 + wl_global_set_user_data@Base 1.17.93 + wl_keyboard_interface@Base 1.0.2 + wl_list_empty@Base 1.0.2 + wl_list_init@Base 1.0.2 + wl_list_insert@Base 1.0.2 + wl_list_insert_list@Base 1.0.2 + wl_list_length@Base 1.0.2 + wl_list_remove@Base 1.0.2 + wl_log_set_handler_server@Base 1.0.2 + wl_output_interface@Base 1.0.2 + wl_pointer_interface@Base 1.0.2 + wl_protocol_logger_destroy@Base 1.11.91 + wl_region_interface@Base 1.0.2 + wl_registry_interface@Base 1.0.2 + wl_resource_add_destroy_listener@Base 1.2.0 + wl_resource_create@Base 1.2.0 + wl_resource_destroy@Base 1.0.2 + wl_resource_find_for_client@Base 1.2.0 + wl_resource_from_link@Base 1.2.0 + wl_resource_get_class@Base 1.11.91 + wl_resource_get_client@Base 1.2.0 + wl_resource_get_destroy_listener@Base 1.2.0 + wl_resource_get_id@Base 1.2.0 + wl_resource_get_link@Base 1.2.0 + wl_resource_get_user_data@Base 1.2.0 + wl_resource_get_version@Base 1.2.0 + wl_resource_instance_of@Base 1.2.0 + wl_resource_post_error@Base 1.0.2 + wl_resource_post_event@Base 1.0.2 + wl_resource_post_event_array@Base 1.3.0 + wl_resource_post_no_memory@Base 1.0.2 + wl_resource_queue_event@Base 1.0.2 + wl_resource_queue_event_array@Base 1.3.0 + wl_resource_set_destructor@Base 1.2.0 + wl_resource_set_dispatcher@Base 1.3.0 + wl_resource_set_implementation@Base 1.2.0 + wl_resource_set_user_data@Base 1.2.0 + wl_seat_interface@Base 1.0.2 + wl_shell_interface@Base 1.0.2 + wl_shell_surface_interface@Base 1.0.2 + wl_shm_buffer_begin_access@Base 1.3.92 + wl_shm_buffer_create@Base 1.0.2 + wl_shm_buffer_end_access@Base 1.3.92 + wl_shm_buffer_get@Base 1.2.0 + wl_shm_buffer_get_data@Base 1.0.2 + wl_shm_buffer_get_format@Base 1.0.2 + wl_shm_buffer_get_height@Base 1.0.2 + wl_shm_buffer_get_stride@Base 1.0.2 + wl_shm_buffer_get_width@Base 1.0.2 + wl_shm_buffer_ref_pool@Base 1.9.91 + wl_shm_interface@Base 1.0.2 + wl_shm_pool_interface@Base 1.0.2 + wl_shm_pool_unref@Base 1.9.91 + wl_subcompositor_interface@Base 1.3.92 + wl_subsurface_interface@Base 1.3.92 + wl_surface_interface@Base 1.0.2 + wl_touch_interface@Base 1.0.2 --- wayland-1.18.0.orig/debian/rules +++ wayland-1.18.0/debian/rules @@ -0,0 +1,45 @@ +#!/usr/bin/make -f + +SOURCE=wayland + +# Don't build the documentation when not building arch:all packages +ifeq (,$(filter libwayland-doc,$(shell dh_listpackages))) +configure_flags += -Ddocumentation=false +endif + +override_dh_auto_configure: + dh_auto_configure -- $(configure_flags) + +# Kill *.la files, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + dh_install --fail-missing + +override_dh_makeshlibs: + dh_makeshlibs -plibwayland-client0 \ + -V 'libwayland-client0 (>= 1.2.0)' -- -c4 + dh_makeshlibs -plibwayland-cursor0 \ + -V 'libwayland-cursor0 (>= 1.0.4)' -- -c4 + dh_makeshlibs -plibwayland-egl1 \ + -V 'libwayland-egl1 (>= 1.14.91)' -- -c4 + dh_makeshlibs -plibwayland-server0 \ + -V 'libwayland-server0 (>= 1.2.0)' -- -c4 + +# Debug package: +override_dh_strip: + dh_strip -plibwayland-client0 --dbgsym-migration='libwayland-client0 (<< 1.10.0-2)' + dh_strip -plibwayland-cursor0 --dbgsym-migration='libwayland-cursor0 (<< 1.10.0-2)' + dh_strip -plibwayland-server0 --dbgsym-migration='libwayland-server0 (<< 1.10.0-2)' + dh_strip -a --remaining-packages + +override_dh_auto_test: + # the test suite does not pass completely in headless mode + dh_auto_test || true + +%: + dh $@ --with quilt --builddirectory=build/ --buildsystem=meson + +# For maintainer use only, generate a tarball: +gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//') +gentarball: + git archive --format=tar upstream-experimental --prefix=$(SOURCE)-$(UV)/ | gzip -9 > ../$(SOURCE)_$(UV).orig.tar.gz --- wayland-1.18.0.orig/debian/upstream/signing-key.asc +++ wayland-1.18.0/debian/upstream/signing-key.asc @@ -0,0 +1,74 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBET+XhERBADlUYa7VXfPl3y9uCBUMniYdE4FKLAobrREyiveLf+2mTf435YL +de0gcx9ZS/EZUq+4rn4uv6AsKmw/f/N/VWGC4KL60uyp7zJjUNed2KKBk3sk57IG +pHwRqzXQwk8wVMOuhyyv207cmUadGVtL4GPKUCOYp+C0hnSs3Jq0fZJ9lwCg5xDx +fg3g++HUm8Gu2D/SYR4pFWED/2J4fkdPRQhxnfmvUxphqKf24aDngDwXYLkKlywY +Gs52J8iOwTQ/DRIruKepqrh66gb06QwnMQe9R5mJqncoi87m2jlKzUdJ5WV4JRmX +c4QVu9vRySK9j6e1O2mJeRrYvkf5rDBCHXvOoXET6VSHZI//1OJJ5OMiIApERFdT ++a5TA/4u82BHdLFerbK23ML0aWOpTc/kMbOwLjF7rFF3iJ4Pbhv0gS2wWx/1oqbF +ZGdTS5XVGiWf/+/rZpN8SeC5Q8cJ1EYqSHyo/eA+mI+C6ylqyyODmZ42OQr142xj +t6MFj5uBMq3QQGYytZ65ustDfnE/qP6hNJGtE9Lw6NVGd6oG37QjQnJ5Y2UgSGFy +cmluZ3RvbiA8YnJ5Y2VAdWJ1bnR1LmNvbT6IYAQTEQIAIAIbAwYLCQgHAwIEFQII +AwQWAgMBAh4BAheABQJUwED9AAoJEBGjAVbg5nYRYHkAoN8LIA4RjqX6TtK87+V+ +5aOSggk1AKC6T20Lo9yte4Q6uXXJWGPNVydG8bQmQnJ5Y2UgSGFycmluZ3RvbiA8 +YnJ5Y2VAY2Fub25pY2FsLmNvbT6IYAQTEQIAIAIbAwYLCQgHAwIEFQIIAwQWAgMB +Ah4BAheABQJUwED9AAoJEBGjAVbg5nYRNDQAoKJ3TMTZS3nK+gtYCosXcO4JFYxR +AKDdOzV2Hn+dwors+2n3X91Ol3BNArQoQnJ5Y2UgSGFycmluZ3RvbiA8YnJ5Y2VA +b3NnLnNhbXN1bmcuY29tPohiBBMRAgAiAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe +AQIXgAUCVMBA/QAKCRARowFW4OZ2Ed2iAJ4s0EVg9+vuE3wAmeHGZazsvRnakACg +0VP0/JUmDDvgm7vOfg5Ex/v82nC0LEJyeWNlIEhhcnJpbmd0b24gPGJyeWNlQGJy +eWNlaGFycmluZ3Rvbi5vcmc+iGAEExECACACGwMGCwkIBwMCBBUCCAMEFgIDAQIe +AQIXgAUCVMBA/QAKCRARowFW4OZ2EfLRAKC/HqDca42tb3lyPxjEJv17tpFxSQCd +HJeu88EIYaC5HZHUbG9ZaFoUuwi0LkJyeWNlIEhhcnJpbmd0b24gPGJyeWNlLmhh +cnJpbmd0b25AdWJ1bnR1LmNvbT6IYAQTEQIAIAIbAwYLCQgHAwIEFQIIAwQWAgMB +Ah4BAheABQJUwED6AAoJEBGjAVbg5nYRHEcAnRluXGX7z2CeQHVccOjXPEx3Dhbu +AKC3BOql6z4e/oHnuPcrmm+cDVwvn7QxQnJ5Y2UgSGFycmluZ3RvbiA8YnJ5Y2Uu +aGFycmluZ3RvbkBjYW5vbmljYWwuY29tPohgBBMRAgAgAhsDBgsJCAcDAgQVAggD +BBYCAwECHgECF4AFAlTAQP0ACgkQEaMBVuDmdhHg7wCgghXeewn/DeBZh3g0EstN +cdSDDU4Anif0Ud+4cdTFS4jWWPJrs/gaPFbDuQINBET+XiQQCADT0bmOAoaZ/3Y7 +cpvc221+V7Yq1YtUw1QNUgkaku5I+5ee54oIvMrEWbADQRd1TqtKjsTS8v1kYFqH +C965uhHgXAMHCb6hlN+AzVXsgl/iqQI3knqHAtx51Buqd/PF1t6grELRhGH39Elz +kK2D9E1e8Ag6XdWY/jCx/tRypc2HrUJoNsdUFrj8+VDOYa9Xi1XSzQdRPbWbdzXi +IxtA5iY4i8mS3B3wItl1eyzD5UFQzgWK5FLFjfhm6/DEpVqlyu1mp+2I7InKz4HW +64l0Rkzn5EC7UxUn/chGDWQTtfiyjeia4ANcUC8Jx5C4NOKXPzXN8anWV3S0oJZh ++pGRaUKTAAMFB/9YkEg13DveEPPg8+bqUXtN9YU+Ogxcvcyou8I5bzRMxlpJkG3a +EsrpAB7mS9D3kpImUa5QA8Y9QoEl4CLxbGIDJIyKNm93OhZrO+A0h8uCTHK45clm +qg3UdUKqnXr5V48zIvs56lrpTnlJ3PqNSl2ErDYtT7fgODyXAyLPNpCGsz2otYfJ +4ne1aYf7i/7gI+UTXpavDUsM90FrX+sydnjbZIi0t6HNpmO9sb9o82QjF+hMr28Y +ntWS0LUvOdUmWNnUyrDtZ2fnTzxoOYl0/8hxE+vUwcw3vk6+CtNEw4r+VkuKKpZg +rP7BIyD8m2dGJn5cfRe8LCP2TIkYh7WBoKQxiEkEGBECAAkFAkT+XiQCGwwACgkQ +EaMBVuDmdhHXAgCg1DelVwB3NVuI4X3w4QAijqlg3vsAn13J6LbSbWkCE1GwkJfo +F9GzWqNd +=LLvz +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQENBFPqgXYBCAC0sUvZrj31IAB8LzM8tR3KS6njXsX0zRCDYYCcE/bNsWlvfo5M +YNxiR/PYDgvN8SAoDt9r7xb8a0Q9tAG326d13RStQSsaY2EvcBLMBgzXO4pFQ3pm +gLuK6NFZKz4qNle2kaq+KndTawGHAk0O9epsUYJUfcKj4bMLm3uZVRzJsfy5P8Qx +E4yLfBZgtdMnYXY9PHjqiFAtu4d//wNMSJ9Hv43eumVP3W28hFD5ZAsvyL3yL6rz +t+MtJrAYqSTgV0PrtR0JU3hAWAupW6SxmjeQHdMPJy4NbFCckdoNigid6FjsjjtW +uNuWtEa/lg58e5eyxKu6/KRmooqoyo6BOB53ABEBAAG0JkRlcmVrIEZvcmVtYW4g +PGRlcmVrZkBvc2cuc2Ftc3VuZy5jb20+iQE3BBMBAgAiBQJT6oF2AhsDBgsJCAcD +AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBeVEmOaX8R1+CFB/dYZDkH0Ne2hsjwRQBg +i7sL2fuyNlRLO0xAnii3vhDQ+yv6VLOb16eSqs8AcwKpLJMh+C8jrj2J8F8LYC0c +y0HRLZAJAn13q3/xsG550ZlDsy9Suq2U5KdGivCmsBfvvE8Qt4l0P0Ut0QJczo4h +ZywKxOAe3IjByXeeElsg+vW5dG+YWqhQde07XP5qzfZXmsevIPdVyg9+y3Ack8EM +Uk017ZzYfnOMysyOZAh8dXIW5uCFlN9s2plaKdVpvvnhe9JsQnL9btDcyOVYEHvn +RGA7HZwFDynJ+q5hfvNDcI2a0N5IRsT4mTAh+wwNFblAhJVX4LirxaHH9ZVS3vTo +HoK5AQ0EU+qBdgEIALV7qjn4lAzS8uqmNbNZqjH+juHorkYaoRN7idlBItujs7pe +72rJhF1dp4NIHuNh60aUu0IggjuGXF0r6YeoE5N9NwkBoLvOIx7EqodJM5yUmR+e +rYqiJOF4LDR2iaErBIrrpIXAyHnzUPToopXQxx4eMYpoDfN2zoJZlFHRpiy25aFc +P4hA7K1+Gb2YGhIvenDqPeGQJ3sr4FozMv0eqNKqqaj3oq11UrY5xRLWeoK7Y3H0 +e7zMukXZ3q1RfMxWDkSdDDkS8P1F7vVsAlluC/GJg1SOcQIK/hfbJGxiMsKYy5vd +iss8+etu8EDDkFzGQ4GirSP35rTVqpRXUnn0iSsAEQEAAYkBHwQYAQIACQUCU+qB +dgIbDAAKCRBeVEmOaX8R1/hyB/wLgXoRsHaE6AFcwzBfl8+KgPK3/VDcEBHslX3w +fYbXRrwuLUcyQO/lZiFIbZ9jNlcKH2zVd9Cu8QtYxCGF5lMGHW5K+aSiOe0AFDkO +X8auKZKskjhyGqSPtmNPeiuwOJI1nPaw7wochwBl2L7SdT20IPdwuUOOGymj0VYe +3QlxQ3tOG2WjMMYoCHIqOnJA0BP5HxTJob2cB7oraOc0QKHOS6KVJAovTrjJllFE +ncwhWUq20xh3NxSQKE8OpSQPv1mG8QmB+iThSeRarixXCvy/1GZb6HzFdaozj5Iy +T61de1eQ+/rLgixBkkiLtm6kkl8HlyJUNZGofRtAc7k7OkXo +=/RHj +-----END PGP PUBLIC KEY BLOCK----- --- wayland-1.18.0.orig/debian/watch +++ wayland-1.18.0/debian/watch @@ -0,0 +1,4 @@ +#git=git://anongit.freedesktop.org/wayland/wayland +version=4 +opts="pgpsigurlmangle=s%$%.sig%" \ +https://wayland.freedesktop.org/releases.html releases/wayland-([\d].*)\.tar\.xz --- wayland-1.18.0.orig/protocol/generate-shm-formats.py +++ wayland-1.18.0/protocol/generate-shm-formats.py @@ -0,0 +1,153 @@ +#!/usr/bin/env python3 + +# This script synchronizes wayland.xml's wl_shm.format enum with drm_fourcc.h. +# Invoke it to update wayland.xml, then manually check the changes applied. +# +# Requires Python 3, python-lxml, a C compiler and pkg-config. + +import os +import subprocess +import sys +import tempfile +# We need lxml instead of the standard library because we want +# Element.sourceline +from lxml import etree as ElementTree + +proto_dir = os.path.dirname(os.path.realpath(__file__)) +wayland_proto = proto_dir + "/wayland.xml" + +cc = os.getenv("CC", "cc") +pkg_config = os.getenv("PKG_CONFIG", "pkg-config") + +# Find drm_fourcc.h +version = subprocess.check_output([pkg_config, "libdrm", + "--modversion"]).decode().strip() +cflags = subprocess.check_output([pkg_config, "libdrm", + "--cflags-only-I"]).decode().strip().split() +libdrm_include = None +for include_flag in cflags: + if not include_flag.startswith("-I"): + raise Exception("Expected one include dir for libdrm") + include_dir = include_flag[2:] + if include_dir.endswith("/libdrm"): + libdrm_include = include_dir + fourcc_include = libdrm_include + "/drm_fourcc.h" +if libdrm_include == None: + raise Exception("Failed to find libdrm include dir") + +print("Using libdrm " + version, file=sys.stderr) + +def drm_format_to_wl(ident): + return ident.replace("DRM_FORMAT_", "").lower() + +# Collect DRM format constant names +ident_list = [] +descriptions = {} +prev_comment = None +with open(fourcc_include) as input_file: + for l in input_file.readlines(): + l = l.strip() + + # Collect comments right before format definitions + if l.startswith("/*") and l.endswith("*/"): + prev_comment = l[2:-2] + continue + desc = prev_comment + prev_comment = None + + # Recognize format definitions + parts = l.split() + if len(parts) < 3 or parts[0] != "#define": + continue + ident = parts[1] + if not ident.startswith("DRM_FORMAT_") or ident.startswith( + "DRM_FORMAT_MOD_"): + continue + + ident_list.append(ident) + + # Prefer in-line comments + if l.endswith("*/"): + desc = l[l.rfind("/*") + 2:-2] + if desc != None: + descriptions[drm_format_to_wl(ident)] = desc.strip() + +# Collect DRM format values +idents = {} +with tempfile.TemporaryDirectory() as work_dir: + c_file_name = work_dir + "/print-formats.c" + exe_file_name = work_dir + "/print-formats" + + with open(c_file_name, "w+") as c_file: + c_file.write('#include \n') + c_file.write('#include \n') + c_file.write('#include \n') + c_file.write('#include \n') + c_file.write('\n') + c_file.write('int main(void) {\n') + for ident in ident_list: + c_file.write('printf("0x%" PRIX64 "\\n", (uint64_t)' + ident + ');\n') + c_file.write('}\n') + + subprocess.check_call([cc, "-Wall", "-Wextra", "-o", exe_file_name, + c_file_name] + cflags) + output = subprocess.check_output([exe_file_name]).decode().strip() + for i, val in enumerate(output.splitlines()): + idents[ident_list[i]] = val + +# We don't need those +del idents["DRM_FORMAT_BIG_ENDIAN"] +del idents["DRM_FORMAT_INVALID"] +del idents["DRM_FORMAT_RESERVED"] + +# Convert from DRM constants to Wayland wl_shm.format entries +formats = {} +for ident, val in idents.items(): + formats[drm_format_to_wl(ident)] = val.lower() +# Special case for ARGB8888 and XRGB8888 +formats["argb8888"] = "0" +formats["xrgb8888"] = "1" + +print("Loaded {} formats from drm_fourcc.h".format(len(formats)), file=sys.stderr) + +tree = ElementTree.parse("wayland.xml") +root = tree.getroot() +wl_shm_format = root.find("./interface[@name='wl_shm']/enum[@name='format']") +if wl_shm_format == None: + raise Exception("wl_shm.format not found in wayland.xml") + +# Remove formats we already know about +last_line = None +for node in wl_shm_format: + if node.tag != "entry": + continue + fmt = node.attrib["name"] + val = node.attrib["value"] + if fmt not in formats: + raise Exception("Format present in wl_shm.formats but not in " + "drm_fourcc.h: " + fmt) + if val != formats[fmt]: + raise Exception("Format value in wl_shm.formats ({}) differs " + "from value in drm_fourcc.h ({}) for format {}" + .format(val, formats[fmt], fmt)) + del formats[fmt] + last_line = node.sourceline +if last_line == None: + raise Exception("Expected at least one existing wl_shm.format entry") + +print("Adding {} formats to wayland.xml...".format(len(formats)), file=sys.stderr) + +# Append new formats +new_wayland_proto = wayland_proto + ".new" +with open(new_wayland_proto, "w+") as output_file, \ + open(wayland_proto) as input_file: + for i, l in enumerate(input_file.readlines()): + output_file.write(l) + if i + 1 == last_line: + for fmt, val in formats.items(): + output_file.write(' \n') +os.rename(new_wayland_proto, wayland_proto) --- wayland-1.18.0.orig/publish-doc +++ wayland-1.18.0/publish-doc @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +[ -e doc ] || (echo "Run this from the project root" && exit 1) + +make + +DOC_HTML=./doc/publican/Wayland/en-US/html/ + +[ -e "${DOC_HTML}" ] || (echo "HTML documentation failed to build at ${DOC_HTML}" && exit 1) + +chmod -R g+x ${DOC_HTML} + +rsync --delete -avz ${DOC_HTML} freedesktop.org:/srv/wayland.freedesktop.org/www/docs/html/ --- wayland-1.18.0.orig/releasing.txt +++ wayland-1.18.0/releasing.txt @@ -0,0 +1,78 @@ +To make a release of Wayland, follow these steps. + + 0. Verify the test suites and codebase checks pass. All of the + tests should either pass or skip. + + $ make check + + 1. Update the first stanza of configure.ac to the intended version. + + Then commit your changes: + + $ export RELEASE_NUMBER="x.y.z" + $ export RELEASE_NAME="[alpha|beta|RC1|RC2|official|point]" + $ git status + $ git commit configure.ac -m "configure.ac: bump to version $RELEASE_NUMBER for the $RELEASE_NAME release" + $ git push + + 2. Run the release.sh script to generate the tarballs, sign and + upload them, and generate a release announcement template. + This script can be obtained from X.org's modular package: + + http://cgit.freedesktop.org/xorg/util/modular/tree/release.sh + + The script supports a --dry-run option to test it without actually + doing a release. If the script fails on the distcheck step due to + a testsuite error that can't be fixed for some reason, you can + skip testsuite by specifying the --dist argument. Pass --help to + see other supported options. + + $ release.sh . + + For Wayland official and point releases, also publish the publican + documentation to wayland.freedesktop.org: + + $ ./publish-doc + + 3. Compose the release announcements. The script will generate + *.x.y.z.announce files with a list of changes and tags. Prepend + it with a human-readable listing of the most notable changes. + For x.y.0 releases, indicate the schedule for the x.y+1.0 + release. + + 4. PGP sign the release announcements and send them to + wayland-devel@lists.freedesktop.org + + 5. Update releases.html in wayland-web with links to tarballs and + the release email URL. + + The wl_register_release script in wayland-web will generate an HTML + snippet that can be pasted into releases.html (or e.g. in emacs + insert it via "C-u M-! scripts/wl_register_release x.y.z") and + customized. + + Once satisfied: + + $ git commit ./releases.html -m "releases: Add ${RELEASE_NUMBER} release" + $ git push + $ ./deploy + +For x.y.0 releases, also create the release series x.y branch. The x.y +branch is for bug fixes and conservative changes to the x.y.0 release, +and is where we create x.y.z releases from. Creating the x.y branch +opens up master for new development and lets new development move on. +We've done this both after the x.y.0 release (to focus development on +bug fixing for the x.y.1 release for a little longer) or before the +x.y.0 release (like we did with the 1.5.0 release, to unblock master +development early). + + $ git branch x.y [sha] + $ git push origin x.y + +The master branch's configure.ac version should always be (at least) +x.y.90, with x.y being the most recent stable branch. The stable +branch's configure.ac version is just whatever was most recently +released from that branch. + +For stable branches, we commit fixes to master first, then cherry-pick +them back to the stable branch.