diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2017-09-23 11:18:42 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2017-09-23 11:18:42 +0200 |
| commit | 72fa00235d614ad73d4eb0d8add244350e414a02 (patch) | |
| tree | 4f145f0584d5f71401a81f9b62870137f1bde6d6 /main/ncmpc | |
| parent | 8c23c325fcd82598c3a470d7d44a293911e0fae8 (diff) | |
| download | aports-72fa00235d614ad73d4eb0d8add244350e414a02.tar.bz2 aports-72fa00235d614ad73d4eb0d8add244350e414a02.tar.xz | |
main/ncmpc: upgrade to 0.28
Diffstat (limited to 'main/ncmpc')
| -rw-r--r-- | main/ncmpc/0001-Make-lyrics_plugin_dir-configurable-again.patch | 39 | ||||
| -rw-r--r-- | main/ncmpc/APKBUILD | 32 |
2 files changed, 57 insertions, 14 deletions
diff --git a/main/ncmpc/0001-Make-lyrics_plugin_dir-configurable-again.patch b/main/ncmpc/0001-Make-lyrics_plugin_dir-configurable-again.patch new file mode 100644 index 0000000000..2b84681e3c --- /dev/null +++ b/main/ncmpc/0001-Make-lyrics_plugin_dir-configurable-again.patch @@ -0,0 +1,39 @@ +From b49026a1c9e8075ff7be03dac6d26d22a659219c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> +Date: Sat, 23 Sep 2017 11:09:38 +0200 +Subject: [PATCH] Make lyrics_plugin_dir configurable again + +See: https://github.com/MusicPlayerDaemon/ncmpc/issues/7 +--- + meson.build | 2 +- + meson_options.txt | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 92d0057..f399c69 100644 +--- a/meson.build ++++ b/meson.build +@@ -271,7 +271,7 @@ conf.set('ENABLE_LYRICS_SCREEN', enable_lyrics_screen) + if enable_lyrics_screen + sources += ['src/screen_lyrics.c', 'src/lyrics.c'] + +- lyrics_plugin_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'lyrics') ++ lyrics_plugin_dir = join_paths(get_option('prefix'), get_option('lyrics_plugin_dir')) + conf.set_quoted('LYRICS_PLUGIN_DIR', lyrics_plugin_dir) + install_data( + 'lyrics/10-hd.sh', +diff --git a/meson_options.txt b/meson_options.txt +index 4f58ed3..92e83e6 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -79,3 +79,7 @@ option('chat_screen', type: 'boolean', + option('documentation', type: 'boolean', + value: false, + description: 'Build API documentation') ++ ++option('lyrics_plugin_dir', type: 'string', ++ value: 'lib/ncmpc/lyrics', ++ description: 'Directory where lyrics plugins are stored') +-- +2.14.1 + diff --git a/main/ncmpc/APKBUILD b/main/ncmpc/APKBUILD index 4a59433769..0da5ef4f52 100644 --- a/main/ncmpc/APKBUILD +++ b/main/ncmpc/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Peter Bui <pnutzh4x0r@gmail.com> # Maintainer: Peter Bui <pnutzh4x0r@gmail.com> pkgname=ncmpc -pkgver=0.27 +pkgver=0.28 pkgrel=0 pkgdesc="Fully featured MPD client using ncurses" url="http://www.musicpd.org/clients/ncmpc/" @@ -10,35 +10,39 @@ arch="all" license="GPL2" depends="" depends_dev="" -makedepends="ncurses-dev glib-dev libmpdclient-dev" +makedepends="ncurses-dev glib-dev libmpdclient-dev meson" install="" subpackages="$pkgname-doc $pkgname-lang $pkgname-dbg" -source="http://www.musicpd.org/download/${pkgname}/0/${pkgname}-${pkgver}.tar.xz" +source="http://www.musicpd.org/download/${pkgname}/0/${pkgname}-${pkgver}.tar.xz + 0001-Make-lyrics_plugin_dir-configurable-again.patch" builddir="$srcdir"/$pkgname-$pkgver build() { cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --enable-lyrics-screen \ - --with-lyrics-plugin-dir=/usr/share/$pkgname/lyrics \ - || return 1 - make || return 1 + -Dcurses=ncurses \ + -Dlyrics_screen=true \ + -Dlyrics_plugin_dir=share/$pkgname/lyrics \ + . output + ninja -C output } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + DESTDIR="$pkgdir" ninja -C output install mkdir -p "$pkgdir"/usr/share/$pkgname/lyrics install -m755 lyrics/* \ - "$pkgdir"/usr/share/$pkgname/lyrics \ - || return 1 + "$pkgdir"/usr/share/$pkgname/lyrics + + mkdir -p "$pkgdir"/usr/share/licenses/$pkgname/ + mv "$pkgdir"/usr/share/doc/$pkgname/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/ } -sha512sums="255b5529a5eae14d89d9419dfb06d91c50b68a9e05f2e124fc07035e2a4619c7b6801c08d52c639d934b50f939cf1dc58f3c5265805ce8eeeba211803108f663 ncmpc-0.27.tar.xz" +sha512sums="d5cf890fc72b3c8c3391ddbcae49d494d9504eb237dcef1277b3b34eaecdce20611b1a874a2d248722b66e932a0ec7ace5bedc0dafbb0afe0d3476d4af520e0c ncmpc-0.28.tar.xz +686c8b10e14f33139df254a2c5bb29d6e52cdfdc938ad60e1ac315280c7936b56913a81b9278a9a083fa2831b41ef3ea0800d2971efc4b8d5fec5b48fa95214f 0001-Make-lyrics_plugin_dir-configurable-again.patch" |