diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2023-03-13 21:17:40 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2023-03-13 21:17:40 +0000 |
| commit | 0dc71261d600a3ba5bb946b9ee0e37462ff4f70f (patch) | |
| tree | 088b8943607d35589782372474ae32ece6bad3db | |
| parent | 53a9466d03a670b78144e1551e2628af87ac6d2f (diff) | |
multimedia/audacious: Import upstreamed build patch
Obtained from: https://github.com/audacious-media-player/audacious/pull/60
| -rw-r--r-- | multimedia/audacious/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/audacious/files/patch-meson.build | 9 | ||||
| -rw-r--r-- | multimedia/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', |