[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: contrib: bluray: drop unused configure switches
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Sep 8 12:02:27 UTC 2025
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
a812c7f2 by Pavlov Konstantin at 2025-09-08T11:12:39+00:00
contrib: bluray: drop unused configure switches
(cherry picked from commit a2ce74c34a7da04a63552c94f8d30ec28d834a0a)
- - - - -
dee10a9e by Steve Lhomme at 2025-09-08T11:12:39+00:00
contrib: bluray: remove internal header installation
We don't use the hack anymore.
(cherry picked from commit 804acaed6762e0213ab263fb6e203a185c7a4cb1) (rebased)
rebased:
- the code around the patch is different
- - - - -
dc67166f by Steve Lhomme at 2025-09-08T11:12:39+00:00
contrib: libbluray: update to 1.4.0
(cherry picked from commit 87cb4d8687ce08cb8004221f37d6908c772297a8) (edited)
edited:
- the autoconf usage was updated in 3.0 but now we use meson
- - - - -
4 changed files:
- + contrib/src/bluray/0001-Link-with-gdi32-when-using-freetype-in-Windows.patch
- − contrib/src/bluray/0001-install-bdjo_data-header.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 <robux4 at 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/0001-install-bdjo_data-header.patch deleted
=====================================
@@ -1,37 +0,0 @@
-From 73681388dfd0f839e0b4447b3063842d606691d8 Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcvlcdev at free.fr>
-Date: Mon, 19 Nov 2018 15:27:23 +0100
-Subject: [PATCH] install bdjo_data header
-
----
- Makefile.am | 1 +
- src/libbluray/bluray.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 94add5b..f9a76a0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -218,6 +218,7 @@ pkginclude_HEADERS = \
- src/libbluray/bluray-version.h \
- src/libbluray/keys.h \
- src/libbluray/player_settings.h \
-+ src/libbluray/bdj/bdjo_data.h \
- src/libbluray/bdnav/clpi_data.h \
- src/libbluray/bdnav/meta_data.h \
- src/libbluray/decoders/overlay.h \
-diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
-index 8eb8100..86be9e6 100644
---- a/src/libbluray/bluray.h
-+++ b/src/libbluray/bluray.h
-@@ -1073,6 +1073,7 @@ void bd_free_mobj(struct mobj_objects *);
- struct bdjo_data;
- struct bdjo_data *bd_read_bdjo(const char *bdjo_file);
- void bd_free_bdjo(struct bdjo_data *);
-+#define BLURAY_HAS_BDJO_DATA_H
-
- /* BD-J testing */
-
---
-2.17.2
-
=====================================
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
PKGS += bluray
@@ -26,36 +26,32 @@ endif
DEPS_bluray = libxml2 $(DEPS_libxml2) freetype2 $(DEPS_freetype2)
-BLURAY_CONF = --disable-examples \
- --with-libxml2 \
- --enable-udf \
- --enable-bdjava
+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)
- $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux
- $(APPLY) $(SRC)/bluray/0001-install-bdjo_data-header.patch
- $(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
- cd $< && ./bootstrap
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(BLURAY_CONF)
- $(MAKE) -C $< install
+ $(MESONCLEAN)
+ $(MESON) $(BLURAY_CONF)
+ +$(MESONBUILD)
touch $@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/52607b44a1ac1ecdcc847a35d2b075d669ab7c45...dc67166f3ff9dec236f1296a993005217e63a52c
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/52607b44a1ac1ecdcc847a35d2b075d669ab7c45...dc67166f3ff9dec236f1296a993005217e63a52c
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list