gentoo resync : 12.01.2019

4 files changed, 46 insertions, 7 deletions

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index c02778f1614d..0b0cd0a974aa 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,8 +1,9 @@
 AUX dosbox-0.74-gcc46.patch 274 BLAKE2B 6375a8c0752eed6481cfc987ac3b7c7f699d745498e619862223dcbf660eef21f7619ef5b8e2034d20ad09716714988875e30d1959fe29393fd96559a2d710df SHA512 3175ba75be568d24286501844073bebbd2ae2e770ca6bdd9d409b290ca7b9f98a8406b5b92b89a9965eeda8045f2ac9634aacf8eb01917cbf02087996de53177
+AUX dosbox-0.74.2_events.patch 1274 BLAKE2B f0041d8be1c1dbbed5595cb90f618ec6cb5c8e5098da838f2c2892596fc6ae2db40d0b9f99dc19a01c837983516101568c37476bf18868a6225f3a4327fe01bd SHA512 d947d8eb168198598e413011bd6b68dc4cf2ea4d4c9b2fa0028c98276a2245c02709f0830eaacee43c712b921d0879372569766829e12e9cf1a4040e11448bf4
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376 SHA512 625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585 SHA512 d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
-EBUILD dosbox-0.74_p20160629-r2.ebuild 1919 BLAKE2B f5602bbcea7b32d71584aa1efaef2b0a9e2d305467329ee4fcf8a9ec2e83f4fc885cd12c19abd9c5d4c9ac5a511074fa8286d04c5dd4077e6601eef0a94c79b3 SHA512 2f854b566e89795f2126d687b5d9597a8142ef5d328a4dd87a8fa65529b3b5855ac0a38ff1f114f137f329a52db34a17b19f703e64131cf062a4fdbf57397382
+EBUILD dosbox-0.74_p20160629-r3.ebuild 1953 BLAKE2B c7cb3ac6debda1c32081b954eb751347dca7016d5fefc2402cc79bb163625dc632a790287cc031695e1ac8c0613895b8ca4a66c009b0215a5545e63e96dadff0 SHA512 cbf1578c442cdc2d8526425f39164832dba64ac232730945e09ac5f2835dcbd755b3ce9a8d496ed433573c2445e8d21a69cf583947e1068929d03332a3fc3388
 EBUILD dosbox-0.74_p20160629.ebuild 1076 BLAKE2B e0ca5a03e6817622ef09305464a4a98661fe97d94ffe0ddb021073af2d1fe4bb31ae3fd967e4fc03c08848e2abb2a6465364bcbee1a09f0a415b0077144a9724 SHA512 ba8f55ede135d0e8a024d72b8db79db0816f845452b54e71cc7ad3460e0b1152bad67f0800b5c8a0a506a26959a606f8f57159b37b0a4dc465fd95897a083529
-EBUILD dosbox-9999.ebuild 2015 BLAKE2B d874dfcce054cfe4bf10de764e1a4aad40bf90a74532d6f7e6d97d233871aa53779a601ce2487bd625686ff4a8123b1294d3005091add6e7b70bf832d5593202 SHA512 3352352a8cc3d623184066a5ccbca680defa7e2103986266092be93e4f91cbaf15dd7125112b97a28cf719b27b88b5862e8e7649df289a1315b40a2589a239c1
+EBUILD dosbox-9999.ebuild 2008 BLAKE2B 4fd2809355ff62f58a0d2313e5722c2e32260a3e6ff284c4629293dd1ad4fdd441e04a39fa5b4472ea16037b4a388e833232d4f7e08289810879ac92bce95b59 SHA512 3c820cebf87b34d2c7b05e9d15c87619a7b5c537f79faa95c27e1103642d32b47b682f64281ba73963acc6727cc42dbfc4505f2c1623d7bb76caf7b842dba7f3
 MISC metadata.xml 742 BLAKE2B 1b36ebc57b143b7fb214632f79c3f51f812ac96de39e6f8886efd5c13cf1ee86d905c2cef3d46e58171ee00cc8515852bfb177726aaab196415e47b876d28a12 SHA512 0c9ad19d1512236023a349545c8bb8790388ac49ef62b30d03a81f84407aae2b9b199f7041a513af5b34a61bc5a439d663be2cdb3cd59a7e23830f78633285b5
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
index f6a503b6b2a4..140ff29f6f0c 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ PATCH=3989
 GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
 
 DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/"
+HOMEPAGE="https://www.dosbox.com/"
 SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
 	glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
 
@@ -34,7 +34,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.74-gcc46.patch
+	"${FILESDIR}/${PN}-0.74-gcc46.patch"
+	"${FILESDIR}/${PN}-0.74.2_events.patch"
 )
 
 src_prepare() {
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 421603aa2fd0..8c4711e5620c 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/"
+HOMEPAGE="https://www.dosbox.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/games-emulation/dosbox/files/dosbox-0.74.2_events.patch b/games-emulation/dosbox/files/dosbox-0.74.2_events.patch
new file mode 100644
index 000000000000..fee09a65a4ce
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.74.2_events.patch
@@ -0,0 +1,37 @@
+Index: src/gui/sdlmain.cpp
+===================================================================
+--- a/src/gui/sdlmain.cpp	(revision 4177)
++++ b/src/gui/sdlmain.cpp	(working copy)
+@@ -1426,6 +1426,12 @@
+ #define DB_POLLSKIP 1
+ #endif
+ 
++#if defined(LINUX)
++#define SDL_XORG_FIX 1
++#else
++#define SDL_XORG_FIX 0
++#endif
++
+ void GFX_Events() {
+ 	//Don't poll too often. This can be heavy on the OS, especially Macs.
+ 	//In idle mode 3000-4000 polls are done per second without this check.
+@@ -1449,6 +1455,19 @@
+ 	}
+ #endif
+ 	while (SDL_PollEvent(&event)) {
++#if SDL_XORG_FIX
++		// Special code for broken SDL with Xorg 1.20.1, where pairs of inputfocus gain and loss events are generated
++		// when locking the mouse in windowed mode.
++		if (event.type == SDL_ACTIVEEVENT && event.active.state == SDL_APPINPUTFOCUS && event.active.gain == 0) {
++			SDL_Event test; //Check if the next event would undo this one.
++			if (SDL_PeepEvents(&test,1,SDL_PEEKEVENT,SDL_ACTIVEEVENTMASK) == 1 && test.active.state == SDL_APPINPUTFOCUS && test.active.gain == 1) {
++				// Skip both events.
++				SDL_PeepEvents(&test,1,SDL_GETEVENT,SDL_ACTIVEEVENTMASK);
++				continue;
++			}
++		}
++#endif
++
+ 		switch (event.type) {
+ 		case SDL_ACTIVEEVENT:
+ 			if (event.active.state & SDL_APPINPUTFOCUS) {