diff -Nru kodi-audioencoder-lame-2.0.0/appveyor.yml kodi-audioencoder-lame-2.0.3/appveyor.yml --- kodi-audioencoder-lame-2.0.0/appveyor.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/appveyor.yml 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,33 @@ +version: BuildNr.{build} + +image: Visual Studio 2015 + +shallow_clone: true + +clone_folder: c:\projects\audioencoder.lame + +environment: + app_id: audioencoder.lame + + matrix: + - GENERATOR: "Visual Studio 14" + CONFIG: Release + - GENERATOR: "Visual Studio 14 Win64" + CONFIG: Release + - GENERATOR: "Visual Studio 14 Win64" + CONFIG: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + - GENERATOR: "Visual Studio 14 ARM" + CONFIG: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + +build_script: + - cd .. + - 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% %APPVEYOR_BUILD_FOLDER% %APPVEYOR_REPO_COMMIT% > definition\%app_id%\%app_id%.txt + - cmake -T host=x64 -G "%GENERATOR%" %WINSTORE% -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons + - cmake --build . --config %CONFIG% --target %app_id% diff -Nru kodi-audioencoder-lame-2.0.0/audioencoder.lame/addon.xml.in kodi-audioencoder-lame-2.0.3/audioencoder.lame/addon.xml.in --- kodi-audioencoder-lame-2.0.0/audioencoder.lame/addon.xml.in 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/audioencoder.lame/addon.xml.in 2014-05-17 10:40:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -10,7 +10,7 @@ extension=".mp3" library_@PLATFORM@="@LIBRARY_FILENAME@"/> - Lame MP3 Audio Encoder + LAME is a high quality MPEG Audio Layer III (MP3) It use LAME, the high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL. @PLATFORM@ diff -Nru kodi-audioencoder-lame-2.0.0/audioencoder.lame/resources/language/English/strings.po kodi-audioencoder-lame-2.0.3/audioencoder.lame/resources/language/English/strings.po --- kodi-audioencoder-lame-2.0.0/audioencoder.lame/resources/language/English/strings.po 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/audioencoder.lame/resources/language/English/strings.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\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" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: en\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgctxt "#30000" -msgid "Preset" -msgstr "" - -msgctxt "#30001" -msgid "Medium" -msgstr "" - -msgctxt "#30002" -msgid "Standard" -msgstr "" - -msgctxt "#30003" -msgid "Extreme" -msgstr "" - -msgctxt "#30004" -msgid "Constant bitrate" -msgstr "" - -msgctxt "#30005" -msgid "Bitrate" -msgstr "" - -msgctxt "#30006" -msgid "{0:d} kHz" -msgstr "" diff -Nru kodi-audioencoder-lame-2.0.0/audioencoder.lame/resources/language/resource.language.en_gb/strings.po kodi-audioencoder-lame-2.0.3/audioencoder.lame/resources/language/resource.language.en_gb/strings.po --- kodi-audioencoder-lame-2.0.0/audioencoder.lame/resources/language/resource.language.en_gb/strings.po 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/audioencoder.lame/resources/language/resource.language.en_gb/strings.po 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,49 @@ +msgid "" +msgstr "" +"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" +"Report-Msgid-Bugs-To: http://trac.xbmc.org/\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgctxt "#30000" +msgid "Preset" +msgstr "" + +msgctxt "#30001" +msgid "Enables some preconfigured settings" +msgstr "" + +msgctxt "#30002" +msgid "Medium" +msgstr "" + +msgctxt "#30003" +msgid "Standard" +msgstr "" + +msgctxt "#30004" +msgid "Extreme" +msgstr "" + +msgctxt "#30005" +msgid "Constant bitrate" +msgstr "" + +msgctxt "#30006" +msgid "Bitrate" +msgstr "" + +msgctxt "#30007" +msgid "The bitrate to be used" +msgstr "" + +msgctxt "#30008" +msgid "{0:d} kHz" +msgstr "" diff -Nru kodi-audioencoder-lame-2.0.0/audioencoder.lame/resources/settings.xml kodi-audioencoder-lame-2.0.3/audioencoder.lame/resources/settings.xml --- kodi-audioencoder-lame-2.0.0/audioencoder.lame/resources/settings.xml 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/audioencoder.lame/resources/settings.xml 2014-05-17 10:40:22.000000000 +0000 @@ -2,19 +2,19 @@
- + 0 - - - - + + + + - + 192 3 @@ -25,7 +25,7 @@ 320 - 30006 + 30008 diff -Nru kodi-audioencoder-lame-2.0.0/CMakeLists.txt kodi-audioencoder-lame-2.0.3/CMakeLists.txt --- kodi-audioencoder-lame-2.0.0/CMakeLists.txt 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/CMakeLists.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1,11 +1,8 @@ +cmake_minimum_required(VERSION 3.5) project(audioencoder.lame) -cmake_minimum_required(VERSION 2.6) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) -enable_language(CXX) - find_package(Kodi REQUIRED) find_package(Lame REQUIRED) if(WIN32) diff -Nru kodi-audioencoder-lame-2.0.0/debian/changelog kodi-audioencoder-lame-2.0.3/debian/changelog --- kodi-audioencoder-lame-2.0.0/debian/changelog 2018-03-12 17:09:40.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/debian/changelog 2014-05-17 10:40:22.000000000 +0000 @@ -1,9 +1,7 @@ -kodi-audioencoder-lame (2.0.0-1~bionic) bionic; urgency=low +kodi-audioencoder-lame (2.0.3-1~bionic) bionic; urgency=low [ xbmc ] * autogenerated dummy changelog - [ wsnipex ] - * no upstream changelog available + -- dummy Sat, 17 May 2014 11:40:22 +0100 - -- wsnipex Mon, 12 Mar 2018 18:09:40 +0100 diff -Nru kodi-audioencoder-lame-2.0.0/debian/changelog.tmp kodi-audioencoder-lame-2.0.3/debian/changelog.tmp --- kodi-audioencoder-lame-2.0.0/debian/changelog.tmp 2018-03-12 17:09:36.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/debian/changelog.tmp 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -kodi-audioencoder-lame (2.0.0-1~#DIST#) #DIST#; urgency=low - - [ xbmc ] - * autogenerated dummy changelog - - -- dummy Sat, 17 May 2014 11:40:22 +0100 - diff -Nru kodi-audioencoder-lame-2.0.0/debian/kodi-audioencoder-lame.install kodi-audioencoder-lame-2.0.3/debian/kodi-audioencoder-lame.install --- kodi-audioencoder-lame-2.0.0/debian/kodi-audioencoder-lame.install 2018-03-12 17:09:36.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/debian/kodi-audioencoder-lame.install 2014-05-17 10:40:22.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib -usr/share +usr/lib/* +usr/share/* diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/01-field-width-fix.patch kodi-audioencoder-lame-2.0.3/depends/common/lame/01-field-width-fix.patch --- kodi-audioencoder-lame-2.0.0/depends/common/lame/01-field-width-fix.patch 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/01-field-width-fix.patch 2014-05-17 10:40:22.000000000 +0000 @@ -6,7 +6,7 @@ --- a/frontend/parse.c +++ b/frontend/parse.c -@@ -372,11 +372,11 @@ +@@ -402,11 +402,11 @@ lame_version_print(FILE * const fp) const char *b = get_lame_os_bitness(); const char *v = get_lame_version(); const char *u = get_lame_url(); diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/02-privacy-breach.patch kodi-audioencoder-lame-2.0.3/depends/common/lame/02-privacy-breach.patch --- kodi-audioencoder-lame-2.0.0/depends/common/lame/02-privacy-breach.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/02-privacy-breach.patch 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,267 @@ +Description: Fix privacy-breach lintian error +Author: Sebastian Ramacher +Last-Update: 2014-08-30 + +--- a/doc/html/about.html ++++ b/doc/html/about.html +@@ -116,9 +116,9 @@ MPEG2 sample rates are 16Khz, 22.05Khz a + + + + + +- +\ No newline at end of file ++ +--- a/doc/html/cbr.html ++++ b/doc/html/cbr.html +@@ -82,9 +82,9 @@ without scanning and partially decoding + + + + +- +\ No newline at end of file ++ +--- a/doc/html/contact.html ++++ b/doc/html/contact.html +@@ -104,9 +104,9 @@ + + + + +- +\ No newline at end of file ++ +--- a/doc/html/contributors.html ++++ b/doc/html/contributors.html +@@ -169,9 +169,9 @@ + + + + +- +\ No newline at end of file ++ +--- a/doc/html/detailed.html ++++ b/doc/html/detailed.html +@@ -1286,9 +1286,9 @@ so using this switch shouldn't cause har + + + + + + + +- +\ No newline at end of file ++ +--- a/doc/html/list.html ++++ b/doc/html/list.html +@@ -47,9 +47,9 @@ + + + + +- +\ No newline at end of file ++ +--- a/doc/html/ms_stereo.html ++++ b/doc/html/ms_stereo.html +@@ -104,9 +104,9 @@ href="http://en.wikipedia.org/wiki/Joint + + + + +- +\ No newline at end of file ++ +--- a/doc/html/usage.html ++++ b/doc/html/usage.html +@@ -118,9 +118,9 @@ sounds transparent. Use lossless codecs + + + + + +- +\ No newline at end of file ++ diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/02-unbreak-ftbfs-gcc4.4.patch kodi-audioencoder-lame-2.0.3/depends/common/lame/02-unbreak-ftbfs-gcc4.4.patch --- kodi-audioencoder-lame-2.0.0/depends/common/lame/02-unbreak-ftbfs-gcc4.4.patch 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/02-unbreak-ftbfs-gcc4.4.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -Description: Unbreak compilation with gcc 4.4 - This patch is only necessary before gcc 4.5, such as gcc 4.4 in debian/squeeze. - Actually, this is a workaround in config.h for a workaround in the autoconf - generated configure script, which comments out every #undef CPP statement. - This is actually documented in the autoconf manual, like here: - http://www.gnu.org/s/hello/manual/autoconf/Header-Templates.html -Author: Reinhard Tartler - - - ---- a/config.h.in -+++ b/config.h.in -@@ -56,12 +56,14 @@ - /* add ieee754_float32_t type */ - #undef HAVE_IEEE754_FLOAT32_T - #ifndef HAVE_IEEE754_FLOAT32_T -+#define HAVE_IEEE754_FLOAT32_T - typedef float ieee754_float32_t; - #endif - - /* add ieee754_float64_t type */ - #undef HAVE_IEEE754_FLOAT64_T - #ifndef HAVE_IEEE754_FLOAT64_T -+#define HAVE_IEEE754_FLOAT64_T - typedef double ieee754_float64_t; - #endif - -@@ -71,6 +73,7 @@ - /* add ieee854_float80_t type */ - #undef HAVE_IEEE854_FLOAT80_T - #ifndef HAVE_IEEE854_FLOAT80_T -+#define HAVE_IEEE854_FLOAT80_T - typedef long double ieee854_float80_t; - #endif - ---- a/configure.in -+++ b/configure.in -@@ -147,6 +147,7 @@ - [/* add uint8_t type */ - #undef HAVE_UINT8_T - #ifndef HAVE_UINT8_T -+#define HAVE_UINT8_T - typedef unsigned char uint8_t; - #endif]) - -@@ -154,6 +155,7 @@ - [/* add int8_t type */ - #undef HAVE_INT8_T - #ifndef HAVE_INT8_T -+#define HAVE_INT8_T - typedef char int8_t; - #endif]) - -@@ -161,6 +163,7 @@ - [/* add uint16_t type */ - #undef HAVE_UINT16_T - #ifndef HAVE_UINT16_T -+#define HAVE_UINT16_T - typedef unsigned short uint16_t; - #endif]) - -@@ -168,6 +171,7 @@ - [/* add int16_t type */ - #undef HAVE_INT16_T - #ifndef HAVE_INT16_T -+#define HAVE_INT16_T - typedef short int16_t; - #endif]) - -@@ -275,6 +279,7 @@ - [/* add ieee854_float80_t type */ - #undef HAVE_IEEE854_FLOAT80_T - #ifndef HAVE_IEEE854_FLOAT80_T -+#define HAVE_IEEE854_FLOAT80_T - typedef long double ieee854_float80_t; - #endif]) - -@@ -287,6 +292,7 @@ - [/* add ieee754_float64_t type */ - #undef HAVE_IEEE754_FLOAT64_T - #ifndef HAVE_IEEE754_FLOAT64_T -+#define HAVE_IEEE754_FLOAT64_T - typedef double ieee754_float64_t; - #endif]) - -@@ -294,6 +300,7 @@ - [/* add ieee754_float32_t type */ - #undef HAVE_IEEE754_FLOAT32_T - #ifndef HAVE_IEEE754_FLOAT32_T -+#define HAVE_IEEE754_FLOAT32_T - typedef float ieee754_float32_t; - #endif]) - diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/03-msse.patch kodi-audioencoder-lame-2.0.3/depends/common/lame/03-msse.patch --- kodi-audioencoder-lame-2.0.0/depends/common/lame/03-msse.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/03-msse.patch 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Build xmm_quantize_sub.c with -msse +Author: Sebastian Ramacher +Bug: http://sourceforge.net/p/lame/bugs/443/ +Bug-Debian: https://bugs.debian.org/760047 +Forwarded: http://sourceforge.net/p/lame/bugs/443/ +Last-Update: 2014-08-31 + +--- a/libmp3lame/vector/Makefile.am ++++ b/libmp3lame/vector/Makefile.am +@@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c + + if WITH_XMM + liblamevectorroutines_la_SOURCES = $(xmm_sources) ++liblamevectorroutines_la_CFLAGS = -msse + endif + + noinst_HEADERS = lame_intrin.h diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/03-privacy-breach.patch kodi-audioencoder-lame-2.0.3/depends/common/lame/03-privacy-breach.patch --- kodi-audioencoder-lame-2.0.0/depends/common/lame/03-privacy-breach.patch 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/03-privacy-breach.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,267 +0,0 @@ -Description: Fix privacy-breach lintian error -Author: Sebastian Ramacher -Last-Update: 2014-08-30 - ---- lame-3.99.5+repack1.orig/doc/html/about.html -+++ lame-3.99.5+repack1/doc/html/about.html -@@ -116,9 +116,9 @@ MPEG2 sample rates are 16Khz, 22.05Khz a - - - - - -- -\ No newline at end of file -+ ---- lame-3.99.5+repack1.orig/doc/html/cbr.html -+++ lame-3.99.5+repack1/doc/html/cbr.html -@@ -82,9 +82,9 @@ without scanning and partially decoding - - - - -- -\ No newline at end of file -+ ---- lame-3.99.5+repack1.orig/doc/html/contact.html -+++ lame-3.99.5+repack1/doc/html/contact.html -@@ -104,9 +104,9 @@ - - - - -- -\ No newline at end of file -+ ---- lame-3.99.5+repack1.orig/doc/html/contributors.html -+++ lame-3.99.5+repack1/doc/html/contributors.html -@@ -169,9 +169,9 @@ - - - - -- -\ No newline at end of file -+ ---- lame-3.99.5+repack1.orig/doc/html/detailed.html -+++ lame-3.99.5+repack1/doc/html/detailed.html -@@ -1259,9 +1259,9 @@ so using it shouldn't cause harm. - - - - - - - -- -\ No newline at end of file -+ ---- lame-3.99.5+repack1.orig/doc/html/list.html -+++ lame-3.99.5+repack1/doc/html/list.html -@@ -47,9 +47,9 @@ - - - - -- -\ No newline at end of file -+ ---- lame-3.99.5+repack1.orig/doc/html/ms_stereo.html -+++ lame-3.99.5+repack1/doc/html/ms_stereo.html -@@ -104,9 +104,9 @@ href="http://en.wikipedia.org/wiki/Joint - - - - -- -\ No newline at end of file -+ ---- lame-3.99.5+repack1.orig/doc/html/usage.html -+++ lame-3.99.5+repack1/doc/html/usage.html -@@ -116,9 +116,9 @@ sounds transparent. Use lossless codecs - - - - - -- -\ No newline at end of file -+ diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/04-msse.patch kodi-audioencoder-lame-2.0.3/depends/common/lame/04-msse.patch --- kodi-audioencoder-lame-2.0.0/depends/common/lame/04-msse.patch 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/04-msse.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Build xmm_quantize_sub.c with -msse -Author: Sebastian Ramacher -Bug: http://sourceforge.net/p/lame/bugs/443/ -Bug-Debian: https://bugs.debian.org/760047 -Forwarded: http://sourceforge.net/p/lame/bugs/443/ -Last-Update: 2014-08-31 - ---- lame-3.99.5+repack1.orig/libmp3lame/vector/Makefile.am -+++ lame-3.99.5+repack1/libmp3lame/vector/Makefile.am -@@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c - - if WITH_XMM - liblamevectorroutines_la_SOURCES = $(xmm_sources) -+liblamevectorroutines_la_CFLAGS = -msse - endif - - noinst_HEADERS = lame_intrin.h diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/04-spelling-error-in-binary.patch kodi-audioencoder-lame-2.0.3/depends/common/lame/04-spelling-error-in-binary.patch --- kodi-audioencoder-lame-2.0.0/depends/common/lame/04-spelling-error-in-binary.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/04-spelling-error-in-binary.patch 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Fix a spelling error in the frontend code +Author: Fabian Greffrath + +--- a/frontend/get_audio.c ++++ b/frontend/get_audio.c +@@ -470,7 +470,7 @@ fskip(FILE * fp, long offset, int whence + if (whence != SEEK_CUR || offset < 0) { + if (global_ui_config.silent < 10) { + error_printf +- ("fskip problem: Mostly the return status of functions is not evaluate so it is more secure to polute .\n"); ++ ("fskip problem: Mostly the return status of functions is not evaluate so it is more secure to pollute .\n"); + } + return -1; + } diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/05-ansi2knr2devnull.patch kodi-audioencoder-lame-2.0.3/depends/common/lame/05-ansi2knr2devnull.patch --- kodi-audioencoder-lame-2.0.0/depends/common/lame/05-ansi2knr2devnull.patch 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/05-ansi2knr2devnull.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -Description: Patch out remaining ansi2knr. -Author: Dimitri John Ledkov -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755111 ---- a/configure.in -+++ b/configure.in -@@ -78,7 +78,6 @@ - fi - - dnl more automake stuff --AM_C_PROTOTYPES - - AC_CHECK_HEADER(dmalloc.h) - if test "${ac_cv_header_dmalloc_h}" = "yes"; then ---- a/doc/man/Makefile.am -+++ b/doc/man/Makefile.am -@@ -1,6 +1,6 @@ - ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $ - --AUTOMAKE_OPTIONS = foreign ansi2knr -+AUTOMAKE_OPTIONS = foreign - - man_MANS = lame.1 - EXTRA_DIST = ${man_MANS} ---- a/libmp3lame/i386/Makefile.am -+++ b/libmp3lame/i386/Makefile.am -@@ -1,6 +1,6 @@ - ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $ - --AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr -+AUTOMAKE_OPTIONS = foreign - - DEFS = @DEFS@ @CONFIG_DEFS@ - ---- a/doc/html/Makefile.am -+++ b/doc/html/Makefile.am -@@ -1,6 +1,6 @@ - ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $ - --AUTOMAKE_OPTIONS = foreign ansi2knr -+AUTOMAKE_OPTIONS = foreign - - docdir = $(datadir)/doc - pkgdocdir = $(docdir)/$(PACKAGE) diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/05-spelling-error-in-manpage.patch kodi-audioencoder-lame-2.0.3/depends/common/lame/05-spelling-error-in-manpage.patch --- kodi-audioencoder-lame-2.0.0/depends/common/lame/05-spelling-error-in-manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/05-spelling-error-in-manpage.patch 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Fix a spelling error in the frontend manpage +Author: Fabian Greffrath + +--- a/doc/man/lame.1 ++++ b/doc/man/lame.1 +@@ -906,7 +906,7 @@ Your binary may for speed reasons be com + .SH ID3 TAGS + LAME is able to embed ID3 v1, + v1.1 or v2 tags inside the encoded MP3 file. +-This allows to have some useful information about the music track ++This allows one to have some useful information about the music track + included inside the file. + Those data can be read by most MP3 players. + diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/06-gtk1-ac-directives.patch kodi-audioencoder-lame-2.0.3/depends/common/lame/06-gtk1-ac-directives.patch --- kodi-audioencoder-lame-2.0.0/depends/common/lame/06-gtk1-ac-directives.patch 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/06-gtk1-ac-directives.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ -Description: Include GTK-1 autoconf directives in build system. -Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=debian/patches -Forwarded: yes -Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/acinclude.m4?revision=1.6 - ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -85,4 +85,197 @@ - [AC_MSG_WARN(can't check for IEEE854 compliant 80 bit floats)] - )])]) # alex_IEEE854_FLOAT80 - -+# Configure paths for GTK+ -+# Owen Taylor 97-11-3 - -+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -+dnl -+AC_DEFUN([AM_PATH_GTK], -+[dnl -+dnl Get the cflags and libraries from the gtk-config script -+dnl -+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], -+ gtk_config_prefix="$withval", gtk_config_prefix="") -+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], -+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], -+ , enable_gtktest=yes) -+ -+ for module in . $4 -+ do -+ case "$module" in -+ gthread) -+ gtk_config_args="$gtk_config_args gthread" -+ ;; -+ esac -+ done -+ -+ if test x$gtk_config_exec_prefix != x ; then -+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ fi -+ fi -+ if test x$gtk_config_prefix != x ; then -+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ fi -+ fi -+ -+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no) -+ min_gtk_version=ifelse([$1], ,0.99.7,$1) -+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) -+ no_gtk="" -+ if test "$GTK_CONFIG" = "no" ; then -+ no_gtk=yes -+ else -+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+dnl -+dnl Now check if the installed GTK is sufficiently new. (Also sanity -+dnl checks the results of gtk-config to some extent -+dnl -+ rm -f conf.gtktest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.gtktest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_gtk_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) -+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || -+ (gtk_minor_version != GTK_MINOR_VERSION) || -+ (gtk_micro_version != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ } -+#endif /* defined (GTK_MAJOR_VERSION) ... */ -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -+ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$GTK_CONFIG" = "no" ; then -+ echo "*** The gtk-config script installed by GTK could not be found" -+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GTK_CONFIG environment variable to the" -+ echo "*** full path to gtk-config." -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK test program, checking why..." -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK or finding the wrong" -+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps gtk gtk-devel" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GTK was incorrectly installed" -+ echo "*** or that you have moved GTK since it was installed. In the latter case, you" -+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+ rm -f conf.gtktest -+]) diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/CMakeLists.txt kodi-audioencoder-lame-2.0.3/depends/common/lame/CMakeLists.txt --- kodi-audioencoder-lame-2.0.0/depends/common/lame/CMakeLists.txt 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/CMakeLists.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1,7 +1,6 @@ +cmake_minimum_required(VERSION 3.5) project(lame) -cmake_minimum_required(VERSION 2.8) - include(ExternalProject) externalproject_add(lame SOURCE_DIR ${CMAKE_SOURCE_DIR} @@ -16,6 +15,6 @@ BUILD_COMMAND make -C libmp3lame INSTALL_COMMAND "" BUILD_IN_SOURCE 1) - + install(CODE "execute_process(COMMAND make -C include install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") install(CODE "execute_process(COMMAND make -C libmp3lame install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/lame.sha256 kodi-audioencoder-lame-2.0.3/depends/common/lame/lame.sha256 --- kodi-audioencoder-lame-2.0.0/depends/common/lame/lame.sha256 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/lame.sha256 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1 @@ +ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e diff -Nru kodi-audioencoder-lame-2.0.0/depends/common/lame/lame.txt kodi-audioencoder-lame-2.0.3/depends/common/lame/lame.txt --- kodi-audioencoder-lame-2.0.0/depends/common/lame/lame.txt 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/common/lame/lame.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1 +1 @@ -lame http://mirrors.xbmc.org/build-deps/sources/lame-3.99.5.tar.gz +lame http://ftp.kodi.tv/build-deps/sources/lame-3.100.tar.gz diff -Nru kodi-audioencoder-lame-2.0.0/depends/windows/lame/CMakeLists.txt kodi-audioencoder-lame-2.0.3/depends/windows/lame/CMakeLists.txt --- kodi-audioencoder-lame-2.0.0/depends/windows/lame/CMakeLists.txt 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/windows/lame/CMakeLists.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1,7 +1,6 @@ +cmake_minimum_required(VERSION 3.5) project(lame) -cmake_minimum_required(VERSION 2.8) - file(RENAME ${PROJECT_SOURCE_DIR}/configMS.h ${PROJECT_SOURCE_DIR}/config.h) # there is an issue with using "Whole program optimization" so disable it diff -Nru kodi-audioencoder-lame-2.0.0/depends/windows/lame/lame.sha256 kodi-audioencoder-lame-2.0.3/depends/windows/lame/lame.sha256 --- kodi-audioencoder-lame-2.0.0/depends/windows/lame/lame.sha256 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/windows/lame/lame.sha256 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1 @@ +ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e diff -Nru kodi-audioencoder-lame-2.0.0/depends/windows/lame/lame.txt kodi-audioencoder-lame-2.0.3/depends/windows/lame/lame.txt --- kodi-audioencoder-lame-2.0.0/depends/windows/lame/lame.txt 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/depends/windows/lame/lame.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1 +1 @@ -lame http://mirrors.xbmc.org/build-deps/sources/lame-3.99.5.tar.gz \ No newline at end of file +lame http://ftp.kodi.tv/build-deps/sources/lame-3.100.tar.gz diff -Nru kodi-audioencoder-lame-2.0.0/Jenkinsfile kodi-audioencoder-lame-2.0.3/Jenkinsfile --- kodi-audioencoder-lame-2.0.0/Jenkinsfile 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/Jenkinsfile 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1 @@ +buildPlugin(version: "Leia") diff -Nru kodi-audioencoder-lame-2.0.0/README.md kodi-audioencoder-lame-2.0.3/README.md --- kodi-audioencoder-lame-2.0.0/README.md 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/README.md 2014-05-17 10:40:22.000000000 +0000 @@ -14,7 +14,7 @@ ### Linux -1. `git clone https://github.com/xbmc/xbmc.git` +1. `git clone --branch Leia https://github.com/xbmc/xbmc.git` 2. `git clone https://github.com/audioencoder.lame/audioencoder.lame.git` 3. `cd audioencoder.lame && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=audioencoder.lame -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons` diff -Nru kodi-audioencoder-lame-2.0.0/src/EncoderLame.cpp kodi-audioencoder-lame-2.0.3/src/EncoderLame.cpp --- kodi-audioencoder-lame-2.0.0/src/EncoderLame.cpp 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/src/EncoderLame.cpp 2014-05-17 10:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2005-2013 Team XBMC - * http://xbmc.org + * 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 @@ -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 * . * */ @@ -24,26 +24,26 @@ #include #include -class CEncoderLame : public kodi::addon::CInstanceAudioEncoder +class ATTRIBUTE_HIDDEN CEncoderLame : public kodi::addon::CInstanceAudioEncoder { public: CEncoderLame(KODI_HANDLE instance); - virtual ~CEncoderLame(); + ~CEncoderLame() override; - virtual bool 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) override; - virtual int Encode(int numBytesRead, const uint8_t* stream) override; - virtual bool Finish() override; + bool 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) override; + int Encode(int numBytesRead, const uint8_t* stream) override; + bool Finish() override; private: lame_global_flags* m_encoder; ///< lame encoder context @@ -197,11 +197,11 @@ //------------------------------------------------------------------------------ -class CMyAddon : public kodi::addon::CAddonBase +class ATTRIBUTE_HIDDEN CMyAddon : public kodi::addon::CAddonBase { public: - CMyAddon() { } - virtual ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance) override; + CMyAddon() = default; + ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance) override; }; ADDON_STATUS CMyAddon::CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance) diff -Nru kodi-audioencoder-lame-2.0.0/.travis.yml kodi-audioencoder-lame-2.0.3/.travis.yml --- kodi-audioencoder-lame-2.0.0/.travis.yml 2017-06-20 04:37:49.000000000 +0000 +++ kodi-audioencoder-lame-2.0.3/.travis.yml 2014-05-17 10:40:22.000000000 +0000 @@ -14,28 +14,20 @@ matrix: include: - os: linux - dist: trusty + dist: xenial sudo: required compiler: gcc - os: linux - dist: trusty + dist: xenial sudo: required compiler: clang - os: osx - osx_image: xcode7.3 + osx_image: xcode9 - os: osx - osx_image: xcode6.1 + osx_image: xcode9.4 -# -# Some of the OS X images don't have cmake, contrary to what people -# on the Internet say -# before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install lame; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -qq -y libtool libmp3lame-dev; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link gettext --force; fi # # The addon source is automatically checked out in $TRAVIS_BUILD_DIR, @@ -43,7 +35,7 @@ # before_script: - cd $TRAVIS_BUILD_DIR/.. - - git clone --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git - cd ${APPID} - mkdir build - cd build