diff options
author | James Le Cuirot <chewi@gentoo.org> | 2020-01-01 22:36:25 +0000 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2020-01-01 22:56:10 +0000 |
commit | 26934bf2b1ca06f45df3f6f51c05f6bd2196dfbe (patch) | |
tree | 5574f499f731aef9f7b2bdae7088b88da8181189 /games-emulation | |
parent | games-emulation/dosbox: New trunk snapshot to address vulnerabilities (diff) | |
download | gentoo-26934bf2b1ca06f45df3f6f51c05f6bd2196dfbe.tar.gz gentoo-26934bf2b1ca06f45df3f6f51c05f6bd2196dfbe.tar.bz2 gentoo-26934bf2b1ca06f45df3f6f51c05f6bd2196dfbe.zip |
games-emulation/dosbox: Drop old and vulnerable 0.74_p20160629-r3
Bug: https://bugs.gentoo.org/704414
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'games-emulation')
-rw-r--r-- | games-emulation/dosbox/Manifest | 1 | ||||
-rw-r--r-- | games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild | 75 | ||||
-rw-r--r-- | games-emulation/dosbox/files/dosbox-0.74.2_events.patch | 37 |
3 files changed, 0 insertions, 113 deletions
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest index 0d2c34d52aa7..2287035a6995 100644 --- a/games-emulation/dosbox/Manifest +++ b/games-emulation/dosbox/Manifest @@ -1,5 +1,4 @@ DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B bc25e6aba29747d4060269809d729904d8d187527c59953125c8591c0a91cf4583223c1bcf1224a041d44bfe5efcfe9034d6572954cf26870a290ff1b27e7d9d SHA512 3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376 SHA512 625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7 DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b SHA512 57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69 -DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585 SHA512 d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2 diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild deleted file mode 100644 index 4223e8728e91..000000000000 --- a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools desktop flag-o-matic - -PATCH=3989 -GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b - -DESCRIPTION="DOS emulator" -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 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="alsa +core-inline debug glide hardened opengl X" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - glide? ( media-libs/openglide ) - opengl? ( virtual/glu virtual/opengl ) - debug? ( sys-libs/ncurses:0 ) - X? ( x11-libs/libX11 ) - media-libs/libpng:0= - media-libs/libsdl[joystick,opengl?,video,X?] - media-libs/sdl-net - media-libs/sdl-sound - sys-libs/zlib" -DEPEND="${RDEPEND} - app-arch/unzip" - -S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk - -PATCHES=( - "${FILESDIR}/${PN}-0.74-gcc46.patch" - "${FILESDIR}/${PN}-0.74.2_events.patch" -) - -src_prepare() { - use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff - default - eautoreconf -} - -src_configure() { - use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide - - ac_cv_lib_X11_main=$(usex X yes no) \ - econf \ - $(use_enable alsa alsa-midi) \ - $(use_enable core-inline) \ - $(use_enable !hardened dynamic-core) \ - $(use_enable !hardened dynamic-x86) \ - $(use_enable debug) \ - $(use_enable opengl) -} - -src_install() { - default - make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico - doicon src/dosbox.ico -} - -pkg_postinst() { - if use glide; then - elog "You have enabled unofficial Glide emulation. To use this, symlink" - elog "or copy ${EPREFIX}/usr/share/openglide/glide2x-dosbox.ovl to your game's" - elog "directory and add the following to your DOSBox configuration." - elog "" - elog "[glide]" - elog "glide=true" - fi -} diff --git a/games-emulation/dosbox/files/dosbox-0.74.2_events.patch b/games-emulation/dosbox/files/dosbox-0.74.2_events.patch deleted file mode 100644 index fee09a65a4ce..000000000000 --- a/games-emulation/dosbox/files/dosbox-0.74.2_events.patch +++ /dev/null @@ -1,37 +0,0 @@ -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) { |