* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-fritzbox/files/, media-plugins/vdr-fritzbox/
@ 2019-06-30 11:51 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-06-30 11:51 UTC (permalink / raw
To: gentoo-commits
commit: 41994240d5a6caae4fd9dfff2b7ed6c40eff46fd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 11:39:40 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 11:51:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41994240
media-plugins/vdr-fritzbox: Fix build with >=boost-1.67
Non-maintainer commit after timeout.
Closes: https://bugs.gentoo.org/671468
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/vdr-fritzbox-1.5.3-boost-1.67.patch | 22 ++++++++++++++
.../vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild | 34 ++++++++++++++++++++++
2 files changed, 56 insertions(+)
diff --git a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch
new file mode 100644
index 00000000000..f5733878279
--- /dev/null
+++ b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch
@@ -0,0 +1,22 @@
+From 212847f0efaeffee8422059b8e202d844174aaf3 Mon Sep 17 00:00:00 2001
+From: Joachim Wilke <github.com@joachim-wilke.de>
+Date: Thu, 28 Jun 2018 12:56:54 +0200
+Subject: [PATCH] Add compatibility with boost 1.67
+
+Refers to https://github.com/jowi24/vdr-fritz/issues/1
+---
+ TcpClient.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/TcpClient.cpp b/TcpClient.cpp
+index b9b38e9..c6cc08e 100644
+--- a/libnet++/TcpClient.cpp
++++ b/libnet++/TcpClient.cpp
+@@ -19,6 +19,7 @@
+ *
+ */
+
++#define BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM
+ #include "TcpClient.h"
+
+ #include <liblog++/Log.h>
diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild
new file mode 100644
index 00000000000..eaa4abe5e23
--- /dev/null
+++ b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: Inform about incoming phone-calls and use the fritz!box phonebook"
+HOMEPAGE="https://github.com/jowi24/vdr-fritz"
+SRC_URI="https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/libgcrypt:0
+ dev-libs/boost[threads]
+ >=media-video/vdr-1.7.34
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-boost-1.67.patch" )
+
+pkg_postinst() {
+ elog "It is recommend to update your firmware release to the latest."
+ elog
+ elog "The integrated call monitor (available in Fritz!Box official"
+ elog "firmware releases >= *.04.29) has to be enabled in order to"
+ elog "have the vdr-fritzbox plugin display anything on your tv. To"
+ elog "enable it call #96*5* from your telephone. If that doesn't"
+ elog "work for you, read the documentation for further instructions."
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-fritzbox/files/, media-plugins/vdr-fritzbox/
@ 2021-05-14 14:33 Jörg Bornkessel
0 siblings, 0 replies; 3+ messages in thread
From: Jörg Bornkessel @ 2021-05-14 14:33 UTC (permalink / raw
To: gentoo-commits
commit: 5729eec09566c4bf09787330e8787ccd953c7619
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 14:32:51 2021 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Fri May 14 14:32:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5729eec0
media-plugins/vdr-fritzbox: llvm/clang compile fixed
Closes: https://bugs.gentoo.org/740290
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
.../vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch | 17 +++++++++++++++++
...box-1.5.3-r2.ebuild => vdr-fritzbox-1.5.3-r3.ebuild} | 5 ++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch
new file mode 100644
index 00000000000..1819244ffba
--- /dev/null
+++ b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch
@@ -0,0 +1,17 @@
+compile fix llvm/clang
+
+https://bugs.gentoo.org/740290
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (14 May 2021)
+diff -Naur fritzbox-1.5.3.orig/notifyosd.cpp fritzbox-1.5.3/notifyosd.cpp
+--- fritzbox-1.5.3.orig/notifyosd.cpp 2021-05-14 14:20:08.973067369 +0200
++++ fritzbox-1.5.3/notifyosd.cpp 2021-05-14 14:21:17.945067369 +0200
+@@ -128,7 +128,7 @@
+ delete osd;
+ osd = cOsdProvider::NewOsd(left, top);
+ // defines drawing area and color depth
+- tArea Area = { 0, 0, width-1, height-1, colorDepth };
++ tArea Area = { 0, 0, static_cast<int>(width-1), static_cast<int>(height-1), colorDepth };
+ osd->SetAreas(&Area, 1);
+ // draw osd frame, 2px thick
+ osd->DrawRectangle(0, 0, width-1, height-1, clrBackground);
diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r2.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r3.ebuild
similarity index 93%
rename from media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r2.ebuild
rename to media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r3.ebuild
index 860f542aaea..8ca019bad2a 100644
--- a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r2.ebuild
+++ b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r3.ebuild
@@ -19,7 +19,10 @@ DEPEND="dev-libs/libgcrypt:0
media-video/vdr"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-boost-1.67.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-boost-1.67.patch"
+ "${FILESDIR}/${P}_clang.patch"
+ )
src_prepare() {
vdr-plugin-2_src_prepare
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-fritzbox/files/, media-plugins/vdr-fritzbox/
@ 2021-08-20 1:10 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-08-20 1:10 UTC (permalink / raw
To: gentoo-commits
commit: 70fb657a44f8967db0d1096ebfc1b21d978e8d5a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 20 01:06:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 20 01:10:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70fb657a
media-plugins/vdr-fritzbox: fix build with GCC 11
See: https://github.com/jowi24/libnetpp/pull/1
Closes: https://bugs.gentoo.org/808665
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/vdr-fritzbox-1.5.3-boost-1.67.patch | 6 ------
.../files/vdr-fritzbox-1.5.3-gcc11-include.patch | 18 ++++++++++++++++++
.../vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch | 5 ++---
.../vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild | 7 ++++---
4 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch
index f5733878279..c47d6e849dc 100644
--- a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch
+++ b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch
@@ -4,12 +4,6 @@ Date: Thu, 28 Jun 2018 12:56:54 +0200
Subject: [PATCH] Add compatibility with boost 1.67
Refers to https://github.com/jowi24/vdr-fritz/issues/1
----
- TcpClient.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/TcpClient.cpp b/TcpClient.cpp
-index b9b38e9..c6cc08e 100644
--- a/libnet++/TcpClient.cpp
+++ b/libnet++/TcpClient.cpp
@@ -19,6 +19,7 @@
diff --git a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-gcc11-include.patch b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-gcc11-include.patch
new file mode 100644
index 00000000000..923a24112f0
--- /dev/null
+++ b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-gcc11-include.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/808665
+https://github.com/jowi24/libnetpp/pull/1
+
+From: Sam James <sam@gentoo.org>
+Date: Fri, 20 Aug 2021 02:03:34 +0100
+Subject: [PATCH] Add missing <map> include
+
+Needed for std::map. Fixes GCC 11 build.
+--- a/libnet++/HttpClient.h
++++ b/libnet++/HttpClient.h
+@@ -22,6 +22,7 @@
+ #ifndef HTTPCLIENT_H
+ #define HTTPCLIENT_H
+
++#include <map>
+ #include <string>
+
+ #include "TcpClient.h"
diff --git a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch
index 1819244ffba..b6d0326ef76 100644
--- a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch
+++ b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch
@@ -3,9 +3,8 @@ compile fix llvm/clang
https://bugs.gentoo.org/740290
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (14 May 2021)
-diff -Naur fritzbox-1.5.3.orig/notifyosd.cpp fritzbox-1.5.3/notifyosd.cpp
---- fritzbox-1.5.3.orig/notifyosd.cpp 2021-05-14 14:20:08.973067369 +0200
-+++ fritzbox-1.5.3/notifyosd.cpp 2021-05-14 14:21:17.945067369 +0200
+--- a/notifyosd.cpp
++++ b/notifyosd.cpp
@@ -128,7 +128,7 @@
delete osd;
osd = cOsdProvider::NewOsd(left, top);
diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild
index 8d282d5f871..628b4bc7e06 100644
--- a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild
+++ b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild
@@ -21,9 +21,10 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${P}-boost-1.67.patch"
- "${FILESDIR}/${P}_clang.patch"
- )
+ "${FILESDIR}/${P}-boost-1.67.patch"
+ "${FILESDIR}/${P}_clang.patch"
+ "${FILESDIR}/${P}-gcc11-include.patch"
+)
src_prepare() {
vdr-plugin-2_src_prepare
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-20 1:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-20 1:10 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-fritzbox/files/, media-plugins/vdr-fritzbox/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-05-14 14:33 Jörg Bornkessel
2019-06-30 11:51 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox