[packages/mythplugins] - fix c++11 build errors - rel 4
baggins
baggins at pld-linux.org
Sat May 27 07:27:07 CEST 2017
commit 71d992b31ce0903cd4b3d962317adc537b4ff769
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat May 27 07:26:43 2017 +0200
- fix c++11 build errors
- rel 4
cxx11.patch | 30 ++++++++++++++++++++++++++++++
mythplugins.spec | 4 +++-
2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/mythplugins.spec b/mythplugins.spec
index f2cd7fe..2e0b243 100644
--- a/mythplugins.spec
+++ b/mythplugins.spec
@@ -31,7 +31,7 @@ Summary: Main MythTV plugins
Summary(pl.UTF-8): Główne wtyczki MythTV
Name: mythplugins
Version: 0.26.1
-Release: 3
+Release: 4
License: GPL v2
Group: Applications/Multimedia
Source0: ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}.tar.bz2
@@ -43,6 +43,7 @@ Source4: http_servers_conf_tips.txt
Source5: mythweb-httpd.conf
Patch0: mythweb-chdir.patch
Patch1: system-zmq.patch
+Patch2: cxx11.patch
Patch10: %{name}-compile_fixes_for_qt_4_7.patch
Patch20: %{name}-mytharchive-INT64.patch
URL: http://www.mythtv.org/
@@ -294,6 +295,7 @@ Obsługa kamer przemysłowych dla MythTV.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
#%patch10 -p1
%patch20 -p1
diff --git a/cxx11.patch b/cxx11.patch
new file mode 100644
index 0000000..89c56db
--- /dev/null
+++ b/cxx11.patch
@@ -0,0 +1,30 @@
+--- mythplugins-0.26.1/mythmusic/mythmusic/metaio.h~ 2013-08-15 16:44:02.000000000 +0200
++++ mythplugins-0.26.1/mythmusic/mythmusic/metaio.h 2017-05-27 07:18:20.791635440 +0200
+@@ -95,7 +95,7 @@
+ {
+ (void)filename;
+ (void)type;
+- return false;
++ return nullptr;
+ }
+
+ void readFromFilename(const QString &filename, QString &artist,
+--- mythplugins-0.26.1/mythzoneminder/mythzmserver/zmserver.cpp.orig 2013-08-15 16:44:02.000000000 +0200
++++ mythplugins-0.26.1/mythzoneminder/mythzmserver/zmserver.cpp 2017-05-27 07:23:00.152442302 +0200
+@@ -1376,14 +1376,14 @@
+ if (mapFile >= 0)
+ {
+ if (m_debug)
+- cout << "Opened mmap file: " << mmap_filename << endl;
++ cout << "Opened mmap file: " << mmap_filename.rdbuf() << endl;
+
+ shm_ptr = mmap(NULL, shared_data_size, PROT_READ,
+ MAP_SHARED, mapFile, 0x0);
+ if (shm_ptr == NULL)
+ {
+ cout << "Failed to map shared memory from file [" <<
+- mmap_filename << "] " <<
++ mmap_filename.rdbuf() << "] " <<
+ "for monitor: " <<
+ monitor->mon_id <<
+ endl;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mythplugins.git/commitdiff/71d992b31ce0903cd4b3d962317adc537b4ff769
More information about the pld-cvs-commit
mailing list