diff --git a/.github/workflows/buildCPAN.yaml b/.github/workflows/buildCPAN.yaml index 3ecc88864..828def1ab 100644 --- a/.github/workflows/buildCPAN.yaml +++ b/.github/workflows/buildCPAN.yaml @@ -1,4 +1,4 @@ -name: Build Perl CPAN modules for Logitech Media Server +name: Build Perl CPAN modules for Lyrion Music Server on: workflow_dispatch: inputs: diff --git a/CPAN/Audio-Scan-0.93.tar.gz b/CPAN/Audio-Scan-0.93.tar.gz deleted file mode 100644 index e3e3d0d95..000000000 Binary files a/CPAN/Audio-Scan-0.93.tar.gz and /dev/null differ diff --git a/CPAN/Audio-Scan-0.95.tar.gz b/CPAN/Audio-Scan-0.95.tar.gz deleted file mode 100644 index b10e5899e..000000000 Binary files a/CPAN/Audio-Scan-0.95.tar.gz and /dev/null differ diff --git a/CPAN/Audio-Scan-1.02.tar.gz b/CPAN/Audio-Scan-1.02.tar.gz deleted file mode 100644 index 19b40303f..000000000 Binary files a/CPAN/Audio-Scan-1.02.tar.gz and /dev/null differ diff --git a/CPAN/Audio-Scan-1.05.tar.gz b/CPAN/Audio-Scan-1.05.tar.gz deleted file mode 100644 index 1ead16209..000000000 Binary files a/CPAN/Audio-Scan-1.05.tar.gz and /dev/null differ diff --git a/CPAN/Audio-Scan-1.06.tar.gz b/CPAN/Audio-Scan-1.06.tar.gz deleted file mode 100644 index 63f4c12c7..000000000 Binary files a/CPAN/Audio-Scan-1.06.tar.gz and /dev/null differ diff --git a/CPAN/Audio-Scan-1.10.tar.gz b/CPAN/Audio-Scan-1.10.tar.gz new file mode 100644 index 000000000..a13b00101 Binary files /dev/null and b/CPAN/Audio-Scan-1.10.tar.gz differ diff --git a/CPAN/Docker/act.json b/CPAN/Docker/act.json index 44cd509b5..f39a28f4e 100644 --- a/CPAN/Docker/act.json +++ b/CPAN/Docker/act.json @@ -2,8 +2,8 @@ "action": "workflow_dispatch", "inputs": { "flavour": "debian", - "tag": "bullseye", - "platform": "arm64", + "tag": "bookworm", + "platform": "arm/v7", "module": "Audio::Scan" } } \ No newline at end of file diff --git a/CPAN/buildme.sh b/CPAN/buildme.sh index e80724049..2d46d961a 100755 --- a/CPAN/buildme.sh +++ b/CPAN/buildme.sh @@ -932,7 +932,7 @@ function build { build_module Sub-Uplevel-0.22 "" 0 build_module Tree-DAG_Node-1.06 "" 0 build_module Test-Warn-0.23 "" 0 - build_module Audio-Scan-1.09 + build_module Audio-Scan-1.10 ;; MP3::Cut::Gapless) diff --git a/flac/02-flac-C-locale.patch b/flac/02-flac-C-locale.patch index 7c6f84e33..127ecec5a 100644 --- a/flac/02-flac-C-locale.patch +++ b/flac/02-flac-C-locale.patch @@ -12,7 +12,7 @@ If the separator used on the flac command line does not match the separator specified by the locale, flac will simply fail, with a message of the form 'ERROR: invalid value for skip'. -Logitech Media Server makes use of the 'skip' and 'until' specifiers in +Lyrion Music Server makes use of the 'skip' and 'until' specifiers in in some of its transcoding rules. But it uses the '.' convention exclusively, without reference to the current locale. 'Slim::Utils::DateTime::fracSecToMinSec' is responsible for formatting @@ -52,7 +52,7 @@ index be072a3d..43e912b9 100644 +++ b/src/flac/main.c @@ -310,6 +310,12 @@ int main(int argc, char *argv[]) #endif - + srand((uint32_t)time(0)); + +#if 1 @@ -77,13 +77,13 @@ index be072a3d..43e912b9 100644 printf("Copyright (C) 2000-2009 Josh Coalson\n"); printf("Copyright (C) 2011-2016 Xiph.Org Foundation\n"); printf("\n"); -+ printf(" Patched for Logitech Media Server:\n"); ++ printf(" Patched for Lyrion Music Server:\n"); + printf(" This version of flac operates exclusively in the 'C'\n"); + printf(" locale. In particular, '--skip' and '--until' mm:ss.ss\n"); + printf(" specifications require a '.' as decimal separator.\n\n"); printf("This program is free software; you can redistribute it and/or\n"); printf("modify it under the terms of the GNU General Public License\n"); printf("as published by the Free Software Foundation; either version 2\n"); --- +-- 2.20.1