diff --git a/debian/README.source b/debian/README.source index b1be94f46..57e51c2bd 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,19 +1,19 @@ This package is based on the version of Monado in Debian -(https://salsa.debian.org/monado-team/monado), but is slightly adapted for use +(https://salsa.debian.org/xr-team/monado), but is slightly adapted for use directly within the "upstream" source tree. There is useful stuff, more directed at package maintenance for distro submission, in the Debian copy of this file: - + To build a package for local use: -- Checkout the branch you want to build (assuming `master` here) and make sure +- Checkout the branch you want to build (assuming `main` here) and make sure your tree is clean (`git reset --hard` will be used later!) A fresh clone or one kept clean just for package building is probably a good idea. - Do a `git merge --no-commit debian/sid` (or `debian/buster-backports`, or `ubuntu/focal`, or...) -- `debian/extra/prepare-commit-package.sh master` to make the orig.tar.gz file +- `debian/extra/prepare-commit-package.sh main` to make the orig.tar.gz file and add the `debian/changelog` entry. (Add an additional command line argument with the debian revision if you want to customize it. The default is usually good.) diff --git a/debian/changelog b/debian/changelog index d0f482f5d..a91d08bdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,36 @@ +monado (21.0.0+git2905.e26a272c1~dfsg1-2) unstable; urgency=medium + + * d/patches + - Update Forwarded fields. + * d/libopenxr1-monado.lintian-overrides: Fix override + + [ Adrian Bunk ] + * Build with -ffloat-store on i386 to fix test failure. + + -- Rylie Pavlik Thu, 02 Mar 2023 18:28:36 -0600 + +monado (21.0.0+git2905.e26a272c1~dfsg1-1) unstable; urgency=medium + + * New upstream snapshot 21.0.0+git2905.e26a272c1~dfsg1 + * d/copyright: Update + * Drop all existing patches, applied upstream + - Add 0002-Do-not-install-a-test-binary.patch: Test binaries + should not be installed + - Add 0001-Fix-typo-in-DearImGui-demo.patch: Fix typo + * Add d/.gitignore and d/.gitattributes back + * d/README.source: Update + * Add Build-Depends on wayland-protocols. + * Bump Standards-Version to 4.6.2 - no changes required. + + -- Rylie Pavlik Thu, 02 Mar 2023 14:56:01 +0100 + +monado (21.0.0~dfsg1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream fix for FTBFS with glibc 2.34. (Closes: #1001262) + + -- Adrian Bunk Mon, 12 Sep 2022 10:16:51 +0300 + monado (21.0.0~dfsg1-2~ubuntu2004~20211027+1) focal; urgency=medium * Rebuild for focal diff --git a/debian/clean b/debian/clean new file mode 100644 index 000000000..5520875a1 --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +src/xrt/ipc/shared/ipcproto/__pycache__/ +imgui.ini diff --git a/debian/control b/debian/control index ecee9292b..d08353cd7 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,5 @@ Source: monado Maintainer: Rylie Pavlik -Uploaders: Andrew Lee (李健秋) Section: libs Priority: optional Build-Depends: debhelper-compat (= 12), @@ -32,7 +31,7 @@ Build-Depends: debhelper-compat (= 12), libxxf86vm-dev, pandoc , pkg-config -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Vcs-Browser: https://gitlab.freedesktop.org/monado/monado/-/tree/ubuntu/focal Vcs-Git: https://gitlab.freedesktop.org/monado/monado.git -b ubuntu/focal Homepage: https://monado.freedesktop.org/ diff --git a/debian/copyright b/debian/copyright index 74e74f34d..d70d7d71e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,35 +1,123 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: monado Source: -Copyright: 2018-2021, Collabora, Ltd. -License: BSL-1.0 Files: * +Copyright: 2018-2024, Collabora, Ltd. +License: BSL-1.0 + +Files: .cmake-format.py +Copyright: 2021, 2022, Collabora, Ltd. +License: CC0-1.0 + +Files: CMakePresets.json + vcpkg.json Copyright: 2018-2021, Collabora, Ltd. License: BSL-1.0 -Files: cmake/GetGitRevisionDescription.cmake.in -Copyright: Iowa State University 2009-2010. +Files: CompilerFlags.cmake +Copyright: 2018-2024, Collabora, Ltd. License: BSL-1.0 +Files: cmake/* +Copyright: 2018-2024, Collabora, Ltd. +License: BSL-1.0 + +Files: cmake/.cmake-format.json + cmake/openxr_monado.in.json +Copyright: 2018-2021, Collabora, Ltd. +License: BSL-1.0 + +Files: cmake/CleanDirectoryList.cmake + cmake/GetGitRevisionDescription.cmake.in + cmake/PrefixListGlob.cmake + cmake/ProgramFilesGlob.cmake +Copyright: 2009-2010, Iowa State University +License: BSL-1.0 + +Files: cmake/FindEGL.cmake +Copyright: 2019, 2021, Rylie Pavlik + 2014, Martin Gräßlin + 2014, Alex Merry +License: BSD-3-clause + +Files: cmake/FindEigen3.cmake +Copyright: 2009, Benoit Jacob + 2008, 2009, Gael Guennebaud, + 2006, 2007, Montel Laurent, +License: BSD-2-clause + +Files: cmake/FindHIDAPI.cmake +Copyright: 2009-2010, Iowa State University + 2019-2021, Collabora, Ltd. +License: BSL-1.0 + +Files: cmake/FindLibusb1.cmake +Copyright: 2009-2010, Iowa State University + 2021, Collabora, Ltd. +License: BSL-1.0 + +Files: cmake/FindSystemd.cmake +Copyright: 2020, 2021, Collabora, Ltd. + 2015, Jari Vetoniemi +License: BSL-1.0 + +Files: cmake/Findudev.cmake +Copyright: 2021, Collabora, Ltd. + 2014, Kevin M. Godby +License: BSL-1.0 + +Files: cmake/GenerateOpenXRRuntimeManifest.cmake + cmake/SPIR-V.cmake +Copyright: 2018-2022, Collabora, Ltd. +License: BSL-1.0 + +Files: cmake/GenerateOpenXRRuntimeManifestInstall.cmake.in +Copyright: 2019-2022, Collabora, Ltd. + 2019, Benjamin Saunders +License: BSL-1.0 + +Files: cmake/GetGitRevisionDescription.cmake +Copyright: 2013-2020, Rylie Pavlik + 2013-2020, Contributors + 2009-2013, Iowa State University. +License: BSL-1.0 + +Files: cmake/OptionWithDeps.cmake +Copyright: 2022, Collabora, Ltd. + 2000-2022, Kitware, Inc., Insight Software Consortium +License: BSL-1.0 + +Files: cmake/sanitizers/* +Copyright: 2013, Matthew Arsenault + 2015-2016, RWTH Aachen University, Federal Republic of Germany +License: Expat + Files: debian/* -Copyright: 2020, 2021, Rylie Pavlik +Copyright: 2020-2024, Rylie Pavlik License: BSL-1.0 Files: debian/extra/* Copyright: 2020, Rylie Pavlik License: CC0-1.0 +Files: debian/monado-cli.1 + debian/monado-ctl.1 + debian/monado-gui.1 + debian/monado-service.1 +Copyright: 2018-2022, Collabora, Ltd. +License: BSL-1.0 + 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 +Copyright: 2018-2023, Collabora, Ltd. and the Monado contributors License: BSL-1.0 Files: doc/CHANGELOG.md -Copyright: 2020, Collabora, Ltd. and the Monado contributors +Copyright: 2020-2022, Collabora, Ltd. and the Monado contributors License: CC0-1.0 Files: doc/changes/* @@ -68,16 +156,46 @@ 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. +Files: doc/doxygen-awesome-css/* +Copyright: 2021-2023, jothepro +License: Expat + +Files: doc/doxygen-awesome-css/doxygen-awesome-darkmode-toggle.js + doc/doxygen-awesome-css/doxygen-awesome-paragraph-link.js +Copyright: 2021-2023, jothepro +License: Apache-2.0 and/or Expat + +Files: doc/example_configs/* +Copyright: 2018-2020, Collabora, Ltd. and the Monado contributors License: BSL-1.0 +Files: doc/hand-tracking-mercury.md +Copyright: 2018-2024, Collabora, Ltd. +License: BSL-1.0 + +Files: gradlew +Copyright: 2015-2021, the original authors. +License: Apache-2.0 + Files: scripts/* -Copyright: 2018-2021, Collabora, Ltd. +Copyright: 2018-2024, Collabora, Ltd. +License: BSL-1.0 + +Files: src/* +Copyright: 2018-2024, Collabora, Ltd. License: BSL-1.0 Files: src/external/Catch2/* -Copyright: 2020, Two Blue Cubes Ltd. +Copyright: 2022, Two Blue Cubes Ltd. +License: BSL-1.0 + +Files: src/external/android-jni-wrap/wrap/android.hardware.display.cpp + src/external/android-jni-wrap/wrap/android.hardware.display.h + src/external/android-jni-wrap/wrap/android.hardware.display.impl.h + src/external/android-jni-wrap/wrap/java.io.cpp + src/external/android-jni-wrap/wrap/java.io.h + src/external/android-jni-wrap/wrap/java.io.impl.h +Copyright: 2021-2024, Qualcomm Innovation Center, Inc. License: BSL-1.0 Files: src/external/cjson/* @@ -85,33 +203,13 @@ Copyright: 2009-2017, Dave Gamble and cJSON contributors License: Expat Files: src/external/flexkalman/* -Copyright: 2019, Collabora, Ltd. - 2015, 2016, Sensics, Inc. -License: Apache-2.0 - -Files: src/external/flexkalman/flexkalman/AbsoluteOrientationMeasurement.h - src/external/flexkalman/flexkalman/AngularVelocityMeasurement.h - src/external/flexkalman/flexkalman/FlexibleKalmanBase.h - src/external/flexkalman/flexkalman/FlexibleKalmanCorrect.h - src/external/flexkalman/flexkalman/FlexibleKalmanFilter.h - src/external/flexkalman/flexkalman/FlexibleKalmanMeta.h - src/external/flexkalman/flexkalman/FlexibleUnscentedCorrect.h - src/external/flexkalman/flexkalman/MatrixExponentialMap.h - src/external/flexkalman/flexkalman/OrientationConstantVelocity.h - src/external/flexkalman/flexkalman/OrientationState.h - src/external/flexkalman/flexkalman/PoseConstantVelocity.h - src/external/flexkalman/flexkalman/PoseConstantVelocityGeneric.h - src/external/flexkalman/flexkalman/PoseDampedConstantVelocity.h - src/external/flexkalman/flexkalman/PoseSeparatelyDampedConstantVelocity.h - src/external/flexkalman/flexkalman/PoseState.h - src/external/flexkalman/flexkalman/PoseStateExponentialMap.h Copyright: 2019, 2020, Collabora, Ltd. 2015, 2016, Sensics, Inc. License: Apache-2.0 Files: src/external/flexkalman/flexkalman/AbsolutePositionLeverArmMeasurement.h src/external/flexkalman/flexkalman/SO3.h -Copyright: 2019, 2020, Collabora, Ltd. +Copyright: 2018-2024, Collabora, Ltd. License: Apache-2.0 or BSL-1.0 Files: src/external/flexkalman/flexkalman/AbsolutePositionMeasurement.h @@ -130,12 +228,12 @@ Copyright: 2019, Collabora, Ltd. License: Apache-2.0 Files: src/external/glad/* -Copyright: 2020, Collabora, Ltd. and the Monado contributors -License: BSL-1.0 +Copyright: 2013-2022, David Herberth +License: Expat Files: src/external/glad/include/* -Copyright: 2007-2020, The Khronos Group Inc. -License: Khronos +Copyright: 2007-2024, The Khronos Group Inc. +License: Apache-2.0 Files: src/external/glad/include/KHR/* Copyright: 2008-2018, The Khronos Group Inc. @@ -144,23 +242,45 @@ 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. +Comment: This is generated from the specification XML (licensed as indicated earlier) by GLAD2: + https://github.com/KhronosGroup/EGL-Registry/blob/main/api/egl.xml + Specification copyright statement last updated 2020 though file itself updated more recently. + +Files: src/external/glad/include/glad/gl.h +Copyright: 2013-2022, The Khronos Group, Inc. +License: Apache-2.0 +Comment: This is generated from the specification XML (licensed as indicated earlier) by GLAD2: + https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/main/xml/gl.xml + Specification copyright statement last updated 2020 though file itself updated more recently. + +Files: src/external/glad/include/glad/glx.h +Copyright: 2013-2022, The Khronos Group, Inc. +License: Apache-2.0 +Comment: This is generated from the specification XML (licensed as indicated earlier) by GLAD2: + https://github.com/KhronosGroup/OpenGL-Registry/blob/main/xml/glx.xml + +Files: src/external/glad/include/glad/wgl.h +Copyright: 2013-2022, The Khronos Group, Inc. +License: Apache-2.0 +Comment: This is generated from the specification XML (licensed as indicated earlier) by GLAD2: + https://github.com/KhronosGroup/OpenGL-Registry/blob/main/xml/wgl.xml Files: src/external/glad/src/* -Copyright: 2013-2020, David Herberth +Copyright: 2013-2022, David Herberth License: Expat Files: src/external/hungarian/* Copyright: 2016, mcximing License: BSD-2-clause -Files: src/external/imgui/* +Files: src/external/imgui/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_demo.cpp src/external/imgui/imgui/implot_internal.h src/external/imgui/imgui/implot_items.cpp Copyright: 2020, Evan Pezent @@ -173,12 +293,12 @@ Copyright: 2017, Sean Barrett License: Expat or Unlicense Files: src/external/imgui/imgui_monado/* -Copyright: 2018-2021, Collabora, Ltd. +Copyright: 2018-2023, Collabora, Ltd. License: BSL-1.0 Files: src/external/jnipp/* -Copyright: 2016, Mitchell Dowd - 2020, Collabora, Ltd. +Copyright: 2020, Collabora, Ltd. + 2016-2020, Mitchell Dowd License: Expat Files: src/external/jnipp/README.md @@ -190,11 +310,26 @@ Copyright: 2020, Collabora, Ltd. 2016-2020, Mitchell Dowd License: Expat +Files: src/external/jnipp/android/* +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/nanopb/* +Copyright: 2011-2022, Petteri Aimonen +License: Zlib + +Files: src/external/nanopb/pb_common.c +Copyright: 2014, Petteri Aimonen + 2005, Markus Kuhn +License: Zlib and Expat +Comment: Includes (unused) UTF8 validation code available under MIT (Expat) + Files: src/external/openvr_includes/* Copyright: 2015, Valve Corporation License: BSD-3-clause @@ -203,33 +338,123 @@ Files: src/external/openvr_includes/CHANGELOG.md Copyright: 2018-2020, Collabora, Ltd. License: BSL-1.0 +Files: src/external/openvr_includes/openvr.h +Copyright: 2015, Valve Corporation +License: BSD-3-clause + Files: src/external/openvr_includes/openvr_driver.h Copyright: 2015-2020, Valve Corporation License: BSD-3-clause Files: src/external/openxr_includes/* -Copyright: 2007-2020, The Khronos Group Inc. +Copyright: 2007-2024, The Khronos Group Inc. License: Apache-2.0 or Expat -Files: src/external/openxr_includes/openxr/loader_interfaces.h -Copyright: 2017-2020, The Khronos Group Inc. - 2017, Valve Corporation - 2017, LunarG, Inc. -License: Apache-2.0 +Files: src/external/openxr_includes/openxr/XR_MNDX_ball_on_a_stick_controller.h + src/external/openxr_includes/openxr/XR_MNDX_hydra.h + src/external/openxr_includes/openxr/XR_MNDX_system_buttons.h +Copyright: 2018-2024, Collabora, Ltd. +License: BSL-1.0 -Files: src/xrt/* -Copyright: 2018-2021, Collabora, Ltd. +Files: src/external/renderdoc_api/* +Copyright: 2019-2022, Baldur Karlsson +License: Expat + +Files: src/external/stb/* +Copyright: 2017, Sean Barrett +License: Expat or Unlicense + +Files: src/external/tinyceres/* +Copyright: 2021, 2022, Collabora, Ltd. + 2015, 2019, 2021, 2022, Google Inc. +License: BSD-3-clause + +Files: src/external/tinyceres/README.md +Copyright: 2021, 2022, Collabora, Ltd. +License: CC0-1.0 + +Files: src/external/tinyceres/include/* +Copyright: 2015, 2019, 2021, 2022, Google Inc. +License: BSD-3-clause + +Files: src/external/tracy/* +Copyright: 2017-2022, Bartosz Taudul +License: BSD-3-clause + +Files: src/external/tracy/client/tracy_SPSCQueue.h +Copyright: 2020, Erik Rigtorp +License: Expat + +Files: src/external/tracy/client/tracy_concurrentqueue.h +Copyright: 2013-2016, Cameron Desrochers. +License: BSD-2-clause + +Files: src/external/tracy/client/tracy_rpmalloc.cpp + src/external/tracy/client/tracy_rpmalloc.hpp +Copyright: 2017, Mattias Jansson +License: Expat or Unlicense +Comment: Per upstream repo https://github.com/mjansson/rpmalloc/blob/8060943bd3477d4a6b34134a795a95c0c3e65641/LICENSE + +Files: src/external/tracy/common/tracy_lz4.cpp + src/external/tracy/common/tracy_lz4.hpp + src/external/tracy/common/tracy_lz4hc.cpp + src/external/tracy/common/tracy_lz4hc.hpp +Copyright: 2011-2020, Yann Collet. +License: BSD-2-clause + +Files: src/external/tracy/libbacktrace/* +Copyright: 2012-2021, Free Software Foundation, Inc. +License: BSD-3-clause + +Files: src/external/util-headers/* +Copyright: 2009, 2010, Iowa State University. +License: BSL-1.0 + +Files: src/external/util-headers/util/Finally.h +Copyright: 2016, Sensics, Inc. +License: BSL-1.0 + +Files: src/external/util-headers/util/FixedLengthStringFunctions.h +Copyright: 2022, Collabora, Ltd. + 2015, Sensics, Inc. +License: BSL-1.0 + +Files: src/external/valve-file-vdf/* +Copyright: 2016 Matthias Moeller +License: Expat + +Files: src/xrt/auxiliary/android/android_looper.cpp + src/xrt/auxiliary/android/android_looper.h +Copyright: 2021-2024, Qualcomm Innovation Center, Inc. +License: BSL-1.0 + +Files: src/xrt/auxiliary/android/src/main/java/org/freedesktop/monado/auxiliary/SystemUiController.kt +Copyright: 2021-2024, Qualcomm Innovation Center, Inc. License: BSL-1.0 Files: src/xrt/auxiliary/bindings/bindings.json Copyright: 2018-2020, Collabora, Ltd. License: BSL-1.0 +Files: src/xrt/auxiliary/bindings/bindings.schema.json +Copyright: 2018-2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/auxiliary/math/m_filter_one_euro.c +Copyright: 2021, 2022, Jan Schmidt + 2019-2023, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/auxiliary/math/m_filter_one_euro.h +Copyright: 2021-2023, Collabora, Ltd. + 2021, Jan Schmidt +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. - 2013, Jakob Bornecrantz. - 2013, Fredrik Hultin. + 2013, Jakob Bornecrantz. + 2013, Fredrik Hultin. License: BSL-1.0 Files: src/xrt/auxiliary/math/m_quatexpmap.cpp @@ -239,29 +464,58 @@ License: Apache-2.0 Files: src/xrt/auxiliary/math/m_vec3.h Copyright: 2020, Nova King. - 2019, 2020, Collabora, Ltd. + 2019-2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/auxiliary/ogl/glx_api.c + src/xrt/auxiliary/ogl/glx_api.h +Copyright: 2022, James Hogan +License: BSL-1.0 + +Files: src/xrt/auxiliary/util/u_verify.h +Copyright: 2020, 2021, Moses Turner. + 2020, 2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/compositor/main/comp_window_peek.c +Copyright: 2022, Simon Zeni + 2022, 2023, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/compositor/main/comp_window_peek.h +Copyright: 2022, Simon Zeni +License: BSL-1.0 + +Files: src/xrt/compositor/shaders/* +Copyright: 2021-2023, Collabora Ltd. +License: BSL-1.0 + +Files: src/xrt/compositor/shaders/mesh.frag +Copyright: 2019, Collabora, Ltd. + 2017, James Sarrett. + 2017, Bastiaan Olij. +License: BSL-1.0 + +Files: src/xrt/compositor/shaders/mesh.vert +Copyright: 2018-2024, 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. +Copyright: 2020-2023, 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 +Copyright: 2019-2023, Collabora, Ltd. + 2014-2018, Sensics, Inc. + 2014, Kevin M. Godby License: BSL-1.0 -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. +Files: src/xrt/drivers/hydra/hydra_driver.c +Copyright: 2019-2021, Collabora, Ltd. + 2009-2011, Iowa State University License: BSL-1.0 Files: src/xrt/drivers/illixr/* @@ -270,55 +524,198 @@ License: BSL-1.0 Files: src/xrt/drivers/north_star/* Copyright: 2020, Nova King. - 2019, 2020, Collabora, Ltd. + 2019-2021, Collabora, Ltd. License: BSL-1.0 -Files: src/xrt/drivers/north_star/distortion/* +Files: src/xrt/drivers/north_star/distortion_3d/* Copyright: 2020, Nova King. - 2020, Hesham Wahba. + 2020, Hesham Wahba. License: BSD-3-clause -Files: src/xrt/drivers/north_star/ns_hmd.c +Files: src/xrt/drivers/north_star/exampleconfigs/* Copyright: 2020, Nova King. - 2020, Moses Turner. - 2020, Collabora, Ltd. + 2019, 2020, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/drivers/north_star/exampleconfigs/v1_deckx_50cm.* +Copyright: 2021, CombineReality +License: BSL-1.0 + +Files: src/xrt/drivers/north_star/ns_hmd.c +Copyright: 2020-2023, Collabora, Ltd. + 2020, Nova King. + 2020, Moses Turner. License: BSL-1.0 Files: src/xrt/drivers/north_star/ns_hmd.h -Copyright: 2018-2021, Collabora, Ltd. +Copyright: 2021, Moses Turner. + 2020, Nova King. + 2019, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/drivers/pssense/* +Copyright: 2023, Jarett Millard + 2023, Collabora, Ltd. License: BSL-1.0 Files: src/xrt/drivers/psvr/* -Copyright: 2019, 2020, Collabora, Ltd. - 2016, Joey Ferwerda. +Copyright: 2019-2022, Collabora, Ltd. + 2016, Joey Ferwerda. License: BSL-1.0 Files: src/xrt/drivers/psvr/psvr_interface.h src/xrt/drivers/psvr/psvr_prober.c -Copyright: 2018-2021, Collabora, Ltd. +Copyright: 2018-2024, Collabora, Ltd. License: BSL-1.0 -Files: src/xrt/drivers/realsense/* -Copyright: 2020, Nova King. - 2019, 2020, Collabora, Ltd. +Files: src/xrt/drivers/qwerty/* +Copyright: 2021, Mateo de Mayo. License: BSL-1.0 -Files: src/xrt/drivers/realsense/rs_interface.h -Copyright: 2018-2021, Collabora, Ltd. +Files: src/xrt/drivers/qwerty/qwerty_interface.h +Copyright: 2023, Collabora, Ltd. + 2021, Mateo de Mayo. +License: BSL-1.0 + +Files: src/xrt/drivers/realsense/rs_ddev.c +Copyright: 2020-2023, Collabora, Ltd. + 2020, Nova King. +License: BSL-1.0 + +Files: src/xrt/drivers/rift_s/* +Copyright: 2020-2023, Jan Schmidt +License: BSL-1.0 + +Files: src/xrt/drivers/rift_s/rift_s.c + src/xrt/drivers/rift_s/rift_s.h + src/xrt/drivers/rift_s/rift_s_camera.h + src/xrt/drivers/rift_s/rift_s_hmd.c + src/xrt/drivers/rift_s/rift_s_hmd.h + src/xrt/drivers/rift_s/rift_s_tracker.c + src/xrt/drivers/rift_s/rift_s_tracker.h +Copyright: 2019-2022, Jan Schmidt + 2016, Philipp Zabel + 2013, Jakob Bornecrantz. + 2013, Fredrik Hultin. +License: BSL-1.0 + +Files: src/xrt/drivers/rift_s/rift_s_camera.c + src/xrt/drivers/rift_s/rift_s_interface.h +Copyright: 2021, 2022, Jan Schmidt + 2019-2023, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/drivers/rift_s/rift_s_protocol.c +Copyright: 2019, Lucas Teske + 2019, 2020, Jan Schmidt + 2016, Philipp Zabel + 2013, Jakob Bornecrantz. + 2013, Fredrik Hultin. +License: BSL-1.0 + +Files: src/xrt/drivers/rift_s/rift_s_protocol.h +Copyright: 2019, Lucas Teske + 2019, 2020, Jan Schmidt +License: BSL-1.0 + +Files: src/xrt/drivers/rift_s/rift_s_tracker.c +Copyright: 2023, Collabora, Ltd. + 2019-2022, Jan Schmidt + 2016, Philipp Zabel + 2013, Jakob Bornecrantz. + 2013, Fredrik Hultin. +License: BSL-1.0 + +Files: src/xrt/drivers/simula/svr_interface.h +Copyright: 2018-2023, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/drivers/ultraleap_v2/* +Copyright: 2020, 2021, Moses Turner. + 2020, 2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/drivers/ultraleap_v2/readme.md +Copyright: 2021, Moses Turner +License: BSL-1.0 + +Files: src/xrt/drivers/ultraleap_v2/ulv2_driver.cpp +Copyright: 2020, 2021, Moses Turner + 2020, 2021, Collabora, Ltd. License: BSL-1.0 Files: src/xrt/drivers/vive/* -Copyright: 2019, 2020, Collabora, Ltd. +Copyright: 2019-2021, 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 +Files: 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. + src/xrt/drivers/vive/vive_source.c + src/xrt/drivers/vive/vive_source.h +Copyright: 2018-2023, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/drivers/wmr/* +Copyright: 2020, 2021, N Madsen. + 2020, 2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/drivers/wmr/wmr_camera.c +Copyright: 2021, Philipp Zabel + 2021, Jan Schmidt + 2021, Jakob Bornecrantz +License: BSL-1.0 + +Files: src/xrt/drivers/wmr/wmr_camera.h +Copyright: 2021, Jan Schmidt +License: BSL-1.0 + +Files: src/xrt/drivers/wmr/wmr_config.c + src/xrt/drivers/wmr/wmr_config.h + src/xrt/drivers/wmr/wmr_config_key.h +Copyright: 2020-2022, Jan Schmidt +License: BSL-1.0 + +Files: src/xrt/drivers/wmr/wmr_hmd.c +Copyright: 2020-2022, Collabora, Ltd. + 2020, 2021, N Madsen. + 2018, Philipp Zabel. +License: BSL-1.0 + +Files: src/xrt/drivers/wmr/wmr_hmd.h + src/xrt/drivers/wmr/wmr_protocol.c + src/xrt/drivers/wmr/wmr_protocol.h +Copyright: 2020, 2021, N Madsen. + 2020, 2021, Collabora, Ltd. + 2018, Philipp Zabel. +License: BSL-1.0 + +Files: src/xrt/drivers/wmr/wmr_prober.c +Copyright: 2020-2022, Collabora, Ltd. + 2020, 2021, N Madsen. +License: BSL-1.0 + +Files: src/xrt/drivers/wmr/wmr_source.c + src/xrt/drivers/wmr/wmr_source.h +Copyright: 2018-2023, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/SurfaceManager.kt + src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/Watchdog.kt +Copyright: 2021, Qualcomm Innovation Center, Inc. +License: BSL-1.0 + +Files: src/xrt/ipc/server/ipc_server_mainloop_windows.cpp +Copyright: 2022, Magic Leap, Inc. + 2020-2022, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/ipc/shared/ipc_utils_windows.cpp +Copyright: 2022, Magic Leap, Inc. + 2020-2022, Collabora, Ltd. License: BSL-1.0 Files: src/xrt/ipc/shared/proto.json @@ -326,20 +723,57 @@ Files: src/xrt/ipc/shared/proto.json Copyright: 2018-2020, Collabora, Ltd. License: BSL-1.0 +Files: src/xrt/targets/android_common/src/main/java/org/freedesktop/monado/android_common/DisplayOverOtherAppsStatusFragment.kt + src/xrt/targets/android_common/src/main/java/org/freedesktop/monado/android_common/RestartRuntimeDialogFragment.kt +Copyright: 2021, Qualcomm Innovation Center, Inc. +License: BSL-1.0 + +Files: src/xrt/targets/android_common/src/main/res/layout/fragment_display_over_other_app_status.xml +Copyright: 2021, Qualcomm Innovation Center, Inc. +License: BSL-1.0 + +Files: src/xrt/targets/android_common/src/main/res/values/display_over_other_apps_strings.xml + src/xrt/targets/android_common/src/main/res/values/restart_runtime_strings.xml +Copyright: 2021, Qualcomm Innovation Center, Inc. +License: BSL-1.0 + +Files: src/xrt/targets/common/target_builder_rift_s.c +Copyright: 2021, 2022, Jan Schmidt + 2019-2021, Collabora, Ltd. +License: BSL-1.0 + +Files: src/xrt/targets/openxr/active_runtime.cmake +Copyright: 2019, Benjamin Saunders +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. +Copyright: 2015, Valve Corporation +License: BSD-3-clause + +Files: src/xrt/tracking/hand/mercury/kine_lm/lm_rotations.inl +Copyright: 2022, Google, Inc. + 2022, Collabora, Ltd. +License: BSD-3-clause + +Files: tests/tests_input_transform.cpp + tests/tests_main.cpp +Copyright: 2018-2023, Collabora, Ltd. License: BSL-1.0 -Files: tests/* -Copyright: 2018-2021, Collabora, Ltd. +Files: tests/tests_levenbergmarquardt.cpp + tests/tests_quat_change_of_basis.cpp + tests/tests_quat_swing_twist.cpp + tests/tests_vec3_angle.cpp +Copyright: 2022, Collabora, Inc. +License: BSL-1.0 + +Files: tests/tests_pose.cpp +Copyright: 2022, Collabora, Ltd. + 2022, Campbell Suter License: BSL-1.0 License: Apache-2.0 @@ -516,3 +950,25 @@ License: Unlicense OTHER DEALINGS IN THE SOFTWARE. . For more information, please refer to + +License: Zlib + Copyright (c) 2011 Petteri Aimonen + . + This software is provided 'as-is', without any express or + implied warranty. In no event will the authors be held liable + for any damages arising from the use of this software. + . + Permission is granted to anyone to use this software for any + purpose, including commercial applications, and to alter it and + redistribute it freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you use + this software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + . + 2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + . + 3. This notice may not be removed or altered from any source + distribution. diff --git a/debian/copyright-scan-patterns.yml b/debian/copyright-scan-patterns.yml index 4df1898bb..616c92fe9 100644 --- a/debian/copyright-scan-patterns.yml +++ b/debian/copyright-scan-patterns.yml @@ -1,5 +1,17 @@ --- +check: + suffixes: + - cmake + - kt + - xml + - inl + - aidl + - comp + - frag + - vert + - 1 ignore: pattern: - .reuse/* - .gitlab-ci + - LICENSES/* diff --git a/debian/extra/prepare-commit-package.sh b/debian/extra/prepare-commit-package.sh index e2e0bd6bd..dbb2b803a 100755 --- a/debian/extra/prepare-commit-package.sh +++ b/debian/extra/prepare-commit-package.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2020-2021, Rylie Pavlik +# SPDX-FileCopyrightText: 2020-2024, Rylie Pavlik # SPDX-License-Identifier: CC0-1.0 # Packages produced this way are for automated use only and shouldn't be uploaded to the Debian archive. @@ -12,21 +12,26 @@ set -e if [ x"$1" != x ]; then COMMIT_TO_PACKAGE=$1 + echo "Package version will describe commit specified on command line: ${COMMIT_TO_PACKAGE}" export COMMIT_TO_PACKAGE else - COMMIT_TO_PACKAGE=master + COMMIT_TO_PACKAGE=main + echo "Package version will describe default commit: ${COMMIT_TO_PACKAGE}" export COMMIT_TO_PACKAGE fi if [ x"$2" != x ]; then PKG_REVISION=$2 + echo "Appending custom revision suffix specified on command line: ${PKG_REVISION}" export PKG_REVISION else PKG_REVISION=1~ubuntu2004~ci$(date --utc "+%Y%m%d") + echo "Appending auto-generated revision suffix: ${PKG_REVISION}" export PKG_REVISION fi - UPSTREAM_VER=$(git describe $COMMIT_TO_PACKAGE | sed -E -e 's/^v//' -e 's/-([0-9]+)-g([0-9a-f])/+git\1.\2/') - git archive -o "../monado_${UPSTREAM_VER}.orig.tar.gz" ${COMMIT_TO_PACKAGE} + UPSTREAM_VER=$(git describe --exclude "v0*" "$COMMIT_TO_PACKAGE" | sed -E -e 's/^v//' -e 's/-([0-9]+)-g([0-9a-f])/+git\1.\2/') + echo "Computed package version ${UPSTREAM_VER}" + git archive --format=tar "--prefix=monado_${UPSTREAM_VER}/" "${COMMIT_TO_PACKAGE}" | gzip -n > "../monado_${UPSTREAM_VER}.orig.tar.gz" dch --newversion "${UPSTREAM_VER}-${PKG_REVISION}" --preserve "Automated CI build of commit ${COMMIT_TO_PACKAGE}" ) diff --git a/debian/fill.copyright.blanks.yml b/debian/fill.copyright.blanks.yml index 8bc1242c6..d13b2ca1a 100644 --- a/debian/fill.copyright.blanks.yml +++ b/debian/fill.copyright.blanks.yml @@ -6,7 +6,7 @@ doc/CHANGELOG.md: license: CC0-1.0 skip: false doc/changes/: - copyright: 2020, Collabora, Ltd. and the Monado contributors + copyright: 2020-2023, Collabora, Ltd. and the Monado contributors license: CC0-1.0 skip: true doc/changes/README.md: @@ -37,6 +37,17 @@ src/external/imgui/imgui_monado/: src/external/openvr_includes/openvr_driver.h: override-copyright: 2015-2020, Valve Corporation skip: false +src/external/stb: + override-license: Expat or Unlicense + skip: false +src/external/tracy/client/tracy_rpmalloc: + override-license: Expat or Unlicense + skip: false +src/external/nanopb/pb_common.c: + override-copyright: | + 2014, Petteri Aimonen + 2005, Markus Kuhn + skip: false src/xrt: license: BSL-1.0 skip: false diff --git a/debian/fix.scanned.copyright b/debian/fix.scanned.copyright index 408699390..c369a007b 100644 --- a/debian/fix.scanned.copyright +++ b/debian/fix.scanned.copyright @@ -1,5 +1,15 @@ # Remove mistaken prefix. ! Files:~/.*/ Copyright=~"s/Text: //" +# STB files ! Files:~/.*imstb_.*/ License short_name=~"s/and\/or/or/" +! Files:~/.*stb_.*/ License short_name=~"s/and\/or/or/" +# Fix stubborn guesses +#! Files:~"/src\/external\/glad\/include.*/" License short_name=~"s/^Khronos/LicenseRef-Khronos-Free-Use-License-for-Software-and-Documentation/" full_license~ + +# Normalize capitalization +! Files:~/.*/ License short_name=~"s/BSD-3-Clause/BSD-3-clause/" + +# Dedupe this entry +! Files:~"/src\/external\/jnipp\/.*/" Copyright=~"s/2016, Mitchell Dowd//" diff --git a/debian/gbp.conf b/debian/gbp.conf index adfc890db..442678595 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,5 +3,5 @@ debian-branch = ubuntu/focal debian-tag = ubuntu/%(version)s debian-tag-msg = %(pkg)s Ubuntu release %(version)s pristine-tar = True -upstream-branch = master +upstream-branch = main upstream-tag = v%(version)s diff --git a/debian/libopenxr1-monado.lintian-overrides b/debian/libopenxr1-monado.lintian-overrides index bc9bacce4..64937e5e6 100644 --- a/debian/libopenxr1-monado.lintian-overrides +++ b/debian/libopenxr1-monado.lintian-overrides @@ -1,4 +1,4 @@ # This is never linked directly against. It is placed in the main library directory # so that it can be found by the loader using an unqualified name, to allow multiple architectures # to have an active OpenXR runtime (the same one) at the same time. -libopenxr1-monado: sharedobject-in-library-directory-missing-soname usr/lib/*/libopenxr_monado.so +libopenxr1-monado: sharedobject-in-library-directory-missing-soname [usr/lib/*/libopenxr_monado.so] diff --git a/debian/rules b/debian/rules index 83e7080e2..fab0af54b 100755 --- a/debian/rules +++ b/debian/rules @@ -35,6 +35,11 @@ ifeq (,$(findstring linux,$(DEB_HOST_ARCH_OS))) CONFIG_ARGS += -DXRT_FEATURE_SERVICE=OFF endif +ifneq (,$(filter $(DEB_HOST_ARCH_CPU), i386)) +export DEB_CFLAGS_MAINT_APPEND += -ffloat-store +export DEB_CXXFLAGS_MAINT_APPEND += -ffloat-store +endif + %: dh $@ diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 2fa55e632..3964b50a6 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,7 +1,7 @@ --- Bug-Database: https://gitlab.freedesktop.org/monado/monado/-/issues Bug-Submit: https://gitlab.freedesktop.org/monado/monado/-/issues -Changelog: https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/CHANGELOG.md +Changelog: https://gitlab.freedesktop.org/monado/monado/-/blob/main/doc/CHANGELOG.md Documentation: https://monado.pages.freedesktop.org/monado/ Repository-Browse: hhttps://gitlab.freedesktop.org/monado/monado/ Repository: https://gitlab.freedesktop.org/monado/monado.git