Merge pull request #12 from AlwinEsch/Matrix-change

[Matrix] some cleanups

audiodecoder.ssf/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="audiodecoder.ssf"
-  version="2.2.0"
+  version="2.2.1"
   name="SSF/DSF Audio Decoder"
   provider-name="spiff">
   <requires>@ADDON_DEPENDS@</requires>
@@ -15,5 +15,10 @@
     <summary lang="en">Sega SSF/DSF Audio Decoder</summary>
     <description lang="en">Sega Saturn Sound Format (SSF) and Dreamcast Sound Format (DSF) is an audio format based on PSF. It stores audio ripped from the ROMs of Sega Saturn and Sega Dreamcast games.</description>
     <platform>@PLATFORM@</platform>
+    <license>GPL-2.0</license>
+    <source>https://github.com/xbmc/audiodecoder.ssf</source>
+    <assets>
+      <icon>icon.png</icon>
+    </assets>
   </extension>
 </addon>

debian/changelog.in

@@ -3,5 +3,5 @@ kodi-audiodecoder-ssf (#PACKAGEVERSION#-#TAGREV#~#DIST#) #DIST#; urgency=low
   [ kodi ]
   * autogenerated dummy changelog
 
- -- Arne Morten Kvarving <[email protected]>  Sat, 01 Jun 2013 00:59:22 +0200
+ -- Nobody <[email protected]>  Sat, 01 Jun 2013 00:59:22 +0200
 

debian/compat

@@ -1 +1 @@
-8
+9

debian/control

@@ -1,10 +1,11 @@
 Source: kodi-audiodecoder-ssf
 Priority: extra
-Maintainer: Arne Morten Kvarving <[email protected]>
-Build-Depends: debhelper (>= 8.0.0), cmake, kodi-addon-dev,
+Maintainer: Nobody <[email protected]>
+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-ssf
 Section: libs

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: audiodecoder.ssf
 Source: <url://example.com>
 
 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

debian/kodi-audiodecoder-ssf.install

@@ -0,0 +1,2 @@
+usr/lib/*
+usr/share/*

debian/rules

@@ -18,8 +18,5 @@ override_dh_auto_configure:
 override_dh_strip:
 	dh_strip --dbg-package=kodi-audiodecoder-ssf-dbg
 
-override_dh_auto_install:
-	dh_auto_install --destdir=debian/kodi-audiodecoder-ssf
-
 override_dh_installdocs:
 	dh_installdocs --link-doc=kodi-audiodecoder-ssf

debian/source/format

@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)

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()

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)
+

src/CircularBuffer.h

@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2019 Team Kodi
+ *      Copyright (C) 2019-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 +12,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
  *  <http://www.gnu.org/licenses/>.
  *
  */

src/SSFCodec.cpp

@@ -1,5 +1,6 @@
 /*
- *      Copyright (C) 2014 Arne Morten Kvarving
+ *      Copyright (C) 2014-2020 Arne Morten Kvarving
+ *      Copyright (C) 2019-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
  *  <http://www.gnu.org/licenses/>.
  *
  */

src/SSFCodec.h

@@ -1,6 +1,6 @@
 /*
- *      Copyright (C) 2019 Team Kodi
- *      Copyright (C) 2014 Arne Morten Kvarving
+ *      Copyright (C) 2014-2020 Arne Morten Kvarving
+ *      Copyright (C) 2019-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
@@ -13,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
  *  <http://www.gnu.org/licenses/>.
  *
  */