summary refs log tree commit diff
path: root/gnu/packages/patches/libmp4v2-c++11.patch
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-18 16:31:14 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-18 16:31:14 +0200
commit995c30d0d65c1ad8c98897a7b0ff08740dbed38f (patch)
tree8b38de27f738e90f1d35d2d94a38d5443436c612 /gnu/packages/patches/libmp4v2-c++11.patch
parent0de9a1be04a2f93bcdf81bdb0f6c2dca12225974 (diff)
downloadguix-995c30d0d65c1ad8c98897a7b0ff08740dbed38f.tar.gz
gnu: libmp4v2: Fix build with C++11.
* gnu/packages/patches/libmp4v2-c++11.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/video.scm (libmp4v2)[source](patches): New field.
Diffstat (limited to 'gnu/packages/patches/libmp4v2-c++11.patch')
-rw-r--r--gnu/packages/patches/libmp4v2-c++11.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/gnu/packages/patches/libmp4v2-c++11.patch b/gnu/packages/patches/libmp4v2-c++11.patch
new file mode 100644
index 0000000000..e12f89bd84
--- /dev/null
+++ b/gnu/packages/patches/libmp4v2-c++11.patch
@@ -0,0 +1,14 @@
+Avoid a type mismatch that shows up in C++11.
+Taken from <https://bugs.debian.org/853560>.
+
+--- a/src/rtphint.cpp	2012-05-20 16:11:53.000000000 -0600
++++ b/src/rtphint.cpp	2017-05-16 10:25:26.930705191 -0600
+@@ -339,7 +339,7 @@
+                 pSlash = strchr(pSlash, '/');
+                 if (pSlash != NULL) {
+                     pSlash++;
+-                    if (pSlash != '\0') {
++                    if (*pSlash != '\0') {
+                         length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap);
+                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
+                         strncpy(*ppEncodingParams, pSlash, length);