Date: Sun, 28 Dec 2025 20:58:38 +0000 From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Polarian <polarian@polarian.dev> Subject: git: 36b4776db0d9 - main - net-im/dino: Unbreak build Message-ID: <695199fe.3f8d3.2a4f3f9e@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=36b4776db0d974f27c3f3e956d91ea389d7adc13 commit 36b4776db0d974f27c3f3e956d91ea389d7adc13 Author: Polarian <polarian@polarian.dev> AuthorDate: 2025-12-25 16:50:39 +0000 Commit: Ashish SHUKLA <ashish@FreeBSD.org> CommitDate: 2025-12-28 20:56:17 +0000 net-im/dino: Unbreak build - Incorrect use of meson in the previous patch (apologies), this patch fixes the previous misconception. - Reformatted Makefile so plugin options are grouped together. - Ensure plugin-dependent files within plist are properly labeled with the right plugin. PR: 291721 Reported by: Ivan Rozhuk <rozhuk dot im at gmail dot com> --- net-im/dino/Makefile | 59 ++++++++------- net-im/dino/pkg-plist | 195 +++++++++++++++++++++++++------------------------- 2 files changed, 127 insertions(+), 127 deletions(-) diff --git a/net-im/dino/Makefile b/net-im/dino/Makefile index b0b96d64c0c4..01c2f062be4e 100644 --- a/net-im/dino/Makefile +++ b/net-im/dino/Makefile @@ -1,7 +1,7 @@ PORTNAME= dino DISTVERSIONPREFIX= v DISTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= ashish@FreeBSD.org @@ -11,8 +11,6 @@ WWW= https://dino.im LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= Fails to build, depends on shared library: libwebrtc-audio-processing.so - not found - LIB_DEPENDS= libadwaita-1.so:x11-toolkits/libadwaita \ libassuan.so:security/libassuan \ libgcrypt.so:security/libgcrypt \ @@ -41,42 +39,43 @@ LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS+= -Wl,--export-dynamic USE_LDCONFIG= yes -#USE_GNOME= cairo gdkpixbuf glib20 gnomeprefix gtk40 intlhack USE_GNOME= cairo gdkpixbuf glib20 gtk40 intlhack -CANBERRA_DESC= Notifications sounds support -ICE_DESC= ICE NAT traversal plugin -OMEMO_DESC= OMEMO plugin -RTP_DESC= RTP plugin -UPLOAD_DESC= HTTP file upload plugin +# CANBERRA +CANBERRA_DESC= Notifications sounds support +CANBERRA_LIB_DEPENDS= libcanberra.so:audio/libcanberra +CANBERRA_MESON_ENABLED= plugin-notification-sound + +# GNUPG +GNUPG_DESC= GPG encryption support +GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme +GNUPG_MESON_ENABLED= plugin-openpgp + +# ICE +ICE_DESC= ICE NAT traversal plugin (used for A/V calls) ICE_LIB_DEPENDS= libgnutls.so:security/gnutls \ libnice.so:net-im/libnice -ICE_VARS= ENABLED_PLUGINS+=plugin-ice -ICE_VARS_OFF= DISABLED_PLUGINS+=plugin-ice +ICE_MESON_ENABLED= plugin-ice + +# OMEMO +OMEMO_DESC= OMEMO plugin +OMEMO_LIB_DEPENDS= libqrencode.so:graphics/libqrencode \ + libomemo-c.so:security/libomemo-c +OMEMO_MESON_ENABLED= plugin-omemo + +# RTP +RTP_DESC= RTP plugin RTP_LIB_DEPENDS= libgnutls.so:security/gnutls \ - libwebrtc-audio-processing.so:audio/webrtc-audio-processing + libwebrtc-audio-processing-1.so:audio/webrtc-audio-processing RTP_USES= gstreamer RTP_USE= GSTREAMER=gtk,opus,pulse,speex,srtp,v4l2,vpx,x264 -RTP_VARS= ENABLED_PLUGINS+= plugin-rtp plugin-rtp-h264 plugin-rtp-msdk \ +RTP_MESON_ENABLED= plugin-rtp plugin-rtp-h264 plugin-rtp-msdk \ plugin-rtp-vaapi plugin-rtp-vp9 plugin-rtp-webrtc-audio-processing -RTP_VARS_OFF= DISABLED_PLUGINS+=plugin-rtp plugin-rtp-h264 plugin-rtp-msdk \ - plugin-rtp-vaapi plugin-rtp-vp9 plugin-rtp-webrtc-audio-processing -OMEMO_LIB_DEPENDS= libqrencode.so:graphics/libqrencode \ - libomemo-c.so:security/libomemo-c -OMEMO_VARS= ENABLED_PLUGINS+=plugin-omemo -OMEMO_VARS_OFF= DISABLED_PLUGINS+=plugin-omemo -UPLOAD_MESON_ON= -DSOUP_VERSION:INT=2 -UPLOAD_VARS= ENABLED_PLUGINS+=plugin-http-files -UPLOAD_VARS_OFF= DISABLED_PLUGINS+=plugin-http-files -GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme -GNUPG_VARS= ENABLED_PLUGINS+=plugin-openpgp -GNUPG_VARS_OFF= DISABLED_PLUGINS+=plugin-openpgp -CANBERRA_VARS= ENABLED_PLUGINS+=plugin-notification-sound -CANBERRA_VARS_OFF= DISABLED_PLUGINS+=plugin-notification-sound -CANBERRA_LIB_DEPENDS= libcanberra.so:audio/libcanberra -OPT_MESON_ENABLED= "${ENABLED_PLUGINS}" -OPT_MESON_DISABLED= "${DISABLED_PLUGINS}" +# UPLOAD +UPLOAD_DESC= HTTP file upload plugin +UPLOAD_MESON_ON= -DSOUP_VERSION:INT=2 +UPLOAD_MESON_ENABLED= plugin-http-files pre-configure: @if [ -z "${PACKAGE_BUILDING}" ]; then if ! ${PKG_BIN} query \ diff --git a/net-im/dino/pkg-plist b/net-im/dino/pkg-plist index 19ab39c3bc0c..6eb26ff3a717 100644 --- a/net-im/dino/pkg-plist +++ b/net-im/dino/pkg-plist @@ -1,17 +1,18 @@ bin/dino -include/crypto-vala.h +%%ICE%%include/crypto-vala.h include/dino_i18n.h include/libdino.h include/qlite.h include/xmpp-vala.h -lib/dino/plugins/http-files.so -lib/dino/plugins/ice.so -lib/dino/plugins/omemo.so -lib/dino/plugins/openpgp.so -lib/dino/plugins/rtp.so -lib/libcrypto-vala.so -lib/libcrypto-vala.so.0 -lib/libcrypto-vala.so.0.0 +%%UPLOAD%%lib/dino/plugins/http-files.so +%%ICE%%lib/dino/plugins/ice.so +%%CANBERRA%%lib/dino/plugins/notification-sound.so +%%OMEMO%%lib/dino/plugins/omemo.so +%%GNUPG%%lib/dino/plugins/openpgp.so +%%RTP%%lib/dino/plugins/rtp.so +%%ICE%%lib/libcrypto-vala.so +%%ICE%%lib/libcrypto-vala.so.0 +%%ICE%%lib/libcrypto-vala.so.0.0 lib/libdino.so lib/libdino.so.0 lib/libdino.so.0.0 @@ -25,138 +26,138 @@ share/applications/im.dino.Dino.desktop share/dbus-1/services/im.dino.Dino.service share/icons/hicolor/scalable/apps/im.dino.Dino.svg share/icons/hicolor/symbolic/apps/im.dino.Dino-symbolic.svg -share/locale/ar/LC_MESSAGES/dino-omemo.mo -share/locale/ar/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/ar/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/ar/LC_MESSAGES/dino-openpgp.mo share/locale/ar/LC_MESSAGES/dino.mo -share/locale/ca/LC_MESSAGES/dino-omemo.mo -share/locale/ca/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/ca/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/ca/LC_MESSAGES/dino-openpgp.mo share/locale/ca/LC_MESSAGES/dino.mo -share/locale/cs/LC_MESSAGES/dino-omemo.mo -share/locale/cs/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/cs/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/cs/LC_MESSAGES/dino-openpgp.mo share/locale/cs/LC_MESSAGES/dino.mo -share/locale/da/LC_MESSAGES/dino-omemo.mo -share/locale/da/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/da/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/da/LC_MESSAGES/dino-openpgp.mo share/locale/da/LC_MESSAGES/dino.mo -share/locale/de/LC_MESSAGES/dino-omemo.mo -share/locale/de/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/de/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/de/LC_MESSAGES/dino-openpgp.mo share/locale/de/LC_MESSAGES/dino.mo -share/locale/el/LC_MESSAGES/dino-omemo.mo -share/locale/el/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/el/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/el/LC_MESSAGES/dino-openpgp.mo share/locale/el/LC_MESSAGES/dino.mo -share/locale/en/LC_MESSAGES/dino-omemo.mo -share/locale/en/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/en/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/en/LC_MESSAGES/dino-openpgp.mo share/locale/en/LC_MESSAGES/dino.mo -share/locale/eo/LC_MESSAGES/dino-omemo.mo -share/locale/eo/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/eo/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/eo/LC_MESSAGES/dino-openpgp.mo share/locale/eo/LC_MESSAGES/dino.mo -share/locale/es/LC_MESSAGES/dino-omemo.mo -share/locale/es/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/es/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/es/LC_MESSAGES/dino-openpgp.mo share/locale/es/LC_MESSAGES/dino.mo -share/locale/et/LC_MESSAGES/dino-omemo.mo -share/locale/et/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/et/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/et/LC_MESSAGES/dino-openpgp.mo share/locale/et/LC_MESSAGES/dino.mo -share/locale/eu/LC_MESSAGES/dino-omemo.mo -share/locale/eu/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/eu/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/eu/LC_MESSAGES/dino-openpgp.mo share/locale/eu/LC_MESSAGES/dino.mo -share/locale/fa/LC_MESSAGES/dino-omemo.mo -share/locale/fa/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/fa/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/fa/LC_MESSAGES/dino-openpgp.mo share/locale/fa/LC_MESSAGES/dino.mo -share/locale/fi/LC_MESSAGES/dino-omemo.mo -share/locale/fi/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/fi/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/fi/LC_MESSAGES/dino-openpgp.mo share/locale/fi/LC_MESSAGES/dino.mo -share/locale/fr/LC_MESSAGES/dino-omemo.mo -share/locale/fr/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/fr/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/fr/LC_MESSAGES/dino-openpgp.mo share/locale/fr/LC_MESSAGES/dino.mo -share/locale/gl/LC_MESSAGES/dino-omemo.mo -share/locale/gl/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/gl/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/gl/LC_MESSAGES/dino-openpgp.mo share/locale/gl/LC_MESSAGES/dino.mo share/locale/hi/LC_MESSAGES/dino.mo -share/locale/hu/LC_MESSAGES/dino-omemo.mo -share/locale/hu/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/hu/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/hu/LC_MESSAGES/dino-openpgp.mo share/locale/hu/LC_MESSAGES/dino.mo share/locale/hy/LC_MESSAGES/dino.mo -share/locale/ia/LC_MESSAGES/dino-openpgp.mo +%%GNUPG%%share/locale/ia/LC_MESSAGES/dino-openpgp.mo share/locale/ia/LC_MESSAGES/dino.mo -share/locale/id/LC_MESSAGES/dino-omemo.mo -share/locale/id/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/id/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/id/LC_MESSAGES/dino-openpgp.mo share/locale/id/LC_MESSAGES/dino.mo -share/locale/ie/LC_MESSAGES/dino-omemo.mo -share/locale/ie/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/ie/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/ie/LC_MESSAGES/dino-openpgp.mo share/locale/ie/LC_MESSAGES/dino.mo -share/locale/is/LC_MESSAGES/dino-openpgp.mo +%%GNUPG%%share/locale/is/LC_MESSAGES/dino-openpgp.mo share/locale/is/LC_MESSAGES/dino.mo -share/locale/it/LC_MESSAGES/dino-omemo.mo -share/locale/it/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/it/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/it/LC_MESSAGES/dino-openpgp.mo share/locale/it/LC_MESSAGES/dino.mo -share/locale/ja/LC_MESSAGES/dino-omemo.mo -share/locale/ja/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/ja/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/ja/LC_MESSAGES/dino-openpgp.mo share/locale/ja/LC_MESSAGES/dino.mo share/locale/kab/LC_MESSAGES/dino.mo -share/locale/ko/LC_MESSAGES/dino-openpgp.mo +%%GNUPG%%share/locale/ko/LC_MESSAGES/dino-openpgp.mo share/locale/ko/LC_MESSAGES/dino.mo -share/locale/lb/LC_MESSAGES/dino-omemo.mo -share/locale/lb/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/lb/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/lb/LC_MESSAGES/dino-openpgp.mo share/locale/lb/LC_MESSAGES/dino.mo -share/locale/lt/LC_MESSAGES/dino-omemo.mo -share/locale/lt/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/lt/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/lt/LC_MESSAGES/dino-openpgp.mo share/locale/lt/LC_MESSAGES/dino.mo -share/locale/lv/LC_MESSAGES/dino-openpgp.mo +%%GNUPG%%share/locale/lv/LC_MESSAGES/dino-openpgp.mo share/locale/lv/LC_MESSAGES/dino.mo -share/locale/nb/LC_MESSAGES/dino-omemo.mo -share/locale/nb/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/nb/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/nb/LC_MESSAGES/dino-openpgp.mo share/locale/nb/LC_MESSAGES/dino.mo -share/locale/nl/LC_MESSAGES/dino-omemo.mo -share/locale/nl/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/nl/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/nl/LC_MESSAGES/dino-openpgp.mo share/locale/nl/LC_MESSAGES/dino.mo -share/locale/oc/LC_MESSAGES/dino-omemo.mo -share/locale/oc/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/oc/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/oc/LC_MESSAGES/dino-openpgp.mo share/locale/oc/LC_MESSAGES/dino.mo -share/locale/pl/LC_MESSAGES/dino-omemo.mo -share/locale/pl/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/pl/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/pl/LC_MESSAGES/dino-openpgp.mo share/locale/pl/LC_MESSAGES/dino.mo -share/locale/pt/LC_MESSAGES/dino-omemo.mo -share/locale/pt/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/pt/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/pt/LC_MESSAGES/dino-openpgp.mo share/locale/pt/LC_MESSAGES/dino.mo -share/locale/pt_BR/LC_MESSAGES/dino-omemo.mo -share/locale/pt_BR/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/pt_BR/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/pt_BR/LC_MESSAGES/dino-openpgp.mo share/locale/pt_BR/LC_MESSAGES/dino.mo -share/locale/ro/LC_MESSAGES/dino-omemo.mo -share/locale/ro/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/ro/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/ro/LC_MESSAGES/dino-openpgp.mo share/locale/ro/LC_MESSAGES/dino.mo -share/locale/ru/LC_MESSAGES/dino-omemo.mo -share/locale/ru/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/ru/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/ru/LC_MESSAGES/dino-openpgp.mo share/locale/ru/LC_MESSAGES/dino.mo share/locale/si/LC_MESSAGES/dino.mo -share/locale/sq/LC_MESSAGES/dino-omemo.mo -share/locale/sq/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/sq/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/sq/LC_MESSAGES/dino-openpgp.mo share/locale/sq/LC_MESSAGES/dino.mo -share/locale/sv/LC_MESSAGES/dino-omemo.mo -share/locale/sv/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/sv/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/sv/LC_MESSAGES/dino-openpgp.mo share/locale/sv/LC_MESSAGES/dino.mo -share/locale/ta/LC_MESSAGES/dino-omemo.mo -share/locale/ta/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/ta/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/ta/LC_MESSAGES/dino-openpgp.mo share/locale/ta/LC_MESSAGES/dino.mo -share/locale/tr/LC_MESSAGES/dino-omemo.mo -share/locale/tr/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/tr/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/tr/LC_MESSAGES/dino-openpgp.mo share/locale/tr/LC_MESSAGES/dino.mo -share/locale/uk/LC_MESSAGES/dino-omemo.mo -share/locale/uk/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/uk/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/uk/LC_MESSAGES/dino-openpgp.mo share/locale/uk/LC_MESSAGES/dino.mo -share/locale/vi/LC_MESSAGES/dino-omemo.mo -share/locale/vi/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/vi/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/vi/LC_MESSAGES/dino-openpgp.mo share/locale/vi/LC_MESSAGES/dino.mo -share/locale/zh_CN/LC_MESSAGES/dino-omemo.mo -share/locale/zh_CN/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/zh_CN/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/zh_CN/LC_MESSAGES/dino-openpgp.mo share/locale/zh_CN/LC_MESSAGES/dino.mo -share/locale/zh_TW/LC_MESSAGES/dino-omemo.mo -share/locale/zh_TW/LC_MESSAGES/dino-openpgp.mo +%%OMEMO%%share/locale/zh_TW/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/zh_TW/LC_MESSAGES/dino-openpgp.mo share/locale/zh_TW/LC_MESSAGES/dino.mo share/metainfo/im.dino.Dino.appdata.xml -share/vala/vapi/crypto-vala.deps -share/vala/vapi/crypto-vala.vapi -share/vala/vapi/dino.deps -share/vala/vapi/libdino.vapi -share/vala/vapi/qlite.deps -share/vala/vapi/qlite.vapi -share/vala/vapi/xmpp-vala.deps -share/vala/vapi/xmpp-vala.vapi +%%RTP%%share/vala/vapi/crypto-vala.deps +%%RTP%%share/vala/vapi/crypto-vala.vapi +%%RTP%%share/vala/vapi/dino.deps +%%RTP%%share/vala/vapi/libdino.vapi +%%RTP%%share/vala/vapi/qlite.deps +%%RTP%%share/vala/vapi/qlite.vapi +%%RTP%%share/vala/vapi/xmpp-vala.deps +%%RTP%%share/vala/vapi/xmpp-vala.vapihome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?695199fe.3f8d3.2a4f3f9e>