commit: 442ebfd45c180c360a6cfb1a27d4ff941284c784 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Dec 29 11:47:07 2018 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Dec 29 12:15:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442ebfd4
games-emulation/dosbox: opengl USE flag should require libsdl[opengl] Closes: https://bugs.gentoo.org/608366 Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> ...9999.ebuild => dosbox-0.74_p20160629-r2.ebuild} | 28 +++++++++------------- games-emulation/dosbox/dosbox-9999.ebuild | 4 ++-- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild similarity index 67% copy from games-emulation/dosbox/dosbox-9999.ebuild copy to games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild index 786b1f78688..d9dccc1aa6a 100644 --- a/games-emulation/dosbox/dosbox-9999.ebuild +++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild @@ -1,41 +1,35 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit autotools desktop flag-o-matic -GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6 -SRC_URI="glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )" - -if [[ ${PV} = 9999 ]]; then - ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"; - inherit subversion -else - SRC_URI+=" mirror://sourceforge/dosbox/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc64 ~x86" -fi +PATCH=3989 +GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b DESCRIPTION="DOS emulator" HOMEPAGE="http://dosbox.sourceforge.net/"; +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 ~ppc64 ~x86" IUSE="alsa debug glide hardened opengl" -DEPEND="alsa? ( media-libs/alsa-lib ) +RDEPEND="alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) media-libs/libpng:0 - media-libs/libsdl[joystick,video,X] + media-libs/libsdl[joystick,opengl?,video,X] media-libs/sdl-net media-libs/sdl-sound" -RDEPEND=${DEPEND} +DEPEND="${RDEPEND} + app-arch/unzip" -if [[ ${PV} = 9999 ]]; then - S=${WORKDIR}/${PN} -fi +S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk PATCHES=( "${FILESDIR}"/${PN}-0.74-gcc46.patch diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild index 786b1f78688..a5bfff9c4f3 100644 --- a/games-emulation/dosbox/dosbox-9999.ebuild +++ b/games-emulation/dosbox/dosbox-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,7 +28,7 @@ DEPEND="alsa? ( media-libs/alsa-lib ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) media-libs/libpng:0 - media-libs/libsdl[joystick,video,X] + media-libs/libsdl[joystick,opengl?,video,X] media-libs/sdl-net media-libs/sdl-sound" RDEPEND=${DEPEND}
