Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build system: Qt6: fix plugin detection for static mingw builds

Browse Source
This commit is contained in:
Moritz Bunkus 2022-02-21 22:04:36 +01:00
parent 1c75ad28b2
commit b489d894fe
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ac/qt5.m4
View File

@ -71,7 +71,6 @@ check_qt5() {
if test x"$enable_static_qt" = "xyes"; then
AC_DEFINE(HAVE_STATIC_QT,,[define if building against a static Qt library])
QT_PKG_CONFIG_STATIC=--static
else
QT_PKG_CONFIG_STATIC=
@ -244,7 +243,7 @@ AC_ARG_ENABLE([qt5],
AC_HELP_STRING([--enable-qt5],[compile with Qt 5 (yes if Qt 6 is not found)]),
[],[enable_qt5=yes])
AC_ARG_ENABLE([static_qt],
AC_HELP_STRING([--enable-static-qt],[link to static versions of the Qt 5 library (no)]))
AC_HELP_STRING([--enable-static-qt],[link to static versions of the Qt library (no)]))
AC_ARG_WITH([qt_pkg_config_modules],
AC_HELP_STRING([--with-qt-pkg-config-modules=modules],[gather include/link flags for additional Qt 5 modules from pkg-config]))
AC_ARG_WITH([qt_pkg_config],

39
ac/qt6.m4
View File

@ -22,6 +22,7 @@ check_qt6() {
return
fi
rm -f src/mkvtoolnix-gui/static_plugins.cpp
qmake_dir="`mktemp -d`"
touch "$qmake_dir/configure.cpp" "$qmake_dir/configure.h"
@ -42,8 +43,16 @@ EOT
</RCC>
EOT
qmake_qtplugin_ui=""
qmake_qt_ui=""
if ! test x"$MINGW" = x1; then
qmake_qt_ui="dbus multimedia"
fi
cat > "$qmake_dir/configure_non_gui.pro" <<EOT
QT = core
TARGET = console
HEADERS = configure.h
SOURCES = configure.cpp
@ -63,10 +72,9 @@ EOT
fi
fi
MTXDBUS=dbus
for MTXTRY in 1 2; do
cat > "$qmake_dir/configure.pro" <<EOT
QT = core $MTXDBUS gui widgets network concurrent
cat > "$qmake_dir/configure.pro" <<EOT
QT = core $qmake_qt_ui gui widgets network concurrent
QTPLUGIN += $qmake_qtplugin_ui
FORMS = configure.ui
RESOURCES = configure.qrc
@ -74,20 +82,17 @@ HEADERS = configure.h
SOURCES = configure.cpp
EOT
"$QMAKE6" -makefile -nocache configure.pro > /dev/null
result2=$?
"$QMAKE6" -makefile -nocache configure.pro > /dev/null
result2=$?
if test $result2 = 0; then
if test -f Makefile.Release; then
mv Makefile.Release Makefile
fi
break
if test $result2 = 0; then
if test -f Makefile.Release; then
mv Makefile.Release Makefile
fi
unset MTXDBUS
done
unset MTXTRY
if test -f configure_plugin_import.cpp; then
cp configure_plugin_import.cpp "$old_wd/src/mkvtoolnix-gui/static_plugins.cpp"
fi
fi
"$QMAKE6" -query > "$qmake_dir/configure.properties"
result3=$?
@ -130,7 +135,7 @@ EOT
QT_LIBS="`echo $QT_LIBS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
QT_LIBS_NON_GUI="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[[^ ]]*//g' -e 's/ -f[[a-z]][[^ ]]*//g'`"
QT_LIBS_NON_GUI="$QT_LIBS_NON_GUI `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LIBS *= *//' -e 's/\$([[^)]]*)//g' -e 's:-L[[^/]][[^ ]]*::g'`"
QT_LIBS_NON_GUI="`echo $QT_LIBS_NON_GUI | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
QT_LIBS_NON_GUI="`echo $QT_LIBS_NON_GUI | sed -e 's/\$(EXPORT_ARCH_ARGS)//' -e 's/-Wl,-subsystem,windows *//g'`"
rm -rf "$qmake_dir"