Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Remko van der Vossen (e0511cfd05779dc54cd4ae6b797b5eae11f310ad)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Remko van der Vossen (e0511cfd05779dc54cd4ae6b797b5eae11f310ad)
  • Date: Sat, 26 Jan 2019 20:12:16 +0000

GIT changes to master games grimoire by Remko van der Vossen <wich AT yuugen.jp>:

games-emulators/dosbox/DEPENDS | 61
+++++++++++++++------------
games-emulators/dosbox/DETAILS | 4 -
games-emulators/dosbox/HISTORY | 7 +++
games-emulators/dosbox/PRE_BUILD | 6 --
games-emulators/dosbox/gcc46.patch | 11 ----
games-emulators/dosbox/pic.patch | 39 -----------------
games-emulators/dosbox/sdl-xorg-1.20.1.patch | 35 +++++++++++++++
7 files changed, 81 insertions(+), 82 deletions(-)

New commits:
commit e0511cfd05779dc54cd4ae6b797b5eae11f310ad
Author: Remko van der Vossen <wich AT yuugen.jp>
Commit: Remko van der Vossen <wich AT yuugen.jp>

dosbox: 0.74-2 and add patch for xorg-1.20.1 incompatibility

diff --git a/games-emulators/dosbox/DEPENDS b/games-emulators/dosbox/DEPENDS
index 0044e9b..729c845 100755
--- a/games-emulators/dosbox/DEPENDS
+++ b/games-emulators/dosbox/DEPENDS
@@ -1,26 +1,35 @@
-depends sdl &&
-depends -sub CXX gcc &&
-optional_depends ncurses \
- "--enable-debug" \
- "--disable-debug" \
- "Enable debugger?" &&
-optional_depends alsa-lib \
- "" \
- "" \
- "Enable alsa support." &&
-optional_depends libpng \
- "" \
- "" \
- "Enable screenshots" &&
-optional_depends sdl_net \
- "" \
- "" \
- "SDL Networking support(modem/ipx)" &&
-optional_depends sdl_sound \
- "" \
- "" \
- "SDL Sound support(compress audio on disk images)" &&
-optional_depends OPENGL \
- "--enable-opengl" \
- "--disable-opengl" \
- "OpenGL Support"
+depends sdl &&
+depends -sub CXX gcc &&
+
+optional_depends ncurses \
+ "--enable-debug" \
+ "--disable-debug" \
+ "Enable debugger?" &&
+
+optional_depends alsa-lib \
+ "" \
+ "" \
+ "Enable alsa support." &&
+
+optional_depends libpng \
+ "" \
+ "" \
+ "Enable screenshots" &&
+optional_depends sdl_net \
+ "" \
+ "" \
+ "SDL Networking support(modem/ipx)" &&
+
+optional_depends sdl_sound \
+ "" \
+ "" \
+ "SDL Sound support(compress audio on disk images)" &&
+
+optional_depends OPENGL \
+ "--enable-opengl" \
+ "--disable-opengl" \
+ "OpenGL Support" &&
+
+if [[ -n $(get_spell_provider $SPELL OPENGL) ]]; then
+ depends glu
+fi
diff --git a/games-emulators/dosbox/DETAILS b/games-emulators/dosbox/DETAILS
index 7cbe1d5..2513c70 100755
--- a/games-emulators/dosbox/DETAILS
+++ b/games-emulators/dosbox/DETAILS
@@ -1,10 +1,10 @@
SPELL=dosbox
- VERSION=0.74
+ VERSION=0.74-2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/${VERSION}/${SOURCE}
LICENSE[0]=GPL
-
SOURCE_HASH=sha512:4a6ff4c658997a495119d200ec6ad37649da940814a4b14fca0dd29a99142026e324695b7aa9d2946efc2abf9067a819d911e43778efe905ed10ddf9b9f2dd3d
+
SOURCE_HASH=sha512:5e02ba84bfb89318f2ce4d2f387d36a0988e4e5c04e89d6c902f865bbf951a38850fc51b24632cec706687b51b4f661de918975367e6fd0d775c5f40a623cf78
WEB_SITE=http://www.dosbox.com/
ENTERED=20031012
SHORT="DOS emulator developed mainly for games"
diff --git a/games-emulators/dosbox/HISTORY b/games-emulators/dosbox/HISTORY
index 931a1e0..cd22855 100644
--- a/games-emulators/dosbox/HISTORY
+++ b/games-emulators/dosbox/HISTORY
@@ -1,3 +1,10 @@
+2019-01-26 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: version 0.74-2
+ * DEPENDS: depends glu if OPENGL provider enabled
+ * PRE_BUILD, gcc46.patch, pic.patch, sdl-xorg-1.20.1.patch: remove
+ unnecessary patches and add patch to work around an incompatibility
+ with xorg 1.20.1
+
2014-10-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: fix SOURCE_URL

