From 884ae646d629de2186c9214dfb95f1c97a352c16 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 2 Feb 2020 12:24:29 +0100 Subject: [PATCH 1/6] add zlib patches to prevent examples and have pkgconfig in lib --- .../zlib/02-disable-example-binaries.patch | 28 +++++++++++++++++++ .../zlib/03-install-pkgconfig-in-lib.patch | 12 ++++++++ 2 files changed, 40 insertions(+) create mode 100644 depends/common/zlib/02-disable-example-binaries.patch create mode 100644 depends/common/zlib/03-install-pkgconfig-in-lib.patch diff --git a/depends/common/zlib/02-disable-example-binaries.patch b/depends/common/zlib/02-disable-example-binaries.patch new file mode 100644 index 0000000..e0619bc --- /dev/null +++ b/depends/common/zlib/02-disable-example-binaries.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -226,25 +226,3 @@ endif() + if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) + install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") + endif() +- +-#============================================================================ +-# Example binaries +-#============================================================================ +- +-add_executable(example test/example.c) +-target_link_libraries(example zlib) +-add_test(example example) +- +-add_executable(minigzip test/minigzip.c) +-target_link_libraries(minigzip zlib) +- +-if(HAVE_OFF64_T) +- add_executable(example64 test/example.c) +- target_link_libraries(example64 zlib) +- set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") +- add_test(example64 example64) +- +- add_executable(minigzip64 test/minigzip.c) +- target_link_libraries(minigzip64 zlib) +- set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") +-endif() diff --git a/depends/common/zlib/03-install-pkgconfig-in-lib.patch b/depends/common/zlib/03-install-pkgconfig-in-lib.patch new file mode 100644 index 0000000..9c9be0f --- /dev/null +++ b/depends/common/zlib/03-install-pkgconfig-in-lib.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,7 +12,7 @@ set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation direc + set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") + set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") + set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages") +-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") ++set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") + + include(CheckTypeSize) + include(CheckFunctionExists) + From 3d448ff8c4d0380bba74cbd026d3e6ae773cfc09 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 2 Feb 2020 12:26:32 +0100 Subject: [PATCH 2/6] add license and source url to addon.xml --- audiodecoder.gsf/addon.xml.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/audiodecoder.gsf/addon.xml.in b/audiodecoder.gsf/addon.xml.in index 18eec12..42d183d 100644 --- a/audiodecoder.gsf/addon.xml.in +++ b/audiodecoder.gsf/addon.xml.in @@ -15,5 +15,10 @@ VIOGSF Audio Decoder GSF is a addon for Kodi which adds the ability to play Game Boy Advance music files, the GSF format (MINIGSF and GSFLIB files). This player is based on the Visual Boy Advanced emulator, although the sound quality appears to be identical to Highly Advanced. @PLATFORM@ + GPL-2.0 + https://github.com/xbmc/audiodecoder.gsf + + icon.png + From 93b1a2741ac4f17526bf389225ebfff4e01186e0 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 2 Feb 2020 22:49:15 +0100 Subject: [PATCH 3/6] update debian code --- debian/changelog.in | 2 +- debian/compat | 2 +- debian/control | 7 ++++--- debian/kodi-audiodecoder-gsf.install | 2 ++ debian/rules | 3 --- debian/source/format | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 debian/kodi-audiodecoder-gsf.install diff --git a/debian/changelog.in b/debian/changelog.in index e992ff9..b169a7b 100644 --- a/debian/changelog.in +++ b/debian/changelog.in @@ -3,5 +3,5 @@ kodi-audiodecoder-gsf (#PACKAGEVERSION#-#TAGREV#~#DIST#) #DIST#; urgency=low [ kodi ] * autogenerated dummy changelog - -- Arne Morten Kvarving Sat, 01 Jun 2013 00:59:22 +0200 + -- Nobody Sat, 01 Jun 2013 00:59:22 +0200 diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index ea721cf..b23811d 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,11 @@ Source: kodi-audiodecoder-gsf Priority: extra -Maintainer: Arne Morten Kvarving -Build-Depends: debhelper (>= 8.0.0), cmake, kodi-addon-dev, +Maintainer: Nobody +Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev, zlib1g-dev -Standards-Version: 3.9.6 +Standards-Version: 4.1.2 Section: libs +Homepage: http://kodi.tv Package: kodi-audiodecoder-gsf Section: libs diff --git a/debian/kodi-audiodecoder-gsf.install b/debian/kodi-audiodecoder-gsf.install new file mode 100644 index 0000000..db2d2dc --- /dev/null +++ b/debian/kodi-audiodecoder-gsf.install @@ -0,0 +1,2 @@ +usr/lib/* +usr/share/* diff --git a/debian/rules b/debian/rules index 73fa69f..a1e2e9d 100755 --- a/debian/rules +++ b/debian/rules @@ -18,8 +18,5 @@ override_dh_auto_configure: override_dh_strip: dh_strip --dbg-package=kodi-audiodecoder-gsf-dbg -override_dh_auto_install: - dh_auto_install --destdir=debian/kodi-audiodecoder-gsf - override_dh_installdocs: dh_installdocs --link-doc=kodi-audiodecoder-gsf diff --git a/debian/source/format b/debian/source/format index 89ae9db..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) From 0414fdcaf38d0077c1b3f3839c4a7b3c316d727c Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 2 Feb 2020 12:43:11 +0100 Subject: [PATCH 4/6] update copyright year to 2020 --- debian/copyright | 2 +- src/GSFCodec.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/copyright b/debian/copyright index 2d7d084..f13d3fb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: audiodecoder.gsf Source: Files: * -Copyright: 2005-2013 Team XBMC +Copyright: 2005-2020 Team Kodi License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/GSFCodec.cpp b/src/GSFCodec.cpp index 17ac497..eb120fb 100644 --- a/src/GSFCodec.cpp +++ b/src/GSFCodec.cpp @@ -1,5 +1,6 @@ /* - * Copyright (C) 2014 Arne Morten Kvarving + * Copyright (C) 2014-2020 Arne Morten Kvarving + * Copyright (C) 2016-2020 Team Kodi * * 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 @@ -12,7 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, see + * along with Kodi; see the file COPYING. If not, see * . * */ From 25ffea17ffa1e3e4047e5fdb7144c1b23f3121bc Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 5 Feb 2020 18:56:37 +0100 Subject: [PATCH 5/6] add Azure to Readme.md and prevent AppVeyor show --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ef55def..6bed938 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ This is a [Kodi](https://kodi.tv) audio decoder addon for GSF files. [![Build Status](https://travis-ci.org/xbmc/audiodecoder.gsf.svg?branch=Matrix)](https://travis-ci.org/xbmc/audiodecoder.gsf/branches) -[![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.gsf?branch=Matrix&svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-gsf?branch=Matrix) +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audiodecoder.gsf?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=6&branchName=Matrix) + ## Build instructions From b53d18a5528273a4e0c454d19a8dd9c183d1f273 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 2 Feb 2020 12:49:39 +0100 Subject: [PATCH 6/6] increase version to 2.1.2 --- audiodecoder.gsf/addon.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audiodecoder.gsf/addon.xml.in b/audiodecoder.gsf/addon.xml.in index 42d183d..6085d1d 100644 --- a/audiodecoder.gsf/addon.xml.in +++ b/audiodecoder.gsf/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@