Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
87cb4d86 by Steve Lhomme at 2025-08-25T16:16:56+02:00
contrib: libbluray: update to 1.4.0
- - - - -
3 changed files:
- + contrib/src/bluray/0001-Link-with-gdi32-when-using-freetype-in-Windows.patch
- contrib/src/bluray/SHA512SUMS
- contrib/src/bluray/rules.mak
Changes:
=====================================
contrib/src/bluray/0001-Link-with-gdi32-when-using-freetype-in-Windows.patch
=====================================
@@ -0,0 +1,30 @@
+From 8e5ef374c8ff3603a8ed4e1f48d4d5399e2e8044 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <rob...@ycbcr.xyz>
+Date: Mon, 25 Aug 2025 16:11:15 +0200
+Subject: [PATCH] Link with gdi32 when using freetype in Windows
+
+It's calling EnumFontFamiliesExW().
+---
+ src/meson.build | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/meson.build b/src/meson.build
+index 07152660..255fbc47 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -65,6 +65,12 @@ if host_machine.system() == 'windows'
+ 'file/file_win32.c',
+ 'file/mount.c',
+ )
++
++ if freetype_dependency.found()
++ # for EnumFontFamiliesExW
++ extra_dependencies += cc.find_library('gdi32')
++ endif
++
+ elif host_machine.system() == 'darwin'
+ libbluray_src += files(
+ 'file/dir_posix.c',
+--
+2.45.1.windows.1
+
=====================================
contrib/src/bluray/SHA512SUMS
=====================================
@@ -1 +1 @@
-94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1
libbluray-1.3.4.tar.bz2
+7284169b32624e5ca4fd71b260a4cc2921efafb1f63143a562568be45e373bfcbfeac63895d5659ccdcb11d7dbd0236cc46ccb15c12eff855703010e46991f27
libbluray-1.4.0.tar.xz
=====================================
contrib/src/bluray/rules.mak
=====================================
@@ -1,7 +1,7 @@
# LIBBLURAY
-BLURAY_VERSION := 1.3.4
-BLURAY_URL :=
$(VIDEOLAN)/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2
+BLURAY_VERSION := 1.4.0
+BLURAY_URL :=
$(VIDEOLAN)/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.xz
ifdef BUILD_DISCS
ifndef HAVE_WINSTORE
@@ -28,34 +28,32 @@ endif
DEPS_bluray = libxml2 $(DEPS_libxml2) freetype2 $(DEPS_freetype2)
-BLURAY_CONF = --disable-examples \
- --with-libxml2
+BLURAY_CONF = -Dfreetype=enabled -Dlibxml2=enabled
+ifdef HAVE_CROSS_COMPILE
+BLURAY_CONF += -Denable_tools=false
+endif
ifneq ($(WITH_FONTCONFIG), 0)
DEPS_bluray += fontconfig $(DEPS_fontconfig)
-else
-BLURAY_CONF += --without-fontconfig
-endif
+BLURAY_CONF += -Dfontconfig=enabled
-ifndef WITH_OPTIMIZATION
-BLURAY_CONF += --disable-optimizations
+else
+BLURAY_CONF += -Dfontconfig=disabled
endif
-$(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2:
+$(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.xz:
$(call download,$(BLURAY_URL))
-.sum-bluray: libbluray-$(BLURAY_VERSION).tar.bz2
+.sum-bluray: libbluray-$(BLURAY_VERSION).tar.xz
-bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray
+bluray: libbluray-$(BLURAY_VERSION).tar.xz .sum-bluray
$(UNPACK)
- $(call update_autoconfig,build-aux)
- $(call pkg_static,"src/libbluray.pc.in")
+ $(APPLY)
$(SRC)/bluray/0001-Link-with-gdi32-when-using-freetype-in-Windows.patch
$(MOVE)
-.bluray: bluray
+.bluray: bluray crossfile.meson
rm -rf $(PREFIX)/share/java/libbluray*.jar
- $(MAKEBUILDDIR)
- $(MAKECONFIGURE) $(BLURAY_CONF)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ $(MESONCLEAN)
+ $(MESON) $(BLURAY_CONF)
+ +$(MESONBUILD)
touch $@
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/87cb4d8687ce08cb8004221f37d6908c772297a8
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/87cb4d8687ce08cb8004221f37d6908c772297a8
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
