| 1 |
commit: b765dc5d03b45bba1756ef66a5350d3e87deb16c |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 12:01:55 2018 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 12:15:50 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b765dc5d |
| 7 |
|
| 8 |
games-emulation/dosbox: Make X11 dependency optional |
| 9 |
|
| 10 |
The x11-libs/libX11 dependency was missing although this was |
| 11 |
transitively covered by libsdl[X]. It's not really required though and |
| 12 |
DOSBox detects it somewhat automagically. If libX11 is present but |
| 13 |
libsdl was not built with X support then the build actually fails. For |
| 14 |
these reasons, we have to forcibly disable X11 using an autoconf cache |
| 15 |
variable. |
| 16 |
|
| 17 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
| 18 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 19 |
|
| 20 |
games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 6 ++++-- |
| 21 |
games-emulation/dosbox/dosbox-9999.ebuild | 4 +++- |
| 22 |
2 files changed, 7 insertions(+), 3 deletions(-) |
| 23 |
|
| 24 |
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild |
| 25 |
index d9dccc1aa6a..14138bcda6d 100644 |
| 26 |
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild |
| 27 |
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild |
| 28 |
@@ -16,14 +16,15 @@ SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip |
| 29 |
LICENSE="GPL-2" |
| 30 |
SLOT="0" |
| 31 |
KEYWORDS="~amd64 ~arm ~ppc64 ~x86" |
| 32 |
-IUSE="alsa debug glide hardened opengl" |
| 33 |
+IUSE="alsa debug glide hardened opengl X" |
| 34 |
|
| 35 |
RDEPEND="alsa? ( media-libs/alsa-lib ) |
| 36 |
glide? ( media-libs/openglide ) |
| 37 |
opengl? ( virtual/glu virtual/opengl ) |
| 38 |
debug? ( sys-libs/ncurses:0 ) |
| 39 |
+ X? ( x11-libs/libX11 ) |
| 40 |
media-libs/libpng:0 |
| 41 |
- media-libs/libsdl[joystick,opengl?,video,X] |
| 42 |
+ media-libs/libsdl[joystick,opengl?,video,X?] |
| 43 |
media-libs/sdl-net |
| 44 |
media-libs/sdl-sound" |
| 45 |
DEPEND="${RDEPEND} |
| 46 |
@@ -44,6 +45,7 @@ src_prepare() { |
| 47 |
src_configure() { |
| 48 |
use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide |
| 49 |
|
| 50 |
+ ac_cv_lib_X11_main=$(usex X yes no) \ |
| 51 |
econf \ |
| 52 |
$(use_enable alsa alsa-midi) \ |
| 53 |
$(use_enable !hardened dynamic-core) \ |
| 54 |
|
| 55 |
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild |
| 56 |
index a5bfff9c4f3..c8d3998bd01 100644 |
| 57 |
--- a/games-emulation/dosbox/dosbox-9999.ebuild |
| 58 |
+++ b/games-emulation/dosbox/dosbox-9999.ebuild |
| 59 |
@@ -21,12 +21,13 @@ HOMEPAGE="http://dosbox.sourceforge.net/" |
| 60 |
|
| 61 |
LICENSE="GPL-2" |
| 62 |
SLOT="0" |
| 63 |
-IUSE="alsa debug glide hardened opengl" |
| 64 |
+IUSE="alsa debug glide hardened opengl X" |
| 65 |
|
| 66 |
DEPEND="alsa? ( media-libs/alsa-lib ) |
| 67 |
glide? ( media-libs/openglide ) |
| 68 |
opengl? ( virtual/glu virtual/opengl ) |
| 69 |
debug? ( sys-libs/ncurses:0 ) |
| 70 |
+ X? ( x11-libs/libX11 ) |
| 71 |
media-libs/libpng:0 |
| 72 |
media-libs/libsdl[joystick,opengl?,video,X] |
| 73 |
media-libs/sdl-net |
| 74 |
@@ -50,6 +51,7 @@ src_prepare() { |
| 75 |
src_configure() { |
| 76 |
use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide |
| 77 |
|
| 78 |
+ ac_cv_lib_X11_main=$(usex X yes no) \ |
| 79 |
econf \ |
| 80 |
$(use_enable alsa alsa-midi) \ |
| 81 |
$(use_enable !hardened dynamic-core) \ |
Archives