pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: glib2 deprecation vs gtk2



29 February 2020, 07:42:47 "voidpin" <voidpin%protonmail.com@localhost>: 
> pin@mybox $ doas pkgin install speedcrunch
> Password:
> calculating dependencies...done.
> 
> 30 packages to install:
> libdaemon-0.14nb1 flac-1.3.3 speex-1.2.0 check-0.13.0nb1 orc-0.4.31
> gstreamer1-1.16.2 libmysofa-1.0 speexdsp-1.2.0 libsndfile-1.0.28nb3
> libltdl-2.4.6 gdbm-1.14.1 consolekit-1.2.1nb3 avahi-0.6.32nb19 llvm-9.0.1
> qt5-qtserialport-5.14.1 pulseaudio-13.0nb2 openal-soft-1.20.1
> gst-plugins1-base-1.16.2 qt5-qtwebsockets-5.14.1 gsed-4.8 bash-5.0.16nb1
> xdg-utils-1.1.3nb1 qt5-qtwebchannel-5.14.1 qt5-qtsensors-5.14.1
> qt5-qtmultimedia-5.14.1 qt5-qtlocation-5.14.1 qt5-qtdeclarative-5.14.1
> clang-9.0.1 qt5-qttools-5.14.1 speedcrunch-0.12.0nb1
> 
> 0 to refresh, 0 to upgrade, 30 to install
> 160M to download, 637M to install

Qt5 pkgsrc packaging might have a few mistakes, because no pulseaudio or
bash or clang need to be in this list. Application doesn't use them.

Clang builds qt5 developer documentation tools, you don't want it or the
rest of llvm unless you develop llvm or qt. Pulseaudio is optional, with
it and some PLIST changes the rest builds fine, no longer wanting
consolekit and its recursive dependencies like spidermonkey.

About bash, qt build calls it somewhere, but I tried giving it mksh under
that name and all built fine, though pdksh wasn't enough and I don't know
how best to reflect that in Makefile.

> I wish I could untangle this dependency
> hell but, I can't do it on my own and it goes rather deep.
> And, sorry for being a bit out of topic here.

Could you please try my patch? Had no time yet to add generic fixes
that would work on all platforms, only cut out what fails to build on
Linux against musl. But it happens to address your exact problem,
so if you adjust the ifs and set PKG_OPTIONS.qt5-qttools=-llvm in
your mk.conf, you should be able to build qt5 apps with less overhead.
---
diff --git a/x11/qt5-qtmultimedia/Makefile b/x11/qt5-qtmultimedia/Makefile
index 43cf73d79..8a22f06b0 100644
--- a/x11/qt5-qtmultimedia/Makefile
+++ b/x11/qt5-qtmultimedia/Makefile
@@ -23,3 +23,3 @@ post-install:
 
-PLIST_VARS+=		alsa
+PLIST_VARS+=		alsa pulse
 .if ${OPSYS} == "Linux"
@@ -31,3 +31,6 @@ PLIST.alsa=		yes
 .include "../../audio/openal-soft/buildlink3.mk"
+.if ${OPSYS} != "Linux" || defined(GLIBC_VERSION)
 .include "../../audio/pulseaudio/buildlink3.mk"
+PLIST.pulse=		yes
+.endif
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
diff --git a/x11/qt5-qtmultimedia/PLIST b/x11/qt5-qtmultimedia/PLIST
index 8a733d8b2..34ef6aa59 100644
--- a/x11/qt5-qtmultimedia/PLIST
+++ b/x11/qt5-qtmultimedia/PLIST
@@ -290,3 +290,3 @@ ${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePl
 qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QM3uPlaylistPlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake
+${PLIST.pulse}${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake
 ${PLIST.unix}qt5/lib/cmake/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig.cmake
@@ -326,3 +326,3 @@ qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri
 ${PLIST.alsa}qt5/plugins/audio/libqtaudio_alsa.so
-${PLIST.unix}qt5/plugins/audio/libqtmedia_pulse.so
+${PLIST.pulse}${PLIST.unix}qt5/plugins/audio/libqtmedia_pulse.so
 ${PLIST.unix}qt5/plugins/mediaservice/libgstaudiodecoder.so
diff --git a/x11/qt5-qtmultimedia/buildlink3.mk b/x11/qt5-qtmultimedia/buildlink3.mk
index 16dfe1f4a..c25ed621f 100644
--- a/x11/qt5-qtmultimedia/buildlink3.mk
+++ b/x11/qt5-qtmultimedia/buildlink3.mk
@@ -17,3 +17,5 @@ BUILDLINK_LIBDIRS.qt5-qtmultimedia+=	qt5/plugins
 .include "../../audio/openal-soft/buildlink3.mk"
+.if ${OPSYS} != "Linux" || defined(GLIBC_VERSION)
 .include "../../audio/pulseaudio/buildlink3.mk"
+.endif
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
diff --git a/x11/qt5-qttools/PLIST b/x11/qt5-qttools/PLIST
index 2eb23075a..dc4b57182 100644
--- a/x11/qt5-qttools/PLIST
+++ b/x11/qt5-qttools/PLIST
@@ -261,4 +261,4 @@ qt5/lib/cmake/Qt5DesignerComponents/Qt5DesignerComponentsConfig.cmake
 qt5/lib/cmake/Qt5DesignerComponents/Qt5DesignerComponentsConfigVersion.cmake
-qt5/lib/cmake/Qt5DocTools/Qt5DocToolsConfig.cmake
-qt5/lib/cmake/Qt5DocTools/Qt5DocToolsConfigVersion.cmake
+${PLIST.llvm}qt5/lib/cmake/Qt5DocTools/Qt5DocToolsConfig.cmake
+${PLIST.llvm}qt5/lib/cmake/Qt5DocTools/Qt5DocToolsConfigVersion.cmake
 qt5/lib/cmake/Qt5Help/Qt5HelpConfig.cmake
diff --git a/x11/qt5/Makefile b/x11/qt5/Makefile
index c0f5f742f..dc578392b 100644
--- a/x11/qt5/Makefile
+++ b/x11/qt5/Makefile
@@ -14,3 +14,5 @@ DEPENDS+=	qt5-qtconnectivity-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtconnectivit
 DEPENDS+=	qt5-qtdeclarative-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtdeclarative
+.if ${OPSYS} != "Linux" || defined(GLIBC_VERSION)
 DEPENDS+=	qt5-qtdoc-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtdoc
+.endif
 DEPENDS+=	qt5-qtgraphicaleffects-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtgraphicaleffects


Home | Main Index | Thread Index | Old Index