[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: qt: do not add nostrip to CONFIG

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
f642419c by Johannes Kauffmann at 2022-12-03T15:34:01+00:00
contrib: qt: do not add nostrip to CONFIG

It was added by 44b9ee3f1daa05bd9b484a37619db7deb48ac5bc, but doesn't
have any effect on the built static libraries. It is set internally when
cross-compiling anyway.

- - - - -
a0e8ad60 by Johannes Kauffmann at 2022-12-03T15:34:01+00:00
contrib: qt: explain release-only build config

Followup from !2795.

- - - - -
2a5b058d by Johannes Kauffmann at 2022-12-03T15:34:01+00:00
contrib: qt: remove create_pc from patch

It is no longer needed here, as create_pc is added globally to CONFIG
using the qmake toolchain file.

- - - - -


2 changed files:

- contrib/src/qt/rules.mak
- contrib/src/qt/set-mkspecs-properties.patch


Changes:

=====================================
contrib/src/qt/rules.mak
=====================================
@@ -106,6 +106,8 @@ QT_CONFIG := -static -opensource -confirm-license $(QT_OPENGL) -no-pkg-config \
 	-no-feature-xml -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
+# throwing an assertion in debug mode, but only when built with clang. See issue 27476.
 QT_CONFIG += -release
 
 ifeq ($(V),1)
@@ -133,7 +135,7 @@ qmake_toolchain = echo "!host_build {"    > $(1)/.qmake.cache && \
 	echo "  QMAKE_LFLAGS   += $(BUILDLDFLAGS)"  >> $(1)/.qmake.cache && \
 	echo "}"                                           >> $(1)/.qmake.cache && \
 	echo "CONFIG -= create_libtool debug_and_release" >> $(1)/.qmake.cache && \
-	echo "CONFIG += nostrip object_parallel_to_source create_pc force_bootstrap" >> $(1)/.qmake.cache
+	echo "CONFIG += object_parallel_to_source create_pc force_bootstrap" >> $(1)/.qmake.cache
 
 
 .qt: qt


=====================================
contrib/src/qt/set-mkspecs-properties.patch
=====================================
@@ -1,11 +1,9 @@
 --- a/mkspecs/features/qml_plugin.prf	2020-09-02 12:15:07.000000000 +0200
 +++ b/mkspecs/features/qml_plugin.prf	2022-08-31 10:58:10.110600024 +0200
-@@ -12,7 +12,11 @@
- load(qt_build_config)
+@@ -13,6 +13,10 @@
 
  TEMPLATE = lib
--CONFIG += plugin
-+CONFIG += plugin create_pc
+ CONFIG += plugin
 +qmlprefixpclib_replace.match = $$dirname(_QMAKE_CONF_)
 +qmlprefixpclib_replace.replace = $$[QT_INSTALL_PREFIX]
 +qmlprefixpclib_replace.CONFIG = path
@@ -15,12 +13,10 @@
      qtConfig(debug_and_release): CONFIG += debug_and_release
 --- a/mkspecs/features/qt_plugin.prf	2020-09-02 12:15:07.000000000 +0200
 +++ b/mkspecs/features/qt_plugin.prf	2022-08-31 10:59:48.380662936 +0200
-@@ -14,8 +14,12 @@
- isEmpty(PLUGIN_TYPE): error("PLUGIN_TYPE (plugins/ subdirectory) needs to be defined.")
+@@ -15,6 +15,10 @@
 
  TEMPLATE = lib
--CONFIG += plugin
-+CONFIG += plugin create_pc
+ CONFIG += plugin
 +pluginpclib_replace.match = $$MODULE_BASE_OUTDIR/lib
 +pluginpclib_replace.replace = $$[QT_INSTALL_LIBS]
 +pluginpclib_replace.CONFIG = path
@@ -28,7 +24,6 @@
  DESTDIR = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE
 
  win32:CONFIG(shared, static|shared) {
-     # Embed a VERSIONINFO resource into the plugin's DLL.
 --- a/mkspecs/features/qml_plugin.prf	2022-09-02 14:15:09.023765377 +0200
 +++ b/mkspecs/features/qml_plugin.prf	2022-09-02 14:59:06.296938907 +0200
 @@ -30,9 +30,9 @@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/037edac375bd08e7bbe7346fd6fd1f060816bc93...2a5b058dcead7b9d55a3ddaee93055af3b9bfc63

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/037edac375bd08e7bbe7346fd6fd1f060816bc93...2a5b058dcead7b9d55a3ddaee93055af3b9bfc63
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance