Skip to content

Commit 2dc54d4

Browse files
committed
Update libcdio to version 2.2.0 and libcdio-paranoia to version 10.2+2.0.2.
1 parent 0863f10 commit 2dc54d4

File tree

6 files changed

+19
-20
lines changed

6 files changed

+19
-20
lines changed

.github/workflows/tools/build-macos

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ if [[ ${MACOSX_DEPLOYMENT_TARGET:0:2} = 11 ]]; then
1919
../build-codecs libcdio libcdio-paranoia
2020
cd ..
2121

22-
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
23-
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
24-
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
22+
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
23+
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
24+
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
2525

2626
sudo cp libcdio*.dylib /usr/local/lib
2727

Readme

+2
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ History
193193
- updated mpg123 to version 1.32.9
194194
- updated libfdk-aac to version 2.0.3
195195
- updated libsndfile to version 1.2.2
196+
- updated libcdio to version 2.2.0
197+
- updated libcdio-paranoia to version 10.2+2.0.2
196198

197199
- New and updated translations
198200

Readme.de

+2
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ Geschichte
192192
- mpg123 auf Version 1.32.9 aktualisiert
193193
- libfdk-aac auf Version 2.0.3 aktualisiert
194194
- libsndfile auf Version 1.2.2 aktualisiert
195+
- libcdio auf Version 2.2.0 aktualisiert
196+
- libcdio-paranoia auf Version 10.2+2.0.2 aktualisiert
195197

196198
- Neue und aktualisierte Übersetzungen
197199

packaging/flatpak/org.freac.freac.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"sources": [
4646
{
4747
"type": "archive",
48-
"url": "https://ftp.gnu.org/gnu/libcdio/libcdio-2.1.0.tar.bz2",
49-
"sha256": "8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b"
48+
"url": "https://github.com/libcdio/libcdio/releases/download/2.2.0/libcdio-2.2.0.tar.bz2",
49+
"sha256": "6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539"
5050
}
5151
]
5252
},
@@ -62,8 +62,8 @@
6262
"sources": [
6363
{
6464
"type": "archive",
65-
"url": "https://github.com/rocky/libcdio-paranoia/archive/release-10.2+2.0.1.tar.gz",
66-
"sha256": "7a4e257c85f3f84129cca55cd097c397364c7a6f79b9701bbc593b13bd59eb95"
65+
"url": "https://github.com/libcdio/libcdio-paranoia/releases/download/release-10.2+2.0.2/libcdio-paranoia-10.2+2.0.2.tar.bz2",
66+
"sha256": "186892539dedd661276014d71318c8c8f97ecb1250a86625256abd4defbf0d0c"
6767
}
6868
]
6969
},

snap/snapcraft.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ parts:
4545
- -*
4646

4747
libcdio:
48-
source: https://ftp.gnu.org/gnu/libcdio/libcdio-2.1.0.tar.bz2
49-
source-checksum: sha256/8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b
48+
source: https://github.com/libcdio/libcdio/releases/download/2.2.0/libcdio-2.2.0.tar.bz2
49+
source-checksum: sha256/6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539
5050
plugin: autotools
5151
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 ]
5252
prime:
5353
- usr/lib/libcdio.so*
5454

5555
libcdio-paranoia:
5656
after: [ libcdio ]
57-
source: https://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-10.2+2.0.1.tar.bz2
58-
source-checksum: sha256/33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a
57+
source: https://github.com/libcdio/libcdio-paranoia/releases/download/release-10.2+2.0.2/libcdio-paranoia-10.2+2.0.2.tar.bz2
58+
source-checksum: sha256/186892539dedd661276014d71318c8c8f97ecb1250a86625256abd4defbf0d0c
5959
plugin: autotools
6060
autotools-configure-parameters: [ --prefix=/usr, --disable-cxx, --disable-example-progs ]
6161
prime:

tools/build-codecs

+4-9
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ fdk_aac_version=2.0.3
160160
ffmpeg_version=7.1
161161
flac_version=1.4.3
162162
lame_version=3.100
163-
libcdio_version=2.1.0
164-
libcdio_paranoia_version=10.2+2.0.1
163+
libcdio_version=2.2.0
164+
libcdio_paranoia_version=10.2+2.0.2
165165
libcdrip_version=2.4a
166166
libogg_version=1.3.5
167167
libsamplerate_version=0.2.2
@@ -185,8 +185,8 @@ fdk_aac_location=https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk
185185
ffmpeg_location=https://ffmpeg.org/releases/ffmpeg-$ffmpeg_version.tar.xz
186186
flac_location=https://ftp.osuosl.org/pub/xiph/releases/flac/flac-$flac_version.tar.xz
187187
lame_location=https://sourceforge.net/projects/lame/files/lame/$lame_version/lame-$lame_version.tar.gz
188-
libcdio_location=https://ftp.gnu.org/gnu/libcdio/libcdio-$libcdio_version.tar.bz2
189-
libcdio_paranoia_location=https://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-$libcdio_paranoia_version.tar.bz2
188+
libcdio_location=https://github.com/libcdio/libcdio/releases/download/$libcdio_version/libcdio-$libcdio_version.tar.bz2
189+
libcdio_paranoia_location=https://github.com/libcdio/libcdio-paranoia/releases/download/release-$libcdio_paranoia_version/libcdio-paranoia-$libcdio_paranoia_version.tar.bz2
190190
libcdrip_location=http://cdrip.org/releases/libcdrip-$libcdrip_version.zip
191191
libogg_location=https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-$libogg_version.tar.xz
192192
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)
209209
lame_patches_ppc=(https://freac.org/patches/lame-$lame_version-altivec-20171014.diff https://freac.org/patches/lame-$lame_version-fastcrc.diff)
210210
lame_patch_levels_ppc=(0 1)
211211

212-
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)
213-
libcdio_patch_levels=(1 1 1)
214-
215212
rubberband_patches=(https://freac.org/patches/rubberband-$rubberband_version-fixed.diff)
216213
rubberband_patch_levels=(1)
217214

@@ -508,8 +505,6 @@ for package in ${packages[@]}; do
508505

509506
elif [ $package == libcdio ]; then
510507
# Build libcdio
511-
patches=${libcdio_patches[@]}
512-
patch_levels=(${libcdio_patch_levels[@]})
513508
export CFLAGS="$cflags -Os"
514509
configure_flags="--disable-cxx"
515510
build $libcdio_location lib/driver/.libs/libcdio$sharedinfix.$sharedext libcdio.$sharedext

0 commit comments

Comments
 (0)