Update libcdio to version 2.2.0 and libcdio-paranoia to version 10.2+…

…2.0.2.
enzo1982 · Jan 20, 2025 · 2dc54d4 · 2dc54d4
1 parent 0863f10
commit 2dc54d4
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/tools/build-macos b/.github/workflows/tools/build-macos
@@ -19,9 +19,9 @@ if [[ ${MACOSX_DEPLOYMENT_TARGET:0:2} = 11 ]]; then
   ../build-codecs libcdio libcdio-paranoia
   cd ..
 
-  lipo -create libcdio-2.1.0/lib/driver/.libs/libcdio.19.dylib arm64/libcdio-2.1.0/lib/driver/.libs/libcdio.19.dylib -output libcdio.19.dylib
-  lipo -create libcdio-paranoia-10.2+2.0.1/lib/cdda_interface/.libs/libcdio_cdda.2.dylib arm64/libcdio-paranoia-10.2+2.0.1/lib/cdda_interface/.libs/libcdio_cdda.2.dylib -output libcdio_cdda.2.dylib
-  lipo -create libcdio-paranoia-10.2+2.0.1/lib/paranoia/.libs/libcdio_paranoia.2.dylib arm64/libcdio-paranoia-10.2+2.0.1/lib/paranoia/.libs/libcdio_paranoia.2.dylib -output libcdio_paranoia.2.dylib
+  lipo -create libcdio-2.2.0/lib/driver/.libs/libcdio.19.dylib arm64/libcdio-2.2.0/lib/driver/.libs/libcdio.19.dylib -output libcdio.19.dylib
+  lipo -create libcdio-paranoia-10.2+2.0.2/lib/cdda_interface/.libs/libcdio_cdda.2.dylib arm64/libcdio-paranoia-10.2+2.0.2/lib/cdda_interface/.libs/libcdio_cdda.2.dylib -output libcdio_cdda.2.dylib
+  lipo -create libcdio-paranoia-10.2+2.0.2/lib/paranoia/.libs/libcdio_paranoia.2.dylib arm64/libcdio-paranoia-10.2+2.0.2/lib/paranoia/.libs/libcdio_paranoia.2.dylib -output libcdio_paranoia.2.dylib
 
   sudo cp libcdio*.dylib /usr/local/lib
 

diff --git a/Readme b/Readme
@@ -193,6 +193,8 @@ History
 			- updated mpg123 to version 1.32.9
 			- updated libfdk-aac to version 2.0.3
 			- updated libsndfile to version 1.2.2
+			- updated libcdio to version 2.2.0
+			- updated libcdio-paranoia to version 10.2+2.0.2
 
 		- New and updated translations
 

diff --git a/Readme.de b/Readme.de
@@ -192,6 +192,8 @@ Geschichte
 			- mpg123 auf Version 1.32.9 aktualisiert
 			- libfdk-aac auf Version 2.0.3 aktualisiert
 			- libsndfile auf Version 1.2.2 aktualisiert
+			- libcdio auf Version 2.2.0 aktualisiert
+			- libcdio-paranoia auf Version 10.2+2.0.2 aktualisiert
 
 		- Neue und aktualisierte Übersetzungen
 

diff --git a/packaging/flatpak/org.freac.freac.json b/packaging/flatpak/org.freac.freac.json
@@ -45,8 +45,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://ftp.gnu.org/gnu/libcdio/libcdio-2.1.0.tar.bz2",
-                    "sha256": "8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b"
+                    "url": "https://github.com/libcdio/libcdio/releases/download/2.2.0/libcdio-2.2.0.tar.bz2",
+                    "sha256": "6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539"
                 }
             ]
         },
@@ -62,8 +62,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/rocky/libcdio-paranoia/archive/release-10.2+2.0.1.tar.gz",
-                    "sha256": "7a4e257c85f3f84129cca55cd097c397364c7a6f79b9701bbc593b13bd59eb95"
+                    "url": "https://github.com/libcdio/libcdio-paranoia/releases/download/release-10.2+2.0.2/libcdio-paranoia-10.2+2.0.2.tar.bz2",
+                    "sha256": "186892539dedd661276014d71318c8c8f97ecb1250a86625256abd4defbf0d0c"
                 }
             ]
         },

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -45,17 +45,17 @@ parts:
       - -*
 
   libcdio:
