diff -Nru kodi-audioencoder-flac-2.0.6/appveyor.yml kodi-audioencoder-flac-3.0.0/appveyor.yml --- kodi-audioencoder-flac-2.0.6/appveyor.yml 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/appveyor.yml 2014-05-17 10:40:22.000000000 +0000 @@ -1,6 +1,6 @@ version: BuildNr.{build} -image: Visual Studio 2015 +image: Visual Studio 2017 shallow_clone: true @@ -10,20 +10,20 @@ app_id: audioencoder.flac matrix: - - GENERATOR: "Visual Studio 14" + - GENERATOR: "Visual Studio 15" CONFIG: Release - - GENERATOR: "Visual Studio 14 Win64" + - GENERATOR: "Visual Studio 15 Win64" CONFIG: Release - - GENERATOR: "Visual Studio 14 Win64" + - GENERATOR: "Visual Studio 15 Win64" CONFIG: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" - - GENERATOR: "Visual Studio 14 ARM" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" + - GENERATOR: "Visual Studio 15 ARM" CONFIG: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" build_script: - cd .. - - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git - cd %app_id% - mkdir build - cd build diff -Nru kodi-audioencoder-flac-2.0.6/audioencoder.flac/addon.xml.in kodi-audioencoder-flac-3.0.0/audioencoder.flac/addon.xml.in --- kodi-audioencoder-flac-2.0.6/audioencoder.flac/addon.xml.in 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/audioencoder.flac/addon.xml.in 2014-05-17 10:40:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -10,12 +10,16 @@ extension=".flac" library_@PLATFORM@="@LIBRARY_FILENAME@"/> -

FLAC (Free Lossless Audio Codec) Encoder

- FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo, see supported devices) just like you would an MP3 file. +

FLAC-Encoder (Free Lossless Audio Codec)

FLAC (Free Lossless Audio Codec) Encoder

