[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/, games-emulation/dosbox/files/
commit: 0146cd428adeb9fc3404a1869af788cbba1576ef Author: James Le Cuirot gentoo org> AuthorDate: Sat Jan 4 12:55:29 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Jan 4 14:30:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0146cd42 games-emulation/dosbox: Patch to fix USE=debug with ncurses[tinfo] Bug: https://bugs.gentoo.org/701688 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: James Le Cuirot gentoo.org> games-emulation/dosbox/dosbox-0.74.3.ebuild| 4 ++ games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 4 ++ games-emulation/dosbox/dosbox-.ebuild | 4 ++ .../dosbox/files/dosbox-0.74-ncurses.patch | 72 ++ 4 files changed, 84 insertions(+) diff --git a/games-emulation/dosbox/dosbox-0.74.3.ebuild b/games-emulation/dosbox/dosbox-0.74.3.ebuild index 167f646d360..418766f8d96 100644 --- a/games-emulation/dosbox/dosbox-0.74.3.ebuild +++ b/games-emulation/dosbox/dosbox-0.74.3.ebuild @@ -45,6 +45,10 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-0.74-ncurses.patch +) + src_prepare() { default eautoreconf diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild index ebcdda7b522..4a25d8ebdb4 100644 --- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild +++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild @@ -49,6 +49,10 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-0.74-ncurses.patch +) + src_prepare() { use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff default diff --git a/games-emulation/dosbox/dosbox-.ebuild b/games-emulation/dosbox/dosbox-.ebuild index d6c94125051..3292eebd77d 100644 --- a/games-emulation/dosbox/dosbox-.ebuild +++ b/games-emulation/dosbox/dosbox-.ebuild @@ -49,6 +49,10 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-0.74-ncurses.patch +) + src_prepare() { use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff default diff --git a/games-emulation/dosbox/files/dosbox-0.74-ncurses.patch b/games-emulation/dosbox/files/dosbox-0.74-ncurses.patch new file mode 100644 index 000..dd7016f8c92 --- /dev/null +++ b/games-emulation/dosbox/files/dosbox-0.74-ncurses.patch @@ -0,0 +1,72 @@ +https://sourceforge.net/p/dosbox/patches/286/ + +--- a/configure.ac 2019-11-12 17:55:51.0 + b/configure.ac 2020-01-02 21:26:27.551856431 + +@@ -235,36 +235,38 @@ + #Features to enable/disable + AH_TEMPLATE(C_DEBUG,[Define to 1 to enable internal debugger, requires libcurses]) + AH_TEMPLATE(C_HEAVY_DEBUG,[Define to 1 to enable heavy debugging, also have to enable C_DEBUG]) +-AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug mode]),[ +- AC_CHECK_HEADER(curses.h,have_curses_h=yes,) +- AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , ) +- AC_CHECK_LIB(ncurses, initscr, have_ncurses_lib=yes, , ) +- AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , ) ++AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug mode]),,enable_debug=no) ++AC_MSG_CHECKING(whether debug will be enabled) ++ ++if test x$enable_debug = xno; then ++ AC_MSG_RESULT(no) ++else ++ AC_MSG_RESULT(yes) + +- if test x$enable_debug = xno; then +- AC_MSG_RESULT([Debugger not enabled]) +- elif test x$have_ncurses_lib = xyes -a x$have_curses_h = xyes ; then +- LIBS="$LIBS -lncurses" +- AC_DEFINE(C_DEBUG,1) +- if test x$enable_debug = xheavy ; then +- AC_DEFINE(C_HEAVY_DEBUG,1) +- fi +- elif test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then +- LIBS="$LIBS -lcurses" +- AC_DEFINE(C_DEBUG,1) +- if test x$enable_debug = xheavy ; then +- AC_DEFINE(C_HEAVY_DEBUG,1) +- fi +- elif test x$have_pdcurses_lib = xyes -a x$have_curses_h = xyes ; then +- LIBS="$LIBS -lpdcurses" +- AC_DEFINE(C_DEBUG,1) +- if test x$enable_debug = xheavy ; then +- AC_DEFINE(C_HEAVY_DEBUG,1) +- fi +- else +- AC_MSG_ERROR([Can't find curses, which is required for debug mode]) +- fi +-],) ++ PKG_CHECK_MODULES(NCURSES, ncurses, [ ++LIBS="$LIBS $NCURSES_LIBS"; CFLAGS="$CFLAGS $NCURSES_CFLAGS" ++ ], [ ++AC_CHECK_HEADER(curses.h,have_curses_h=yes,) ++AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , ) ++AC_CHECK_LIB(ncurses, initscr, have_ncurses_lib=yes, , ) ++AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , ) ++ ++if test x$have_ncurses_lib = xyes -a x$have_curses_h = xyes ; then ++ LIBS="$LIBS -lncurses" ++elif test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then ++ LIBS="$LIBS -lcurses" ++elif test x$have_pdcurses_lib = xyes -a x$have_curses_h = xyes ; then ++ LIBS="$LIBS -lpdcurses" ++else ++
[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/, games-emulation/dosbox/files/
commit: e17dcd37000234ba0ae79246a09d5c09ff33a16e Author: Azamat H. Hackimov gmail com> AuthorDate: Sat Jan 5 18:11:13 2019 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Jan 5 19:43:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17dcd37 games-emulation/dosbox: fix for xorg 1.20 issue * Added patch for xorg 1.20 issue (https://sourceforge.net/p/dosbox/code-0/4177/). * Changed HOMEPAGE Signed-off-by: Azamat H. Hackimov gmail.com> Package-Manager: Portage-2.3.51, Repoman-2.3.11 Closes: https://github.com/gentoo/gentoo/pull/10747 Signed-off-by: James Le Cuirot gentoo.org> ....ebuild => dosbox-0.74_p20160629-r3.ebuild} | 33 --- games-emulation/dosbox/dosbox-.ebuild | 4 +-- .../dosbox/files/dosbox-0.74.2_events.patch| 37 ++ 3 files changed, 53 insertions(+), 21 deletions(-) diff --git a/games-emulation/dosbox/dosbox-.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild similarity index 65% copy from games-emulation/dosbox/dosbox-.ebuild copy to games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild index 421603aa2fd..140ff29f6f0 100644 --- a/games-emulation/dosbox/dosbox-.ebuild +++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild @@ -1,46 +1,41 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 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} = ]]; 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/; +HOMEPAGE="https://www.dosbox.com/; +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 +core-inline debug glide hardened opengl X" -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 ) X? ( x11-libs/libX11 ) media-libs/libpng:0= - media-libs/libsdl[joystick,opengl?,video,X] + media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib" -RDEPEND=${DEPEND} +DEPEND="${RDEPEND} + app-arch/unzip" -if [[ ${PV} = ]]; then - S=${WORKDIR}/${PN} -fi +S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk PATCHES=( - "${FILESDIR}"/${PN}-0.74-gcc46.patch + "${FILESDIR}/${PN}-0.74-gcc46.patch" + "${FILESDIR}/${PN}-0.74.2_events.patch" ) src_prepare() { diff --git a/games-emulation/dosbox/dosbox-.ebuild b/games-emulation/dosbox/dosbox-.ebuild index 421603aa2fd..8c4711e5620 100644 --- a/games-emulation/dosbox/dosbox-.ebuild +++ b/games-emulation/dosbox/dosbox-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ else fi DESCRIPTION="DOS emulator" -HOMEPAGE="http://dosbox.sourceforge.net/; +HOMEPAGE="https://www.dosbox.com/; LICENSE="GPL-2" SLOT="0" diff --git a/games-emulation/dosbox/files/dosbox-0.74.2_events.patch b/games-emulation/dosbox/files/dosbox-0.74.2_events.patch new file mode 100644 index 000..fee09a65a4c --- /dev/null +++ b/games-emulation/dosbox/files/dosbox-0.74.2_events.patch @@ -0,0 +1,37 @@ +Index: src/gui/sdlmain.cpp +=== +--- a/src/gui/sdlmain.cpp (revision 4177) b/src/gui/sdlmain.cpp (working copy) +@@ -1426,6 +1426,12 @@ + #define DB_POLLSKIP 1 + #endif + ++#if defined(LINUX) ++#define SDL_XORG_FIX 1 ++#else ++#define SDL_XORG_FIX 0 ++#endif ++ + void GFX_Events() { + //Don't poll too often. This can be heavy on the OS, especially Macs. + //In idle mode 3000-4000 polls are done per second without this check. +@@ -1449,6 +1455,19 @@ + } + #endif + while (SDL_PollEvent()) { ++#if SDL_XORG_FIX ++ // Special code for broken SDL with Xorg 1.20.1, where pairs of inputfocus gain and loss events are generated ++ // when locking the mouse in windowed mode. ++ if (event.type ==