From nobody Mon Mar 13 21:22:24 2023 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 4Pb8kT1n7bz3yDQh; Mon, 13 Mar 2023 21:22:25 +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 4Pb8kT0zCkz3GrP; Mon, 13 Mar 2023 21:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678742545; 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=Y5KYUulSEW5uWWKSvgz9szA/Aa3bLJMN7mRdVNddXLM=; b=rvyiGQuL+zbdoSiWcYD/ekd+AMEGNpRX4JUnEu1iW3TmDl7D6W3f1P/To4D6bQNFnBkmCz nDUZ6zvmPNF3oqjGsmzOE7zGn19C9JrP9XSxZsNW93PgF0dE0LELGckE+Fu8NH/E/7R2SX j/H4BqwWIGGmlavmQbw3Xl/0gKHpXi6IwkLkdCsM7c3O8gHXK2coMgjETFb2s9WCs8IUbJ 4igh8LnlINKnuLNGJdIb8gTZ8+qNDqDbhqvMKt/EBZlu+Od8UHfy0VAIwgsxpdRdwGyVNn yPP843ThFBH9hlheCBwyn8+oR1mov3+7EdzvUEti9qUJiKNixzoQlfW641g6Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678742545; 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=Y5KYUulSEW5uWWKSvgz9szA/Aa3bLJMN7mRdVNddXLM=; b=ZqEHww+FT40KqxvJJyffo2KlfdKUoF5BZDrmhZmaNjZqCKrB74TbVazcdLfkCyEHM434Ex SDgUDKsgxv2YtInBx3T3fuvbirvq6nw/ANVxlN6hj+/+tJtqxqgiYCcDgxneoZrmubyZ8H joQywTTWCnpEBbHb5zIn2vH+Y1BgdmPGZSba4XU8aRX5l9xg9pFd7BsjYjinLgFrFRfoAD OIAuiso62QnDQCgEkSX21TouxR5kzuiW1ucunDC6TyOs0Cg/zxz7R8wHu5NHdL7uky9wsu GFPqIkiHHUL8e2db3HJhzmqiYbsdWbzRppnrtbgs9eNr3HZzeNfrNasc0MDtlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678742545; a=rsa-sha256; cv=none; b=Ps1mojA+jwx5xEnS9eAkM1B4sGdKVzzbuA+HuMb0yk9O6ViUyoAscdlQfeKBb5xFU3dJ0o hYwV0u6c0INEkU/YGOMMvIYclcbrN7J+pJeusBM4461aa1KHja2RmoxmaJ1cjQP0DQbhln CcOwmbhzfwOiw4857/lzEpsL2uoNHQ9D4EOB4ed6ExEx8X7mX/XduuP+08d3BSZq9O6QZA IS8h6FPauTdjGfpeoYFhrwdEgdxzhgMlH9pTo+7EVrFd2F35pAlVzL0Ra2DzOKSmpwV55H jgkgDeEiARoVFIIROuOl3bT99qltcQB7cyJ3zjpWwwE4GO/KDvjF34bEY5FF2w== 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 4Pb8kS67qwz189B; Mon, 13 Mar 2023 21:22:24 +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 32DLMODq082870; Mon, 13 Mar 2023 21:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DLMOhi082869; Mon, 13 Mar 2023 21:22:24 GMT (envelope-from git) Date: Mon, 13 Mar 2023 21:22:24 GMT Message-Id: <202303132122.32DLMOhi082869@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: f1eca3188595 - main - multimedia/audacious-plugins: Import upstreamed build patches 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: f1eca3188595af4cdbe4c3576bc8fbad4340a721 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1eca3188595af4cdbe4c3576bc8fbad4340a721 commit f1eca3188595af4cdbe4c3576bc8fbad4340a721 Author: Guido Falsi AuthorDate: 2023-03-13 21:20:50 +0000 Commit: Guido Falsi CommitDate: 2023-03-13 21:20:50 +0000 multimedia/audacious-plugins: Import upstreamed build patches - Expose OPUS option and enable it by default - Fix lame detection which enables mp3 filewriter plugin (suggested by upstream developer Thomas Lange) Obtained from: https://github.com/audacious-media-player/audacious-plugins/pull/132 --- multimedia/audacious-plugins/Makefile | 14 +++++++++----- .../audacious-plugins/files/patch-src_aac_meson.build | 13 ++++++++++--- .../files/patch-src_filewriter_meson.build | 18 ++++++++++++++++++ .../audacious-plugins/files/patch-src_lirc_meson.build | 14 ++++++++++---- multimedia/audacious-plugins/pkg-plist | 1 + 5 files changed, 48 insertions(+), 12 deletions(-) diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile index 2b8f1da7de7d..da2e020eb874 100644 --- a/multimedia/audacious-plugins/Makefile +++ b/multimedia/audacious-plugins/Makefile @@ -1,5 +1,6 @@ PORTNAME= audacious-plugins PORTVERSION= 4.3 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ @@ -24,6 +25,10 @@ USES= compiler:c++11-lib gettext-tools gmake gnome iconv \ USE_GNOME= glib20 libxml2 gdkpixbuf2 USE_XORG= x11 +CONFIGURE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" +MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" +MESON_ARGS= -Dconsole=false -Dmms=false -Dsoxr=false -Dcoreaudio=false + qt5_CONFLICTS_INSTALL= audacious-plugins-qt6 audacious-plugins-gtk2 audacious-plugins-gtk3 qt5_RUN_DEPENDS= audacious:multimedia/audacious@qt5 qt5_BUILD_DEPENDS= audacious:multimedia/audacious@qt5 @@ -45,8 +50,6 @@ gtk3_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz gtk3_RUN_DEPENDS= audacious:multimedia/audacious@gtk3 gtk3_BUILD_DEPENDS= audacious:multimedia/audacious@gtk3 -MESON_ARGS= -Dconsole=false -Dmms=false -Dsoxr=false -Dcoreaudio=false - .if ${FLAVOR} == qt5 MESON_ARGS+= -Dqt=true -Dqt6=false -Dgtk=false -Dgtk3=false USES+= qt:5 @@ -68,12 +71,12 @@ PLIST_SUB= QT="@comment " QT6="@comment " GTK="" .endif OPTIONS_DEFINE= AAC ADPLUG AMIDI BS2B CDDA CUE FFMPEG FLAC LAME LIRC \ - MODPLUG MPG123 MPRIS NEON NLS NOTIFY OPENGL OPENMPT SAMPLERATE \ - SCROBBLER SID SNDFILE SPEEDPITCH VORBIS WAVPACK + MODPLUG MPG123 MPRIS NEON NLS NOTIFY OPENGL OPENMPT OPUS \ + SAMPLERATE SCROBBLER SID SNDFILE SPEEDPITCH VORBIS WAVPACK OPTIONS_MULTI= OUTPUT OPTIONS_MULTI_OUTPUT= ALSA FILEWRITER JACK OSS PIPEWIRE PULSEAUDIO SDL SNDIO OPTIONS_DEFAULT= AAC ADPLUG CDDA CUE FILEWRITER FFMPEG FLAC MPRIS \ - MPG123 NEON NLS NOTIFY OPENMPT OSS PIPEWIRE PULSEAUDIO \ + MPG123 NEON NLS NOTIFY OPENMPT OPUS OSS PIPEWIRE PULSEAUDIO \ SCROBBLER SID VORBIS WAVPACK OPTIONS_SUB= yes @@ -200,6 +203,7 @@ MESON_ARGS+= -Dfilewriter-flac=false -Dfilewriter-mp3=false -Dfilewriter-ogg=fal post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/src/aac/meson.build \ + ${WRKSRC}/src/filewriter/meson.build \ ${WRKSRC}/src/lirc/meson.build post-patch-NLS-off: diff --git a/multimedia/audacious-plugins/files/patch-src_aac_meson.build b/multimedia/audacious-plugins/files/patch-src_aac_meson.build index 03c51d67524c..536ee6b8e1bb 100644 --- a/multimedia/audacious-plugins/files/patch-src_aac_meson.build +++ b/multimedia/audacious-plugins/files/patch-src_aac_meson.build @@ -1,8 +1,15 @@ --- src/aac/meson.build.orig 2023-03-05 17:51:20 UTC +++ src/aac/meson.build -@@ -1,4 +1,4 @@ +@@ -1,6 +1,10 @@ -faad_dep = cxx.find_library('faad', required: false) -+faad_dep = cxx.find_library('faad', dirs: ['%%LOCALBASE%%/lib'], required: false) - have_aac = faad_dep.found() and cxx.has_header('neaacdec.h') +-have_aac = faad_dep.found() and cxx.has_header('neaacdec.h') ++faad_dep = dependency('faad2', required: false) ++if not faad_dep.found() ++ faad_dep = cxx.find_library('faad', has_headers: 'neaacdec.h', required: false) ++endif ++ ++have_aac = faad_dep.found() + if have_aac + shared_module('aac-raw', diff --git a/multimedia/audacious-plugins/files/patch-src_filewriter_meson.build b/multimedia/audacious-plugins/files/patch-src_filewriter_meson.build new file mode 100644 index 000000000000..147769b8249f --- /dev/null +++ b/multimedia/audacious-plugins/files/patch-src_filewriter_meson.build @@ -0,0 +1,18 @@ +--- src/filewriter/meson.build.orig 2023-03-05 17:51:20 UTC ++++ src/filewriter/meson.build +@@ -34,9 +34,13 @@ if get_option('filewriter-mp3') + + + if get_option('filewriter-mp3') +- lame_dep = cxx.find_library('mp3lame', required: false) ++ lame_dep = dependency('lame', required: false) + +- if lame_dep.found() and cxx.has_header('lame/lame.h') ++ if not lame_dep.found() ++ lame_dep = cxx.find_library('mp3lame', has_headers: 'lame/lame.h', required: false) ++ endif ++ ++ if lame_dep.found() + filewriter_deps += [lame_dep] + filewriter_srcs += ['mp3.cc'] + diff --git a/multimedia/audacious-plugins/files/patch-src_lirc_meson.build b/multimedia/audacious-plugins/files/patch-src_lirc_meson.build index 2bb50e040eef..0b4c2295d061 100644 --- a/multimedia/audacious-plugins/files/patch-src_lirc_meson.build +++ b/multimedia/audacious-plugins/files/patch-src_lirc_meson.build @@ -1,12 +1,18 @@ --- src/lirc/meson.build.orig 2023-03-05 17:51:20 UTC +++ src/lirc/meson.build -@@ -1,4 +1,4 @@ +@@ -1,13 +1,16 @@ -lirc_dep = cxx.find_library('lirc', required: false) -+lirc_dep = cxx.find_library('lirc_client', dirs: ['%%LOCALBASE%%/lib'], required: false) - have_lirc = lirc_dep.found() and cxx.has_header('lirc/lirc_client.h') +-have_lirc = lirc_dep.found() and cxx.has_header('lirc/lirc_client.h') ++lirc_dep = dependency('lirc', required: false) ++if not lirc_dep.found() ++ lirc_dep = cxx.find_library('lirc_client', has_headers: 'lirc/lirc_client.h', required: false) ++endif ++have_lirc = lirc_dep.found() -@@ -7,7 +7,6 @@ if have_lirc ++ + if have_lirc + shared_module('lirc', 'lirc.cc', dependencies: [audacious_dep, glib_dep, lirc_dep], name_prefix: '', diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist index d2677c627cf8..cdbf5e195376 100644 --- a/multimedia/audacious-plugins/pkg-plist +++ b/multimedia/audacious-plugins/pkg-plist @@ -52,6 +52,7 @@ lib/audacious/Input/metronom.so %%MODPLUG%%lib/audacious/Input/modplug.so %%ADPLUG%%lib/audacious/Input/adplug.so %%OPENMPT%%lib/audacious/Input/openmpt.so +%%OPUS%%lib/audacious/Input/opus.so lib/audacious/Input/psf2.so %%SID%%lib/audacious/Input/sid.so %%SNDFILE%%lib/audacious/Input/sndfile.so