diff -Nru kodi-audioencoder-vorbis-2.0.0/appveyor.yml kodi-audioencoder-vorbis-2.0.2/appveyor.yml --- kodi-audioencoder-vorbis-2.0.0/appveyor.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/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.vorbis + +environment: + app_id: audioencoder.vorbis + + 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.14393.0" + - GENERATOR: "Visual Studio 14 ARM" + CONFIG: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.14393.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-vorbis-2.0.0/audioencoder.vorbis/addon.xml.in kodi-audioencoder-vorbis-2.0.2/audioencoder.vorbis/addon.xml.in --- kodi-audioencoder-vorbis-2.0.0/audioencoder.vorbis/addon.xml.in 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/audioencoder.vorbis/addon.xml.in 2014-05-17 10:40:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff -Nru kodi-audioencoder-vorbis-2.0.0/audioencoder.vorbis/resources/language/English/strings.po kodi-audioencoder-vorbis-2.0.2/audioencoder.vorbis/resources/language/English/strings.po --- kodi-audioencoder-vorbis-2.0.0/audioencoder.vorbis/resources/language/English/strings.po 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/audioencoder.vorbis/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 "Average bitrate" -msgstr "" - -msgctxt "#30005" -msgid "Bitrate" -msgstr "" - -msgctxt "#30006" -msgid "{0:d} kHz" -msgstr "" diff -Nru kodi-audioencoder-vorbis-2.0.0/audioencoder.vorbis/resources/language/resource.language.en_gb/strings.po kodi-audioencoder-vorbis-2.0.2/audioencoder.vorbis/resources/language/resource.language.en_gb/strings.po --- kodi-audioencoder-vorbis-2.0.0/audioencoder.vorbis/resources/language/resource.language.en_gb/strings.po 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/audioencoder.vorbis/resources/language/resource.language.en_gb/strings.po 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,41 @@ +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 "Average bitrate" +msgstr "" + +msgctxt "#30005" +msgid "Bitrate" +msgstr "" + +msgctxt "#30006" +msgid "{0:d} kHz" +msgstr "" diff -Nru kodi-audioencoder-vorbis-2.0.0/CMakeLists.txt kodi-audioencoder-vorbis-2.0.2/CMakeLists.txt --- kodi-audioencoder-vorbis-2.0.0/CMakeLists.txt 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/CMakeLists.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1,11 +1,8 @@ +cmake_minimum_required(VERSION 3.5) project(audioencoder.vorbis) -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(Ogg REQUIRED) find_package(Vorbis REQUIRED) diff -Nru kodi-audioencoder-vorbis-2.0.0/debian/changelog kodi-audioencoder-vorbis-2.0.2/debian/changelog --- kodi-audioencoder-vorbis-2.0.0/debian/changelog 2018-03-05 09:07:38.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/debian/changelog 2014-05-17 10:40:22.000000000 +0000 @@ -1,9 +1,7 @@ -kodi-audioencoder-vorbis (2.0.0-1~xenial) xenial; urgency=low +kodi-audioencoder-vorbis (2.0.2-1~xenial) xenial; urgency=low [ xbmc ] * autogenerated dummy changelog - [ wsnipex ] - * no upstream changelog available + -- dummy Sat, 17 May 2014 11:40:22 +0100 - -- wsnipex Mon, 05 Mar 2018 10:07:38 +0100 diff -Nru kodi-audioencoder-vorbis-2.0.0/debian/changelog.tmp kodi-audioencoder-vorbis-2.0.2/debian/changelog.tmp --- kodi-audioencoder-vorbis-2.0.0/debian/changelog.tmp 2018-03-05 09:07:25.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/debian/changelog.tmp 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -kodi-audioencoder-vorbis (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-vorbis-2.0.0/debian/kodi-audioencoder-vorbis.install kodi-audioencoder-vorbis-2.0.2/debian/kodi-audioencoder-vorbis.install --- kodi-audioencoder-vorbis-2.0.0/debian/kodi-audioencoder-vorbis.install 2018-03-05 09:07:25.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/debian/kodi-audioencoder-vorbis.install 2014-05-17 10:40:22.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib -usr/share +usr/lib/*/kodi/addons/audioencoder.vorbis/audioencoder.vorbis.so* +usr/share/kodi/addons/audioencoder.vorbis diff -Nru kodi-audioencoder-vorbis-2.0.0/depends/common/ogg/CMakeLists.txt kodi-audioencoder-vorbis-2.0.2/depends/common/ogg/CMakeLists.txt --- kodi-audioencoder-vorbis-2.0.0/depends/common/ogg/CMakeLists.txt 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/depends/common/ogg/CMakeLists.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1,7 +1,6 @@ +cmake_minimum_required(VERSION 3.5) project(ogg) -cmake_minimum_required(VERSION 2.8) - include(ExternalProject) externalproject_add(ogg SOURCE_DIR ${CMAKE_SOURCE_DIR} @@ -10,7 +9,7 @@ --prefix=${OUTPUT_DIR} --enable-static --disable-shared - "CFLAGS=-fPIC -DPIC -O2" + --with-pic INSTALL_COMMAND "" BUILD_IN_SOURCE 1) diff -Nru kodi-audioencoder-vorbis-2.0.0/depends/common/ogg/ogg.sha256 kodi-audioencoder-vorbis-2.0.2/depends/common/ogg/ogg.sha256 --- kodi-audioencoder-vorbis-2.0.0/depends/common/ogg/ogg.sha256 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/depends/common/ogg/ogg.sha256 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1 @@ +9354c183fd88417c2860778b60b7896c9487d8f6e58b9fec3fdbf971142ce103 diff -Nru kodi-audioencoder-vorbis-2.0.0/depends/common/vorbis/CMakeLists.txt kodi-audioencoder-vorbis-2.0.2/depends/common/vorbis/CMakeLists.txt --- kodi-audioencoder-vorbis-2.0.0/depends/common/vorbis/CMakeLists.txt 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/depends/common/vorbis/CMakeLists.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1,7 +1,6 @@ +cmake_minimum_required(VERSION 3.5) project(vorbis) -cmake_minimum_required(VERSION 2.8) - include(ExternalProject) externalproject_add(vorbis SOURCE_DIR ${CMAKE_SOURCE_DIR} @@ -13,7 +12,7 @@ --disable-examples --enable-static --disable-shared - "CFLAGS=-fPIC -DPIC -O2" + --with-pic INSTALL_COMMAND "" BUILD_IN_SOURCE 1) diff -Nru kodi-audioencoder-vorbis-2.0.0/depends/common/vorbis/vorbis.sha256 kodi-audioencoder-vorbis-2.0.2/depends/common/vorbis/vorbis.sha256 --- kodi-audioencoder-vorbis-2.0.0/depends/common/vorbis/vorbis.sha256 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/depends/common/vorbis/vorbis.sha256 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1 @@ +eeb4dcada143846dfba760d982954a02f82e08845cbc33871f5dac547b8b6124 diff -Nru kodi-audioencoder-vorbis-2.0.0/depends/windows/ogg/CMakeLists.txt kodi-audioencoder-vorbis-2.0.2/depends/windows/ogg/CMakeLists.txt --- kodi-audioencoder-vorbis-2.0.0/depends/windows/ogg/CMakeLists.txt 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/depends/windows/ogg/CMakeLists.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1,7 +1,6 @@ +cmake_minimum_required(VERSION 3.5) project(libogg) -cmake_minimum_required(VERSION 2.8) - add_definitions(-DWIN32 -D_WINDOWS -D_USRDLL -DLIBOGG_EXPORTS) set(LIBOGG_SOURCES src/bitwise.c diff -Nru kodi-audioencoder-vorbis-2.0.0/depends/windows/ogg/ogg.sha256 kodi-audioencoder-vorbis-2.0.2/depends/windows/ogg/ogg.sha256 --- kodi-audioencoder-vorbis-2.0.0/depends/windows/ogg/ogg.sha256 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/depends/windows/ogg/ogg.sha256 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1 @@ +a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780 diff -Nru kodi-audioencoder-vorbis-2.0.0/depends/windows/vorbis/CMakeLists.txt kodi-audioencoder-vorbis-2.0.2/depends/windows/vorbis/CMakeLists.txt --- kodi-audioencoder-vorbis-2.0.0/depends/windows/vorbis/CMakeLists.txt 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/depends/windows/vorbis/CMakeLists.txt 2014-05-17 10:40:22.000000000 +0000 @@ -1,7 +1,6 @@ +cmake_minimum_required(VERSION 3.5) project(vorbis) -cmake_minimum_required(VERSION 2.8) - add_definitions(-DWIN32 -D_WINDOWS -D_USRDLL -DLIBVORBIS_EXPORTS) set(LIBVROBIS_SOURCES lib/analysis.c diff -Nru kodi-audioencoder-vorbis-2.0.0/depends/windows/vorbis/vorbis.sha256 kodi-audioencoder-vorbis-2.0.2/depends/windows/vorbis/vorbis.sha256 --- kodi-audioencoder-vorbis-2.0.0/depends/windows/vorbis/vorbis.sha256 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/depends/windows/vorbis/vorbis.sha256 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1 @@ +eeb4dcada143846dfba760d982954a02f82e08845cbc33871f5dac547b8b6124 diff -Nru kodi-audioencoder-vorbis-2.0.0/FindOgg.cmake kodi-audioencoder-vorbis-2.0.2/FindOgg.cmake --- kodi-audioencoder-vorbis-2.0.0/FindOgg.cmake 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/FindOgg.cmake 2014-05-17 10:40:22.000000000 +0000 @@ -7,16 +7,15 @@ find_package(PkgConfig) if(PKG_CONFIG_FOUND) - pkg_check_modules (OGG ogg) - list(APPEND OGG_INCLUDE_DIRS ${OGG_INCLUDEDIR}) + pkg_check_modules(PC_OGG ogg QUIET) endif() -if(NOT OGG_FOUND) - find_path(OGG_INCLUDE_DIRS ogg/ogg.h) - find_library(OGG_LIBRARIES ogg) -endif() +find_path(OGG_INCLUDE_DIRS ogg/ogg.h + PATHS ${PC_OGG_INCLUDEDIR}) +find_library(OGG_LIBRARIES ogg + PATHS ${PC_OGG_LIBDIR}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Ogg DEFAULT_MSG OGG_INCLUDE_DIRS OGG_LIBRARIES) +find_package_handle_standard_args(Ogg REQUIRED_VARS OGG_INCLUDE_DIRS OGG_LIBRARIES) mark_as_advanced(OGG_INCLUDE_DIRS OGG_LIBRARIES) diff -Nru kodi-audioencoder-vorbis-2.0.0/FindVorbis.cmake kodi-audioencoder-vorbis-2.0.2/FindVorbis.cmake --- kodi-audioencoder-vorbis-2.0.0/FindVorbis.cmake 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/FindVorbis.cmake 2014-05-17 10:40:22.000000000 +0000 @@ -7,16 +7,15 @@ find_package(PkgConfig) if(PKG_CONFIG_FOUND) - pkg_check_modules (VORBIS vorbis) - list(APPEND VORBIS_INCLUDE_DIRS ${VORBIS_INCLUDEDIR}) + pkg_check_modules(PC_VORBIS vorbis QUIET) endif() -if(NOT VORBIS_FOUND) - find_path(VORBIS_INCLUDE_DIRS vorbis/vorbisenc.h) - find_library(VORBIS_LIBRARIES vorbis) -endif() +find_path(VORBIS_INCLUDE_DIRS vorbis/vorbisenc.h + PATHS ${PC_VORBIS_INCLUDEDIR}) +find_library(VORBIS_LIBRARIES vorbis + PATHS ${PC_VORBIS_LIBDIR}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Vorbis DEFAULT_MSG VORBIS_INCLUDE_DIRS VORBIS_LIBRARIES) +find_package_handle_standard_args(Vorbis REQUIRED_VARS VORBIS_INCLUDE_DIRS VORBIS_LIBRARIES) mark_as_advanced(VORBIS_INCLUDE_DIRS VORBIS_LIBRARIES) diff -Nru kodi-audioencoder-vorbis-2.0.0/FindVorbisEnc.cmake kodi-audioencoder-vorbis-2.0.2/FindVorbisEnc.cmake --- kodi-audioencoder-vorbis-2.0.0/FindVorbisEnc.cmake 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/FindVorbisEnc.cmake 2014-05-17 10:40:22.000000000 +0000 @@ -7,16 +7,15 @@ find_package(PkgConfig) if(PKG_CONFIG_FOUND) - pkg_check_modules (VORBISENC vorbisenc) - list(APPEND VORBISENC_INCLUDE_DIRS ${VORBISENC_INCLUDEDIR}) + pkg_check_modules(PC_VORBISENC vorbisenc QUIET) endif() -if(NOT VORBISENC_FOUND) - find_path(VORBISENC_INCLUDE_DIRS vorbis/vorbisenc.h) - find_library(VORBISENC_LIBRARIES vorbisenc) -endif() +find_path(VORBISENC_INCLUDE_DIRS vorbis/vorbisenc.h + PATHS ${PC_VORBISENC_INCLUDEDIR}) +find_library(VORBISENC_LIBRARIES vorbisenc + PATHS ${PC_VORBISENC_LIBDIR}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(VorbisEnc DEFAULT_MSG VORBISENC_INCLUDE_DIRS VORBISENC_LIBRARIES) +find_package_handle_standard_args(VorbisEnc REQUIRED_VARS VORBISENC_INCLUDE_DIRS VORBISENC_LIBRARIES) mark_as_advanced(VORBISENC_INCLUDE_DIRS VORBISENC_LIBRARIES) diff -Nru kodi-audioencoder-vorbis-2.0.0/Jenkinsfile kodi-audioencoder-vorbis-2.0.2/Jenkinsfile --- kodi-audioencoder-vorbis-2.0.0/Jenkinsfile 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/Jenkinsfile 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1 @@ +buildPlugin(version: "Leia") diff -Nru kodi-audioencoder-vorbis-2.0.0/README.md kodi-audioencoder-vorbis-2.0.2/README.md --- kodi-audioencoder-vorbis-2.0.0/README.md 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/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.vorbis/audioencoder.vorbis.git` 3. `cd audioencoder.vorbis && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=audioencoder.vorbis -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons` diff -Nru kodi-audioencoder-vorbis-2.0.0/.travis.yml kodi-audioencoder-vorbis-2.0.2/.travis.yml --- kodi-audioencoder-vorbis-2.0.0/.travis.yml 2017-10-23 06:41:34.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.2/.travis.yml 2014-05-17 10:40:22.000000000 +0000 @@ -3,10 +3,6 @@ # # 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 -# cmake and g++. -# env: global: - APPID=audioencoder.vorbis @@ -14,28 +10,17 @@ 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 - -# -# 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 libvorbis; 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 libvorbis-dev; fi + osx_image: xcode9.4 # # The addon source is automatically checked out in $TRAVIS_BUILD_DIR, @@ -43,7 +28,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