[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: qt: disable printsupport

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
51c28aaa by Johannes Kauffmann at 2022-12-07T11:12:55+00:00
contrib: qt: disable printsupport

It is built, but not installed. This causes problems on macOS when
linking our libqt_plugin:

clang: error: no such file or directory: '/vlc/contrib/x86_64-apple-darwin19/lib/libQt5PrintSupport.a'

Since we don't use any of the printer related functionality, disable it
altogether.

- - - - -
0f6b7fab by Johannes Kauffmann at 2022-12-07T11:12:55+00:00
contrib: freetype: actually disable bzip2

Regression from d9c9482b253762312bcb5c0ab5043e34bb23575f.

This fixes linking on macOS with static Qt from contribs:

Undefined symbols for architecture x86_64:
  "_BZ2_bzDecompress", referenced from:
      _ft_bzip2_file_fill_output in libfreetype.a(ftbzip2.c.o)
  "_BZ2_bzDecompressEnd", referenced from:
      _ft_bzip2_stream_io in libfreetype.a(ftbzip2.c.o)
      _ft_bzip2_stream_close in libfreetype.a(ftbzip2.c.o)
  "_BZ2_bzDecompressInit", referenced from:
      _FT_Stream_OpenBzip2 in libfreetype.a(ftbzip2.c.o)
      _ft_bzip2_stream_io in libfreetype.a(ftbzip2.c.o)
ld: symbol(s) not found for architecture x86_64

- - - - -


2 changed files:

- contrib/src/freetype2/rules.mak
- contrib/src/qt/rules.mak


Changes:

=====================================
contrib/src/freetype2/rules.mak
=====================================
@@ -20,7 +20,7 @@ freetype: freetype-$(FREETYPE2_VERSION).tar.xz .sum-freetype2
 
 DEPS_freetype2 = zlib $(DEPS_zlib)
 
-FREETYPE_CONF = -DFT_DISABLE_ZLIB=OFF -DFT_DISABLE_PNG=ON -DFT_DISABLE_BZIP2=NO \
+FREETYPE_CONF = -DFT_DISABLE_ZLIB=OFF -DFT_DISABLE_PNG=ON -DFT_DISABLE_BZIP2=ON \
                 -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=ON -DFT_DISABLE_HARFBUZZ=ON \
                 -DFT_DISABLE_BROTLI=ON
 


=====================================
contrib/src/qt/rules.mak
=====================================
@@ -105,7 +105,7 @@ endif
 QT_CONFIG := -static -opensource -confirm-license $(QT_OPENGL) -no-pkg-config \
 	-no-sql-sqlite -no-gif -no-openssl -no-dbus -no-vulkan -no-sql-odbc -no-pch \
 	-no-feature-testlib -no-feature-itemmodeltester -no-feature-sqlmodel -no-feature-sql \
-	-no-feature-xml -no-compile-examples -nomake examples -nomake tests \
+	-no-feature-xml -no-feature-printer -no-compile-examples -nomake examples -nomake tests \
 	-system-freetype -system-harfbuzz -system-libjpeg -system-libpng -system-zlib
 
 # For now, we only build Qt in release mode. In debug mode, startup is prevented by the internal ANGLE



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3f097706d2ea87c942afb42ae0d25da118c7ba1d...0f6b7fab25d8c79f078b0c7b7a98ea4ebe3e2b5a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3f097706d2ea87c942afb42ae0d25da118c7ba1d...0f6b7fab25d8c79f078b0c7b7a98ea4ebe3e2b5a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance