summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn-Michael Mulesa2020-07-04 09:39:05 +1000
committerJohn-Michael Mulesa2020-07-04 09:39:05 +1000
commitbef7cefe0affc84a09df1cf5e1151e07b92e74b4 (patch)
tree8eac9405ad94671756eb3f8be590658c2eb44073
parent10f1ab77e6d015c0c3095113f5b712c9e43a99d9 (diff)
downloadaur-bef7cefe0affc84a09df1cf5e1151e07b92e74b4.tar.gz
Backport libplist workaround to fix builds.
https://github.com/ejurgensen/forked-daapd/commit/ce2006a31b7114a9cf621a5aa142ecf68b8c9884
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
-rw-r--r--libplist.patch20
3 files changed, 35 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5ed63c9ab7e..7bc2430b3e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = forked-daapd
pkgdesc = iTunes-compatible media server, originally intended as a rewrite of Firefly Media Server (mt-daapd).
pkgver = 27.1
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/ejurgensen/forked-daapd
install = forked-daapd.install
arch = armv6h
@@ -28,26 +28,32 @@ pkgbase = forked-daapd
source = https://github.com/ejurgensen/forked-daapd/archive/27.1.tar.gz
source = forked-daapd.install
source = forked-daapd.service
+ source = libplist.patch
source = http://www.antlr3.org/download/antlr-3.4-complete.jar
md5sums = 378a22c3969f910106bc23102a9033c7
md5sums = bad1372140c914d1c312a186087fe375
md5sums = 5047515b396f37a9030a003f12eaaafa
+ md5sums = b0137a62d0003bdc65125854eeea4bbc
md5sums = 1b91dea1c7d480b3223f7c8a9aa0e172
sha1sums = d3f6137cefbf9960b2f070c0cf436b081b969037
sha1sums = 90a796470231ae7c22635c3fbbb47f9d8a61ebd6
sha1sums = 76623036d11d411cb438f9ac8f9cdf21f12b305f
+ sha1sums = a4eb96180923b2efaa92fe06fb0d1d99a4b0f771
sha1sums = 5cab59d859caa6598e28131d30dd2e89806db57f
sha256sums = 3ac63737008f04f5fb66a94cdb4ba295f141346490b8f21a22ba5df14bc32737
sha256sums = 19b394a38ac88247d6b7d939e648ac53e8f08bef852e76c79355d1231bffad3d
sha256sums = f623bfe983e65bd5c658bb456b775c62812e3daf8a5f27d154cf70c48c1e51bf
+ sha256sums = be3ed065850185b57fe80b9a80ef2f3327757868e483a863d3b62cbfd4b22125
sha256sums = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7
sha384sums = 5c0ce600605bcb710c43304b8ba874221d8622c0f71668a0c1484356428bb5dd0335eb709c0a6982356b3bdf74011f9a
sha384sums = b536551061e8404f0128e9313411c9f2419d7bf4c982c8d9f32300727c873219d90c90bda32256fb9d3bd560c0be2704
sha384sums = a4dc8c4a504496a624e210ac668e5190eb6756a4f7f2825c42624f424723ddfd0c0338fa753ad1d61944d3bdf08451a7
+ sha384sums = 4b65eb965ab9e5806dfbfbd4850acfe139c09829eb7a436d67ff598df0e974b6575e881116f15640e46e0038b8ce1905
sha384sums = a2fbecb5fae6af12adcfb3801624d4941e25e4b526794f7b9a713ae8b6873962ca36a74f9220d7e0057aaa89d5ca6d68
sha512sums = e6f4400cc668d6ff40adf7b57afaf3e834eb76831c96b6184821a235739041436fbf402f9f4a799dd194f6d9db082c1df487e6bea2d86a25b91c9d49d4200a10
sha512sums = f82c8b73b39e6b8e83b09953d187b98b9fb856914a0a231b6758701f4f383b5dd5368ec468011b78402fd9850662b61b48e6198336ed4049cfd1ed7cb8659e9b
sha512sums = bc32f4cb705bf3890e85a51530818a1d86b260c1f6c1203b0f07757a8ab23b7654a357bc9c7ab10b370f4714f26b60368c1910c7efe9197041015183518a40d6
+ sha512sums = 34640e2d835c761ee6b202d3928dcb4f9530d459b9ce551753b8bd0958469f51990d3e58d2853d6a5d3c2eeee0e6f2a79a4b17af2ef4603724c138cb0afb09cd
sha512sums = 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
pkgname = forked-daapd
diff --git a/PKGBUILD b/PKGBUILD
index 1e2163b9098..976ebfd8ef2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: John-Michael Mulesa <jmulesa@gmail.com>
pkgname=forked-daapd
pkgver=27.1
-pkgrel=2
+pkgrel=3
pkgdesc="iTunes-compatible media server, originally intended as a rewrite of Firefly Media Server (mt-daapd)."
arch=('armv6h' 'armv7h' 'i686' 'x86_64')
url="https://github.com/ejurgensen/forked-daapd"
@@ -17,27 +17,32 @@ backup=(etc/forked-daapd.conf)
options=()
install=forked-daapd.install
changelog=
-source=(https://github.com/ejurgensen/forked-daapd/archive/$pkgver.tar.gz forked-daapd.install forked-daapd.service http://www.antlr3.org/download/antlr-3.4-complete.jar)
+source=(https://github.com/ejurgensen/forked-daapd/archive/$pkgver.tar.gz forked-daapd.install forked-daapd.service libplist.patch http://www.antlr3.org/download/antlr-3.4-complete.jar)
noextract=()
md5sums=('378a22c3969f910106bc23102a9033c7'
'bad1372140c914d1c312a186087fe375'
'5047515b396f37a9030a003f12eaaafa'
+ 'b0137a62d0003bdc65125854eeea4bbc'
'1b91dea1c7d480b3223f7c8a9aa0e172')
sha1sums=('d3f6137cefbf9960b2f070c0cf436b081b969037'
'90a796470231ae7c22635c3fbbb47f9d8a61ebd6'
'76623036d11d411cb438f9ac8f9cdf21f12b305f'
+ 'a4eb96180923b2efaa92fe06fb0d1d99a4b0f771'
'5cab59d859caa6598e28131d30dd2e89806db57f')
sha256sums=('3ac63737008f04f5fb66a94cdb4ba295f141346490b8f21a22ba5df14bc32737'
'19b394a38ac88247d6b7d939e648ac53e8f08bef852e76c79355d1231bffad3d'
'f623bfe983e65bd5c658bb456b775c62812e3daf8a5f27d154cf70c48c1e51bf'
+ 'be3ed065850185b57fe80b9a80ef2f3327757868e483a863d3b62cbfd4b22125'
'9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7')
sha384sums=('5c0ce600605bcb710c43304b8ba874221d8622c0f71668a0c1484356428bb5dd0335eb709c0a6982356b3bdf74011f9a'
'b536551061e8404f0128e9313411c9f2419d7bf4c982c8d9f32300727c873219d90c90bda32256fb9d3bd560c0be2704'
'a4dc8c4a504496a624e210ac668e5190eb6756a4f7f2825c42624f424723ddfd0c0338fa753ad1d61944d3bdf08451a7'
+ '4b65eb965ab9e5806dfbfbd4850acfe139c09829eb7a436d67ff598df0e974b6575e881116f15640e46e0038b8ce1905'
'a2fbecb5fae6af12adcfb3801624d4941e25e4b526794f7b9a713ae8b6873962ca36a74f9220d7e0057aaa89d5ca6d68')
sha512sums=('e6f4400cc668d6ff40adf7b57afaf3e834eb76831c96b6184821a235739041436fbf402f9f4a799dd194f6d9db082c1df487e6bea2d86a25b91c9d49d4200a10'
'f82c8b73b39e6b8e83b09953d187b98b9fb856914a0a231b6758701f4f383b5dd5368ec468011b78402fd9850662b61b48e6198336ed4049cfd1ed7cb8659e9b'
'bc32f4cb705bf3890e85a51530818a1d86b260c1f6c1203b0f07757a8ab23b7654a357bc9c7ab10b370f4714f26b60368c1910c7efe9197041015183518a40d6'
+ '34640e2d835c761ee6b202d3928dcb4f9530d459b9ce551753b8bd0958469f51990d3e58d2853d6a5d3c2eeee0e6f2a79a4b17af2ef4603724c138cb0afb09cd'
'04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2')
build() {
@@ -48,6 +53,7 @@ build() {
echo "exec java -cp ${safequotedsrcdir}/antlr-3.4-complete.jar org.antlr.Tool \"\$@\"" >> antlr3
chmod a+x ./antlr3
cd "$srcdir/$pkgname-$pkgver"
+ patch --forward --strip=1 --input="${srcdir}/libplist.patch"
echo "$PATH"
autoreconf -i
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-itunes --enable-chromecast --enable-lastfm --with-libwebsockets --sbindir=/usr/bin LDFLAGS="-Wl,--allow-multiple-definition"
diff --git a/libplist.patch b/libplist.patch
new file mode 100644
index 00000000000..2cb773ac1fa
--- /dev/null
+++ b/libplist.patch
@@ -0,0 +1,20 @@
+diff --git a/configure.ac b/configure.ac
+index f63fdba81..5d50fa3ce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -261,9 +261,12 @@ dnl Build with libsodium
+ FORK_ARG_WITH_CHECK([FORKED_OPTS], [libsodium support], [libsodium], [LIBSODIUM],
+ [libsodium], [sodium_init], [sodium.h])
+
+-dnl Build with libplist
+-FORK_ARG_WITH_CHECK([FORKED_OPTS], [libplist support], [libplist], [LIBPLIST],
+- [libplist >= 0.16], [plist_dict_get_item], [plist/plist.h])
++dnl Build with libplist (2.2.0 does not ship libplist.pc, only libplist-2.0.pc)
++PKG_CHECK_EXISTS([libplist],
++ [FORK_ARG_WITH_CHECK([FORKED_OPTS], [libplist support], [libplist], [LIBPLIST],
++ [libplist >= 0.16], [plist_dict_get_item], [plist/plist.h])],
++ [FORK_ARG_WITH_CHECK([FORKED_OPTS], [libplist support], [libplist], [LIBPLIST],
++ [libplist-2.0], [plist_dict_get_item], [plist/plist.h])])
+
+ dnl Build with libevent_pthreads
+ FORK_ARG_WITH_CHECK([FORKED_OPTS], [libevent_pthreads support],