| 1 |
commit: 26934bf2b1ca06f45df3f6f51c05f6bd2196dfbe |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 1 22:36:25 2020 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 1 22:56:10 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26934bf2 |
| 7 |
|
| 8 |
games-emulation/dosbox: Drop old and vulnerable 0.74_p20160629-r3 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/704414 |
| 11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 13 |
|
| 14 |
games-emulation/dosbox/Manifest | 1 - |
| 15 |
.../dosbox/dosbox-0.74_p20160629-r3.ebuild | 75 ---------------------- |
| 16 |
.../dosbox/files/dosbox-0.74.2_events.patch | 37 ----------- |
| 17 |
3 files changed, 113 deletions(-) |
| 18 |
|
| 19 |
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest |
| 20 |
index 0d2c34d52aa..2287035a699 100644 |
| 21 |
--- a/games-emulation/dosbox/Manifest |
| 22 |
+++ b/games-emulation/dosbox/Manifest |
| 23 |
@@ -1,5 +1,4 @@ |
| 24 |
DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B bc25e6aba29747d4060269809d729904d8d187527c59953125c8591c0a91cf4583223c1bcf1224a041d44bfe5efcfe9034d6572954cf26870a290ff1b27e7d9d SHA512 3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f |
| 25 |
DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376 SHA512 625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7 |
| 26 |
DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b SHA512 57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69 |
| 27 |
-DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585 SHA512 d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714 |
| 28 |
DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2 |
| 29 |
|
| 30 |
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild |
| 31 |
deleted file mode 100644 |
| 32 |
index 4223e8728e9..00000000000 |
| 33 |
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,75 +0,0 @@ |
| 36 |
-# Copyright 1999-2019 Gentoo Authors |
| 37 |
-# Distributed under the terms of the GNU General Public License v2 |
| 38 |
- |
| 39 |
-EAPI=6 |
| 40 |
- |
| 41 |
-inherit autotools desktop flag-o-matic |
| 42 |
- |
| 43 |
-PATCH=3989 |
| 44 |
-GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b |
| 45 |
- |
| 46 |
-DESCRIPTION="DOS emulator" |
| 47 |
-HOMEPAGE="https://www.dosbox.com/" |
| 48 |
-SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip |
| 49 |
- glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )" |
| 50 |
- |
| 51 |
-LICENSE="GPL-2" |
| 52 |
-SLOT="0" |
| 53 |
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
| 54 |
-IUSE="alsa +core-inline debug glide hardened opengl X" |
| 55 |
- |
| 56 |
-RDEPEND="alsa? ( media-libs/alsa-lib ) |
| 57 |
- glide? ( media-libs/openglide ) |
| 58 |
- opengl? ( virtual/glu virtual/opengl ) |
| 59 |
- debug? ( sys-libs/ncurses:0 ) |
| 60 |
- X? ( x11-libs/libX11 ) |
| 61 |
- media-libs/libpng:0= |
| 62 |
- media-libs/libsdl[joystick,opengl?,video,X?] |
| 63 |
- media-libs/sdl-net |
| 64 |
- media-libs/sdl-sound |
| 65 |
- sys-libs/zlib" |
| 66 |
-DEPEND="${RDEPEND} |
| 67 |
- app-arch/unzip" |
| 68 |
- |
| 69 |
-S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk |
| 70 |
- |
| 71 |
-PATCHES=( |
| 72 |
- "${FILESDIR}/${PN}-0.74-gcc46.patch" |
| 73 |
- "${FILESDIR}/${PN}-0.74.2_events.patch" |
| 74 |
-) |
| 75 |
- |
| 76 |
-src_prepare() { |
| 77 |
- use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff |
| 78 |
- default |
| 79 |
- eautoreconf |
| 80 |
-} |
| 81 |
- |
| 82 |
-src_configure() { |
| 83 |
- use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide |
| 84 |
- |
| 85 |
- ac_cv_lib_X11_main=$(usex X yes no) \ |
| 86 |
- econf \ |
| 87 |
- $(use_enable alsa alsa-midi) \ |
| 88 |
- $(use_enable core-inline) \ |
| 89 |
- $(use_enable !hardened dynamic-core) \ |
| 90 |
- $(use_enable !hardened dynamic-x86) \ |
| 91 |
- $(use_enable debug) \ |
| 92 |
- $(use_enable opengl) |
| 93 |
-} |
| 94 |
- |
| 95 |
-src_install() { |
| 96 |
- default |
| 97 |
- make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico |
| 98 |
- doicon src/dosbox.ico |
| 99 |
-} |
| 100 |
- |
| 101 |
-pkg_postinst() { |
| 102 |
- if use glide; then |
| 103 |
- elog "You have enabled unofficial Glide emulation. To use this, symlink" |
| 104 |
- elog "or copy ${EPREFIX}/usr/share/openglide/glide2x-dosbox.ovl to your game's" |
| 105 |
- elog "directory and add the following to your DOSBox configuration." |
| 106 |
- elog "" |
| 107 |
- elog "[glide]" |
| 108 |
- elog "glide=true" |
| 109 |
- fi |
| 110 |
-} |
| 111 |
|
| 112 |
diff --git a/games-emulation/dosbox/files/dosbox-0.74.2_events.patch b/games-emulation/dosbox/files/dosbox-0.74.2_events.patch |
| 113 |
deleted file mode 100644 |
| 114 |
index fee09a65a4c..00000000000 |
| 115 |
--- a/games-emulation/dosbox/files/dosbox-0.74.2_events.patch |
| 116 |
+++ /dev/null |
| 117 |
@@ -1,37 +0,0 @@ |
| 118 |
-Index: src/gui/sdlmain.cpp |
| 119 |
-=================================================================== |
| 120 |
---- a/src/gui/sdlmain.cpp (revision 4177) |
| 121 |
-+++ b/src/gui/sdlmain.cpp (working copy) |
| 122 |
-@@ -1426,6 +1426,12 @@ |
| 123 |
- #define DB_POLLSKIP 1 |
| 124 |
- #endif |
| 125 |
- |
| 126 |
-+#if defined(LINUX) |
| 127 |
-+#define SDL_XORG_FIX 1 |
| 128 |
-+#else |
| 129 |
-+#define SDL_XORG_FIX 0 |
| 130 |
-+#endif |
| 131 |
-+ |
| 132 |
- void GFX_Events() { |
| 133 |
- //Don't poll too often. This can be heavy on the OS, especially Macs. |
| 134 |
- //In idle mode 3000-4000 polls are done per second without this check. |
| 135 |
-@@ -1449,6 +1455,19 @@ |
| 136 |
- } |
| 137 |
- #endif |
| 138 |
- while (SDL_PollEvent(&event)) { |
| 139 |
-+#if SDL_XORG_FIX |
| 140 |
-+ // Special code for broken SDL with Xorg 1.20.1, where pairs of inputfocus gain and loss events are generated |
| 141 |
-+ // when locking the mouse in windowed mode. |
| 142 |
-+ if (event.type == SDL_ACTIVEEVENT && event.active.state == SDL_APPINPUTFOCUS && event.active.gain == 0) { |
| 143 |
-+ SDL_Event test; //Check if the next event would undo this one. |
| 144 |
-+ if (SDL_PeepEvents(&test,1,SDL_PEEKEVENT,SDL_ACTIVEEVENTMASK) == 1 && test.active.state == SDL_APPINPUTFOCUS && test.active.gain == 1) { |
| 145 |
-+ // Skip both events. |
| 146 |
-+ SDL_PeepEvents(&test,1,SDL_GETEVENT,SDL_ACTIVEEVENTMASK); |
| 147 |
-+ continue; |
| 148 |
-+ } |
| 149 |
-+ } |
| 150 |
-+#endif |
| 151 |
-+ |
| 152 |
- switch (event.type) { |
| 153 |
- case SDL_ACTIVEEVENT: |
| 154 |
- if (event.active.state & SDL_APPINPUTFOCUS) { |
Archives