diff options
author | Jason A. Donenfeld <zx2c4@gentoo.org> | 2020-08-06 15:24:14 +0200 |
---|---|---|
committer | Jason A. Donenfeld <zx2c4@gentoo.org> | 2020-08-06 15:24:14 +0200 |
commit | 45145f7b3d15af680db938c5a3fd78a68502fad7 (patch) | |
tree | 8fade69282006cfcddbcbacb7daea774913bda1e /media-libs | |
parent | dev-ros/laser_cb_detector: fix tests with ocv4 (diff) | |
download | gentoo-45145f7b3d15af680db938c5a3fd78a68502fad7.tar.gz gentoo-45145f7b3d15af680db938c5a3fd78a68502fad7.tar.bz2 gentoo-45145f7b3d15af680db938c5a3fd78a68502fad7.zip |
media-libs/libmp4v2: fix compilation with recent gcc
Closes: https://bugs.gentoo.org/723098
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch | 96 | ||||
-rw-r--r-- | media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild | 1 |
2 files changed, 97 insertions, 0 deletions
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch new file mode 100644 index 000000000000..25830bc596be --- /dev/null +++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch @@ -0,0 +1,96 @@ +From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" <Jason@zx2c4.com> +Date: Thu, 6 Aug 2020 15:22:04 +0200 +Subject: [PATCH] Static cast to unsigned int for cases + +Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> +--- + libutil/Utility.cpp | 2 +- + util/mp4art.cpp | 2 +- + util/mp4chaps.cpp | 2 +- + util/mp4file.cpp | 2 +- + util/mp4subtitle.cpp | 2 +- + util/mp4track.cpp | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp +index 76cdd12..d6739d4 100644 +--- a/libutil/Utility.cpp ++++ b/libutil/Utility.cpp +@@ -493,7 +493,7 @@ Utility::process_impl() + if( codes.find( code ) == codes.end() ) + continue; + +- switch( code ) { ++ switch( static_cast<unsigned int>( code ) ) { + case 'z': + _optimize = true; + break; +diff --git a/util/mp4art.cpp b/util/mp4art.cpp +index add935e..6e7f531 100644 +--- a/util/mp4art.cpp ++++ b/util/mp4art.cpp +@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast<unsigned int> ( code ) ) { + case LC_ART_ANY: + _artFilter = numeric_limits<uint32_t>::max(); + break; +diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp +index 98400f8..ccc8b70 100644 +--- a/util/mp4chaps.cpp ++++ b/util/mp4chaps.cpp +@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast<unsigned int> ( code ) ) { + case 'A': + case LC_CHPT_ANY: + _ChapterType = MP4ChapterTypeAny; +diff --git a/util/mp4file.cpp b/util/mp4file.cpp +index c27844b..b127cd1 100644 +--- a/util/mp4file.cpp ++++ b/util/mp4file.cpp +@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast<unsigned int>( code ) ) { + case LC_LIST: + _action = &FileUtility::actionList; + break; +diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp +index 7462153..19d977d 100644 +--- a/util/mp4subtitle.cpp ++++ b/util/mp4subtitle.cpp +@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast<unsigned int>( code ) ) { + case LC_LIST: + _action = &SubtitleUtility::actionList; + break; +diff --git a/util/mp4track.cpp b/util/mp4track.cpp +index d550506..cd63d7e 100644 +--- a/util/mp4track.cpp ++++ b/util/mp4track.cpp +@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast<unsigned int>( code ) ) { + case LC_TRACK_WILDCARD: + _trackMode = TM_WILDCARD; + break; +-- +2.28.0 + diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild index 9602704da8a8..44a34cb45c5c 100644 --- a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild +++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}/${P}-CVE-2018-14325.patch" "${FILESDIR}/${P}-CVE-2018-14379.patch" "${FILESDIR}/${P}-CVE-2018-14403.patch" + "${FILESDIR}/${P}-unsigned-int-cast.patch" ) src_prepare() { |