From nobody Sat Jun 11 13:34:58 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AFED2838D1B; Sat, 11 Jun 2022 13:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LKzN23Hj9z4mBn; Sat, 11 Jun 2022 13:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654954498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EdN9eyHI+IOVF1TmtJBfPTXLmwjm0RcK5gn3LD2jdeE=; b=lSA2PXfBUP+ciJOHUjLSYrYh9nZ2/WnOwKZB2g5UwM+e+egM7ueXq95dSn2Ks/kuTP9ei1 Z6p0hlmHqEtrXMTKbkmnFqhRLtXlDKMceRT1HfUivMYejSMsA7/dEdT3AusVoY5IPOmMG7 r0pUOpjNka9zHkGqVQqtzXWyHQzqWqfHbsCSUu0TwOZBBhoBU61OEROiHo7+zG8Thqv4GV oo19suHhMFr0MCeFr/fB2d30WkYvnd1NxM8Qr9MYFgGyjEQCC4HYTxUoJuL3kuHlIRGl97 OKw00afxanLtMoQl28HFsGyX1RymG/XWnxDm89Yo/9vdTwCoRrJPSObSCf94wQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27A326103; Sat, 11 Jun 2022 13:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25BDYwKp055360; Sat, 11 Jun 2022 13:34:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25BDYwkx055359; Sat, 11 Jun 2022 13:34:58 GMT (envelope-from git) Date: Sat, 11 Jun 2022 13:34:58 GMT Message-Id: <202206111334.25BDYwkx055359@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: b02e706ba7e9 - main - multimedia/audacious-plugins: Add missing dependencies, enable missing plugins List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b02e706ba7e9acf0a1834f4cc64c82dc74793ebc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654954498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EdN9eyHI+IOVF1TmtJBfPTXLmwjm0RcK5gn3LD2jdeE=; b=gJIRsGqEfqti5p2ncrzWeacWA016Qko4y4Yh9MKc4fhxRpMLhrur8OJFWQfKTqRRC+oNBG MmIkeMaJPsdERQ9r7mIzReDcGK5ti28wVjoYAmk2bHqajXEECaKMHOTIBPxdjF7i551ixO s8weNy3p1MFxm7nllJ9YqvKVoftfU2+KozoQiNUbQfVR4ZIPA7HlGr3v4ueY8T8ESbhE1s mqWyETF1S7RvIAypSDhnsmwOA/epoAIdqZGnc7PjmBVzBBh+V7w1rY0LEyIyxgdllE2gg5 JqX7z64ZNUe8QtY3A0jyTGrj8bgtmSlKBf4RwJKwRTXpCCCX8sQKIFaxR80P/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654954498; a=rsa-sha256; cv=none; b=b8063HPnQ2bHeW1qammLUbcryFLp8lcjAkcBqZe+dZnz4EllIDqa+2yd8TyYA6nnDRIPlv XftfJxga2CKYkUwR2HjFwQgjMZ1bmZh/ZeYVtub/t6uVJ+v79/nvxMs+oOXib0J/xMWNNh StZyM9ragYX/bhV3M3C0N2dMDU1AoPlFJEdhcdwrJNaUfOKP173jhfMGv7iGxrNBaRpvf1 Q+aHGm+6OdcJFSGZIzF6s+AtpS98C3I8E/aYcStVZTYbE8vFqNpP8XtRVu7OBCYXOvq6lo rLkDd+NFLv8mP0yijQlXnWogf9L1KrehE80oLna4kVBynNFXC7BTUGlTMeOopw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=b02e706ba7e9acf0a1834f4cc64c82dc74793ebc commit b02e706ba7e9acf0a1834f4cc64c82dc74793ebc Author: Guido Falsi AuthorDate: 2022-06-11 13:33:44 +0000 Commit: Guido Falsi CommitDate: 2022-06-11 13:33:44 +0000 multimedia/audacious-plugins: Add missing dependencies, enable missing plugins - Add some missing dependencies - Adding these dependencies enables building the qthotkey plugin [1] - Added dependencies also allow building the qtaudio plugin - Add OPENGL option to the qt flavor too, and add requirements to allow building the gl-spectrum-qt visualization plugin PR: 264605 [1] --- multimedia/audacious-plugins/Makefile | 18 ++++++++++++------ multimedia/audacious-plugins/pkg-plist | 3 +++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile index e08b8ff138af..77ec34d7c1a4 100644 --- a/multimedia/audacious-plugins/Makefile +++ b/multimedia/audacious-plugins/Makefile @@ -2,7 +2,7 @@ PORTNAME= audacious-plugins PORTVERSION= 4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ @@ -32,6 +32,7 @@ qt5_BUILD_DEPENDS= audacious:multimedia/audacious@qt5 gtk2_PKGNAMESUFFIX= -gtk2 gtk2_CONFLICTS_INSTALL= audacious-plugins +gtk2_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz gtk2_RUN_DEPENDS= audacious:multimedia/audacious@gtk2 gtk2_BUILD_DEPENDS= audacious:multimedia/audacious@gtk2 @@ -42,7 +43,7 @@ CONFIGURE_ARGS= --disable-console --disable-soxr \ .if ${FLAVOR} == qt5 CONFIGURE_ARGS+= --enable-qt --disable-gtk USES+= qt:5 -USE_QT= core gui widgets +USE_QT= core gui multimedia network widgets x11extras PLIST_SUB= QT5="" GTK2="@comment " .elif ${FLAVOR} == gtk2 CONFIGURE_ARGS+= --disable-qt --enable-gtk --enable-hotkey @@ -51,7 +52,7 @@ PLIST_SUB= QT5="@comment " GTK2="" .endif OPTIONS_DEFINE= AAC ADPLUG AMIDI BS2B CDDA CUE FFMPEG FLAC LAME LIRC \ - MMS MODPLUG MPRIS NEON NLS NOTIFY OPENMPT SAMPLERATE \ + MMS MODPLUG MPRIS NEON NLS NOTIFY OPENGL OPENMPT SAMPLERATE \ SCROBBLER SID SNDFILE SPEEDPITCH VORBIS WAVPACK OPTIONS_MULTI= OUTPUT OPTIONS_MULTI_OUTPUT= ALSA FILEWRITER JACK OSS PULSEAUDIO SDL SNDIO @@ -61,7 +62,7 @@ OPTIONS_DEFAULT= AAC ADPLUG CDDA CUE FILEWRITER FFMPEG FLAC MMS MPRIS \ OPTIONS_SUB= yes .if ${FLAVOR} == gtk2 -OPTIONS_DEFINE+= AOSD OPENGL +OPTIONS_DEFINE+= AOSD OPTIONS_DEFAULT+= AOSD .endif @@ -122,9 +123,14 @@ NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_CONFIGURE_ENABLE=notify -OPENGL_USES= gl xorg -OPENGL_USE= xorg=x11 gl=gl +OPENGL_USES= gl +OPENGL_USE= gl=gl +.if ${FLAVOR} == qt5 +OPENGL_USE+= qt=opengl +OPENGL_CONFIGURE_ENABLE=qtglspectrum +.elif ${FLAVOR} == gtk2 OPENGL_CONFIGURE_ENABLE=glspectrum +.endif OPENMPT_LIB_DEPENDS= libopenmpt.so:audio/libopenmpt OPENMPT_CONFIGURE_ENABLE= openmpt OSS_CONFIGURE_ENABLE= oss4 diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist index 1d2a5426fd5a..08f1d32ddb8b 100644 --- a/multimedia/audacious-plugins/pkg-plist +++ b/multimedia/audacious-plugins/pkg-plist @@ -31,6 +31,7 @@ lib/audacious/General/delete-files.so %%NOTIFY%%lib/audacious/General/notify.so %%GTK2%%lib/audacious/General/playlist-manager.so %%QT5%%lib/audacious/General/playlist-manager-qt.so +%%QT5%%lib/audacious/General/qthotkey.so %%QT5%%lib/audacious/General/qtui.so %%SCROBBLER%%lib/audacious/General/scrobbler.so %%GTK2%%lib/audacious/General/search-tool.so @@ -64,6 +65,7 @@ lib/audacious/Input/xsf.so %%JACK%%lib/audacious/Output/jack-ng.so %%OSS%%lib/audacious/Output/oss4.so %%PULSEAUDIO%%lib/audacious/Output/pulse_audio.so +%%QT5%%lib/audacious/Output/qtaudio.so %%SDL%%lib/audacious/Output/sdlout.so %%SNDIO%%lib/audacious/Output/sndio-ng.so lib/audacious/Transport/gio.so @@ -74,6 +76,7 @@ lib/audacious/Transport/gio.so %%GTK2%%lib/audacious/Visualization/cairo-spectrum.so %%QT5%%lib/audacious/Visualization/qt-spectrum.so %%GTK2%%%%OPENGL%%lib/audacious/Visualization/gl-spectrum.so +%%QT5%%%%OPENGL%%lib/audacious/Visualization/gl-spectrum-qt.so %%QT5%%lib/audacious/Visualization/vumeter-qt.so share/audacious/Skins/Classic/balance.png share/audacious/Skins/Classic/cbuttons.png