From ff2cd73f9a1b678b2ad618709cf49cead4b8e3aa Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 9 Sep 2020 06:03:05 +0200 Subject: [PATCH 1/9] improve language definition inside addon.xml.in and strings.po --- visualization.matrix/addon.xml.in | 4 ++-- .../resources/language/resource.language.en_gb/strings.po | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/visualization.matrix/addon.xml.in b/visualization.matrix/addon.xml.in index f7c85fb..d7dce8e 100644 --- a/visualization.matrix/addon.xml.in +++ b/visualization.matrix/addon.xml.in @@ -9,8 +9,8 @@ point="xbmc.player.musicviz" library_@PLATFORM@="@LIBRARY_FILENAME@"/> - Matrix inspired visualization for Kodi. - This music visualization is inspired by the movie "Matrix". It features eight presets. + Matrix inspired visualization for Kodi. + This music visualization is inspired by the movie "Matrix". It features eight presets. @PLATFORM@ resources/icon.jpg diff --git a/visualization.matrix/resources/language/resource.language.en_gb/strings.po b/visualization.matrix/resources/language/resource.language.en_gb/strings.po index 8fa6bee..0ad0404 100644 --- a/visualization.matrix/resources/language/resource.language.en_gb/strings.po +++ b/visualization.matrix/resources/language/resource.language.en_gb/strings.po @@ -9,11 +9,11 @@ msgstr "" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kodi Translation Team\n" -"Language-Team: English (https://www.transifex.com/teamxbmc/kodi-addons/language/en_GB/)\n" +"Language-Team: English (United Kingdom) (https://www.transifex.com/teamxbmc/kodi-addons/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en\n" +"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#30000" @@ -41,7 +41,7 @@ msgid "Noise fluctuation" msgstr "" msgctxt "#30006" -msgid "The speed how fast the noise is changing. " +msgid "The speed how fast the noise is changing." msgstr "" msgctxt "#30007" @@ -106,4 +106,4 @@ msgstr "" msgctxt "#30107" msgid "Clean rain with waveform envelope" -msgstr "" \ No newline at end of file +msgstr "" From b98b58fb26582b0079bd3098ef1cac19988f9a72 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 9 Sep 2020 05:52:52 +0200 Subject: [PATCH 2/9] add license file, add license and source URL to addon.xml --- LICENSE.md | 264 +++++++++++++++++++++++++++++ README.md | 1 + visualization.matrix/addon.xml.in | 2 + visualization.matrix/changelog.txt | 1 + 4 files changed, 268 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..b017086 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,264 @@ +The GNU General Public License, Version 2, June 1991 (GPLv2) +============================================================ + +> Copyright (C) 1989, 1991 Free Software Foundation, Inc. +> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + + +Preamble +-------- + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to most +of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you can +do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a +fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show them +these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer +you this license which gives you legal permission to copy, distribute and/or +modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced by +others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish +to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's free +use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + +Terms And Conditions For Copying, Distribution And Modification +--------------------------------------------------------------- + +**0.** This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included without +limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is not +restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +**1.** You may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the Program +a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at +your option offer warranty protection in exchange for a fee. + +**2.** You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you also +meet all of these conditions: + +* **a)** You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + +* **b)** You must cause any work that you distribute or publish, that in whole + or in part contains or is derived from the Program or any part thereof, to + be licensed as a whole at no charge to all third parties under the terms of + this License. + +* **c)** If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the entire whole, +and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +**3.** You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and 2 +above provided that you also do one of the following: + +* **a)** Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above on + a medium customarily used for software interchange; or, + +* **b)** Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + +* **c)** Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only for + noncommercial distribution and only if you received the program in object + code or executable form with such an offer, in accord with Subsection b + above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all the +source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code distributed +need not include anything that is normally distributed (in either source or +binary form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component itself +accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source code +from the same place counts as distribution of the source code, even though third +parties are not compelled to copy the source along with the object code. + +**4.** You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +**5.** You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you do +not accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +**6.** Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +**7.** If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution of +the Program by all those who receive copies directly or indirectly through you, +then the only way you could satisfy both it and this License would be to refrain +entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and the +section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +**8.** If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. + +**9.** The Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of this License, you may choose any +version ever published by the Free Software Foundation. + +**10.** If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + + +No Warranty +----------- + +**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. diff --git a/README.md b/README.md index a650b59..f8bd39e 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ This is a [Kodi](https://kodi.tv) visualization addon. +[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) diff --git a/visualization.matrix/addon.xml.in b/visualization.matrix/addon.xml.in index d7dce8e..9fb729f 100644 --- a/visualization.matrix/addon.xml.in +++ b/visualization.matrix/addon.xml.in @@ -12,6 +12,8 @@ Matrix inspired visualization for Kodi. This music visualization is inspired by the movie "Matrix". It features eight presets. @PLATFORM@ + GPL-2.0-or-later + https://github.com/xbmc/visualization.matrix resources/icon.jpg resources/fanart.jpg diff --git a/visualization.matrix/changelog.txt b/visualization.matrix/changelog.txt index 84794a5..2170587 100644 --- a/visualization.matrix/changelog.txt +++ b/visualization.matrix/changelog.txt @@ -1,3 +1,4 @@ +- Add license file, add license and source URL to addon.xml 0.4.2 - Pre-Relese version for Kodi Matrix 0.2.0 From fb1e2c9610206d09355988afb04c742c8a8157fa Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 16 Sep 2020 22:37:46 +0200 Subject: [PATCH 3/9] add debian build to Travis CI --- .travis.yml | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a0ca78..6f4b846 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,12 @@ language: cpp -# -# Define the build matrix -# -# Travis defaults to building on Ubuntu Trusty when building on -# Linux. We need Xenial in order to get up to date versions of -# cmake and g++. -# env: global: - app_id=visualization.matrix +# +# Define the build matrix +# matrix: include: - os: linux @@ -21,23 +17,38 @@ matrix: dist: xenial sudo: required compiler: clang + - os: linux + dist: bionic + sudo: required + compiler: gcc + env: DEBIAN_BUILD=true + - os: linux + dist: focal + sudo: required + compiler: gcc + env: DEBIAN_BUILD=true - os: osx osx_image: xcode10.2 before_install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libgl1-mesa-dev; fi + - if [[ $DEBIAN_BUILD != true ]] && [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get install -y libgl1-mesa-dev; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi # # The addon source is automatically checked out in $TRAVIS_BUILD_DIR, # we'll put the Kodi source on the same level # before_script: - - cd $TRAVIS_BUILD_DIR/.. - - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git - - cd ${app_id} && mkdir build && cd build - - mkdir -p definition/${app_id} - - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt - - cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons + - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi + - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi + - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi + - if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi + - if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi + - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi + - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi -script: make +script: + - if [[ $DEBIAN_BUILD != true ]]; then make; fi + - if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh $TRAVIS_BUILD_DIR; fi From f752c979a7b51fdbfc2c4e33cea9e74353789cf5 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 15 Aug 2020 22:18:50 +0200 Subject: [PATCH 4/9] update/fix debian build --- debian/control | 3 +-- ...shadertoy.install => kodi-visualization-matrix.install} | 0 debian/rules | 7 ++----- debian/source/format | 2 +- visualization.matrix/changelog.txt | 1 + 5 files changed, 5 insertions(+), 8 deletions(-) rename debian/{kodi-visualization-shadertoy.install => kodi-visualization-matrix.install} (100%) diff --git a/debian/control b/debian/control index db39b6a..231fb9b 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev, libglm-dev, libgles2-mesa-dev [arm64 armhf], libgl1-mesa-dev [i386 amd64] Standards-Version: 4.1.2 Section: libs -Homepage: http://kodi.tv +Homepage: https://kodi.tv Package: kodi-visualization-matrix Section: libs @@ -20,4 +20,3 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: debug symbols for Matrix visualization for Kodi debug symbols for Matrix visualization for Kodi - diff --git a/debian/kodi-visualization-shadertoy.install b/debian/kodi-visualization-matrix.install similarity index 100% rename from debian/kodi-visualization-shadertoy.install rename to debian/kodi-visualization-matrix.install diff --git a/debian/rules b/debian/rules index 7cda45f..60bdb7a 100755 --- a/debian/rules +++ b/debian/rules @@ -10,13 +10,10 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1 -DCMAKE_INSTALL_PREFIX=/usr - -override_dh_strip: - dh_strip --dbg-package=kodi-visualization-matrix-dbg + dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1 override_dh_installdocs: dh_installdocs --link-doc=kodi-visualization-matrix diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff --git a/visualization.matrix/changelog.txt b/visualization.matrix/changelog.txt index 2170587..20b9bea 100644 --- a/visualization.matrix/changelog.txt +++ b/visualization.matrix/changelog.txt @@ -1,3 +1,4 @@ +- Fix Debian build code - Add license file, add license and source URL to addon.xml 0.4.2 - Pre-Relese version for Kodi Matrix From ee2e9d3bb6a0639d8c3fe8bc87cf990c041a6fd1 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 15 Aug 2020 22:18:59 +0200 Subject: [PATCH 5/9] update .gitignore --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 9ec0a6d..8a2d71e 100644 --- a/.gitignore +++ b/.gitignore @@ -38,5 +38,13 @@ obj-x86_64-linux-gnu/ # to prevent add after a "git format-patch VALUE" and "git add ." call /*.patch +# Visual Studio Code +.vscode + # to prevent add if project code opened by Visual Studio over CMake file .vs/ + +# General MacOS +.DS_Store +.AppleDouble +.LSOverride From efa88aaa9619c87172efaef8eb17c656809c6a95 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 15 Aug 2020 22:26:27 +0200 Subject: [PATCH 6/9] add Azure and Jenkins CI status badges to README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f8bd39e..c97abb0 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,9 @@ This is a [Kodi](https://kodi.tv) visualization addon. [![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.visualization.matrix?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=72&branchName=Matrix) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/visualization.matrix/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fvisualization.matrix/branches/) ### Screenshot From 22a3a8e55d77baa354abdc0d577a78a7ef5c974e Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 15 Aug 2020 22:29:07 +0200 Subject: [PATCH 7/9] change source license to SPDX format about GPL2 or later --- src/main.cpp | 19 +++---------------- src/main.h | 19 +++---------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index b2c3b5c..7e5053a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,21 +1,8 @@ /* - * Copyright (C) 2005-2019 Team Kodi - * http://kodi.tv - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Kodi; see the file COPYING. If not, see - * . + * Copyright (C) 2005-2020 Team Kodi * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ #include "main.h" diff --git a/src/main.h b/src/main.h index 13df613..e8f5d19 100644 --- a/src/main.h +++ b/src/main.h @@ -1,21 +1,8 @@ /* - * Copyright (C) 2005-2019 Team Kodi - * http://kodi.tv - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Kodi; see the file COPYING. If not, see - * . + * Copyright (C) 2005-2020 Team Kodi * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ #pragma once From c585148e4f4b5db10bb6c84c51619cf34f42ab64 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 6 Sep 2020 19:10:46 +0200 Subject: [PATCH 8/9] add Findglm.cmake to find glm.hpp Because "glm" removed an install support from the cmake there since version 0.9.9.6. --- Findglm.cmake | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Findglm.cmake diff --git a/Findglm.cmake b/Findglm.cmake new file mode 100644 index 0000000..a21f4ea --- /dev/null +++ b/Findglm.cmake @@ -0,0 +1,25 @@ +#.rst: +# Findglm +# ------------ +# Finds the OpenGL Mathematics (GLM) as a header only C++ mathematics library. +# +# This will define the following variables: +# +# GLM_FOUND - system has OpenGLES +# GLM_INCLUDE_DIR - the OpenGLES include directory +# +# Note: Install was removed from GLM on version 0.9.9.6. + +find_package(PkgConfig) +if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_GLM glm QUIET) +endif() + +find_path(GLM_INCLUDE_DIR glm.hpp + PATHS ${PC_GLM_INCLUDEDIR} + PATH_SUFFIXES glm) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(glm REQUIRED_VARS GLM_INCLUDE_DIR) + +mark_as_advanced(GLM_INCLUDE_DIR) From d0c7662e546d9b00420239595c6dd148a17410f1 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 7 Sep 2020 00:10:20 +0200 Subject: [PATCH 9/9] increase versiont 0.5.0 (API related) --- visualization.matrix/addon.xml.in | 2 +- visualization.matrix/changelog.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/visualization.matrix/addon.xml.in b/visualization.matrix/addon.xml.in index 9fb729f..e8db972 100644 --- a/visualization.matrix/addon.xml.in +++ b/visualization.matrix/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/visualization.matrix/changelog.txt b/visualization.matrix/changelog.txt index 20b9bea..98abaee 100644 --- a/visualization.matrix/changelog.txt +++ b/visualization.matrix/changelog.txt @@ -1,3 +1,6 @@ +0.5.0 +- Visualization API change related version update +- Fix standalone build with newer glm versions (>= 0.9.9.6) - Fix Debian build code - Add license file, add license and source URL to addon.xml 0.4.2