diff --git a/debian/.gitignore b/debian/.gitignore index 65b90aa32..97b993676 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -2,9 +2,11 @@ tmp/ libopenxr1-monado/ monado-cli/ monado-gui/ +monado-service/ .debhelper/ debhelper-build-stamp files *.debhelper.log *.substvars +*.debhelper !patches/ diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 000000000..3b586038f --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,23 @@ +monado (0.3.0-2) experimental; urgency=medium + + This build of Monado on Linux supports running much of the runtime + in "service mode", with a systemd user service and socket activation + auto-starting it. + + To enable this without logging out and back in, run: + + systemctl --user enable monado + systemctl --user start monado.socket + + If you do not do that, you will need to start monado-service manually + before running an OpenXR-based application. + + To stop Monado, run: + + systemctl --user stop monado.service + + and run the following to allow manually running a monado-service instance: + + systemctl --user stop monado.socket + + -- Ryan Pavlik Tue, 14 Jul 2020 16:01:24 -0500 diff --git a/debian/changelog b/debian/changelog index 868aa79fb..1e9c21b28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +monado (21.0.0~dfsg1-1) unstable; urgency=medium + + * New upstream version 21.0.0~dfsg1 + * Fix gbp.conf for sid. + * Exclude bitmap icons for SteamVR driver due to unclear + license/source + * Disable building new SteamVR driver. + * d/control + - Fix Vcs- fields for sid + - Update metadata based on conformance results + - Update Standards-Version to 4.5.1 - no changes required. + - Add Build-Depends on gstreamer for video-file support + * d/copyright: Update + * Drop 0001-Fix-destdir-repetition-with-systemd-unit.patch: + merged upstream. + * Add patch to allow overriding package version + * d/rules: Provide the Debian version to the build + + -- Ryan Pavlik Thu, 11 Feb 2021 15:36:12 -0600 + +monado (0.3.0-3) unstable; urgency=medium + + * Source-only upload. + + -- Andrew Lee (李健秋) Sat, 18 Jul 2020 07:58:47 +0800 + +monado (0.3.0-2) experimental; urgency=medium + + * Adjust build to use service-enabled mode on Linux. + - Adds a patch to fix systemd unit install location + - Adds a new binary package, monado-service, on Linux. + + -- Ryan Pavlik Tue, 14 Jul 2020 16:01:24 -0500 + monado (0.3.0-1) unstable; urgency=medium * New upstream version 0.3.0 - substantial upstream changes. diff --git a/debian/control b/debian/control index b1598d0f9..3fd97bf20 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,11 @@ Build-Depends: debhelper-compat (= 12), libeigen3-dev, libgl1-mesa-dev, libglvnd-dev, + libgstreamer1.0-dev, + libgstreamer-plugins-base1.0-dev, libhidapi-dev [!hurd-i386], libopencv-dev, + libsystemd-dev [linux-any], libsdl2-dev, libudev-dev, libusb-1.0-0-dev, @@ -37,21 +40,42 @@ Vcs-Git: https://gitlab.freedesktop.org/monado/monado.git -b debian/sid Homepage: https://monado.freedesktop.org/ Rules-Requires-Root: no +Package: monado-service +Architecture: linux-any +Multi-Arch: foreign +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: xr-hardware, + libopenxr-loader1, + libopenxr1-monado (= ${binary:Version}) +Description: Monado XR hardware and composition service + Monado is an open-source package for interacting with virtual and + augmented reality (collectively known as XR) hardware and software. + . + This package provides the service that provides the VR compositor and + hardware drivers to Monado clients like libopenxr1-monado. + Package: libopenxr1-monado Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + monado-service (= ${binary:Version}) [linux-any] Recommends: xr-hardware, libopenxr-loader1 Suggests: bluez [linux-any] Provides: libopenxr1 -Description: Monado preview implementation of the OpenXR API +Description: Monado implementation of the OpenXR API Monado is an open-source package for interacting with virtual and augmented reality (collectively known as XR) hardware and software. . This package provides a runtime that aims to be a complete and conforming - implementation of the OpenXR API from Khronos, after further development. + implementation of the OpenXR API from Khronos. When used with the + "simulated" device driver, this package is conformant with OpenXR 1.0. + When used with any other driver, this package is based on a published + Khronos Specification and is expected to pass the Khronos Conformance + Process. Current conformance status can be found at + www.khronos.org/conformance. Package: monado-cli Architecture: any diff --git a/debian/copyright b/debian/copyright index a1aebc801..c68593c34 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,15 +1,19 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: monado Source: -Copyright: 2018-2020, Collabora, Ltd. +Copyright: 2018-2021, Collabora, Ltd. License: BSL-1.0 Files: * Copyright: 2018-2020, Collabora, Ltd. License: BSL-1.0 +Files: cmake/GetGitRevisionDescription.cmake.in +Copyright: Iowa State University 2009-2010. +License: BSL-1.0 + Files: debian/* -Copyright: 2020, Ryan Pavlik +Copyright: 2020, 2021, Ryan Pavlik License: BSL-1.0 Files: debian/extra/* @@ -20,6 +24,10 @@ Files: debian/org.freedesktop.monado.openxr1.metainfo.xml Copyright: 2020, Collabora, Ltd. License: CC0-1.0 +Files: doc/* +Copyright: 2018-2020, Collabora, Ltd. and the Monado contributors +License: BSL-1.0 + Files: doc/CHANGELOG.md Copyright: 2020, Collabora, Ltd. and the Monado contributors License: CC0-1.0 @@ -60,6 +68,14 @@ Files: doc/changes/xrt/* Copyright: 2020, Collabora, Ltd. and the Monado contributors License: CC0-1.0 +Files: doc/howto-release.md +Copyright: 2018-2020, Collabora, Ltd. +License: BSL-1.0 + +Files: scripts/* +Copyright: 2018-2021, Collabora, Ltd. +License: BSL-1.0 + Files: src/external/Catch2/* Copyright: 2020, Two Blue Cubes Ltd. License: BSL-1.0 @@ -113,27 +129,102 @@ Files: src/external/flexkalman/flexkalman/BaseTypes.h Copyright: 2019, Collabora, Ltd. License: Apache-2.0 -Files: src/external/imgui/imgui/* +Files: src/external/glad/* +Copyright: 2020, Collabora, Ltd. and the Monado contributors +License: BSL-1.0 + +Files: src/external/glad/include/* +Copyright: 2007-2020, The Khronos Group Inc. +License: Khronos + +Files: src/external/glad/include/KHR/* +Copyright: 2008-2018, The Khronos Group Inc. +License: Khronos + +Files: src/external/glad/include/glad/* +Copyright: 2013-2020, The Khronos Group, Inc. +License: Apache-2.0 +Comment: This is generated from the specification XML (licensed as above) by GLAD2. + +Files: src/external/glad/src/* +Copyright: 2013-2020, David Herberth +License: Expat + +Files: src/external/hungarian/* +Copyright: 2016, mcximing +License: BSD-2-clause + +Files: src/external/imgui/* Copyright: 2015, Stephan Dilly 2014-2020, Omar Cornut License: Expat +Files: src/external/imgui/imgui/implot.cpp + src/external/imgui/imgui/implot.h + src/external/imgui/imgui/implot_internal.h + src/external/imgui/imgui/implot_items.cpp +Copyright: 2020, Evan Pezent +License: Expat + Files: src/external/imgui/imgui/imstb_rectpack.h src/external/imgui/imgui/imstb_textedit.h src/external/imgui/imgui/imstb_truetype.h Copyright: 2017, Sean Barrett +License: Expat or Unlicense + +Files: src/external/imgui/imgui_monado/* +Copyright: 2018-2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/external/jnipp/* +Copyright: 2016, Mitchell Dowd + 2020, Collabora, Ltd. License: Expat +Files: src/external/jnipp/README.md + src/external/jnipp/dotest.sh + src/external/jnipp/jnipp.cpp + src/external/jnipp/jnipp.h + src/external/jnipp/makefile +Copyright: 2020, Collabora, Ltd. + 2016-2020, Mitchell Dowd +License: Expat + +Files: src/external/jnipp/tests/* +Copyright: 2020, Collabora, Ltd. + 2016-2020, Mitchell Dowd +License: Expat + +Files: src/external/openvr_includes/* +Copyright: 2015, Valve Corporation +License: BSD-3-clause + +Files: src/external/openvr_includes/CHANGELOG.md +Copyright: 2018-2020, Collabora, Ltd. +License: BSL-1.0 + +Files: src/external/openvr_includes/openvr_driver.h +Copyright: 2015-2020, Valve Corporation +License: BSD-3-clause + Files: src/external/openxr_includes/* -Copyright: 2017-2020, The Khronos Group Inc. -License: Apache-2.0 +Copyright: 2007-2020, The Khronos Group Inc. +License: Apache-2.0 or Expat Files: src/external/openxr_includes/openxr/loader_interfaces.h -Copyright: 2017-2019, The Khronos Group Inc. +Copyright: 2017-2020, The Khronos Group Inc. 2017, Valve Corporation 2017, LunarG, Inc. License: Apache-2.0 +Files: src/xrt/* +Copyright: 2018-2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/auxiliary/bindings/bindings.json +Copyright: 2018-2020, Collabora, Ltd. +License: BSL-1.0 + Files: src/xrt/auxiliary/math/m_imu_3dof.c src/xrt/auxiliary/math/m_imu_3dof.h Copyright: 2020, Collabora, Ltd. @@ -151,17 +242,32 @@ Copyright: 2020, Nova King. 2019, 2020, Collabora, Ltd. License: BSL-1.0 +Files: src/xrt/drivers/android/android_sensors.c +Copyright: 2020, Collabora, Ltd. + 2015, Joey Ferwerda. + 2013, Jakob Bornecrantz. + 2013, Fredrik Hultin. +License: BSL-1.0 + Files: src/xrt/drivers/hdk/hdk_device.cpp Copyright: 2019, Collabora, Ltd. 2014-2018, Sensics, Inc. 2014, Kevin M. Godby License: BSL-1.0 -Files: src/xrt/drivers/hydra/hydra_driver.c +Files: src/xrt/drivers/hydra/* Copyright: 2019, Collabora, Ltd. 2011, Iowa State University License: BSL-1.0 +Files: src/xrt/drivers/hydra/hydra_interface.h +Copyright: 2018-2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/drivers/illixr/* +Copyright: 2020, 2021, The Board of Trustees of the University of Illinois. +License: BSL-1.0 + Files: src/xrt/drivers/north_star/* Copyright: 2020, Nova King. 2019, 2020, Collabora, Ltd. @@ -170,10 +276,16 @@ License: BSL-1.0 Files: src/xrt/drivers/north_star/distortion/* Copyright: 2020, Nova King. 2020, Hesham Wahba. -License: BSD-3-Clause +License: BSD-3-clause + +Files: src/xrt/drivers/north_star/ns_hmd.c +Copyright: 2020, Nova King. + 2020, Moses Turner. + 2020, Collabora, Ltd. +License: BSL-1.0 Files: src/xrt/drivers/north_star/ns_hmd.h -Copyright: 2018-2020, Collabora, Ltd. +Copyright: 2018-2021, Collabora, Ltd. License: BSL-1.0 Files: src/xrt/drivers/psvr/* @@ -183,27 +295,53 @@ License: BSL-1.0 Files: src/xrt/drivers/psvr/psvr_interface.h src/xrt/drivers/psvr/psvr_prober.c -Copyright: 2018-2020, Collabora, Ltd. +Copyright: 2018-2021, Collabora, Ltd. License: BSL-1.0 -Files: src/xrt/drivers/realsense/rs_6dof.c +Files: src/xrt/drivers/realsense/* Copyright: 2020, Nova King. 2019, 2020, Collabora, Ltd. License: BSL-1.0 -Files: src/xrt/drivers/vive/vive.h - src/xrt/drivers/vive/vive_controller.c - src/xrt/drivers/vive/vive_device.c - src/xrt/drivers/vive/vive_protocol.c - src/xrt/drivers/vive/vive_protocol.h +Files: src/xrt/drivers/realsense/rs_interface.h +Copyright: 2018-2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/drivers/vive/* Copyright: 2019, 2020, Collabora, Ltd. 2016-2019, Philipp Zabel License: BSL-1.0 +Files: src/xrt/drivers/vive/vive_config.c + src/xrt/drivers/vive/vive_config.h + src/xrt/drivers/vive/vive_controller.h + src/xrt/drivers/vive/vive_device.h + src/xrt/drivers/vive/vive_prober.c + src/xrt/drivers/vive/vive_prober.h +Copyright: 2018-2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/ipc/shared/proto.json + src/xrt/ipc/shared/proto.schema.json +Copyright: 2018-2020, Collabora, Ltd. +License: BSL-1.0 + Files: src/xrt/targets/openxr/install_active_runtime.sh Copyright: 2019, Drew DeVault License: BSL-1.0 +Files: src/xrt/targets/openxr/openxr_monado.in.json +Copyright: 2018-2020, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/targets/steamvr_drv/resources/* +Copyright: 2018-2020, Collabora, Ltd. +License: BSL-1.0 + +Files: tests/* +Copyright: 2018-2021, Collabora, Ltd. +License: BSL-1.0 + License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -220,27 +358,62 @@ License: Apache-2.0 On Debian systems, the complete text of the Apache version 2.0 license can be found in "/usr/share/common-licenses/Apache-2.0". -License: BSD-3-Clause +License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: BSD-3-clause + This software is Copyright (c) 2021 by X. Ample. + . + This is free software, licensed under: + . + The (three-clause) BSD License + . + The BSD License + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + * Neither the name of X. Ample nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License: BSL-1.0 @@ -297,3 +470,49 @@ License: Expat LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: Khronos + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and/or associated documentation files (the + "Materials"), to deal in the Materials without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Materials, and to + permit persons to whom the Materials are furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Materials. + . + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + +License: Unlicense + This is free and unencumbered software released into the public domain. + . + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + . + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the benefit + of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + . + For more information, please refer to diff --git a/debian/fill.copyright.blanks.yml b/debian/fill.copyright.blanks.yml index 6f17ca293..8bc1242c6 100644 --- a/debian/fill.copyright.blanks.yml +++ b/debian/fill.copyright.blanks.yml @@ -1,6 +1,10 @@ --- +debian/extra/: + license: CC0-1.0 + skip: false doc/CHANGELOG.md: license: CC0-1.0 + skip: false doc/changes/: copyright: 2020, Collabora, Ltd. and the Monado contributors license: CC0-1.0 @@ -9,24 +13,42 @@ doc/changes/README.md: copyright: 2020, Collabora, Ltd. and the Proclamation contributors license: CC0-1.0 skip: false -src/external/imgui/imgui_monado/: - license: BSL-1.0 -# Default to BSL. -src/xrt: - license: BSL-1.0 -tests/tests_input_transform.cpp: - license: BSL-1.0 -tests/tests_main.cpp: - license: BSL-1.0 -debian/extra/: - license: CC0-1.0 -src/xrt/drivers/north_star/distortion/: - license: BSD-3-Clause -src/xrt/auxiliary/math/m_quatexpmap.cpp: - license: Apache-2.0 scripts/: license: BSL-1.0 + skip: false src/external/flexkalman/flexkalman/AbsolutePositionLeverArmMeasurement.h: license: Apache-2.0 or BSL-1.0 + skip: false src/external/flexkalman/flexkalman/SO3.h: license: Apache-2.0 or BSL-1.0 + skip: false +src/external/imgui/imgui/imstb_rectpack.h: + override-license: Expat or Unlicense + skip: false +src/external/imgui/imgui/imstb_textedit.h: + override-license: Expat or Unlicense + skip: false +src/external/imgui/imgui/imstb_truetype.h: + override-license: Expat or Unlicense + skip: false +src/external/imgui/imgui_monado/: + license: BSL-1.0 + skip: false +src/external/openvr_includes/openvr_driver.h: + override-copyright: 2015-2020, Valve Corporation + skip: false +src/xrt: + license: BSL-1.0 + skip: false +src/xrt/auxiliary/math/m_quatexpmap.cpp: + license: Apache-2.0 + skip: false +src/xrt/drivers/north_star/distortion/: + license: BSD-3-clause + skip: false +tests/tests_input_transform.cpp: + license: BSL-1.0 + skip: false +tests/tests_main.cpp: + license: BSL-1.0 + skip: false diff --git a/debian/fix.scanned.copyright b/debian/fix.scanned.copyright index 4314e352a..408699390 100644 --- a/debian/fix.scanned.copyright +++ b/debian/fix.scanned.copyright @@ -1,2 +1,5 @@ # Remove mistaken prefix. ! Files:~/.*/ Copyright=~"s/Text: //" + +! Files:~/.*imstb_.*/ License short_name=~"s/and\/or/or/" + diff --git a/debian/monado-ctl.1 b/debian/monado-ctl.1 new file mode 100644 index 000000000..d3f5beb29 --- /dev/null +++ b/debian/monado-ctl.1 @@ -0,0 +1,35 @@ +.\" Copyright 2020, Collabora, Ltd. +.\" SPDX-License-Identifier: BSL-1.0 +.\" Author: Ryan Pavlik +.Dd July 10, 2020 +.Dt MONADO-CTL 1 +.Sh NAME +.Nm monado-ctl +.Nd Monado service control utility +.Sh SYNOPSIS +.Nm +.Nm +.Op Fl p Ar clientnum +.Nm +.Op Fl f Ar clientnum +.Sh DESCRIPTION +.Nm +is a tool to control multiple applications on a system +that are accessing +.Xr monado-service 1 +simultaneously. +If called with no arguments, a list of client applications is displayed. +.Pp +The arguments are as follows: +.Bl -tag -width -indent +.It Fl p Ar clientnum +Sets client number +.Pa clientnum +as the primary application. +.It Fl f Ar clientnum +Sets client number +.Pa clientnum +as focused. +.El +.Sh SEE ALSO +.Xr monado-service 1 diff --git a/debian/monado-service.1 b/debian/monado-service.1 new file mode 100644 index 000000000..b9c6da2c7 --- /dev/null +++ b/debian/monado-service.1 @@ -0,0 +1,17 @@ +.\" Copyright 2020, Collabora, Ltd. +.\" SPDX-License-Identifier: BSL-1.0 +.\" Author: Ryan Pavlik +.Dd July 10, 2020 +.Dt MONADO-SERVICE 1 +.Sh NAME +.Nm monado-service +.Nd Device and composition service for Monado-based feaetures +.Sh SYNOPSIS +.Nm +.Sh DESCRIPTION +.Nm +is the service module of Monado that provides hardware access and composition. +It may be manually started, or allowed to auto-start through systemd socket activation +via monado.socket and monado.service. +.Pp +It takes no arguments, and detects whether it was started by socket activation automatically. diff --git a/debian/monado-service.install b/debian/monado-service.install new file mode 100644 index 000000000..660ac16d0 --- /dev/null +++ b/debian/monado-service.install @@ -0,0 +1,4 @@ +usr/bin/monado-service +usr/bin/monado-ctl +usr/lib/systemd/user/monado.service +usr/lib/systemd/user/monado.socket diff --git a/debian/monado-service.manpages b/debian/monado-service.manpages new file mode 100644 index 000000000..ba959e48f --- /dev/null +++ b/debian/monado-service.manpages @@ -0,0 +1,2 @@ +debian/monado-ctl.1 +debian/monado-service.1 diff --git a/debian/rules b/debian/rules index d233b6f46..03779b3f6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # See debhelper(7) (uncomment to enable) # output every command that modifies files on the build system. -#export DH_VERBOSE = 1 +# export DH_VERBOSE = 1 # see FEATURE AREAS in dpkg-buildflags(1) @@ -12,29 +12,44 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all reproducible=+all # Not needed on Bullseye and newer #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -%: - dh $@ +include /usr/share/dpkg/architecture.mk # We manage active runtime via update-alternatives # We use a relative runtime path to allow Multi-Arch: same to work. -# We disable the service process for now because of packaging (need to split a new binary package) -override_dh_auto_configure: - dh_auto_configure -- \ - -DXRT_HAVE_SYSTEM_CJSON=ON \ +# We disable absolute systemd unit files too since we install to the path. +# Don't waste time building the SteamVR driver, we don't package it. +# Tell the version, instead of letting it guess from Git. +CONFIG_ARGS := -DXRT_HAVE_SYSTEM_CJSON=ON \ -DXRT_OPENXR_INSTALL_ACTIVE_RUNTIME=OFF \ -DXRT_VULKAN_ENABLE_VALIDATION=OFF \ -DBUILD_DOC=OFF \ -DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=OFF \ - -DXRT_FEATURE_SERVICE=OFF \ - -DXRT_BUILD_DRIVER_OHMD=OFF + -DXRT_BUILD_DRIVER_OHMD=OFF \ + -DXRT_INSTALL_ABSOLUTE_SYSTEMD_UNIT_FILES=OFF \ + -DXRT_FEATURE_STEAMVR_PLUGIN=OFF \ + -DGIT_DESC=$(DEB_VERSION) -# Make the changelog usable here +# Only building in service mode on Linux where systemd can give us socket activation +ifeq (,$(findstring linux,$(DEB_HOST_ARCH_OS))) +# Disable service elsewhere +CONFIG_ARGS += -DXRT_FEATURE_SERVICE=OFF +endif + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- $(CONFIG_ARGS) + +# Make the changelog usable here, and modify the dependency in systemd unit file. override_dh_install: ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS))) mkdir -p debian/tmp/usr/share/doc/monado cp doc/CHANGELOG.md debian/tmp/usr/share/doc/monado/changelog markdown doc/CHANGELOG.md > debian/tmp/usr/share/doc/monado/changelog.html +endif +ifneq (,$(findstring linux,$(DEB_HOST_ARCH_OS))) + sed -i "s/%N/monado/" debian/tmp/usr/lib/systemd/user/monado.service endif dh_install diff --git a/debian/watch b/debian/watch index e2dda34b8..2f0cf26f3 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,9 @@ version=4 -opts=filenamemangle=s/.*\/archive\/v(\d\S+)\/monado.*\.tar\.bz2/monado-$1\.tar\.bz2/g \ +opts="\ +compression=xz, \ +repacksuffix=~dfsg1, \ +dversionmangle=s/[\~\+](dfsg|ds)\d?$//, \ +filenamemangle=s/.*\/archive\/v(\d\S+)\/monado.*\.tar\.bz2/monado-$1\.tar\.bz2/g" \ https://gitlab.freedesktop.org/monado/monado/-/tags \ .*/archive/v(\d\S+)/.*[.]tar[.]bz2