From 9338ec4039279f359211a18021a6fce7b5e9aecb Mon Sep 17 00:00:00 2001 From: Levon Gevorgyan Date: Fri, 27 Mar 2026 12:11:41 -0500 Subject: [PATCH] bump bluray and use different symbol --- lib/build.sh | 2 +- ...mespace-dec_init-to-fix-static-build.patch | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 patches/libbluray/namespace-dec_init-to-fix-static-build.patch diff --git a/lib/build.sh b/lib/build.sh index df1cce7..c2a15a6 100644 --- a/lib/build.sh +++ b/lib/build.sh @@ -351,7 +351,7 @@ libdav1d 1.5.3 tar.xz https://downloads.videolan.org/videolan libx264 master git https://code.videolan.org/videolan/x264.git libmp3lame 3.100 tar.gz https://pilotfiber.dl.sourceforge.net/project/lame/lame/${ver}/lame-${ver}.${ext} libvpx 1.16.0 tar.gz https://github.com/webmproject/libvpx/archive/refs/tags/v${ver}.${ext} -libbluray 1.4.0 tar.xz https://download.videolan.org/pub/videolan/libbluray/${ver}/libbluray-${ver}.${ext} libfontconfig,libfreetype,libxml2 +libbluray 1.4.1 tar.xz https://download.videolan.org/pub/videolan/libbluray/${ver}/libbluray-${ver}.${ext} libfontconfig,libfreetype,libxml2 libsnappy 1.2.2 tar.gz https://github.com/google/snappy/archive/refs/tags/${ver}.${ext} libssh 0.11.1 tar.gz https://github.com/canonical/libssh/archive/refs/tags/libssh-${ver}.${ext} libcrypto libcrypto 3.6.1 tar.gz https://github.com/openssl/openssl/archive/refs/tags/openssl-${ver}.${ext} brotli,zlib,zstd diff --git a/patches/libbluray/namespace-dec_init-to-fix-static-build.patch b/patches/libbluray/namespace-dec_init-to-fix-static-build.patch new file mode 100644 index 0000000..3f0ae5c --- /dev/null +++ b/patches/libbluray/namespace-dec_init-to-fix-static-build.patch @@ -0,0 +1,39 @@ +diff --git a/src/libbluray/disc/dec.c b/src/libbluray/disc/dec.c +index feb91db..91b0b07 100644 +--- a/src/libbluray/disc/dec.c ++++ b/src/libbluray/disc/dec.c +@@ -284,7 +284,7 @@ static void _dec_load(BD_DEC *dec, BD_ENC_INFO *i) + * + */ + +-BD_DEC *dec_init(struct dec_dev *dev, BD_ENC_INFO *enc_info, ++BD_DEC *libbluray_dec_init(struct dec_dev *dev, BD_ENC_INFO *enc_info, + const char *keyfile_path, + void *regs, void *psr_read, void *psr_write) + { +diff --git a/src/libbluray/disc/dec.h b/src/libbluray/disc/dec.h +index d1329be..18550bf 100644 +--- a/src/libbluray/disc/dec.h ++++ b/src/libbluray/disc/dec.h +@@ -45,7 +45,7 @@ struct dec_dev { + + typedef struct bd_dec BD_DEC; + +-BD_PRIVATE BD_DEC *dec_init(struct dec_dev *dev, ++BD_PRIVATE BD_DEC *libbluray_dec_init(struct dec_dev *dev, + struct bd_enc_info *enc_info, + const char *keyfile_path, + void *regs, void *psr_read, void *psr_write); +diff --git a/src/libbluray/disc/disc.c b/src/libbluray/disc/disc.c +index 887296b..0267814 100644 +--- a/src/libbluray/disc/disc.c ++++ b/src/libbluray/disc/disc.c +@@ -348,7 +348,7 @@ BD_DISC *disc_open(const char *device_path, + } + + struct dec_dev dev = { p->fs_handle, p->pf_file_open_bdrom, p, (file_openFp)disc_open_path, p->disc_root, device_path }; +- p->dec = dec_init(&dev, enc_info, keyfile_path, regs, psr_read, psr_write); ++ p->dec = libbluray_dec_init(&dev, enc_info, keyfile_path, regs, psr_read, psr_write); + + return p; + }