diff --git a/games-emulators/dosbox/PRE_BUILD
b/games-emulators/dosbox/PRE_BUILD
index 3098a99..afbd0fa 100755
--- a/games-emulators/dosbox/PRE_BUILD
+++ b/games-emulators/dosbox/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SCRIPT_DIRECTORY/gcc46.patch" &&
-# Still needed for 0.74 ... simple local name clash with -DPIC.
-patch -p1 < "$SCRIPT_DIRECTORY/pic.patch"
+patch -p1 < "$SCRIPT_DIRECTORY/sdl-xorg-1.20.1.patch" &&
+autoreconf
diff --git a/games-emulators/dosbox/gcc46.patch
b/games-emulators/dosbox/gcc46.patch
deleted file mode 100644
index e0ef8c1..0000000
--- a/games-emulators/dosbox/gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/dos_inc.h.orig
-+++ include/dos_inc.h
-@@ -28,6 +28,8 @@
- #include "mem.h"
- #endif
-
-+#include <stddef.h>
-+
- #ifdef _MSC_VER
- #pragma pack (1)
- #endif
diff --git a/games-emulators/dosbox/pic.patch
b/games-emulators/dosbox/pic.patch
deleted file mode 100644
index 372102e..0000000
--- a/games-emulators/dosbox/pic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru dosbox-0.74/src/hardware/pic.cpp
dosbox-0.74-epic/src/hardware/pic.cpp
---- dosbox-0.74/src/hardware/pic.cpp 2010-05-10 19:43:54.000000000 +0200
-+++ dosbox-0.74-epic/src/hardware/pic.cpp 2012-05-19 15:28:56.000000000
+0200
-@@ -541,12 +541,12 @@
- }
-
-
--class PIC:public Module_base{
-+class EPIC:public Module_base{
- private:
- IO_ReadHandleObject ReadHandler[4];
- IO_WriteHandleObject WriteHandler[4];
- public:
-- PIC(Section* configuration):Module_base(configuration){
-+ EPIC(Section* configuration):Module_base(configuration){
- /* Setup pic0 and pic1 with initial values like DOS has
normally */
- PIC_IRQCheck=0;
- PIC_IRQActive=PIC_NOIRQ;
-@@ -596,17 +596,17 @@
- pic_queue.free_entry=&pic_queue.entries[0];
- pic_queue.next_entry=0;
- }
-- ~PIC(){
-+ ~EPIC(){
- }
- };
-
--static PIC* test;
-+static EPIC* test;
-
- void PIC_Destroy(Section* sec){
- delete test;
- }
-
- void PIC_Init(Section* sec) {
-- test = new PIC(sec);
-+ test = new EPIC(sec);
- sec->AddDestroyFunction(&PIC_Destroy);
- }
diff --git a/games-emulators/dosbox/sdl-xorg-1.20.1.patch
b/games-emulators/dosbox/sdl-xorg-1.20.1.patch
new file mode 100644
index 0000000..259953f
--- /dev/null
+++ b/games-emulators/dosbox/sdl-xorg-1.20.1.patch
@@ -0,0 +1,35 @@
+-- a/src/gui/sdlmain.cpp
++++ b/src/gui/sdlmain.cpp
+@@ -1522,6 +1522,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.
+@@ -1545,6 +1551,19 @@
+ }
+ #endif
+ while (SDL_PollEvent(&event)) {
++#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 == SDL_ACTIVEEVENT && event.active.state ==
SDL_APPINPUTFOCUS && event.active.gain == 0) {
++ SDL_Event test; //Check if the next event would undo
this one.
++ if
(SDL_PeepEvents(&test,1,SDL_PEEKEVENT,SDL_ACTIVEEVENTMASK) == 1 &&
test.active.state == SDL_APPINPUTFOCUS && test.active.gain == 1) {
++ // Skip both events.
++
SDL_PeepEvents(&test,1,SDL_GETEVENT,SDL_ACTIVEEVENTMASK);
++ continue;
++ }
++ }
++#endif
++
+ switch (event.type) {
+ case SDL_ACTIVEEVENT:
+ if (event.active.state & SDL_APPINPUTFOCUS) {



  • [SM-Commit] GIT changes to master games grimoire by Remko van der Vossen (e0511cfd05779dc54cd4ae6b797b5eae11f310ad), Remko van der Vossen, 01/26/2019

Archive powered by MHonArc 2.6.24.

Top of Page