gentoo resync : 16.09.2020

3 files changed, 88 insertions, 1 deletions

diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 008a813a8500..e815e684874b 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,8 +1,9 @@
 AUX milkytracker-1.02.00-CVE-2019-14464.patch 926 BLAKE2B 632af971c55cd80d1a8aa2b8d2dd2fdc5c471feaa0bbe8fff0b980de8a1db2f2281a816381a08a064f105146839fa63194e770190ca77ec79a14d9c2ff1839b0 SHA512 c37d11fd83831199075205ae9631bb6a2ac05458c63155a8a65a093fa8ce851ce7b9d8efb35d7db785760dc126c225aa292c4b11f3de5d2f87d7fa9c0bda6c76
 AUX milkytracker-1.02.00-CVE-2019-1449x.patch 3121 BLAKE2B 8b863ed8a9c78942c303e06ed8f8089d4602a9b8765a38ae9974f3871441f9b10cde4cc8a297a45cd66da567c94234c4ca9f7eed1505ba2ced92fb2407cf5fed SHA512 4805e831e6ae3934fdab2045e76eb1bfd750e3efb4df58b374ac69d7bdc6d5f88241b4a8d87a6b681cfdf11c1b0316f7c6691d505b6cfd28dd6324dc0de7bff8
 AUX milkytracker-1.02.00-CVE-2020-15569.patch 972 BLAKE2B 34dfbe0690fefce4cbcfeabe571d811092bba6c72e2bfe8db5e087d21774563bd79108e88c66b490999553587ab755fce16d53f4822e23149b86c5585aa46c00 SHA512 358b5e1709a634f2e51c6bda53684c903f57e328d73a364c5b7feac4c278288838cfde3f1afc087b2f52259f1cbcacda022dc92f3a621c7d772a9be8d248c220
+AUX milkytracker-1.02.00-clang.patch 2346 BLAKE2B 4e957fbc69e4b5aa9ee5f93292df62e04f577e26dbc2b16464c338761330a95247a5f908d471f000964c8960878d673293f71ddb6289bf386923cebbdbc335c1 SHA512 3dcac9b8d889f761e016f7fedfb2670392982f74438bf4ed83bbdfb89f424f583ea9c16ac13c3c9a99e3453e9ed6f460866563fde3318eaba49218181fa1ebf0
 AUX milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch 2570 BLAKE2B fe0a454e34c9b7b88125ccdfb6f77e1cc014013a8f054f00c6330e733ba54154bc1d96ef256cf5befc8329c169e57f29062652f0ff84dc55201572d0201111fc SHA512 0112a805d61204ff31ad0b1b31cbc9ff60f91f5ada275a839f0c258c3f5302239fd9b00ba7d8387b5865ad2ea86abedc32630ff2f1b58c0a74bfa67895a5676a
 DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650c79e11950b53481686e5dd35ace483839fbdd6b2b1f8ccce2f688beec2c7c28b0fe3b60d0e8d540d6cd163927f4bacf9d396 SHA512 bd4ca0d092229722ca81addaf9eec3ff1b176061da7b44fe3f02fbe020c3820778ed973dde95588b4c9f918728e2c69c24ac23083a2f48c0cbad2e854eeff5ba
 DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
-EBUILD milkytracker-1.02.00-r1.ebuild 1497 BLAKE2B 76e41340629253f19ba1253f3a662ced5af0ad03c0eec158a48120d7b557b96bca64a19dbac13e8a44f8f0b8e5135c20c7134f9168e67ed01bc639512867b113 SHA512 d8da48058c5fb7eb1ef9f95ccb7855fdadf50ed5415af38175d0fe08689c101e110a57685cbcbd814530bf75d05773adebd3195d192163e496aca4b1d9dd148e
+EBUILD milkytracker-1.02.00-r1.ebuild 1529 BLAKE2B e54c9fa967fc74dc2c8469d48d5df7f044744cb3eacca21422165946838e1ee83fe05352390259c5dcaf63d6c35f8055c286cdfffb0151b8d59f17d8d118c56c SHA512 5008cf27c9c897d6a938af45283c08c7bcef875490ba5131828c69eb5393f3d60bbd23ff756ce78604e2ea26a1011206ce774c22393eac5229e2f4e9b2e34bd1
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
new file mode 100644
index 000000000000..48e6dc39cb5a
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
@@ -0,0 +1,85 @@
+diff --git a/src/tracker/EQConstants.cpp b/src/tracker/EQConstants.cpp
+index ffbf6ea..fa6fdce 100644
+--- a/src/tracker/EQConstants.cpp
++++ b/src/tracker/EQConstants.cpp
+@@ -27,9 +27,9 @@
+ 
+ const float EQConstants::EQ3bands[3] = 
+ {
+-	p(5),  // 32     Hz
+-	p(9),  // 522    Hz
+-	p(12), // 4181.5 Hz
++	(float) p(5),  // 32     Hz
++	(float) p(9),  // 522    Hz
++	(float) p(12), // 4181.5 Hz
+ };
+ 
+ const float EQConstants::EQ3bandwidths[3] = 
+@@ -41,28 +41,28 @@ const float EQConstants::EQ3bandwidths[3] =
+ 
+ const float EQConstants::EQ10bands[10] = 
+ {
+-	p(3),  // 8      Hz
+-	p(4),  // 16     Hz
+-	p(5),  // 32     Hz
+-	p(6),  // 65     Hz
+-	p(7),  // 130    Hz
+-	p(8),  // 261    Hz
+-	p(9),  // 522    Hz
+-	p(10), // 1     kHz
+-	p(11), // 2     kHz
+-	p(12), // 4181.5 Hz
++	(float) p(3),  // 8      Hz
++	(float) p(4),  // 16     Hz
++	(float) p(5),  // 32     Hz
++	(float) p(6),  // 65     Hz
++	(float) p(7),  // 130    Hz
++	(float) p(8),  // 261    Hz
++	(float) p(9),  // 522    Hz
++	(float) p(10), // 1     kHz
++	(float) p(11), // 2     kHz
++	(float) p(12), // 4181.5 Hz
+ };
+ 
+ const float EQConstants::EQ10bandwidths[10] = 
+ {
+ 	16,
+-	p(3)*1.5f,
+-	p(4)*1.5f,
+-	p(5)*1.5f,
+-	p(6)*1.5f,
+-	p(7)*1.5f,
+-	p(8)*1.0f,
+-	p(9)*1.0f,
++	(float) p(3)*1.5f,
++	(float) p(4)*1.5f,
++	(float) p(5)*1.5f,
++	(float) p(6)*1.5f,
++	(float) p(7)*1.5f,
++	(float) p(8)*1.0f,
++	(float) p(9)*1.0f,
+ 	600.0f,
+ 	800.0f
+ };
+diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
+index 420b4d9..d404f08 100644
+--- a/src/tracker/sdl/SDL_Main.cpp
++++ b/src/tracker/sdl/SDL_Main.cpp
+@@ -609,7 +609,7 @@ void translateKeyDownEvent(const SDL_Event& event)
+ 	printf ("DEBUG: Key pressed: VK: %d, SC: %d, Scancode: %d\n", toVK(keysym), toSC(keysym), keysym.sym);
+ #endif
+ 
+-	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
++	pp_uint16 chr[3] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (pp_uint16) keysym.sym};
+ 
+ 	PPEvent myEvent(eKeyDown, &chr, sizeof(chr));
+ 	RaiseEventSerialized(&myEvent);
+@@ -621,7 +621,7 @@ void translateKeyUpEvent(const SDL_Event& event)
+ 
+ 	preTranslateKey(keysym);
+ 
+-	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
++	pp_uint16 chr[3] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (pp_uint16) keysym.sym};
+ 
+ 	PPEvent myEvent(eKeyUp, &chr, sizeof(chr));
+ 	RaiseEventSerialized(&myEvent);
diff --git a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
index b27c6c5260b4..b86251123c51 100644
--- a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-CVE-2019-1449x.patch"
 	"${FILESDIR}/${P}-CVE-2020-15569.patch"
 	"${FILESDIR}/${P}-fix-hard-dependency-on-rtmidi.patch"
+	"${FILESDIR}/${P}-clang.patch"
 )
 
 S="${WORKDIR}/MilkyTracker-${PV}"