Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Upd/gerbera
@ 2020-05-03  0:55 mamins1376
  2020-05-03  1:12 ` [PR PATCH] [Updated] gerbera: Update to 1.5.0 mamins1376
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: mamins1376 @ 2020-05-03  0:55 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages upd/gerbera
https://github.com/void-linux/void-packages/pull/21572

Upd/gerbera
This introduces `libupnp1.12` as a way to gradually replace with `libupnp1.8`.

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

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

From 526e6361c763c3d2cd3f019fb229df895a208197 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 3 May 2020 05:19:04 +0430
Subject: [PATCH 1/3] New package: libupnp1.12-1.12.1_1

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

diff --git a/common/shlibs b/common/shlibs
index 060d736457d..60afd80a9ac 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3086,7 +3086,10 @@ libunbound.so.8 libunbound-1.10.0_2
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libixml.so.10 libupnp1.8-1.8.2_1
+libixml.so.11 libupnp1.12-1.12.1_1
+libupnp.so.11 libupnp1.12-1.12.1_1
 libupnp.so.13 libupnp1.8-1.8.4_1
+libupnp.so.16 libupnp1.12-1.12.1_1
 libsysprof-3.so sysprof-3.34.0_1
 libsysprof-ui-3.so sysprof-3.34.0_1
 libmozjs-52.so mozjs52-52.3.0_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..bd302bec393
--- /dev/null
+++ b/srcpkgs/libupnp1.12/template
@@ -0,0 +1,36 @@
+# Template file for 'libupnp1.12'
+pkgname=libupnp1.12
+version=1.12.1
+revision=1
+wrksrc="pupnp-release-${version}"
+build_style=gnu-configure
+configure_args="--enable-ipv6 --enable-reuseaddr"
+hostmakedepends="automake libtool pkg-config"
+short_desc="A Portable Open Source UPnP Development Kit"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://pupnp.sourceforge.net/"
+distfiles="https://github.com/mrjimenez/pupnp/archive/release-${version}.tar.gz"
+checksum=b4fc8f8e78d5d3259f321aecab1bc9d9ef7b9cea816c4b4d850b264120773290
+
+# libupnp uses large file support, so users must do that, too
+CFLAGS="-D_FILE_OFFSET_BITS=64"
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	vlicense COPYING
+}
+
+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"
+	}
+}
diff --git a/srcpkgs/libupnp1.12/update b/srcpkgs/libupnp1.12/update
new file mode 100644
index 00000000000..35ccc57c5ec
--- /dev/null
+++ b/srcpkgs/libupnp1.12/update
@@ -0,0 +1 @@
+pattern="release-\K[\d\.]*(?=\.tar.gz)"

From cc1c01c08a15c97574a8645c0efa42f89188919a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 3 May 2020 05:21:45 +0430
Subject: [PATCH 2/3] spdlog: Use external fmt package.

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

diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index b283634b9a4..b67e92c9033 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,9 +1,11 @@
 # Template file for 'spdlog'
 pkgname=spdlog
 version=1.5.0
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_BUILD_BENCH=OFF"
+configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_BUILD_BENCH=OFF
+ -DSPDLOG_FMT_EXTERNAL=ON"
+makedepends="fmt-devel"
 short_desc="Fast C++ logging library"
 maintainer="John <johnz@posteo.net>"
 license="MIT"

From 34c4aaed6f16fab7f67aff55e489d6908f4bd091 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 3 May 2020 05:22:24 +0430
Subject: [PATCH 3/3] gerbera: Update to 1.5.0.

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

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index cdec13159fd..ee262f27c34 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,17 +1,18 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.3.1
-revision=2
+version=1.5.0
+revision=1
 build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
-makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
- libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel"
+configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1 -DWITH_FFMPEGTHUMBNAILER=1"
+makedepends="duktape-devel expat-devel file-devel libcurl-devel libexif-devel
+ libupnp1.12-devel libuuid-devel sqlite-devel taglib-devel fmt-devel spdlog
+ pugixml-devel libebml-devel libmatroska-devel ffmpegthumbnailer-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=693a99b295bc79d842f036a6d04996d4676ac0791d65f3a1f7aab4badf9fb5ef
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"
@@ -19,6 +20,10 @@ CXXFLAGS="-D_FILE_OFFSET_BITS=64"
 system_accounts="gerbera"
 make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
 
+pre_configure() {
+	sed -i 's/${PC_UPNP_LIBRARIES}//g' cmake/FindLibUpnp.cmake
+}
+
 post_install() {
 	vsv gerbera
 }

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] gerbera: Update to 1.5.0.
  2020-05-03  0:55 [PR PATCH] Upd/gerbera mamins1376
@ 2020-05-03  1:12 ` mamins1376
  2020-05-03  1:25 ` mamins1376
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: mamins1376 @ 2020-05-03  1:12 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages upd/gerbera
https://github.com/void-linux/void-packages/pull/21572

gerbera: Update to 1.5.0.
This introduces `libupnp1.12` as a way to gradually replace with `libupnp1.8`.

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

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

From 7e9f2213d63e91226f54569d25184424721c1e5f Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 3 May 2020 05:19:04 +0430
Subject: [PATCH 1/3] New package: libupnp1.12-1.12.1_1

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

diff --git a/common/shlibs b/common/shlibs
index 060d736457d..5b7c2b0b7fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3087,6 +3087,9 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libixml.so.10 libupnp1.8-1.8.2_1
 libupnp.so.13 libupnp1.8-1.8.4_1
+libixml.so.11 libupnp1.12-1.12.1_1
+libupnp.so.11 libupnp1.12-1.12.1_1
+libupnp.so.16 libupnp1.12-1.12.1_1
 libsysprof-3.so sysprof-3.34.0_1
 libsysprof-ui-3.so sysprof-3.34.0_1
 libmozjs-52.so mozjs52-52.3.0_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..7e93cb29229
--- /dev/null
+++ b/srcpkgs/libupnp1.12/template
@@ -0,0 +1,36 @@
+# Template file for 'libupnp1.12'
+pkgname=libupnp1.12
+version=1.12.1
+revision=1
+wrksrc="pupnp-release-${version}"
+build_style=gnu-configure
+configure_args="--enable-ipv6 --enable-reuseaddr"
+hostmakedepends="automake libtool pkg-config"
+short_desc="Portable Open Source UPnP Development Kit"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://pupnp.sourceforge.net/"
+distfiles="https://github.com/mrjimenez/pupnp/archive/release-${version}.tar.gz"
+checksum=b4fc8f8e78d5d3259f321aecab1bc9d9ef7b9cea816c4b4d850b264120773290
+
+# libupnp uses large file support, so users must do that, too
+CFLAGS="-D_FILE_OFFSET_BITS=64"
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	vlicense COPYING
+}
+
+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"
+	}
+}
diff --git a/srcpkgs/libupnp1.12/update b/srcpkgs/libupnp1.12/update
new file mode 100644
index 00000000000..35ccc57c5ec
--- /dev/null
+++ b/srcpkgs/libupnp1.12/update
@@ -0,0 +1 @@
+pattern="release-\K[\d\.]*(?=\.tar.gz)"

From 82c0e89933a6e4dc1fe98aab0143dcc3b4455bcc Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 3 May 2020 05:21:45 +0430
Subject: [PATCH 2/3] spdlog: Use external fmt package.

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

diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index b283634b9a4..b67e92c9033 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,9 +1,11 @@
 # Template file for 'spdlog'
 pkgname=spdlog
 version=1.5.0
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_BUILD_BENCH=OFF"
+configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_BUILD_BENCH=OFF
+ -DSPDLOG_FMT_EXTERNAL=ON"
+makedepends="fmt-devel"
 short_desc="Fast C++ logging library"
 maintainer="John <johnz@posteo.net>"
 license="MIT"

From af321d702d44c39d7cf7b516cb72f8b0d59f7787 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 3 May 2020 05:22:24 +0430
Subject: [PATCH 3/3] gerbera: Update to 1.5.0.

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

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index cdec13159fd..ee262f27c34 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,17 +1,18 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.3.1
-revision=2
+version=1.5.0
+revision=1
 build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
-makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
- libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel"
+configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1 -DWITH_FFMPEGTHUMBNAILER=1"
+makedepends="duktape-devel expat-devel file-devel libcurl-devel libexif-devel
+ libupnp1.12-devel libuuid-devel sqlite-devel taglib-devel fmt-devel spdlog
+ pugixml-devel libebml-devel libmatroska-devel ffmpegthumbnailer-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=693a99b295bc79d842f036a6d04996d4676ac0791d65f3a1f7aab4badf9fb5ef
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"
@@ -19,6 +20,10 @@ CXXFLAGS="-D_FILE_OFFSET_BITS=64"
 system_accounts="gerbera"
 make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
 
+pre_configure() {
+	sed -i 's/${PC_UPNP_LIBRARIES}//g' cmake/FindLibUpnp.cmake
+}
+
 post_install() {
 	vsv gerbera
 }

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: gerbera: Update to 1.5.0.
  2020-05-03  0:55 [PR PATCH] Upd/gerbera mamins1376
  2020-05-03  1:12 ` [PR PATCH] [Updated] gerbera: Update to 1.5.0 mamins1376
