New Upstream Snapshot - kodi-audioencoder-flac
Ready changes
Summary
Merged new upstream version: 20.2.0+git20220806.1.b480e6f+ds1 (was: 20.2.0+ds1).
Resulting package
Built on 2022-12-19T20:52 (took 2m52s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots kodi-audioencoder-flac-dbgsymapt install -t fresh-snapshots kodi-audioencoder-flac
Diff
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4e2418a..ec583c4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,25 +16,25 @@ jobs:
- job: Windows
pool:
- vmImage: 'VS2017-Win2016'
+ vmImage: 'windows-2022'
strategy:
matrix:
Win32:
- GENERATOR: "Visual Studio 15 2017"
+ GENERATOR: "Visual Studio 17 2022"
ARCHITECTURE: Win32
CONFIGURATION: Release
Win64:
- GENERATOR: "Visual Studio 15 2017"
+ GENERATOR: "Visual Studio 17 2022"
ARCHITECTURE: x64
CONFIGURATION: Release
Win64-UWP:
- GENERATOR: "Visual Studio 15 2017"
+ GENERATOR: "Visual Studio 17 2022"
ARCHITECTURE: x64
CONFIGURATION: Release
WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
ARM64-UWP:
- GENERATOR: "Visual Studio 15 2017"
+ GENERATOR: "Visual Studio 17 2022"
ARCHITECTURE: ARM64
CONFIGURATION: Release
WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
diff --git a/debian/changelog b/debian/changelog
index 932b359..5f412ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kodi-audioencoder-flac (20.2.0+git20220806.1.b480e6f+ds1-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Mon, 19 Dec 2022 20:50:50 -0000
+
kodi-audioencoder-flac (20.2.0+ds1-2) unstable; urgency=medium
* d/watch: switch to git tags
diff --git a/depends/common/flac/01-nasm.patch b/depends/common/flac/01-nasm.patch
new file mode 100644
index 0000000..0c742d5
--- /dev/null
+++ b/depends/common/flac/01-nasm.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -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")
+-if test -n "$NASM" ; then
+-AC_DEFINE(FLAC__HAS_NASM)
+-AH_TEMPLATE(FLAC__HAS_NASM, [define if you are compiling for x86 and have the NASM assembler])
+-fi
+
+ dnl If debugging is disabled AND no CFLAGS/CXXFLAGS/CPPFLAGS/LDFLAGS
+ dnl are provided, we can set defaults to our liking
+
diff --git a/depends/common/flac/02-no-tools-build.patch b/depends/common/flac/02-no-tools-build.patch
new file mode 100644
index 0000000..93bb70f
--- /dev/null
+++ b/depends/common/flac/02-no-tools-build.patch
@@ -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 --git a/depends/common/flac/deps.txt b/depends/common/flac/deps.txt
new file mode 100644
index 0000000..cbb4b00
--- /dev/null
+++ b/depends/common/flac/deps.txt
@@ -0,0 +1 @@
+ogg
\ No newline at end of file
diff --git a/depends/common/flac/flac.sha256 b/depends/common/flac/flac.sha256
new file mode 100644
index 0000000..be27091
--- /dev/null
+++ b/depends/common/flac/flac.sha256
@@ -0,0 +1 @@
+668cdeab898a7dd43cf84739f7e1f3ed6b35ece2ef9968a5c7079fe9adfe1689
diff --git a/depends/common/flac/flac.txt b/depends/common/flac/flac.txt
new file mode 100644
index 0000000..36e71d6
--- /dev/null
+++ b/depends/common/flac/flac.txt
@@ -0,0 +1 @@
+flac https://github.com/xiph/flac/archive/1.3.3.tar.gz
diff --git a/depends/common/flac/flags.txt b/depends/common/flac/flags.txt
new file mode 100644
index 0000000..3b35331
--- /dev/null
+++ b/depends/common/flac/flags.txt
@@ -0,0 +1 @@
+-DBUILD_CXXLIBS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_APPS=OFF -DBUILD_TESTING=OFF
\ No newline at end of file
diff --git a/depends/common/ogg/flags.txt b/depends/common/ogg/flags.txt
new file mode 100644
index 0000000..0dbaf48
--- /dev/null
+++ b/depends/common/ogg/flags.txt
@@ -0,0 +1 @@
+-DINSTALL_DOCS=OFF
\ No newline at end of file
diff --git a/depends/common/ogg/ogg.sha256 b/depends/common/ogg/ogg.sha256
new file mode 100644
index 0000000..ff103ed
--- /dev/null
+++ b/depends/common/ogg/ogg.sha256
@@ -0,0 +1 @@
+0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664
diff --git a/depends/common/ogg/ogg.txt b/depends/common/ogg/ogg.txt
new file mode 100644
index 0000000..92f9e51
--- /dev/null
+++ b/depends/common/ogg/ogg.txt
@@ -0,0 +1 @@
+ogg https://github.com/xiph/ogg/releases/download/v1.3.5/libogg-1.3.5.tar.gz
diff --git a/depends/windows/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch b/depends/windows/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch
new file mode 100644
index 0000000..a4627f2
--- /dev/null
+++ b/depends/windows/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch
@@ -0,0 +1,25 @@
+From: Alwin Esch <alwin.esch@web.de>
+Date: Thu, 19 Sep 2019 19:29:39 +0100
+Subject: [PATCH] Set EXTERNAL_DEPENDENCIES to 0, needed to prevent Perl
+
+Perl not available on build system, but test without was OK.
+---
+ Mkfiles/msvc.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
+index 4112c7f..22da9c6 100644
+--- a/Mkfiles/msvc.mak
++++ b/Mkfiles/msvc.mak
+@@ -364,7 +364,7 @@ everything: all docs nsis
+ # Does this version of this file have external dependencies? This definition
+ # will be automatically updated by mkdep.pl as needed.
+ #
+-EXTERNAL_DEPENDENCIES = 1
++EXTERNAL_DEPENDENCIES = 0
+
+ #
+ # Generate dependency information for this Makefile only.
+--
+2.19.2.windows.1
+
diff --git a/depends/windows/nasmw/CMakeLists.txt b/depends/windows/nasmw/CMakeLists.txt
new file mode 100644
index 0000000..2e6a057
--- /dev/null
+++ b/depends/windows/nasmw/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.5)
+project(nasmw)
+
+include(ExternalProject)
+
+externalproject_add(nasmw
+ SOURCE_DIR ${PROJECT_SOURCE_DIR}
+ BINARY_DIR ${PROJECT_SOURCE_DIR}
+ INSTALL_DIR ${PROJECT_SOURCE_DIR}
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND nmake /f Mkfiles/msvc.mak
+ INSTALL_COMMAND "")
+
+install(PROGRAMS nasm.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+ RENAME nasmw.exe)
diff --git a/depends/windows/nasmw/nasmw.sha256 b/depends/windows/nasmw/nasmw.sha256
new file mode 100644
index 0000000..9ebd362
--- /dev/null
+++ b/depends/windows/nasmw/nasmw.sha256
@@ -0,0 +1 @@
+b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc
diff --git a/depends/windows/nasmw/nasmw.txt b/depends/windows/nasmw/nasmw.txt
new file mode 100644
index 0000000..d3259d3
--- /dev/null
+++ b/depends/windows/nasmw/nasmw.txt
@@ -0,0 +1 @@
+nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz
diff --git a/depends/windowsstore/nasmw/CMakeLists.txt b/depends/windowsstore/nasmw/CMakeLists.txt
new file mode 100644
index 0000000..cb15aad
--- /dev/null
+++ b/depends/windowsstore/nasmw/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.5)
+project(nasmw)
+
+install(
+ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+)
diff --git a/depends/windowsstore/nasmw/nasmw.sha256 b/depends/windowsstore/nasmw/nasmw.sha256
new file mode 100644
index 0000000..a16ca29
--- /dev/null
+++ b/depends/windowsstore/nasmw/nasmw.sha256
@@ -0,0 +1 @@
+250f9b5eeb2111e8c7b494a977490985b8604fe7518a6f5041cde37cc727a067
diff --git a/depends/windowsstore/nasmw/nasmw.txt b/depends/windowsstore/nasmw/nasmw.txt
new file mode 100644
index 0000000..e2f578d
--- /dev/null
+++ b/depends/windowsstore/nasmw/nasmw.txt
@@ -0,0 +1 @@
+nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02-win32.zip
Debdiff
File lists identical (after any substitutions)
No differences were encountered between the control files of package kodi-audioencoder-flac
No differences were encountered between the control files of package kodi-audioencoder-flac-dbgsym