[PR PATCH] Gerbera: update to 1.6.4

[PR PATCH] Gerbera: update to 1.6.4

[crater2150]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

There is a new pull request by crater2150 against master on the void-packages repository

https://github.com/crater2150/void-packages gerbera
https://github.com/void-linux/void-packages/pull/27795

Gerbera: update to 1.6.4
Updates Gerbera, also adds new package for libupnp1.12 (incompatible to versions 1.6 and 1.8 already in the repo)

A patch file from https://github.com/void-linux/void-packages/pull/27795.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gerbera-27795.patch --]
[-- Type: text/x-diff, Size: 3619 bytes --]

From 701a61af5aa7293517a38851b9eabb5a39d63fbc Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Sat, 9 Jan 2021 21:51:35 +0100
Subject: [PATCH 1/2] New package: libupnp1.12-1.12.1

---
 common/shlibs                |  2 ++
 srcpkgs/libupnp1.12-devel    |  1 +
 srcpkgs/libupnp1.12/template | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 120000 srcpkgs/libupnp1.12-devel
 create mode 100644 srcpkgs/libupnp1.12/template

diff --git a/common/shlibs b/common/shlibs
index de5cb65426e..a4fd9f04b5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4047,3 +4047,5 @@ libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
+libupnp.so.16 libupnp1.12-1.12.1_1
+libixml.so.11 libupnp1.12-1.12.1_1
diff --git a/srcpkgs/libupnp1.12-devel b/srcpkgs/libupnp1.12-devel
new file mode 120000
index 00000000000..a3d1eaf5b03
--- /dev/null
+++ b/srcpkgs/libupnp1.12-devel
@@ -0,0 +1 @@
+libupnp1.12
\ No newline at end of file
diff --git a/srcpkgs/libupnp1.12/template b/srcpkgs/libupnp1.12/template
new file mode 100644
index 00000000000..f1dad60fbc6
--- /dev/null
+++ b/srcpkgs/libupnp1.12/template
@@ -0,0 +1,33 @@
+# Template file for 'libupnp1.12'
+pkgname=libupnp1.12
+version=1.12.1
+revision=1
+wrksrc="libupnp-${version}"
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config"
+short_desc="A Portable Open Source UPnP Development Kit"
+maintainer="Alexander Gehrke <void@qwertyuiop.de>"
+license="BSD-3-Clause"
+homepage="http://pupnp.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/pupnp/libupnp-$version.tar.bz2"
+checksum=fc36642b1848fe5a81296d496291d350ecfc12b85fd0b268478ab230976d4009
+configure_args+=" --enable-ipv6 --enable-reuseaddr"
+
+post_install() {
+	vlicense COPYING
+}
+
+pre_configure() {
+	autoreconf -fi
+}
+
+libupnp1.12-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From 9efc9efffabc23df79501ebb39ecab999bc083fe Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Sat, 9 Jan 2021 21:52:24 +0100
Subject: [PATCH 2/2] gerbera: update to 1.6.4

---
 srcpkgs/gerbera/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index cdec13159fd..ada9c06796e 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,17 +1,19 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.3.1
-revision=2
+version=1.6.4
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
- libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel"
+ libexif-devel libupnp1.12-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
+checksum=cbe7ea78977db8c02fcca1759ed149f199a590afaf4a6d21ffcca8623d1a0cc5
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

Re: Gerbera: update to 1.6.4

[crater2150]

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]

New comment by crater2150 on void-packages repository

https://github.com/void-linux/void-packages/pull/27795#issuecomment-757373409

Comment:
Crossbuilding libupnp1.12 to `x86_64-musl` and `i686` via `xbps-src -a` works without errors. Any ideas why it would fail in the CI build?

Re: Gerbera: update to 1.6.4

[tibequadorian]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/27795#issuecomment-757872481

Comment:
libupnp1.12 is missing `CFLAGS="-D_FILE_OFFSET_BITS=64"`

