diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2018-02-04 17:30:49 +0100 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2018-02-04 17:30:49 +0100 |
| commit | 6d2e44d5455216a266601d410761b136824b149c (patch) | |
| tree | 2376df0a89845f0b3841130b47f76557435e1525 /libmp4v2 | |
| parent | f374ce80b6c1609ee25dc8dc9fe1fe0e411e2bef (diff) | |
| download | contrib-6d2e44d5455216a266601d410761b136824b149c.tar.gz contrib-6d2e44d5455216a266601d410761b136824b149c.tar.xz | |
libmp4v2: fix gcc 7 builds
Diffstat (limited to 'libmp4v2')
| -rw-r--r-- | libmp4v2/.md5sum | 1 | ||||
| -rw-r--r-- | libmp4v2/.signature | 5 | ||||
| -rw-r--r-- | libmp4v2/0004-Fix-GCC7-build.patch | 30 | ||||
| -rw-r--r-- | libmp4v2/Pkgfile | 7 |
4 files changed, 39 insertions, 4 deletions
diff --git a/libmp4v2/.md5sum b/libmp4v2/.md5sum index a196ed4b4..6753e0be5 100644 --- a/libmp4v2/.md5sum +++ b/libmp4v2/.md5sum @@ -1 +1,2 @@ +5d1d28e69830f677bc9209423742a5d3 0004-Fix-GCC7-build.patch c91f06711225b34b4c192c9114887b14 mp4v2-2.0.0.tar.bz2 diff --git a/libmp4v2/.signature b/libmp4v2/.signature index 0ce2b8195..530a2e34e 100644 --- a/libmp4v2/.signature +++ b/libmp4v2/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zvqo8m+MrKI0YVFdktH+9eJqvcvh1NMa1Scczkng95IQRAnEsYAQL0ULS26MDgUcX3EPHCrtrCWHBDPbN9s7QI= -SHA256 (Pkgfile) = 3f8024d71517cadc234c971c8468efd45a19d3ea0e0db3a9193e6dee1e60eb07 +RWSagIOpLGJF30PubV2VRv453OU/qSYkfYwSr0cxhXxlRURdd/1wSsjyUuS0xRZwNyeaBmRrqIcuvi0CeRygq/dfysfyiIqWPAk= +SHA256 (Pkgfile) = ec06e8d6dcfc0e1252bda8f3b79aa935b0011ff5f34c223f97e9057a83a3e1ee SHA256 (.footprint) = 33e94bce8c0b66091b4de268125bbf13f3c9688bc60505d764dbb47a38904547 SHA256 (mp4v2-2.0.0.tar.bz2) = 0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338 +SHA256 (0004-Fix-GCC7-build.patch) = 5c1ce3788639e70a932d7f333d5bd50fc1f187028e2c2fb33f67567a68047669 diff --git a/libmp4v2/0004-Fix-GCC7-build.patch b/libmp4v2/0004-Fix-GCC7-build.patch new file mode 100644 index 000000000..dec02f985 --- /dev/null +++ b/libmp4v2/0004-Fix-GCC7-build.patch @@ -0,0 +1,30 @@ +From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com> +Date: Wed, 8 Feb 2017 00:56:32 +0000 +Subject: [PATCH 4/4] Fix GCC7 build + +if (*pSlash != '\0') { + +As it stands the body of that if will always execute and when there are +no encoding parameters ppEncodingParams will be returned as a pointer to +an empty string rather than as a null pointer +--- + src/rtphint.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rtphint.cpp b/src/rtphint.cpp +index e07309d..1eb01f5 100644 +--- a/src/rtphint.cpp ++++ b/src/rtphint.cpp +@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload( + 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); +-- +2.7.4 + diff --git a/libmp4v2/Pkgfile b/libmp4v2/Pkgfile index 282de14ac..6592dbf89 100644 --- a/libmp4v2/Pkgfile +++ b/libmp4v2/Pkgfile @@ -5,12 +5,15 @@ name=libmp4v2 version=2.0.0 -release=2 -source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/mp4v2-$version.tar.bz2) +release=3 +source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/mp4v2-$version.tar.bz2 \ + 0004-Fix-GCC7-build.patch) build() { cd mp4v2-$version + patch -p1 -i $SRC/0004-Fix-GCC7-build.patch + ./configure --prefix=/usr make |