From nobody Mon Mar 13 21:22:23 2023 X-Original-To: dev-commits-ports-main@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 4Pb8kR6zxBz3yDBp; Mon, 13 Mar 2023 21:22:23 +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 4Pb8kR6Tg3z3Gnd; Mon, 13 Mar 2023 21:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678742543; 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=5ZjiYqT23A8QH6Yk518ySE+CSVzWgFu9MnA8POrVg+c=; b=fTLLIGnvimsAKR6zQsDEKR2p+hEZrU17VKsyr2BfzGY75PKSlLfLqpE7g3QGquqvA7jPws L6K+9UrXZFKVyyOWT89DSJQyc0CBs5kyehMmqpKXHWtHOYR9qNE4fFgr8giFdE8SIr7FAZ 01W03uSnKGNKdB+GW9oRJd28qn++MIQEk9HKVdDKbhrR4NxP2IH9bMcF6AMI/asfWH63yP H5zMpuYJ3UKiQrh4VlhPVjI2R9vqvfO/6eJuSXhfPd+1tV6HZEwIxH1TPV3cMHU6mD8N5d NaJjSClSZxA4JRdk2NPFoanzNdOG8xqN10EdsxFDaHSmw8i3ilSsTbjiGzbMjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678742543; 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=5ZjiYqT23A8QH6Yk518ySE+CSVzWgFu9MnA8POrVg+c=; b=wRISX9pBIhCp44bKg2qk7XxIwaPFJBgUo5/hXzJGJzpX9s6864l8pATVfGCqcZV0inKedu oYCcDPFODHfF9+dFo8IIUF2bOA2Q761ml6VzqBeTkT8O5ZC0dhogJ808nWRiWaxvHeQKJ4 dRXTd+mxDSowdmLtqCizFGryht6ipN82pOWXgda4ZtoAghe8LQ+ie+Q3XBWB4aCo5Fc2OX H+lPlaUlkxWM0Mr1FCcur8JHuQuFP6sxAr6wrGUDXjoPyNgvA9AWMZqBMyv6B8ZwpI8EUV w4LxotlifMrFC28Mrgy3WWaCE6+/ETtYbcJCz2XXJvDBqLcTO0D0VyG2V5sTtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678742543; a=rsa-sha256; cv=none; b=QOlTBjLthkS2jnKu+RZtNF3cKq/Ls4xLHbOeEhfpu+2mGxghBcII91iYIlas14WWtqTSvn 9Qe/87VXXoRGaDihS1xHbzEn1DBxy4e1RXw1aIkrxK8LWO4XY4hwAhIowvOmoXttB/PqIz ujxsROJx6zsj7dfSN8bvfK/Dz7VNgE5zNXcqJ+OYAzG8HQobFzCqZgXIDP0bm9Q9/TUJuc 0cYoRlRNwMQiRF5RMdwir+IHEthX4HPZyJ3djfNHnd7FA2vglicwATTBcZVL4a9K7w+VVh KtfXoZ5RAv7N0hFsaA+hH9f6esF9MLc0mgJqeYMCZuPRWIORReXYglV5yjndQQ== 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 4Pb8kR5Z3nz18F0; Mon, 13 Mar 2023 21:22:23 +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 32DLMNsM082851; Mon, 13 Mar 2023 21:22:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DLMNaZ082850; Mon, 13 Mar 2023 21:22:23 GMT (envelope-from git) Date: Mon, 13 Mar 2023 21:22:23 GMT Message-Id: <202303132122.32DLMNaZ082850@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: 0dc71261d600 - main - multimedia/audacious: Import upstreamed build patch List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 0dc71261d600a3ba5bb946b9ee0e37462ff4f70f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=0dc71261d600a3ba5bb946b9ee0e37462ff4f70f commit 0dc71261d600a3ba5bb946b9ee0e37462ff4f70f Author: Guido Falsi AuthorDate: 2023-03-13 21:17:40 +0000 Commit: Guido Falsi CommitDate: 2023-03-13 21:17:40 +0000 multimedia/audacious: Import upstreamed build patch Obtained from: https://github.com/audacious-media-player/audacious/pull/60 --- multimedia/audacious/Makefile | 3 +++ multimedia/audacious/files/patch-meson.build | 9 ++++++++ .../audacious/files/patch-src_libaudqt_meson.build | 27 ---------------------- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile index 7d4647a03587..ca96b2b4ca13 100644 --- a/multimedia/audacious/Makefile +++ b/multimedia/audacious/Makefile @@ -24,6 +24,9 @@ USE_XORG= x11 sm USE_LDCONFIG= yes SUB_FILES= pkg-message +CONFIGURE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" +MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" + qt5_CONFLICTS_INSTALL= audacious-qt6 audacious-gtk2 audacious-gtk3 qt6_PKGNAMESUFFIX= -qt6 diff --git a/multimedia/audacious/files/patch-meson.build b/multimedia/audacious/files/patch-meson.build index a7fd9bfccfd7..ae24ada8769e 100644 --- a/multimedia/audacious/files/patch-meson.build +++ b/multimedia/audacious/files/patch-meson.build @@ -8,3 +8,12 @@ have_windows = host_machine.system() == 'windows' +@@ -120,7 +121,7 @@ if (cxx.has_header('libintl.h')) + if (cxx.has_header('libintl.h')) + add_project_arguments('-DHAVE_GETTEXT', language: ['c', 'cpp']) + +- if have_darwin or have_windows ++ if have_darwin or have_freebsd or have_windows + add_project_link_arguments('-lintl', language: ['c', 'cpp']) + endif + endif diff --git a/multimedia/audacious/files/patch-src_libaudqt_meson.build b/multimedia/audacious/files/patch-src_libaudqt_meson.build deleted file mode 100644 index ebc37c936d75..000000000000 --- a/multimedia/audacious/files/patch-src_libaudqt_meson.build +++ /dev/null @@ -1,27 +0,0 @@ ---- src/libaudqt/meson.build.orig 2023-03-05 17:47:00 UTC -+++ src/libaudqt/meson.build -@@ -42,10 +42,15 @@ libaudqt_headers = [ - 'treeview.h' - ] - - - images_src = qt.preprocess(qresources: 'images.qrc') - -+libaudqt_deps = [qt_dep] - -+if have_freebsd -+ libaudqt_deps += [cc.find_library('intl', has_headers: ['libintl.h'], dirs: ['%%LOCALBASE%%/lib'], required: true)] -+endif -+ - install_headers(libaudqt_headers, subdir: 'libaudqt') - - -@@ -54,7 +58,7 @@ libaudqt_lib = library('audqt', - images_src, - cpp_args: ['-DLIBAUDQT_BUILD'], - include_directories: [src_inc], -- dependencies: [qt_dep], -+ dependencies: libaudqt_deps, - link_with: [libaudcore_lib], - soversion: '2', - version: '2.4.0',