+ FLAC steht für Free Lossless Audio Codec, ein Audioformat ähnlich wie MP3, jedoch verlustfrei, was bedeutet, dass Audio in FLAC ohne Qualitätsverlust komprimiert wird. Dies ähnelt der Funktionsweise von Zip, außer dass Sie mit FLAC eine viel bessere Komprimierung erhalten, da es speziell für Audio entwickelt wurde und Sie komprimierte FLAC-Dateien nun in Ihrem Lieblingsplayer (oder in Ihrem Auto oder Ihrer Heimstereoanlage; siehe ünterstützte Geräte) wiedergeben können, als wären Sie eine MP3-Datei. + +FLAC ist der schnellste und am weitesten verbreitete verlustfreie Audio-Codec und der einzige, der gleichzeitig nicht proprietär ist, nicht durch Patente belastet ist, aus einer Open-Source-Referenzimplementierung besteht, über ein gut dokumentiertes API verfügt und über andere unabhängige Implementierungen verfügt. + FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo, see supported devices) just like you would an MP3 file. FLAC stands out as the fastest and most widely supported lossless audio codec, and the only one that at once is non-proprietary, is unencumbered by patents, has an open-source reference implementation, has a well documented format and API, and has several other independent implementations. @PLATFORM@ - GPL-2.0 + GPL-2.0-or-later https://github.com/xbmc/audioencoder.flac icon.png diff -Nru kodi-audioencoder-flac-2.0.6/audioencoder.flac/resources/language/resource.language.de_de/strings.po kodi-audioencoder-flac-3.0.0/audioencoder.flac/resources/language/resource.language.de_de/strings.po --- kodi-audioencoder-flac-2.0.6/audioencoder.flac/resources/language/resource.language.de_de/strings.po 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/audioencoder.flac/resources/language/resource.language.de_de/strings.po 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,25 @@ +# Kodi Media Center language file +# Addon Name: Flac Audio Encoder +# Addon id: audioencoder.flac +# Addon Provider: Team Kodi +msgid "" +msgstr "" +"Project-Id-Version: KODI Addons\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/audioencoder.flac/issues/\n" +"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: German (Germany) (http://www.transifex.com/projects/p/kodi-addons/language/de_DE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgctxt "#30000" +msgid "Compression level" +msgstr "Komprimierungspegel" + +msgctxt "#30001" +msgid "FLAC uses a compression level parameter that varies from 0 (fastest) to 8 (slowest). The compressed files are always perfect, lossless representations of the original data. Although the compression process involves a tradeoff between speed and size, the decoding process is always quite fast and not dependent on the level of compression." +msgstr "FLAC verwendet einen Komprimierungspegelwert, der von 0 (am schnellsten) bis 8 (am langsamsten) variiert. Die komprimierten Dateien sind immer perfekte und verlustfreie Darstellungen der Originaldaten. Obwohl der Komprimierungsprozess einen Kompromiss zwischen Geschwindigkeit und Größe beinhaltet, ist der Decodierungsprozess immer recht schnell und hängt nicht von dem Komprimierungspegel ab." diff -Nru kodi-audioencoder-flac-2.0.6/audioencoder.flac/resources/language/resource.language.en_gb/strings.po kodi-audioencoder-flac-3.0.0/audioencoder.flac/resources/language/resource.language.en_gb/strings.po --- kodi-audioencoder-flac-2.0.6/audioencoder.flac/resources/language/resource.language.en_gb/strings.po 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/audioencoder.flac/resources/language/resource.language.en_gb/strings.po 2014-05-17 10:40:22.000000000 +0000 @@ -1,15 +1,19 @@ +# Kodi Media Center language file +# Addon Name: Flac Audio Encoder +# Addon id: audioencoder.flac +# Addon Provider: Team Kodi msgid "" msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" +"Project-Id-Version: KODI Addons\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/audioencoder.flac/issues/\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: English (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/en/)\n" +"Last-Translator: Kodi Translation Team\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/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" diff -Nru kodi-audioencoder-flac-2.0.6/azure-pipelines.yml kodi-audioencoder-flac-3.0.0/azure-pipelines.yml --- kodi-audioencoder-flac-2.0.6/azure-pipelines.yml 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/azure-pipelines.yml 2014-05-17 10:40:22.000000000 +0000 @@ -4,7 +4,7 @@ trigger: branches: include: - - Leia + - Matrix - releases/* paths: include: @@ -32,12 +32,12 @@ GENERATOR: "Visual Studio 15 2017" ARCHITECTURE: x64 CONFIGURATION: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" ARM64-UWP: GENERATOR: "Visual Studio 15 2017" ARCHITECTURE: ARM64 CONFIGURATION: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" workspace: clean: all @@ -46,7 +46,7 @@ - script: | cd .. - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git kodi + git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi cd $(Build.SourcesDirectory) mkdir build cd build diff -Nru kodi-audioencoder-flac-2.0.6/.clang-format kodi-audioencoder-flac-3.0.0/.clang-format --- kodi-audioencoder-flac-2.0.6/.clang-format 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/.clang-format 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,88 @@ +--- +# BasedOnStyle: LLVM +AccessModifierOffset: -2 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlines: DontAlign +AlignOperands: true +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: InlineOnly +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: true +BinPackArguments: true +BinPackParameters: false +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Allman +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializers: BeforeColon +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true +ColumnLimit: 100 +CommentPragmas: '^ IWYU pragma:' +ConstructorInitializerAllOnOneLineOrOnePerLine: true +ConstructorInitializerIndentWidth: 2 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +IncludeBlocks: Regroup +IncludeCategories: + - Regex: '^<[a-z0-9_]+>$' + Priority: 3 + - Regex: '^<(assert|complex|ctype|errno|fenv|float|inttypes|iso646|limits|locale|math|setjmp|signal|stdalign|stdarg|stdatomic|stdbool|stddef|stdint|stdio|stdlib|stdnoreturn|string|tgmath|threads|time|uchar|wchar|wctype)\.h>$' + Priority: 3 + - Regex: '^<' + Priority: 3 + - Regex: '^["<](kodi|p8-platform)\/.*\.h[">]$' + Priority: 2 + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '$' +IndentCaseLabels: true +IndentWidth: 2 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: true +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 2 +NamespaceIndentation: None +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60000 +PointerAlignment: Left +ReflowComments: false +SortIncludes: true +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 8 +UseTab: Never +... diff -Nru kodi-audioencoder-flac-2.0.6/debian/changelog kodi-audioencoder-flac-3.0.0/debian/changelog --- kodi-audioencoder-flac-2.0.6/debian/changelog 2014-05-17 10:40:22.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/debian/changelog 2014-05-17 10:40:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-audioencoder-flac (2.0.6-1~focal) focal; urgency=low +kodi-audioencoder-flac (3.0.0-1~focal) focal; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-audioencoder-flac-2.0.6/debian/control kodi-audioencoder-flac-3.0.0/debian/control --- kodi-audioencoder-flac-2.0.6/debian/control 2014-05-17 10:40:22.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/debian/control 2014-05-17 10:40:22.000000000 +0000 @@ -4,7 +4,7 @@ Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev, libtool, libflac-dev, libogg-dev Standards-Version: 4.1.2 Section: libs -Homepage: http://kodi.tv +Homepage: https://kodi.tv Package: kodi-audioencoder-flac Section: libs diff -Nru kodi-audioencoder-flac-2.0.6/debian/rules kodi-audioencoder-flac-3.0.0/debian/rules --- kodi-audioencoder-flac-2.0.6/debian/rules 2014-05-17 10:40:22.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/debian/rules 2014-05-17 10:40:22.000000000 +0000 @@ -13,10 +13,7 @@ dh $@ override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1 - -override_dh_strip: - dh_strip --dbg-package=kodi-audioencoder-flac-dbg + dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1 override_dh_installdocs: dh_installdocs --link-doc=kodi-audioencoder-flac diff -Nru kodi-audioencoder-flac-2.0.6/debian/source/format kodi-audioencoder-flac-3.0.0/debian/source/format --- kodi-audioencoder-flac-2.0.6/debian/source/format 2014-05-17 10:40:22.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/debian/source/format 2014-05-17 10:40:22.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru kodi-audioencoder-flac-2.0.6/depends/common/flac/01-nasm.patch kodi-audioencoder-flac-3.0.0/depends/common/flac/01-nasm.patch --- kodi-audioencoder-flac-2.0.6/depends/common/flac/01-nasm.patch 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/common/flac/01-nasm.patch 2014-05-17 10:40:22.000000000 +0000 @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -379,10 +379,6 @@ +@@ -420,10 +420,6 @@ AC_SUBST(LIB_CLOCK_GETTIME) # only matters for x86 AC_CHECK_PROGS(NASM, nasm) AM_CONDITIONAL(FLaC__HAS_NASM, test -n "$NASM") @@ -9,5 +9,6 @@ -AH_TEMPLATE(FLAC__HAS_NASM, [define if you are compiling for x86 and have the NASM assembler]) -fi - if test "x$debug" = xtrue; then - CPPFLAGS="-DDEBUG $CPPFLAGS" + dnl If debugging is disabled AND no CFLAGS/CXXFLAGS/CPPFLAGS/LDFLAGS + dnl are provided, we can set defaults to our liking + diff -Nru kodi-audioencoder-flac-2.0.6/depends/common/flac/02-no-tools-build.patch kodi-audioencoder-flac-3.0.0/depends/common/flac/02-no-tools-build.patch --- kodi-audioencoder-flac-2.0.6/depends/common/flac/02-no-tools-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/common/flac/02-no-tools-build.patch 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,49 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + + option(BUILD_CXXLIBS "Build libFLAC++" ON) + option(BUILD_EXAMPLES "Build and install examples" ON) ++option(BUILD_APPS "Build applications" ON) + option(WITH_OGG "ogg support (default: test for libogg)" ON) + + if(WITH_OGG) +@@ -95,7 +96,9 @@ endif() + + add_subdirectory("doc") + add_subdirectory("src") +-add_subdirectory("microbench") ++if(BUILD_APPS) ++ add_subdirectory("microbench") ++endif() + if(BUILD_EXAMPLES) + add_subdirectory("examples") + endif() +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.0) + + option(ENABLE_64_BIT_WORDS "Set FLAC__BYTES_PER_WORD to 8 (4 is the default)" OFF) + option(WITH_XMMS "Build XMMS plugin" OFF) ++option(WITH_APPS "Build applications" ON) + + check_include_file("iconv.h" HAVE_ICONV) + +@@ -9,10 +10,13 @@ add_subdirectory("libFLAC") + if(BUILD_CXXLIBS) + add_subdirectory("libFLAC++") + endif() +-add_subdirectory("share") +-add_subdirectory("flac") +-add_subdirectory("metaflac") +-add_subdirectory("utils") ++ ++if(BUILD_APPS) ++ add_subdirectory("share") ++ add_subdirectory("flac") ++ add_subdirectory("metaflac") ++ add_subdirectory("utils") ++endif() + + if(WITH_XMMS) + add_subdirectory("plugin_common") diff -Nru kodi-audioencoder-flac-2.0.6/depends/common/flac/02-relax-linux-OS-detection.patch kodi-audioencoder-flac-3.0.0/depends/common/flac/02-relax-linux-OS-detection.patch --- kodi-audioencoder-flac-2.0.6/depends/common/flac/02-relax-linux-OS-detection.patch 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/common/flac/02-relax-linux-OS-detection.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -186,7 +186,7 @@ - AM_CONDITIONAL(OS_IS_WINDOWS, test "x$os_is_windows" = xyes) - - case "$host" in -- *-pc-linux-gnu) -+ *-pc-linux-gnu|*-linux-gnueabi*) - sys_linux=true - AC_DEFINE(FLAC__SYS_LINUX) - AH_TEMPLATE(FLAC__SYS_LINUX, [define if building for Linux]) diff -Nru kodi-audioencoder-flac-2.0.6/depends/common/flac/CMakeLists.txt kodi-audioencoder-flac-3.0.0/depends/common/flac/CMakeLists.txt --- kodi-audioencoder-flac-2.0.6/depends/common/flac/CMakeLists.txt 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/common/flac/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(flac) - -include(ExternalProject) - -externalproject_add(flac - SOURCE_DIR ${CMAKE_SOURCE_DIR} - UPDATE_COMMAND autoreconf -vif - CONFIGURE_COMMAND /configure - --prefix=${OUTPUT_DIR} - --disable-xmms-plugin - --disable-cpplibs - --disable-asm-optimizations - --enable-static - --disable-shared - --with-pic - INSTALL_COMMAND "" - BUILD_IN_SOURCE 1) - -install(CODE "execute_process(COMMAND make install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") diff -Nru kodi-audioencoder-flac-2.0.6/depends/common/flac/flac.sha256 kodi-audioencoder-flac-3.0.0/depends/common/flac/flac.sha256 --- kodi-audioencoder-flac-2.0.6/depends/common/flac/flac.sha256 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/common/flac/flac.sha256 2014-05-17 10:40:22.000000000 +0000 @@ -1 +1 @@ -91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f +668cdeab898a7dd43cf84739f7e1f3ed6b35ece2ef9968a5c7079fe9adfe1689 diff -Nru kodi-audioencoder-flac-2.0.6/depends/common/flac/flac.txt kodi-audioencoder-flac-3.0.0/depends/common/flac/flac.txt --- kodi-audioencoder-flac-2.0.6/depends/common/flac/flac.txt 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/common/flac/flac.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1 +1 @@ -flac http://mirrors.kodi.tv/build-deps/sources/flac-1.3.2.tar.xz +flac https://github.com/xiph/flac/archive/1.3.3.tar.gz diff -Nru kodi-audioencoder-flac-2.0.6/depends/common/flac/flags.txt kodi-audioencoder-flac-3.0.0/depends/common/flac/flags.txt --- kodi-audioencoder-flac-2.0.6/depends/common/flac/flags.txt 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/common/flac/flags.txt 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1 @@ +-DBUILD_CXXLIBS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_APPS=OFF -DBUILD_TESTING=OFF \ No newline at end of file diff -Nru kodi-audioencoder-flac-2.0.6/depends/windows/flac/CMakeLists.txt kodi-audioencoder-flac-3.0.0/depends/windows/flac/CMakeLists.txt --- kodi-audioencoder-flac-2.0.6/depends/windows/flac/CMakeLists.txt 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/windows/flac/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(flac) - -add_definitions(-DPACKAGE_VERSION="1.3.2" - -DFLAC__NO_DLL -DFLAC__ALIGN_MALLOC_DATA -DFLAC__HAS_OGG -DFLAC__HAS_X86INTRIN - -Dfseeko=_fseeki64 -Dftello=_ftelli64) # work around a bug in the code that leads to "undefined reference errors" - -if(CMAKE_SIZEOF_VOID_P EQUAL 4) - add_definitions(-DFLAC__CPU_IA32 -DFLAC__HAS_NASM) -elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) - add_definitions(-DENABLE_64_BIT_WORDS -DFLAC__CPU_X86_64) -endif() - -# function to setup a custom command for a compiled assembler file -function (build_nasm filename_we) - add_custom_command(OUTPUT src/libFLAC/ia32/${filename_we}.obj - COMMAND ${CMAKE_INSTALL_PREFIX}/bin/nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ${PROJECT_SOURCE_DIR}/src/libFLAC/ia32/ ${PROJECT_SOURCE_DIR}/src/libFLAC/ia32/${filename_we}.nasm -o ${PROJECT_BINARY_DIR}/src/libFLAC/ia32/${filename_we}.obj - WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}") -endfunction (build_nasm filename) - -# make sure that the output directory for the compiled assembler files exists -file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/src/libFLAC/ia32) - -# setup custom commands for the compiled assembler files -build_nasm(bitreader_asm) -build_nasm(cpu_asm) -build_nasm(fixed_asm) -build_nasm(lpc_asm) -build_nasm(stream_encoder_asm) - -set(LIBFLAC_SOURCES src/libFLAC/bitmath.c - src/libFLAC/bitreader.c - src/libFLAC/bitwriter.c - src/libFLAC/cpu.c - src/libFLAC/crc.c - src/libFLAC/fixed.c - src/libFLAC/fixed_intrin_sse2.c - src/libFLAC/fixed_intrin_ssse3.c - src/libFLAC/float.c - src/libFLAC/format.c - src/libFLAC/lpc.c - src/libFLAC/lpc_intrin_avx2.c - src/libFLAC/lpc_intrin_sse.c - src/libFLAC/lpc_intrin_sse2.c - src/libFLAC/lpc_intrin_sse41.c - src/libFLAC/md5.c - src/libFLAC/memory.c - src/libFLAC/metadata_iterators.c - src/libFLAC/metadata_object.c - src/libFLAC/ogg_decoder_aspect.c - src/libFLAC/ogg_encoder_aspect.c - src/libFLAC/ogg_helper.c - src/libFLAC/ogg_mapping.c - src/libFLAC/stream_decoder.c - src/libFLAC/stream_encoder.c - src/libFLAC/stream_encoder_framing.c - src/libFLAC/stream_encoder_intrin_avx2.c - src/libFLAC/stream_encoder_intrin_sse2.c - src/libFLAC/stream_encoder_intrin_ssse3.c - src/libFLAC/window.c - src/libFLAC/windows_unicode_filenames.c) - -if(CMAKE_SIZEOF_VOID_P EQUAL 4) - list(APPEND LIBFLAC_SOURCES - src/libFLAC/ia32/cpu_asm.obj - src/libFLAC/ia32/fixed_asm.obj - src/libFLAC/ia32/lpc_asm.obj) -endif() - -include_directories(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src/libFLAC/include ${CMAKE_INSTALL_PREFIX}/include) - -add_library(flac ${LIBFLAC_SOURCES}) - -set(HEADERS ${PROJECT_SOURCE_DIR}/include/FLAC/all.h - ${PROJECT_SOURCE_DIR}/include/FLAC/assert.h - ${PROJECT_SOURCE_DIR}/include/FLAC/callback.h - ${PROJECT_SOURCE_DIR}/include/FLAC/export.h - ${PROJECT_SOURCE_DIR}/include/FLAC/format.h - ${PROJECT_SOURCE_DIR}/include/FLAC/metadata.h - ${PROJECT_SOURCE_DIR}/include/FLAC/ordinals.h - ${PROJECT_SOURCE_DIR}/include/FLAC/stream_decoder.h - ${PROJECT_SOURCE_DIR}/include/FLAC/stream_encoder.h) -install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/FLAC) -install(TARGETS flac DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) diff -Nru kodi-audioencoder-flac-2.0.6/depends/windows/flac/deps.txt kodi-audioencoder-flac-3.0.0/depends/windows/flac/deps.txt --- kodi-audioencoder-flac-2.0.6/depends/windows/flac/deps.txt 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/windows/flac/deps.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -ogg -nasmw \ No newline at end of file diff -Nru kodi-audioencoder-flac-2.0.6/depends/windows/flac/flac.sha256 kodi-audioencoder-flac-3.0.0/depends/windows/flac/flac.sha256 --- kodi-audioencoder-flac-2.0.6/depends/windows/flac/flac.sha256 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/windows/flac/flac.sha256 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f diff -Nru kodi-audioencoder-flac-2.0.6/depends/windows/flac/flac.txt kodi-audioencoder-flac-3.0.0/depends/windows/flac/flac.txt --- kodi-audioencoder-flac-2.0.6/depends/windows/flac/flac.txt 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/windows/flac/flac.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -flac http://mirrors.kodi.tv/build-deps/sources/flac-1.3.2.tar.xz diff -Nru kodi-audioencoder-flac-2.0.6/depends/windowsstore/flac/0001-fix-uwp-api.patch kodi-audioencoder-flac-3.0.0/depends/windowsstore/flac/0001-fix-uwp-api.patch --- kodi-audioencoder-flac-2.0.6/depends/windowsstore/flac/0001-fix-uwp-api.patch 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/windowsstore/flac/0001-fix-uwp-api.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -diff --git a/src/libFLAC/windows_unicode_filenames.c b/src/libFLAC/windows_unicode_filenames.c -index 2404e31..09dd12a 100644 ---- a/src/libFLAC/windows_unicode_filenames.c -+++ b/src/libFLAC/windows_unicode_filenames.c -@@ -183,6 +183,42 @@ int flac_internal_rename_utf8(const char *oldname, const char *newname) - } - } - -+HANDLE WINAPI CreateFileW(LPCWSTR lpFileName, -+ DWORD dwDesiredAccess, -+ DWORD dwShareMode, -+ LPSECURITY_ATTRIBUTES lpSecurityAttributes, -+ DWORD dwCreationDisposition, -+ DWORD dwFlagsAndAttributes, -+ HANDLE hTemplateFile) -+{ -+ CREATEFILE2_EXTENDED_PARAMETERS createExParams; -+ createExParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS); -+ createExParams.dwFileAttributes = dwFlagsAndAttributes & 0xFFFF; -+ createExParams.dwFileFlags = dwFlagsAndAttributes & 0xFFF00000; -+ createExParams.dwSecurityQosFlags = dwFlagsAndAttributes & 0x000F00000; -+ createExParams.lpSecurityAttributes = lpSecurityAttributes; -+ createExParams.hTemplateFile = hTemplateFile; -+ return CreateFile2(lpFileName, dwDesiredAccess, dwShareMode, dwCreationDisposition, &createExParams); -+} -+ -+HANDLE WINAPI CreateFileA(LPCSTR lpFileName, -+ DWORD dwDesiredAccess, -+ DWORD dwShareMode, -+ LPSECURITY_ATTRIBUTES lpSecurityAttributes, -+ DWORD dwCreationDisposition, -+ DWORD dwFlagsAndAttributes, -+ HANDLE hTemplateFile) -+{ -+ HANDLE handle = INVALID_HANDLE_VALUE; -+ wchar_t *wname; -+ -+ if ((wname = wchar_from_utf8(lpFileName)) != NULL) { -+ handle = CreateFileW(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile); -+ free(wname); -+ } -+ return handle; -+} -+ - HANDLE WINAPI flac_internal_CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) - { - if (!utf8_filenames) { --- -2.13.2.windows.1 - diff -Nru kodi-audioencoder-flac-2.0.6/depends/windowsstore/flac/CMakeLists.txt kodi-audioencoder-flac-3.0.0/depends/windowsstore/flac/CMakeLists.txt --- kodi-audioencoder-flac-2.0.6/depends/windowsstore/flac/CMakeLists.txt 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/windowsstore/flac/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(flac) - -include(CheckSymbolExists) -check_symbol_exists(_X86_ "Windows.h" _X86_) -check_symbol_exists(_AMD64_ "Windows.h" _X64_) -check_symbol_exists(_ARM_ "Windows.h" _ARM_) -check_symbol_exists(_ARM64_ "Windows.h" _ARM64_) - -add_definitions(-DPACKAGE_VERSION="1.3.2" - -DFLAC__NO_DLL -DFLAC__ALIGN_MALLOC_DATA -DFLAC__HAS_OGG -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS - -Dfseeko=_fseeki64 -Dftello=_ftelli64) # work around a bug in the code that leads to "undefined reference errors" - -if(NOT _ARM_) - add_definitions(-DFLAC__SSE_OS -DFLAC__HAS_X86INTRIN) -endif() - -if(_X86_) - add_definitions(-DFLAC__CPU_IA32 -DFLAC__HAS_NASM) -elseif(_X64_) - add_definitions(-DENABLE_64_BIT_WORDS -DFLAC__CPU_X86_64) -elseif(_ARM64_) - add_definitions(-DENABLE_64_BIT_WORDS -DFLAC__NO_ASM -DFLAC__CPU_UNKNOWN) -elseif(_ARM_) - add_definitions(-DFLAC__NO_ASM -DFLAC__CPU_UNKNOWN) -endif() - -# function to setup a custom command for a compiled assembler file -function (build_nasm filename_we) - add_custom_command(OUTPUT src/libFLAC/ia32/${filename_we}.obj - COMMAND ${CMAKE_INSTALL_PREFIX}/bin/nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ${PROJECT_SOURCE_DIR}/src/libFLAC/ia32/ ${PROJECT_SOURCE_DIR}/src/libFLAC/ia32/${filename_we}.nasm -o ${PROJECT_BINARY_DIR}/src/libFLAC/ia32/${filename_we}.obj - WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}") -endfunction (build_nasm filename) - -# make sure that the output directory for the compiled assembler files exists -file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/src/libFLAC/ia32) - -# setup custom commands for the compiled assembler files -set(LIBFLAC_SOURCES src/libFLAC/bitmath.c - src/libFLAC/bitreader.c - src/libFLAC/bitwriter.c - src/libFLAC/cpu.c - src/libFLAC/crc.c - src/libFLAC/fixed.c - src/libFLAC/fixed_intrin_sse2.c - src/libFLAC/fixed_intrin_ssse3.c - src/libFLAC/float.c - src/libFLAC/format.c - src/libFLAC/lpc.c - src/libFLAC/lpc_intrin_avx2.c - src/libFLAC/lpc_intrin_sse.c - src/libFLAC/lpc_intrin_sse2.c - src/libFLAC/lpc_intrin_sse41.c - src/libFLAC/md5.c - src/libFLAC/memory.c - src/libFLAC/metadata_iterators.c - src/libFLAC/metadata_object.c - src/libFLAC/ogg_decoder_aspect.c - src/libFLAC/ogg_encoder_aspect.c - src/libFLAC/ogg_helper.c - src/libFLAC/ogg_mapping.c - src/libFLAC/stream_decoder.c - src/libFLAC/stream_encoder.c - src/libFLAC/stream_encoder_framing.c - src/libFLAC/stream_encoder_intrin_avx2.c - src/libFLAC/stream_encoder_intrin_sse2.c - src/libFLAC/stream_encoder_intrin_ssse3.c - src/libFLAC/window.c - src/libFLAC/windows_unicode_filenames.c) - -if(_X86_) - build_nasm(bitreader_asm) - build_nasm(cpu_asm) - build_nasm(fixed_asm) - build_nasm(lpc_asm) - build_nasm(stream_encoder_asm) - - list(APPEND LIBFLAC_SOURCES - src/libFLAC/ia32/cpu_asm.obj - src/libFLAC/ia32/fixed_asm.obj - src/libFLAC/ia32/lpc_asm.obj) -endif() - -include_directories(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src/libFLAC/include ${CMAKE_INSTALL_PREFIX}/include) - -add_library(flac ${LIBFLAC_SOURCES}) - -set(HEADERS ${PROJECT_SOURCE_DIR}/include/FLAC/all.h - ${PROJECT_SOURCE_DIR}/include/FLAC/assert.h - ${PROJECT_SOURCE_DIR}/include/FLAC/callback.h - ${PROJECT_SOURCE_DIR}/include/FLAC/export.h - ${PROJECT_SOURCE_DIR}/include/FLAC/format.h - ${PROJECT_SOURCE_DIR}/include/FLAC/metadata.h - ${PROJECT_SOURCE_DIR}/include/FLAC/ordinals.h - ${PROJECT_SOURCE_DIR}/include/FLAC/stream_decoder.h - ${PROJECT_SOURCE_DIR}/include/FLAC/stream_encoder.h) -install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/FLAC) -install(TARGETS flac DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) diff -Nru kodi-audioencoder-flac-2.0.6/depends/windowsstore/flac/deps.txt kodi-audioencoder-flac-3.0.0/depends/windowsstore/flac/deps.txt --- kodi-audioencoder-flac-2.0.6/depends/windowsstore/flac/deps.txt 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/windowsstore/flac/deps.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -ogg -nasmw \ No newline at end of file diff -Nru kodi-audioencoder-flac-2.0.6/depends/windowsstore/flac/flac.sha256 kodi-audioencoder-flac-3.0.0/depends/windowsstore/flac/flac.sha256 --- kodi-audioencoder-flac-2.0.6/depends/windowsstore/flac/flac.sha256 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/windowsstore/flac/flac.sha256 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f diff -Nru kodi-audioencoder-flac-2.0.6/depends/windowsstore/flac/flac.txt kodi-audioencoder-flac-3.0.0/depends/windowsstore/flac/flac.txt --- kodi-audioencoder-flac-2.0.6/depends/windowsstore/flac/flac.txt 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/depends/windowsstore/flac/flac.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -flac http://mirrors.kodi.tv/build-deps/sources/flac-1.3.2.tar.xz diff -Nru kodi-audioencoder-flac-2.0.6/.gitignore kodi-audioencoder-flac-3.0.0/.gitignore --- kodi-audioencoder-flac-2.0.6/.gitignore 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -# build artifacts -build/ -audioencoder.*/addon.xml - -# Debian build files -debian/changelog -debian/files -debian/*.log -debian/*.substvars -debian/.debhelper/ -debian/tmp/ -debian/kodi-audioencoder-*/ -obj-x86_64-linux-gnu/ - -# commonly used editors -# vim -*.swp - -# Eclipse -*.project -*.cproject -.classpath -*.sublime-* -.settings/ - -# KDevelop 4 -*.kdev4 - -# gedit -*~ - -# CLion -/.idea - -# clion -.idea/ - -# to prevent add after a "git format-patch VALUE" and "git add ." call -/*.patch - -# to prevent add if project code opened by Visual Studio over CMake file -.vs/ diff -Nru kodi-audioencoder-flac-2.0.6/Jenkinsfile kodi-audioencoder-flac-3.0.0/Jenkinsfile --- kodi-audioencoder-flac-2.0.6/Jenkinsfile 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/Jenkinsfile 2014-05-17 10:40:22.000000000 +0000 @@ -1 +1 @@ -buildPlugin(version: "Leia") +buildPlugin(version: "Matrix") diff -Nru kodi-audioencoder-flac-2.0.6/LICENSE.md kodi-audioencoder-flac-3.0.0/LICENSE.md --- kodi-audioencoder-flac-2.0.6/LICENSE.md 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/LICENSE.md 2014-05-17 10:40:22.000000000 +0000 @@ -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 -Nru kodi-audioencoder-flac-2.0.6/README.md kodi-audioencoder-flac-3.0.0/README.md --- kodi-audioencoder-flac-2.0.6/README.md 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/README.md 2014-05-17 10:40:22.000000000 +0000 @@ -1,23 +1,25 @@ # FLAC Audio Encoder add-on for Kodi -This is a [Kodi] (http://kodi.tv) FLAC audio encoder add-on. +This is a [Kodi](https://kodi.tv) FLAC audio encoder add-on. #### CI Testing -[![Build Status](https://travis-ci.org/xbmc/audioencoder.flac.svg?branch=master)](https://travis-ci.org/xbmc/audioencoder.flac) -[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audioencoder.flac?branchName=Leia)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=21&branchName=Leia) +[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) +[![Build Status](https://travis-ci.org/xbmc/audioencoder.flac.svg?branch=Matrix)](https://travis-ci.org/xbmc/audioencoder.flac/branches) +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audioencoder.flac?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=21&branchName=Matrix) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/audioencoder.flac/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Faudioencoder.flac/branches/) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) - + ## Build instructions -When building the add-on you have to use the correct branch depending on which version of Kodi you're building against. -For example, if you're building the `Jarvis` branch of Kodi you should checkout the `Jarvis` branch of this repository. -Add-on releases are also tagged regularly. +When building the addon you have to use the correct branch depending on which version of Kodi you're building against. +If you want to build the addon to be compatible with the latest kodi `master` commit, you need to checkout the branch with the current kodi codename. +Also make sure you follow this README from the branch in question. ### Linux -1. `git clone --branch Leia https://github.com/xbmc/xbmc.git` -2. `git clone https://github.com/audioencoder.flac/audioencoder.flac.git` +1. `git clone --branch master https://github.com/xbmc/xbmc.git` +2. `git clone --branch Matrix https://github.com/audioencoder.flac/audioencoder.flac.git` 3. `cd audioencoder.flac && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=audioencoder.flac -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons` 5. `make` @@ -27,4 +29,4 @@ ##### Useful links -* [Kodi's add-ons development support] (http://forum.kodi.tv/forumdisplay.php?fid=26) +* [Kodi's add-ons development support](https://forum.kodi.tv/forumdisplay.php?fid=26) diff -Nru kodi-audioencoder-flac-2.0.6/src/EncoderFlac.cpp kodi-audioencoder-flac-3.0.0/src/EncoderFlac.cpp --- kodi-audioencoder-flac-2.0.6/src/EncoderFlac.cpp 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/src/EncoderFlac.cpp 2014-05-17 10:40:22.000000000 +0000 @@ -1,25 +1,12 @@ /* - * Copyright (C) 2005-2020 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 (https://kodi.tv) * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ -#include #include +#include #include #include @@ -28,7 +15,7 @@ class ATTRIBUTE_HIDDEN CEncoderFlac : public kodi::addon::CInstanceAudioEncoder { public: - CEncoderFlac(KODI_HANDLE instance); + CEncoderFlac(KODI_HANDLE instance, const std::string& version); ~CEncoderFlac() override; bool Start(int inChannels, @@ -47,29 +34,28 @@ bool Finish() override; private: - static FLAC__StreamEncoderWriteStatus write_callback_flac(const FLAC__StreamEncoder *encoder, + static FLAC__StreamEncoderWriteStatus write_callback_flac(const FLAC__StreamEncoder* encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, - void *client_data); - static FLAC__StreamEncoderSeekStatus seek_callback_flac(const FLAC__StreamEncoder *encoder, + void* client_data); + static FLAC__StreamEncoderSeekStatus seek_callback_flac(const FLAC__StreamEncoder* encoder, FLAC__uint64 absolute_byte_offset, - void *client_data); + void* client_data); - static FLAC__StreamEncoderTellStatus tell_callback_flac(const FLAC__StreamEncoder *encoder, - FLAC__uint64 *absolute_byte_offset, - void *client_data); + static FLAC__StreamEncoderTellStatus tell_callback_flac(const FLAC__StreamEncoder* encoder, + FLAC__uint64* absolute_byte_offset, + void* client_data); - int64_t m_tellPos; ///< position for tell() callback - FLAC__StreamEncoder* m_encoder; + int64_t m_tellPos; ///< position for tell() callback + FLAC__StreamEncoder* m_encoder; FLAC__StreamMetadata* m_metadata[2]; - FLAC__int32 m_samplesBuf[SAMPLES_BUF_SIZE]; + FLAC__int32 m_samplesBuf[SAMPLES_BUF_SIZE]; }; -CEncoderFlac::CEncoderFlac(KODI_HANDLE instance) - : CInstanceAudioEncoder(instance), - m_tellPos(0) +CEncoderFlac::CEncoderFlac(KODI_HANDLE instance, const std::string& version) + : CInstanceAudioEncoder(instance, version), m_tellPos(0) { m_metadata[0] = nullptr; m_metadata[1] = nullptr; @@ -92,11 +78,18 @@ FLAC__stream_encoder_delete(m_encoder); } -bool CEncoderFlac::Start(int inChannels, int inRate, int inBits, - const std::string& title, const std::string& artist, - const std::string& albumartist, const std::string& album, - const std::string& year, const std::string& track, const std::string& genre, - const std::string& comment, int trackLength) +bool CEncoderFlac::Start(int inChannels, + int inRate, + int inBits, + const std::string& title, + const std::string& artist, + const std::string& albumartist, + const std::string& album, + const std::string& year, + const std::string& track, + const std::string& genre, + const std::string& comment, + int trackLength) { if (!m_encoder) return false; @@ -121,26 +114,33 @@ FLAC__StreamMetadata_VorbisComment_Entry entry; if (ok) { - if ( - (m_metadata[0] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT)) == nullptr || - (m_metadata[1] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING)) == nullptr || - !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "ARTIST", artist.c_str()) || - !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || - !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "ALBUM", album.c_str()) || - !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || - !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "ALBUMARTIST", albumartist.c_str()) || - !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || - !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "TITLE", title.c_str()) || - !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || - !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "GENRE", genre.c_str()) || - !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || - !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "TRACKNUMBER", track.c_str()) || - !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || - !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "DATE", year.c_str()) || - !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || - !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "COMMENT", comment.c_str()) || - !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) - ) + if ((m_metadata[0] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT)) == + nullptr || + (m_metadata[1] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING)) == nullptr || + !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "ARTIST", + artist.c_str()) || + !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || + !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "ALBUM", + album.c_str()) || + !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || + !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "ALBUMARTIST", + albumartist.c_str()) || + !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || + !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "TITLE", + title.c_str()) || + !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || + !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "GENRE", + genre.c_str()) || + !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || + !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "TRACKNUMBER", + track.c_str()) || + !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || + !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "DATE", + year.c_str()) || + !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false) || + !FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, "COMMENT", + comment.c_str()) || + !FLAC__metadata_object_vorbiscomment_append_comment(m_metadata[0], entry, false)) { ok = false; } @@ -155,7 +155,8 @@ if (ok) { FLAC__StreamEncoderInitStatus init_status; - init_status = FLAC__stream_encoder_init_stream(m_encoder, write_callback_flac, seek_callback_flac, tell_callback_flac, nullptr, this); + init_status = FLAC__stream_encoder_init_stream( + m_encoder, write_callback_flac, seek_callback_flac, tell_callback_flac, nullptr, this); if (init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK) { ok = false; @@ -184,7 +185,8 @@ // convert the packed little-endian 16-bit PCM samples into an interleaved FLAC__int32 buffer for libFLAC for (int i = 0; i < nSamples; i++) { // inefficient but simple and works on big- or little-endian machines. - m_samplesBuf[i] = (FLAC__int32)(((FLAC__int16)(FLAC__int8)stream[2*i+1] << 8) | (FLAC__int16)stream[2*i]); + m_samplesBuf[i] = (FLAC__int32)(((FLAC__int16)(FLAC__int8)stream[2 * i + 1] << 8) | + (FLAC__int16)stream[2 * i]); } // feed samples to encoder @@ -208,14 +210,14 @@ return true; } -FLAC__StreamEncoderWriteStatus CEncoderFlac::write_callback_flac(const FLAC__StreamEncoder *encoder, +FLAC__StreamEncoderWriteStatus CEncoderFlac::write_callback_flac(const FLAC__StreamEncoder* encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, - void *client_data) + void* client_data) { - CEncoderFlac *context = static_cast(client_data); + CEncoderFlac* context = static_cast(client_data); if (context) { if (context->Write(static_cast(buffer), bytes) == bytes) @@ -227,11 +229,11 @@ return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR; } -FLAC__StreamEncoderSeekStatus CEncoderFlac::seek_callback_flac(const FLAC__StreamEncoder *encoder, +FLAC__StreamEncoderSeekStatus CEncoderFlac::seek_callback_flac(const FLAC__StreamEncoder* encoder, FLAC__uint64 absolute_byte_offset, - void *client_data) + void* client_data) { - CEncoderFlac *context = static_cast(client_data); + CEncoderFlac* context = static_cast(client_data); if (context) { if (context->Seek(static_cast(absolute_byte_offset), 0) == absolute_byte_offset) @@ -243,12 +245,12 @@ return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR; } -FLAC__StreamEncoderTellStatus CEncoderFlac::tell_callback_flac(const FLAC__StreamEncoder *encoder, - FLAC__uint64 *absolute_byte_offset, - void *client_data) +FLAC__StreamEncoderTellStatus CEncoderFlac::tell_callback_flac(const FLAC__StreamEncoder* encoder, + FLAC__uint64* absolute_byte_offset, + void* client_data) { // libFLAC will cope without a real tell callback - CEncoderFlac *context = static_cast(client_data); + CEncoderFlac* context = static_cast(client_data); if (context) { *absolute_byte_offset = context->m_tellPos; @@ -263,12 +265,20 @@ { public: CMyAddon() = default; - ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance) override; + ADDON_STATUS CreateInstance(int instanceType, + const std::string& instanceID, + KODI_HANDLE instance, + const std::string& version, + KODI_HANDLE& addonInstance) override; }; -ADDON_STATUS CMyAddon::CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance) +ADDON_STATUS CMyAddon::CreateInstance(int instanceType, + const std::string& instanceID, + KODI_HANDLE instance, + const std::string& version, + KODI_HANDLE& addonInstance) { - addonInstance = new CEncoderFlac(instance); + addonInstance = new CEncoderFlac(instance, version); return ADDON_STATUS_OK; } diff -Nru kodi-audioencoder-flac-2.0.6/.travis.yml kodi-audioencoder-flac-3.0.0/.travis.yml --- kodi-audioencoder-flac-2.0.6/.travis.yml 2020-02-06 19:16:11.000000000 +0000 +++ kodi-audioencoder-flac-3.0.0/.travis.yml 2014-05-17 10:40:22.000000000 +0000 @@ -3,8 +3,8 @@ # # Define the build matrix # -# Travis defaults to building on Ubuntu Precise when building on -# Linux. We need Trusty in order to get up to date versions of +# 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: @@ -21,19 +21,33 @@ dist: xenial sudo: required compiler: clang + - os: linux + dist: bionic + sudo: required + compiler: gcc + env: DEBIAN_BUILD=true - os: osx - osx_image: xcode9.4 + osx_image: xcode10.2 + +before_install: + - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; 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 Leia --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-addon-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