-    source: https://ftp.gnu.org/gnu/libcdio/libcdio-2.1.0.tar.bz2
-    source-checksum: sha256/8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b
+    source: https://github.com/libcdio/libcdio/releases/download/2.2.0/libcdio-2.2.0.tar.bz2
+    source-checksum: sha256/6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539
     plugin: autotools
     autotools-configure-parameters: [ --prefix=/usr, --disable-cxx, --disable-example-progs, --without-cd-drive, --without-cd-info, --without-cd-read, --without-cdda-player, --without-iso-info, --without-iso-read ]
     prime:
        - usr/lib/libcdio.so*
 
   libcdio-paranoia:
     after: [ libcdio ]
-    source: https://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-10.2+2.0.1.tar.bz2
-    source-checksum: sha256/33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a
+    source: https://github.com/libcdio/libcdio-paranoia/releases/download/release-10.2+2.0.2/libcdio-paranoia-10.2+2.0.2.tar.bz2
+    source-checksum: sha256/186892539dedd661276014d71318c8c8f97ecb1250a86625256abd4defbf0d0c
     plugin: autotools
     autotools-configure-parameters: [ --prefix=/usr, --disable-cxx, --disable-example-progs ]
     prime:

diff --git a/tools/build-codecs b/tools/build-codecs
@@ -160,8 +160,8 @@ fdk_aac_version=2.0.3
 ffmpeg_version=7.1
 flac_version=1.4.3
 lame_version=3.100
-libcdio_version=2.1.0
-libcdio_paranoia_version=10.2+2.0.1
+libcdio_version=2.2.0
+libcdio_paranoia_version=10.2+2.0.2
 libcdrip_version=2.4a
 libogg_version=1.3.5
 libsamplerate_version=0.2.2
@@ -185,8 +185,8 @@ fdk_aac_location=https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk
 ffmpeg_location=https://ffmpeg.org/releases/ffmpeg-$ffmpeg_version.tar.xz
 flac_location=https://ftp.osuosl.org/pub/xiph/releases/flac/flac-$flac_version.tar.xz
 lame_location=https://sourceforge.net/projects/lame/files/lame/$lame_version/lame-$lame_version.tar.gz
-libcdio_location=https://ftp.gnu.org/gnu/libcdio/libcdio-$libcdio_version.tar.bz2
-libcdio_paranoia_location=https://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-$libcdio_paranoia_version.tar.bz2
+libcdio_location=https://github.com/libcdio/libcdio/releases/download/$libcdio_version/libcdio-$libcdio_version.tar.bz2
+libcdio_paranoia_location=https://github.com/libcdio/libcdio-paranoia/releases/download/release-$libcdio_paranoia_version/libcdio-paranoia-$libcdio_paranoia_version.tar.bz2
 libcdrip_location=http://cdrip.org/releases/libcdrip-$libcdrip_version.zip
 libogg_location=https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-$libogg_version.tar.xz
 libsamplerate_location=https://github.com/libsndfile/libsamplerate/releases/download/$libsamplerate_version/libsamplerate-$libsamplerate_version.tar.xz
@@ -209,9 +209,6 @@ lame_patch_levels=(0 1)
 lame_patches_ppc=(https://freac.org/patches/lame-$lame_version-altivec-20171014.diff https://freac.org/patches/lame-$lame_version-fastcrc.diff)
 lame_patch_levels_ppc=(0 1)
 
-libcdio_patches=(https://freac.org/patches/libcdio-$libcdio_version-toc-osx.patch https://freac.org/patches/libcdio-$libcdio_version-cdtext-osx.patch https://freac.org/patches/libcdio-$libcdio_version-cdtext-win32.patch)
-libcdio_patch_levels=(1 1 1)
-
 rubberband_patches=(https://freac.org/patches/rubberband-$rubberband_version-fixed.diff)
 rubberband_patch_levels=(1)
 
@@ -508,8 +505,6 @@ for package in ${packages[@]}; do
 
   elif [ $package == libcdio ]; then
     # Build libcdio
-    patches=${libcdio_patches[@]}
-    patch_levels=(${libcdio_patch_levels[@]})
     export CFLAGS="$cflags -Os"
     configure_flags="--disable-cxx"
     build $libcdio_location lib/driver/.libs/libcdio$sharedinfix.$sharedext libcdio.$sharedext