| 1 |
commit: 442ebfd45c180c360a6cfb1a27d4ff941284c784 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 11:47:07 2018 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 12:15:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442ebfd4 |
| 7 |
|
| 8 |
games-emulation/dosbox: opengl USE flag should require libsdl[opengl] |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/608366 |
| 11 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
| 12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 13 |
|
| 14 |
...9999.ebuild => dosbox-0.74_p20160629-r2.ebuild} | 28 +++++++++------------- |
| 15 |
games-emulation/dosbox/dosbox-9999.ebuild | 4 ++-- |
| 16 |
2 files changed, 13 insertions(+), 19 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild |
| 19 |
similarity index 67% |
| 20 |
copy from games-emulation/dosbox/dosbox-9999.ebuild |
| 21 |
copy to games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild |
| 22 |
index 786b1f78688..d9dccc1aa6a 100644 |
| 23 |
--- a/games-emulation/dosbox/dosbox-9999.ebuild |
| 24 |
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild |
| 25 |
@@ -1,41 +1,35 @@ |
| 26 |
-# Copyright 1999-2018 Gentoo Foundation |
| 27 |
+# Copyright 1999-2018 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=6 |
| 31 |
|
| 32 |
inherit autotools desktop flag-o-matic |
| 33 |
|
| 34 |
-GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6 |
| 35 |
-SRC_URI="glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )" |
| 36 |
- |
| 37 |
-if [[ ${PV} = 9999 ]]; then |
| 38 |
- ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk" |
| 39 |
- inherit subversion |
| 40 |
-else |
| 41 |
- SRC_URI+=" mirror://sourceforge/dosbox/${P}.tar.gz" |
| 42 |
- KEYWORDS="~amd64 ~arm ~ppc64 ~x86" |
| 43 |
-fi |
| 44 |
+PATCH=3989 |
| 45 |
+GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b |
| 46 |
|
| 47 |
DESCRIPTION="DOS emulator" |
| 48 |
HOMEPAGE="http://dosbox.sourceforge.net/" |
| 49 |
+SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip |
| 50 |
+ glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )" |
| 51 |
|
| 52 |
LICENSE="GPL-2" |
| 53 |
SLOT="0" |
| 54 |
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86" |
| 55 |
IUSE="alsa debug glide hardened opengl" |
| 56 |
|
| 57 |
-DEPEND="alsa? ( media-libs/alsa-lib ) |
| 58 |
+RDEPEND="alsa? ( media-libs/alsa-lib ) |
| 59 |
glide? ( media-libs/openglide ) |
| 60 |
opengl? ( virtual/glu virtual/opengl ) |
| 61 |
debug? ( sys-libs/ncurses:0 ) |
| 62 |
media-libs/libpng:0 |
| 63 |
- media-libs/libsdl[joystick,video,X] |
| 64 |
+ media-libs/libsdl[joystick,opengl?,video,X] |
| 65 |
media-libs/sdl-net |
| 66 |
media-libs/sdl-sound" |
| 67 |
-RDEPEND=${DEPEND} |
| 68 |
+DEPEND="${RDEPEND} |
| 69 |
+ app-arch/unzip" |
| 70 |
|
| 71 |
-if [[ ${PV} = 9999 ]]; then |
| 72 |
- S=${WORKDIR}/${PN} |
| 73 |
-fi |
| 74 |
+S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk |
| 75 |
|
| 76 |
PATCHES=( |
| 77 |
"${FILESDIR}"/${PN}-0.74-gcc46.patch |
| 78 |
|
| 79 |
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild |
| 80 |
index 786b1f78688..a5bfff9c4f3 100644 |
| 81 |
--- a/games-emulation/dosbox/dosbox-9999.ebuild |
| 82 |
+++ b/games-emulation/dosbox/dosbox-9999.ebuild |
| 83 |
@@ -1,4 +1,4 @@ |
| 84 |
-# Copyright 1999-2018 Gentoo Foundation |
| 85 |
+# Copyright 1999-2018 Gentoo Authors |
| 86 |
# Distributed under the terms of the GNU General Public License v2 |
| 87 |
|
| 88 |
EAPI=6 |
| 89 |
@@ -28,7 +28,7 @@ DEPEND="alsa? ( media-libs/alsa-lib ) |
| 90 |
opengl? ( virtual/glu virtual/opengl ) |
| 91 |
debug? ( sys-libs/ncurses:0 ) |
| 92 |
media-libs/libpng:0 |
| 93 |
- media-libs/libsdl[joystick,video,X] |
| 94 |
+ media-libs/libsdl[joystick,opengl?,video,X] |
| 95 |
media-libs/sdl-net |
| 96 |
media-libs/sdl-sound" |
| 97 |
RDEPEND=${DEPEND} |
Archives