Re: [PR PATCH] [Updated] Gerbera: update to 1.6.4

[crater2150]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

There is an updated pull request by crater2150 against master on the void-packages repository

https://github.com/crater2150/void-packages gerbera
https://github.com/void-linux/void-packages/pull/27795

Gerbera: update to 1.6.4
Updates Gerbera, also adds new package for libupnp1.12 (incompatible to versions 1.6 and 1.8 already in the repo)

A patch file from https://github.com/void-linux/void-packages/pull/27795.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gerbera-27795.patch --]
[-- Type: text/x-diff, Size: 3653 bytes --]

From f6938df267b1caf08e1bc89930c70b162c78ad98 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Sat, 9 Jan 2021 21:51:35 +0100
Subject: [PATCH 1/2] New package: libupnp1.12-1.12.1

---
 common/shlibs                |  2 ++
 srcpkgs/libupnp1.12-devel    |  1 +
 srcpkgs/libupnp1.12/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libupnp1.12-devel
 create mode 100644 srcpkgs/libupnp1.12/template

diff --git a/common/shlibs b/common/shlibs
index de5cb65426e..a4fd9f04b5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4047,3 +4047,5 @@ libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
+libupnp.so.16 libupnp1.12-1.12.1_1
+libixml.so.11 libupnp1.12-1.12.1_1
diff --git a/srcpkgs/libupnp1.12-devel b/srcpkgs/libupnp1.12-devel
new file mode 120000
index 00000000000..a3d1eaf5b03
--- /dev/null
+++ b/srcpkgs/libupnp1.12-devel
@@ -0,0 +1 @@
+libupnp1.12
\ No newline at end of file
diff --git a/srcpkgs/libupnp1.12/template b/srcpkgs/libupnp1.12/template
new file mode 100644
index 00000000000..4a80ef9f426
--- /dev/null
+++ b/srcpkgs/libupnp1.12/template
@@ -0,0 +1,34 @@
+# Template file for 'libupnp1.12'
+pkgname=libupnp1.12
+version=1.12.1
+revision=1
+wrksrc="libupnp-${version}"
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config"
+short_desc="A Portable Open Source UPnP Development Kit"
+maintainer="Alexander Gehrke <void@qwertyuiop.de>"
+license="BSD-3-Clause"
+homepage="http://pupnp.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/pupnp/libupnp-$version.tar.bz2"
+checksum=fc36642b1848fe5a81296d496291d350ecfc12b85fd0b268478ab230976d4009
+configure_args+=" --enable-ipv6 --enable-reuseaddr"
+CFLAGS="-D_FILE_OFFSET_BITS=64"
+
+post_install() {
+	vlicense COPYING
+}
+
+pre_configure() {
+	autoreconf -fi
+}
+
+libupnp1.12-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From d5a8378d63b6b44fff6ac1b0725eca96e62cf311 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Sat, 9 Jan 2021 21:52:24 +0100
Subject: [PATCH 2/2] gerbera: update to 1.6.4

---
 srcpkgs/gerbera/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index cdec13159fd..ada9c06796e 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,17 +1,19 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.3.1
-revision=2
+version=1.6.4
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
- libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel"
+ libexif-devel libupnp1.12-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
+checksum=cbe7ea78977db8c02fcca1759ed149f199a590afaf4a6d21ffcca8623d1a0cc5
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

Re: Gerbera: update to 1.6.4

[crater2150]

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

New comment by crater2150 on void-packages repository

https://github.com/void-linux/void-packages/pull/27795#issuecomment-757929923

Comment:
@tibequadorian Thanks, that fixed it.

The remaining linter warning concerns the `short_desc`, which I left consistent with `libupnp` and `libupnp1.8`.

Re: Gerbera: update to 1.6.4

[tibequadorian]

