gentoo resync : 16.09.2020

3 files changed, 46 insertions, 2 deletions

diff --git a/media-plugins/libvisual-plugins/Manifest b/media-plugins/libvisual-plugins/Manifest
index 63de693e2b9e..c7d71972a272 100644
--- a/media-plugins/libvisual-plugins/Manifest
+++ b/media-plugins/libvisual-plugins/Manifest
@@ -1,7 +1,8 @@
+AUX libvisual-plugins-0.4.0-clang.patch 1560 BLAKE2B 78eca21a533d64a330af4c58f26f5b6d4708d4f3f3d420256aa395d3d794d9f5809d99f3aa86bef730f408a885425eb789e78dbdd4371ac571065cc2c470b09c SHA512 b90046ff0515850321d704d2c64f0170646a972a8ca86e0158798936f861c143c155cc47bec56374839c9ea55ad1d54e412519bbc94ed06e972977dda26f9152
 AUX libvisual-plugins-0.4.0-fno-common.patch 627 BLAKE2B 507b9da964a1f636adedfcb5df07466ebd3d360ed91507239c8fb8f8197b0d1afc58c35ee8113deb9c507b9f3f329e3f9671e4e9f8b23e7842dfcede1f1fc801 SHA512 820682ec181739a060adbe9be2dbc704259a99cf2e30840008fd39afd0344bdc33b6486ecdec7478d56c81f08172172ca2fcade4b1384954b2334e5f978fd73f
 DIST libvisual-plugins-0.4.0-m4-1.tar.bz2 1872 BLAKE2B 438fa805e4dccde1f446d3e78e6d3578bbf8ada8ab664bc6e408be1a32edacdf4cb587c213300022cece442c63e88258f2d189d0b35dec9ac1a9b8de826a84db SHA512 6522491f0797d0d442e1839fcfad985fcdba4a6d43ec94eb6edf13cea09a0b187b1e7c09b0c3b2f7b8f22d9b41f9cfb1f5b3559fed00b9dc3935fdf37bf7c08a
 DIST libvisual-plugins-0.4.0-patches-4.tar.bz2 10814 BLAKE2B 75e1df7ebbd7455475a9035fe5fd1249117728c74e27ff17407ae9b941bc2e4bfe3cf890ed72bb389a8be27906b7b2ec2dce61403fde8831c127198d663b3666 SHA512 e6c20ebad338c300e1c049d33241daab3d6cd25a73be3402aedb13bb3cf6a84112e074fc2d57f9a7a158d12addd0d320a94d1690ed789f3a90e9cb14cfb966d2
 DIST libvisual-plugins-0.4.0.tar.gz 828631 BLAKE2B a3afdb65b5da4cd19d9793fe8da3b14e99df77e21fb888b9f26b9c60af6b71e331b7250029144cb56281e77d2b579ce45d2be1445cab96bc8dc99dbd40794275 SHA512 f8666b548bc04e8b9ab69a37bdd5483080c820115903aabaa629bb0bd0fa8424969ee596e6e66bb90d8e62d6e14513fd57f85c1b5e7e074792cfa94638134901
 EBUILD libvisual-plugins-0.4.0-r3.ebuild 1962 BLAKE2B 068bd77ccdcd44315420489e973481e7c4308aacb84995b8da8500818c74f90687b6e0ab3d37b41458d23bb76e71239cc4468b861a7018723abcf19b954211ad SHA512 2160bf96d38216ca0260981b3f649f5c12fdd6d48f9eaafa2b3fd4595791631fbd59c0b1c8078b05403f644e34bbcff6afa7454a7e8c9e46cf422dbc9664c08e
