community/gerbera: fix lint and build warnings

3 files changed, 24 insertions, 3 deletions

diff --git a/community/gerbera/APKBUILD b/community/gerbera/APKBUILD
index 4a6ac19cf8..f6187c0240 100644
--- a/community/gerbera/APKBUILD
+++ b/community/gerbera/APKBUILD
@@ -33,7 +33,7 @@ checkdepends="
         gmock
         "
 install="$pkgname.pre-install $pkgname.post-deinstall"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 pkgusers="$pkgname"
 pkggroups="$pkgname"
 #
@@ -106,8 +106,8 @@ package() {
 }
 
 sha512sums="989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd  gerbera-1.4.0.tar.gz
-9037fbdc18b7af1492352abccaacca39193b16332040b02b72513ce31e47fbd56220b6c0c62a207e04fd56c4d15d5bd92910506968a4d70a66e133ba49eaeeaa  disable-git-test.patch
+f4cd58f52e4ab932d282ad8166c4c9c445140cbed6740ba292317aab28ddb2814803fa8c862846aa8f6f2c02f957176b99fc61437ada51b6219486270cb43cb5  disable-git-test.patch
 47e1953c49ceae3eeaea50b4ecd2bf44d4da2286c315a3bdbfcbe7e7fc8500e2f27438acebe16f6a72a0c97efd7b8a1b185282d73b12e730e1a8fbec19c18046  0001-Remove-IN-and-OUT-dropped-upstream.patch
-e134dee2080c21a39120999d215b0ec36890bed9283a1460d9750e2b21908b3283db09d33c5ff445ae779559b5486f8c81c590c1dbde77ae3d5bb900d694d17f  upnp-updates.patch
+965b356fafff92548b7189edf3763a638cd3dc42e173c5f656612a9cb22c34bde719b86cac3152a166f726c786d2001c42ad772fcac9b90c33b2b12c803cb67d  upnp-updates.patch
 8ae265dd283705802d138dc014d592362b0b95030eee0999bfcf6058fa656f215a5dc11e2b548459300750be0f9e6c3d0f5047714a6fc16eeb430c40aff8d35b  gerbera.initd
 392d7e964b0328778847f871e88ffd475ddac99b6cf8c8ded4825eb2f970e084db692552790a1b30ff96f59eabcd9fff50164d9dedf328badab95a1cec833c02  gerbera.confd"
diff --git a/community/gerbera/disable-git-test.patch b/community/gerbera/disable-git-test.patch
index 3a2bc2f424..2eb64acb2f 100644
--- a/community/gerbera/disable-git-test.patch
+++ b/community/gerbera/disable-git-test.patch
@@ -1,3 +1,13 @@
+From: Mike Crute <mike@crute.us>
+Date: Tue, 24 Dec 2019 16:18:32 +0000
+Subject: Disable broken tests
+
+Patch removes check for git info in server version output. This assumes
+that the binary was built within a git repo which is not the case for
+releases. This test will never work for us.
+
+---
+
 --- a/test/test_server/test_main.cc.orig
 +++ b/test/test_server/test_main.cc
 @@ -48,7 +48,7 @@
diff --git a/community/gerbera/upnp-updates.patch b/community/gerbera/upnp-updates.patch
index 4cc06cfead..7d173398f8 100644
--- a/community/gerbera/upnp-updates.patch
+++ b/community/gerbera/upnp-updates.patch
@@ -1,3 +1,14 @@
+From: Mike Crute <mike@crute.us>
+Date: Tue, 24 Dec 2019 16:18:32 +0000
+Subject: Disable broken tests
+
+Disables some tests that don't work with the latest version of libupnp.
+Upstream has very seriously overhauled these tests and there's noting
+feasible to pull forward. We can drop this patch after the next upstream
+gerbera release.
+
+---
+
 --- a/src/util/headers.cc
 +++ b/src/util/headers.cc
 @@ -81,7 +81,7 @@