[-- Attachment #1: Type: text/plain, Size: 292 bytes --]

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/27795#issuecomment-757938370

Comment:
@crater2150 I would think it's better to make it consistently right than keep it consistently wrong ;) Its also already corrected in `libupnp1.8`

Re: [PR PATCH] [Updated] Gerbera: update to 1.6.4

[crater2150]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

There is an updated pull request by crater2150 against master on the void-packages repository

https://github.com/crater2150/void-packages gerbera
https://github.com/void-linux/void-packages/pull/27795

Gerbera: update to 1.6.4
Updates Gerbera, also adds new package for libupnp1.12 (incompatible to versions 1.6 and 1.8 already in the repo)

A patch file from https://github.com/void-linux/void-packages/pull/27795.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gerbera-27795.patch --]
[-- Type: text/x-diff, Size: 3651 bytes --]

From 30f121978ed69cd1dfd3380bc76ebb0071eeb0e9 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Sat, 9 Jan 2021 21:51:35 +0100
Subject: [PATCH 1/2] New package: libupnp1.12-1.12.1

---
 common/shlibs                |  2 ++
 srcpkgs/libupnp1.12-devel    |  1 +
 srcpkgs/libupnp1.12/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libupnp1.12-devel
 create mode 100644 srcpkgs/libupnp1.12/template

diff --git a/common/shlibs b/common/shlibs
index de5cb65426e..a4fd9f04b5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4047,3 +4047,5 @@ libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
+libupnp.so.16 libupnp1.12-1.12.1_1
+libixml.so.11 libupnp1.12-1.12.1_1
diff --git a/srcpkgs/libupnp1.12-devel b/srcpkgs/libupnp1.12-devel
new file mode 120000
index 00000000000..a3d1eaf5b03
--- /dev/null
+++ b/srcpkgs/libupnp1.12-devel
@@ -0,0 +1 @@
+libupnp1.12
\ No newline at end of file
diff --git a/srcpkgs/libupnp1.12/template b/srcpkgs/libupnp1.12/template
new file mode 100644
index 00000000000..cd46413416e
--- /dev/null
+++ b/srcpkgs/libupnp1.12/template
@@ -0,0 +1,34 @@
+# Template file for 'libupnp1.12'
+pkgname=libupnp1.12
+version=1.12.1
+revision=1
+wrksrc="libupnp-${version}"
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config"
+short_desc="Portable Open Source UPnP Development Kit"
+maintainer="Alexander Gehrke <void@qwertyuiop.de>"
+license="BSD-3-Clause"
+homepage="http://pupnp.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/pupnp/libupnp-$version.tar.bz2"
+checksum=fc36642b1848fe5a81296d496291d350ecfc12b85fd0b268478ab230976d4009
+configure_args+=" --enable-ipv6 --enable-reuseaddr"
+CFLAGS="-D_FILE_OFFSET_BITS=64"
+
+post_install() {
+	vlicense COPYING
+}
+
+pre_configure() {
+	autoreconf -fi
+}
+
+libupnp1.12-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From e1a0f99436b5b19239bf63370f6d2ec314a55b82 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Sat, 9 Jan 2021 21:52:24 +0100
Subject: [PATCH 2/2] gerbera: update to 1.6.4

---
 srcpkgs/gerbera/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index cdec13159fd..ada9c06796e 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,17 +1,19 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.3.1
-revision=2
+version=1.6.4
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
- libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel"
+ libexif-devel libupnp1.12-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
+checksum=cbe7ea78977db8c02fcca1759ed149f199a590afaf4a6d21ffcca8623d1a0cc5
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

Re: Gerbera: update to 1.6.4

[crater2150]

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

New comment by crater2150 on void-packages repository

https://github.com/void-linux/void-packages/pull/27795#issuecomment-757992437

Comment:
Oh, it is indeed. changed it here too.

Re: [PR REVIEW] Gerbera: update to 1.6.4

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27795#discussion_r555102009

Comment:
This should probably conflict with the other `libupnp*-devel` packages.

Re: [PR REVIEW] Gerbera: update to 1.6.4

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27795#discussion_r555102657

Comment:
1.14 exists... Does this really need 1.12? :(

Re: [PR REVIEW] Gerbera: update to 1.6.4

[crater2150]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

New review comment by crater2150 on void-packages repository

https://github.com/void-linux/void-packages/pull/27795#discussion_r555113811

Comment:
1.12 was the version listed in gerbera's readme. I'll try to build it against 1.14 and see if it works. 

Re: [PR PATCH] [Updated] Gerbera: update to 1.6.4

[crater2150]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

There is an updated pull request by crater2150 against master on the void-packages repository

https://github.com/crater2150/void-packages gerbera
https://github.com/void-linux/void-packages/pull/27795

Gerbera: update to 1.6.4
Updates Gerbera, also adds new package for libupnp1.12 (incompatible to versions 1.6 and 1.8 already in the repo)

A patch file from https://github.com/void-linux/void-packages/pull/27795.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gerbera-27795.patch --]
[-- Type: text/x-diff, Size: 3654 bytes --]

From 95a4ab01c61a3732f7cc0a06c9da1991f51b7aea Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Mon, 11 Jan 2021 16:35:15 +0100
Subject: [PATCH 1/2] new package: libupnp1.14-1.14.0

---
 common/shlibs                |  2 ++
 srcpkgs/libupnp1.14-devel    |  1 +
 srcpkgs/libupnp1.14/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libupnp1.14-devel
 create mode 100644 srcpkgs/libupnp1.14/template

diff --git a/common/shlibs b/common/shlibs
index 24c31d8621d..fafe1dd8b08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4045,3 +4045,5 @@ libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
+libupnp.so.17 libupnp1.14-1.14.0_1
+libixml.so.11 libupnp1.14-1.14.0_1
diff --git a/srcpkgs/libupnp1.14-devel b/srcpkgs/libupnp1.14-devel
new file mode 120000
index 00000000000..5aaeacb6af2
--- /dev/null
+++ b/srcpkgs/libupnp1.14-devel
@@ -0,0 +1 @@
+libupnp1.14/
\ No newline at end of file
diff --git a/srcpkgs/libupnp1.14/template b/srcpkgs/libupnp1.14/template
new file mode 100644
index 00000000000..af8a6aeff95
--- /dev/null
+++ b/srcpkgs/libupnp1.14/template
@@ -0,0 +1,34 @@
+# Template file for 'libupnp1.14'
+pkgname=libupnp1.14
+version=1.14.0
+revision=1
+wrksrc="libupnp-${version}"
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config"
+short_desc="Portable Open Source UPnP Development Kit"
+maintainer="Alexander Gehrke <void@qwertyuiop.de>"
+license="BSD-3-Clause"
+homepage="http://pupnp.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/pupnp/libupnp-$version.tar.bz2"
+checksum=ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb
+configure_args+=" --enable-ipv6 --enable-reuseaddr"
+CFLAGS="-D_FILE_OFFSET_BITS=64"
+
+post_install() {
+	vlicense COPYING
+}
+
+pre_configure() {
+	autoreconf -fi
+}
+
+libupnp1.14-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From 74d87fb06ea1193111ca02423449eff33753bfb1 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Mon, 11 Jan 2021 16:37:12 +0100
Subject: [PATCH 2/2] gerbera: update to 1.6.4

---
 srcpkgs/gerbera/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index cdec13159fd..85afaf7bbcb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,17 +1,19 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.3.1
-revision=2
+version=1.6.4
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
- libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel"
+ libexif-devel libupnp1.14-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
+checksum=cbe7ea78977db8c02fcca1759ed149f199a590afaf4a6d21ffcca8623d1a0cc5
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

Re: [PR REVIEW] Gerbera: update to 1.6.4

[crater2150]

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New review comment by crater2150 on void-packages repository

https://github.com/void-linux/void-packages/pull/27795#discussion_r555134083

Comment:
It compiles and seems to work with 1.14, so I replaced the 1.12 package.

Re: [PR PATCH] [Updated] Gerbera: update to 1.6.4

[crater2150]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

There is an updated pull request by crater2150 against master on the void-packages repository

https://github.com/crater2150/void-packages gerbera
https://github.com/void-linux/void-packages/pull/27795

Gerbera: update to 1.6.4
Updates Gerbera, also adds new package for libupnp1.12 (incompatible to versions 1.6 and 1.8 already in the repo)

A patch file from https://github.com/void-linux/void-packages/pull/27795.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gerbera-27795.patch --]
[-- Type: text/x-diff, Size: 3706 bytes --]

From e74eebace3ecbd623fb109e6f167c791cadd5151 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Mon, 11 Jan 2021 16:35:15 +0100
Subject: [PATCH 1/2] new package: libupnp1.14-1.14.0

---
 common/shlibs                |  2 ++
 srcpkgs/libupnp1.14-devel    |  1 +
 srcpkgs/libupnp1.14/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/libupnp1.14-devel
 create mode 100644 srcpkgs/libupnp1.14/template

diff --git a/common/shlibs b/common/shlibs
index 24c31d8621d..fafe1dd8b08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4045,3 +4045,5 @@ libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
+libupnp.so.17 libupnp1.14-1.14.0_1
+libixml.so.11 libupnp1.14-1.14.0_1
diff --git a/srcpkgs/libupnp1.14-devel b/srcpkgs/libupnp1.14-devel
new file mode 120000
index 00000000000..5aaeacb6af2
--- /dev/null
+++ b/srcpkgs/libupnp1.14-devel
@@ -0,0 +1 @@
+libupnp1.14/
\ No newline at end of file
diff --git a/srcpkgs/libupnp1.14/template b/srcpkgs/libupnp1.14/template
new file mode 100644
index 00000000000..d09fe5a2692
--- /dev/null
+++ b/srcpkgs/libupnp1.14/template
@@ -0,0 +1,35 @@
+# Template file for 'libupnp1.14'
+pkgname=libupnp1.14
+version=1.14.0
+revision=1
+wrksrc="libupnp-${version}"
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config"
+short_desc="Portable Open Source UPnP Development Kit"
+maintainer="Alexander Gehrke <void@qwertyuiop.de>"
+license="BSD-3-Clause"
+homepage="http://pupnp.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/pupnp/libupnp-$version.tar.bz2"
+checksum=ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb
+configure_args+=" --enable-ipv6 --enable-reuseaddr"
+CFLAGS="-D_FILE_OFFSET_BITS=64"
+
+post_install() {
+	vlicense COPYING
+}
+
+pre_configure() {
+	autoreconf -fi
+}
+
+libupnp1.14-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	conflicts="libupnp-devel>=0 libupnp1.8-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From dfb92b50c004d12085ba8ab5c560cbe9e616239a Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Mon, 11 Jan 2021 16:37:12 +0100
Subject: [PATCH 2/2] gerbera: update to 1.6.4

---
 srcpkgs/gerbera/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index cdec13159fd..85afaf7bbcb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,17 +1,19 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.3.1
-revision=2
+version=1.6.4
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
- libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel"
+ libexif-devel libupnp1.14-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
+checksum=cbe7ea78977db8c02fcca1759ed149f199a590afaf4a6d21ffcca8623d1a0cc5
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

Re: Gerbera: update to 1.6.4

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/27795#issuecomment-758091658

Comment:
Related: #27829. The idea is to drop the current `libupnp` and, if possible, `libupnp1.8` (although this isn't a hard requirement) to reduce some of the UPnP madness going on here.

Re: [PR PATCH] [Closed]: Gerbera: update to 1.6.4

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

There's a closed pull request on the void-packages repository

Gerbera: update to 1.6.4
https://github.com/void-linux/void-packages/pull/27795

Description:
Updates Gerbera, also adds new package for libupnp1.12 (incompatible to versions 1.6 and 1.8 already in the repo)