@ 2020-05-03  1:25 ` mamins1376
  2020-05-03  1:27 ` mamins1376
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: mamins1376 @ 2020-05-03  1:25 UTC (permalink / raw)
  To: ml

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

New comment by mamins1376 on void-packages repository

https://github.com/void-linux/void-packages/pull/21572#issuecomment-623038739

Comment:
I already updated `common/shlibs` and the new package should have nothing to do with reverse dependencies of `libupnp1.8`. Why is `99-pkglint` making errors?

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: gerbera: Update to 1.5.0.
  2020-05-03  0:55 [PR PATCH] Upd/gerbera mamins1376
  2020-05-03  1:12 ` [PR PATCH] [Updated] gerbera: Update to 1.5.0 mamins1376
  2020-05-03  1:25 ` mamins1376
@ 2020-05-03  1:27 ` mamins1376
  2020-05-04 18:07 ` Chocimier
  2020-11-05 12:07 ` [PR PATCH] [Closed]: " mamins1376
  4 siblings, 0 replies; 6+ messages in thread
From: mamins1376 @ 2020-05-03  1:27 UTC (permalink / raw)
  To: ml

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

New comment by mamins1376 on void-packages repository

https://github.com/void-linux/void-packages/pull/21572#issuecomment-623038853

Comment:
https://travis-ci.org/github/void-linux/void-packages/jobs/682466026#L4642

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: gerbera: Update to 1.5.0.
  2020-05-03  0:55 [PR PATCH] Upd/gerbera mamins1376
                   ` (2 preceding siblings ...)
  2020-05-03  1:27 ` mamins1376
@ 2020-05-04 18:07 ` Chocimier
  2020-11-05 12:07 ` [PR PATCH] [Closed]: " mamins1376
  4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2020-05-04 18:07 UTC (permalink / raw)
  To: ml

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/21572#issuecomment-623618722

Comment:
All packages listed there need to be revbumped and tested.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Closed]: gerbera: Update to 1.5.0.
  2020-05-03  0:55 [PR PATCH] Upd/gerbera mamins1376
                   ` (3 preceding siblings ...)
  2020-05-04 18:07 ` Chocimier
@ 2020-11-05 12:07 ` mamins1376
  4 siblings, 0 replies; 6+ messages in thread
From: mamins1376 @ 2020-11-05 12:07 UTC (permalink / raw)
  To: ml

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

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

gerbera: Update to 1.5.0.
https://github.com/void-linux/void-packages/pull/21572

Description:
This introduces `libupnp1.12` as a way to gradually replace with `libupnp1.8`.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-11-05 12:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-03  0:55 [PR PATCH] Upd/gerbera mamins1376
2020-05-03  1:12 ` [PR PATCH] [Updated] gerbera: Update to 1.5.0 mamins1376
2020-05-03  1:25 ` mamins1376
2020-05-03  1:27 ` mamins1376
2020-05-04 18:07 ` Chocimier
2020-11-05 12:07 ` [PR PATCH] [Closed]: " mamins1376

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).