[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: contrib: fontconfig: disable user downloaded font on Android
Steve Lhomme (@robUx4)
gitlab at videolan.org
Tue Aug 25 18:53:36 UTC 2026
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
fdf96709 by Steve Lhomme at 2026-08-25T17:39:34+00:00
contrib: fontconfig: disable user downloaded font on Android
The system fonts should be enough or VLC should use a temporary font if needed.
We don't know what the users downloaded and how it could affect us.
(cherry picked from commit 3292346a5de85ad4d02af2eff90e3ae48593654f)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
4125d0e0 by Steve Lhomme at 2026-08-25T17:39:34+00:00
contrib: nettle: don't build tools, example, testsuite
(cherry picked from commit 5bc7d037ccc8b4c8b6544bae9048af4e004b4a49)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
f6c66172 by Steve Lhomme at 2026-08-25T17:39:34+00:00
contribs: remove RECONF for contribs not patching autotools files
Only updating the config.guess/sub should be enough.
Some contribs need the RECONF because the tarball doesn't come with a configure
script.
(cherry picked from commit a05a98e0c1a5238fbb7ac3cdc99bd67d3d2733f1) (edited)
edited:
- bluray switched to meson
- mpg123 switched to cmake
- dvdcss has REQUIRE_GPL
- dvdnav is patching configure
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
12 changed files:
- contrib/src/dvdcss/rules.mak
- contrib/src/dvdread/rules.mak
- contrib/src/ffi/rules.mak
- contrib/src/fontconfig/rules.mak
- contrib/src/jack/rules.mak
- contrib/src/nettle/rules.mak
- contrib/src/speexdsp/rules.mak
- contrib/src/twolame/rules.mak
- contrib/src/xau/rules.mak
- contrib/src/xcb-proto/rules.mak
- contrib/src/xorg-macros/rules.mak
- contrib/src/xproto/rules.mak
Changes:
=====================================
contrib/src/dvdcss/rules.mak
=====================================
@@ -20,7 +20,6 @@ DVDCSS_CONF := --disable-doc
.dvdcss: dvdcss
$(REQUIRE_GPL)
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(DVDCSS_CONF)
+$(MAKEBUILD)
=====================================
contrib/src/dvdread/rules.mak
=====================================
@@ -30,7 +30,6 @@ DVDREAD_CONF := --with-libdvdcss
.dvdread: dvdread .dvdcss
$(REQUIRE_GPL)
- $(RECONF) -I m4
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(DVDREAD_CONF)
+$(MAKEBUILD)
=====================================
contrib/src/ffi/rules.mak
=====================================
@@ -16,7 +16,6 @@ ffi: libffi-$(FFI_VERSION).tar.gz .sum-ffi
$(MOVE)
.ffi: ffi
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE)
+$(MAKEBUILD)
=====================================
contrib/src/fontconfig/rules.mak
=====================================
@@ -51,7 +51,7 @@ ifdef HAVE_ANDROID
FONTCONFIG_CONF += \
--with-cache-dir=~/.cache/fontconfig \
--with-default-fonts=/system/fonts \
- --with-add-fonts=/product/fonts,/data/fonts
+ --with-add-fonts=/product/fonts
endif
DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
=====================================
contrib/src/jack/rules.mak
=====================================
@@ -22,7 +22,6 @@ endif
$(MOVE)
.jack: jack
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE)
+$(MAKEBUILD)
=====================================
contrib/src/nettle/rules.mak
=====================================
@@ -30,8 +30,8 @@ DEPS_nettle = gmp $(DEPS_gmp)
ifndef GPL
$(REQUIRE_GNUV3)
endif
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(NETTLE_CONF)
- +$(MAKEBUILD) install
+ +$(MAKEBUILD) SUBDIRS=
+ +$(MAKEBUILD) SUBDIRS= install
touch $@
=====================================
contrib/src/speexdsp/rules.mak
=====================================
@@ -34,7 +34,6 @@ endif
endif
.speexdsp: speexdsp
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(SPEEXDSP_CONF)
+$(MAKEBUILD)
=====================================
contrib/src/twolame/rules.mak
=====================================
@@ -25,7 +25,6 @@ twolame: twolame-$(TWOLAME_VERSION).tar.gz .sum-twolame
TWOLAME_CONF := --enable-static
.twolame: twolame
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(TWOLAME_CONF)
+$(MAKEBUILD)
=====================================
contrib/src/xau/rules.mak
=====================================
@@ -20,7 +20,6 @@ DEPS_xau = xorg-macros $(DEPS_xorg-macros) xproto $(DEPS_xproto)
XAU_CONF := --enable-xthreads
.xau: libxau
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(XAU_CONF)
+$(MAKEBUILD)
=====================================
contrib/src/xcb-proto/rules.mak
=====================================
@@ -17,7 +17,6 @@ xcb-proto: xcb-proto-$(XCB_PROTO_VERSION).tar.bz2 .sum-xcb-proto
$(MOVE)
.xcb-proto: xcb-proto
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE)
+$(MAKEBUILD)
=====================================
contrib/src/xorg-macros/rules.mak
=====================================
@@ -16,7 +16,6 @@ xorg-macros: util-macros-$(UTILS_MACROS_VERSION).tar.bz2 .sum-xorg-macros
$(MOVE)
.xorg-macros: xorg-macros
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE)
+$(MAKEBUILD)
=====================================
contrib/src/xproto/rules.mak
=====================================
@@ -20,7 +20,6 @@ DEPS_xproto = xorg-macros $(DEPS_xorg-macros)
XPROTO_CONF := --enable-xthreads
.xproto: xproto
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(XPROTO_CONF)
+$(MAKEBUILD)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b32aeb837c20ac3a05cb34fd6f37ad344d94d05f...f6c661721ca8b47058f24b213b8f05615a92eadf
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b32aeb837c20ac3a05cb34fd6f37ad344d94d05f...f6c661721ca8b47058f24b213b8f05615a92eadf
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
More information about the vlc-commits
mailing list