Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
Date: Wed, 01 Jan 2020 22:56:56
Message-Id: 1577919366.f4b21c579680b27f1a80d7c86408d659a36a6b7b.chewi@gentoo
1 commit: f4b21c579680b27f1a80d7c86408d659a36a6b7b
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 1 22:33:36 2020 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 1 22:56:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4b21c57
7
8 games-emulation/dosbox: New trunk snapshot to address vulnerabilities
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 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 86 +++++++++++++++++++++++
16 2 files changed, 87 insertions(+)
17
18 diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
19 index a06402a5d87..0d2c34d52aa 100644
20 --- a/games-emulation/dosbox/Manifest
21 +++ b/games-emulation/dosbox/Manifest
22 @@ -1,4 +1,5 @@
23 DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B bc25e6aba29747d4060269809d729904d8d187527c59953125c8591c0a91cf4583223c1bcf1224a041d44bfe5efcfe9034d6572954cf26870a290ff1b27e7d9d SHA512 3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f
24 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376 SHA512 625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
25 +DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b SHA512 57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69
26 DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585 SHA512 d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
27 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
28
29 diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
30 new file mode 100644
31 index 00000000000..ebcdda7b522
32 --- /dev/null
33 +++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
34 @@ -0,0 +1,86 @@
35 +# Copyright 1999-2020 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +inherit autotools desktop flag-o-matic
41 +
42 +case "${PV}" in
43 +9999)
44 + MY_P=${PN}
45 + ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
46 + inherit subversion
47 + ;;
48 +*_pre*)
49 + MY_PV=0-r${PV#*_pre}
50 + MY_P=${PN}-code-${MY_PV}-${PN}-trunk
51 + SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
52 + BDEPEND="app-arch/unzip"
53 + ;;
54 +*)
55 + MY_PV=$(ver_rs 2 -)
56 + MY_P=${PN}-${MY_PV}
57 + SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
58 + ;;
59 +esac
60 +
61 +GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
62 +SRC_URI+=" glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
63 +
64 +DESCRIPTION="DOS emulator"
65 +HOMEPAGE="https://www.dosbox.com/"
66 +LICENSE="GPL-2"
67 +SLOT="0"
68 +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
69 +IUSE="alsa +core-inline debug glide hardened opengl X"
70 +
71 +RDEPEND="alsa? ( media-libs/alsa-lib )
72 + glide? ( media-libs/openglide )
73 + opengl? ( virtual/glu virtual/opengl )
74 + debug? ( sys-libs/ncurses:0= )
75 + X? ( x11-libs/libX11 )
76 + media-libs/libpng:0=
77 + media-libs/libsdl[joystick,opengl?,video,X?]
78 + media-libs/sdl-net
79 + media-libs/sdl-sound
80 + sys-libs/zlib"
81 +
82 +DEPEND="${RDEPEND}"
83 +
84 +S="${WORKDIR}/${MY_P}"
85 +
86 +src_prepare() {
87 + use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
88 + default
89 + eautoreconf
90 +}
91 +
92 +src_configure() {
93 + use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
94 +
95 + ac_cv_lib_X11_main=$(usex X yes no) \
96 + econf \
97 + $(use_enable alsa alsa-midi) \
98 + $(use_enable core-inline) \
99 + $(use_enable !hardened dynamic-core) \
100 + $(use_enable !hardened dynamic-x86) \
101 + $(use_enable debug) \
102 + $(use_enable opengl)
103 +}
104 +
105 +src_install() {
106 + default
107 + make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
108 + doicon src/dosbox.ico
109 +}
110 +
111 +pkg_postinst() {
112 + if use glide; then
113 + elog "You have enabled unofficial Glide emulation. To use this, symlink"
114 + elog "or copy ${EPREFIX}/usr/share/openglide/glide2x-dosbox.ovl to your game's"
115 + elog "directory and add the following to your DOSBox configuration."
116 + elog ""
117 + elog "[glide]"
118 + elog "glide=true"
119 + fi
120 +}