[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: qt: fix .pc generation for qml_plugins

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
f876ee5a by Alexandre Janniaux at 2022-09-14T06:13:24+00:00
contrib: qt: fix .pc generation for qml_plugins

The qml_plugins did not include a rewrite rule like those that were
written in 09e3cc77daeaf597a53f5a3937c386ea1e73e47c. Consequently, the
.pc files were invalid and linking to the contrib build folder instead
of the installation prefix folder. This commit is the same as the
previous commit but dedicated to qml_plugins specifically, instead of
just qt_plugins.

- - - - -
ddb0d2bd by Alexandre Janniaux at 2022-09-14T06:13:24+00:00
contrib: qt: fix harmless typo

The generated filename part was truncated of one character. Since the
same name was reused afterwards for $(INSTALL_FILE), there is no bug nor
failure to fix here, but it helps debugging the contrib.

- - - - -
ad0c7b4b by Steve Lhomme at 2022-09-14T06:13:24+00:00
contrib: qt: use cp instead of ln for .pc

Copy the .pc file directly in $(PREFIX)/lib/pkgconfig instead of linking
them, to avoid running into issues with prebuilts.

- - - - -


2 changed files:

- contrib/src/qt/install_wrapper.sh
- contrib/src/qt/set-mkspecs-properties.patch


Changes:

=====================================
contrib/src/qt/install_wrapper.sh
=====================================
@@ -30,4 +30,4 @@ fi
 
 sed -i.orig "s,libdir=.*,libdir=${pkgconfigdir}," "${DEST}"
 mkdir -p "${VLC_PREFIX}/lib/pkgconfig"
-ln -sf "${DEST}" "${VLC_PREFIX}/lib/pkgconfig/"
+cp "${DEST}" "${VLC_PREFIX}/lib/pkgconfig/"


=====================================
contrib/src/qt/set-mkspecs-properties.patch
=====================================
@@ -1,11 +1,15 @@
 --- 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,7 @@
+@@ -12,7 +12,11 @@
  load(qt_build_config)
 
  TEMPLATE = lib
 -CONFIG += plugin
 +CONFIG += plugin create_pc
++qmlprefixpclib_replace.match = $$dirname(_QMAKE_CONF_)
++qmlprefixpclib_replace.replace = $$[QT_INSTALL_PREFIX]
++qmlprefixpclib_replace.CONFIG = path
++QMAKE_PKGCONFIG_INSTALL_REPLACE += qmlprefixpclib_replace
 
  if(win32|mac):!macx-xcode {
      qtConfig(debug_and_release): CONFIG += debug_and_release
@@ -65,7 +69,7 @@
 +        QString escaped_src = escapeFilePath(src);
 +        if (!sedargs.isEmpty()) {
 +            int pos = src.lastIndexOf('.');
-+            QString filename = src.left(pos - 1);
++            QString filename = src.left(pos);
 +            QString ext = src.mid(pos + 1);
 +            escaped_src = escapeFilePath(filename + ".qmakereplace." + ext);
 +            ret += "$(SED) " + sedargs + ' ' + escapeFilePath(src) + " > "



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4100c227d052cf5f804acd67904f698e89946110...ad0c7b4b403ecb1822cd8bdb851192108c6045e8

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4100c227d052cf5f804acd67904f698e89946110...ad0c7b4b403ecb1822cd8bdb851192108c6045e8
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance