gentoo resync : 20.06.2021

3 files changed, 101 insertions, 1 deletions

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
index e8ce2ce4f62d..94bf17e4928a 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch
 	"${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch
 	"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
+	"${FILESDIR}"/${PN}-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch
 )
 
 pkg_setup() {
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 7f5f50f2b666..b6f5c6f32f99 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,9 +1,10 @@
 AUX 0ad-0.0.24_alpha_pre20210116040036-build.patch 5971 BLAKE2B 968ab7cbfa2b84312937c1f317e15ad9165fd951995dba90eef9b262448a066dc0403f0acf5fb4d40e372455b47d6b0f79c7a078601a8172d185e35463b383ed SHA512 391dc3c02184c9e67c21460833d19e386c0cb53c0bed663df531cc0efecfbe4b9a85c75b8ca682b2cd40891dd0719603108d96a21f8e5ba989fb0951713a1571
+AUX 0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch 2594 BLAKE2B 05c84cf91c8da8258719bdacacf35e7c57e4b5dd867c76a0aa320d919b6a30d68f3334bf9fe3aaaaf13c462d5a2ddd051a610ebe7b100e2d55583a5d0871d1be SHA512 787dc9287c6856c8fa2aabbad0f996801fcf98b5447574893ffbfc39fa2c2b626e60fc48023ff9c39293977749da4841e8a44930bdfb909272ee727dab4215a1
 AUX 0ad-0.0.24b_alpha-respect-tc.patch 1095 BLAKE2B c7f2747ae832de76da3711687ce8e6d52039e23cbe31ca1114d27e93ec2b3ef150f4b241a0d869ec393c9f73e702f35ce5610f9b383bbe43e958989bbcfa0c17 SHA512 00c439a086da6553b09230cf57e76c9abcf8c13093a4d439ccb5724d6dee5474c46f924c5a0c5b43cdc8572445347dcf2a77eba3fcff17b16d492ca4bef90594
 AUX 0ad-0.0.24b_alpha-rust-1.50.patch 3529 BLAKE2B 0f354b806399f1cf9fc515a1f799d119fe5d53c6c48cc5de93cd3762c4df1f2e79b1d6fc34fe2c002b002c73ac2e259556d7464b665f4eb60a186820b9f40ae4 SHA512 71884811ed0c6acbc7fec4aa4f0c3700214fd325c28eb8149c9f65fe4018d968b1dfbe0746aea940aa08a0d656f866f40cfc67fcb62965fdc861583376256602
 DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510
 DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea
 DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726
 EBUILD 0ad-0.0.24_alpha_pre20210116040036-r2.ebuild 6380 BLAKE2B c3baa01f84d1527b0ecff261db42ae84b32110896b98c853c7990c2a76af405ee169710dd3817ec139a31b02a2e97f8300789262849b040040fae4d81e5c17dc SHA512 7d70dc9d942c2956bda278949b0297496be4ecf44a352c5a429eb496884461048721ea42dc3ed2fa5c7b373280b556d1aa323dc8d4c668b3aefd3fad6f7088ac
-EBUILD 0ad-0.0.24b_alpha.ebuild 6580 BLAKE2B 9c2aaf06b4f5365facf6818abb06fdd602988a41567f9db236199a5cd4d5da7e246fd6555a560993954be81a2ea47678839d8210af05621e76527d7bbb6a15df SHA512 628e1d1af80bc0ff90d5cc727f6668d270028b5a8587a26d31109b2dfe21a98564ea40cbe13018e8f11cbe72963892e57781e9af3a6302f8f0982850511e7c31
+EBUILD 0ad-0.0.24b_alpha-r1.ebuild 6651 BLAKE2B 1ffbbda9751ada13ae5cdad2d243e1bba8a4039b083c92164b465013b795128b621fe9b4556f4f7a8f13894a96289aa643d03e7061443ab5f59623479bbfc8bd SHA512 345bda0d2d1ef18f327eb158dbce6aaa18f12cf06382c1e18a7e44585c62a51a9505b0b95616bae42a45c1786e8cb98509e9f3123926ce354f29fd09aecd8868
 MISC metadata.xml 715 BLAKE2B b611d7f5a8ad31e43b744dec6607293165c3e60a901b3598d62859a6d65852c9369429c090e557a970320947557ab5d3e418ecd0a39b0b1ae7a77384e6202b28 SHA512 43cd54bb88313ef72649034afbbde262917d6aa390eb7dd5b1369d851d9dcbed7d0c03169edf0d156ad0351ae7a8e485a20217e6c686b9c6b266303c8ce2b481
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch
new file mode 100644
index 000000000000..fe054eccac51
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch
@@ -0,0 +1,98 @@
+# Nils Freydank <holgersson@posteo.de> (2021-06-17)

+Apply the patch from upstream with minor adoption.

+

+Gentoo bug: https://bugs.gentoo.org/779757

+Upstream Bug: https://trac.wildfiregames.com/ticket/6107

+Upstream Patch: https://trac.wildfiregames.com/changeset/25766

+

+--- a/source/graphics/TextureConverter.cpp	(revision 25765)

++++ b/source/graphics/TextureConverter.cpp	(revision 25766)

+@@ -294,9 +294,8 @@

+ 	m_VFS(vfs), m_HighQuality(highQuality), m_Shutdown(false)

+ {

++#if CONFIG2_NVTT

+ 	// Verify that we are running with at least the version we were compiled with,

+ 	// to avoid bugs caused by ABI changes

+-#if CONFIG2_NVTT

+ 	ENSURE(nvtt::version() >= NVTT_VERSION);

+-#endif

+ 

+ 	m_WorkerThread = std::thread(Threading::HandleExceptions<RunThread>::Wrapper, this);

+@@ -304,8 +303,10 @@

+ 	// Maybe we should share some centralised pool of worker threads?

+ 	// For now we'll just stick with a single thread for this specific use.

++#endif // CONFIG2_NVTT

+ }

+ 

+ CTextureConverter::~CTextureConverter()

+ {

++#if CONFIG2_NVTT

+ 	// Tell the thread to shut down

+ 	{

+@@ -327,4 +328,5 @@

+ 	// Wait for it to shut down cleanly

+ 	m_WorkerThread.join();

++#endif // CONFIG2_NVTT

+ }

+ 

+@@ -477,8 +479,8 @@

+ 	return true;

+ 

+-#else

++#else // CONFIG2_NVTT

+ 	LOGERROR("Failed to convert texture \"%s\" (NVTT not available)", src.string8());

+ 	return false;

+-#endif

++#endif // !CONFIG2_NVTT

+ }

+ 

+@@ -529,22 +531,24 @@

+ 	return true;

+ 

+-#else // #if CONFIG2_NVTT

++#else // CONFIG2_NVTT

+ 	return false;

+-#endif

++#endif // !CONFIG2_NVTT

+ }