-EBUILD libvisual-plugins-0.4.0-r4.ebuild 2605 BLAKE2B 345b53183b674cf65672b66dca363aaf0d17eb7a1d3b1e4e8599bfe663a80d8babfdeb3f643ef6ec65a2fb59e26f72ff810c22bdf6e1c6631e172cc647eac588 SHA512 89fc27f8b408cabd96c1e2564ad60923681607085929726a06c0d4b6a2a2528a9ca2191f457277d70485eab66574899e8bc05f718bf814d5997ca68fa45dd9ac
+EBUILD libvisual-plugins-0.4.0-r4.ebuild 2636 BLAKE2B 2f1a0c546e3ad023aaa2c8edd808a1430f1b143cc2f5a22b0255bdfeed65e0e744a25dc08c529bb6241e18aec0db92c38a053b47954ba005f43a2f90bbf8e051 SHA512 dad73dbc67b0c3af098feee96483ab215e28caf3146a02086f5e892f8b1ee712690801e5602b154051e9260d7a72da70169f141b5b2bd9c822c0906114d9738c
 MISC metadata.xml 332 BLAKE2B c29c386b29c500e0f8a7827985e0c26ee50f9f0465b92c42feed113b3b1fdceae581a6b8d7089ba2d304428f604b531d8e8833da12f2d44e8a1643d952b11445 SHA512 62db2eb31068dc2c0adf100ff0a9782bf9f92118fb2c2322fbde5fff6a22dfe16ff826b22218b44a86b7350ffbbc3e9fc6f0135f0a43feff8f83e3e6365b7288
diff --git a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-clang.patch b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-clang.patch
new file mode 100644
index 000000000000..25c2880fa0c5
--- /dev/null
+++ b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-clang.patch
@@ -0,0 +1,42 @@
+diff --git a/plugins/actor/G-Force/Common/UI/LineXX.cpp b/plugins/actor/G-Force/Common/UI/LineXX.cpp
+index 304eec8..5b18503 100644
+--- a/plugins/actor/G-Force/Common/UI/LineXX.cpp
++++ b/plugins/actor/G-Force/Common/UI/LineXX.cpp
+@@ -74,13 +74,13 @@
+ 
+ 		
+ 	#if CLR_INTERP && P_SZ != 1
+-	int32_t len = sqrt( dx * dx + dy * dy ) + 1;
++	int32_t len = sqrt( (long double) dx * dx + dy * dy ) + 1;
+ 	dR /= len;
+ 	dG /= len;
+ 	dB /= len;
+ 	color = __Clr( R, G, B );
+ 	#elif CLR_INTERP && P_SZ == 1
+-	int32_t len = sqrt( dx * dx + dy * dy ) + 1;
++	int32_t len = sqrt( (long double) dx * dx + dy * dy ) + 1;
+ 	dR /= len;
+ 	color = __Clr( R, G, B );
+ 	#endif
+@@ -154,7 +154,7 @@
+ 		
+ 			for ( j = 0; j < tw; j++ ) {
+ 				int32_t tmp = j - halfW;
+-				c_x = halfW - ( ( int32_t ) sqrt( halfW * halfW - tmp * tmp ) );
++				c_x = halfW - ( ( int32_t ) sqrt( (long double) halfW * halfW - tmp * tmp ) );
+ 				center = basePtr + (j-halfW) * mBytesPerRow;
+ 				for ( int k = c_x; k < tw - c_x; k++ ){
+ 					((PIXTYPE*) center)[k-halfW] = color;
+diff --git a/plugins/morph/flash/morph_flash.c b/plugins/morph/flash/morph_flash.c
+index fb5308a..c57f490 100644
+--- a/plugins/morph/flash/morph_flash.c
++++ b/plugins/morph/flash/morph_flash.c
+@@ -116,7 +116,7 @@ int lv_morph_flash_palette (VisPluginData *plugin, float rate, VisAudio *audio,
+ 	FlashPrivate *priv = visual_object_get_private (VISUAL_OBJECT (plugin));
+ 
+ 	if (src1->pal == NULL || src2->pal == NULL)
+-		return;
++		return -1;
+ 
+ 	if (rate < 0.5)
+ 		visual_palette_blend (pal, src1->pal, &priv->whitepal, rate * 2);
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
index 118a9ee48ba8..01b17e2e5ae4 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/libvisual/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0.4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="alsa debug gtk jack mplayer opengl"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
@@ -38,6 +38,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
 PATCHES=(
 	"${FILESDIR}/${P}-fno-common.patch"
+	"${FILESDIR}/${P}-clang.patch"
 )
 
 src_prepare() {