+ 

+ bool CTextureConverter::IsBusy()

+ {

++#if CONFIG2_NVTT

+ 	std::lock_guard<std::mutex> lock(m_WorkerMutex);

+ 	return !m_RequestQueue.empty();

++#else // CONFIG2_NVTT

++	return false;

++#endif // !CONFIG2_NVTT

+ }

+ 

+ void CTextureConverter::RunThread(CTextureConverter* textureConverter)

+ {

++#if CONFIG2_NVTT

+ 	debug_SetThreadName("TextureConverter");

+ 	g_Profiler2.RegisterCurrentThread("texconv");

+-

+-#if CONFIG2_NVTT

+-

+ 	// Wait until the main thread wakes us up

+ 	while (true)

+@@ -596,4 +600,4 @@

+ 	std::lock_guard<std::mutex> wait_lock(textureConverter->m_WorkerMutex);

+ 	textureConverter->m_Shutdown = false;

+-#endif

+-}

++#endif // CONFIG2_NVTT

++}

+

+--- a/source/graphics/TextureConverter.h	(revision 25765)

++++ b/source/graphics/TextureConverter.h	(revision 25766)

+@@ -208,7 +208,9 @@

+ 	bool m_HighQuality;

+ 

++#if CONFIG2_NVTT

+ 	std::thread m_WorkerThread;

+ 	std::mutex m_WorkerMutex;

+ 	std::condition_variable m_WorkerCV;

++#endif // CONFIG2_NVTT

+ 

+ 	struct ConversionRequest;