Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Thomas Orgis (73cac2cef2e6e604499e4c2b901485b5619526fb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Thomas Orgis (73cac2cef2e6e604499e4c2b901485b5619526fb)
  • Date: Sat, 19 May 2012 09:24:23 -0500

GIT changes to master games grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

games-emulators/dosbox/BUILD | 2 --
games-emulators/dosbox/HISTORY | 6 ++++++
games-emulators/dosbox/PRE_BUILD | 4 +++-
games-emulators/dosbox/pic.patch | 39
+++++++++++++++++++++++++++++++++++++++
4 files changed, 48 insertions(+), 3 deletions(-)

New commits:
commit 73cac2cef2e6e604499e4c2b901485b5619526fb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

dosbox: use $SCRIPT_DIRECTORY

commit b274e6124adf7367224fe5376bd892ae27e5bf83
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

dosbox: Fix it for PICy machines, again.

Perhaps it is time to tell dosbox folks about the PICly name conflict.

diff --git a/games-emulators/dosbox/BUILD b/games-emulators/dosbox/BUILD
deleted file mode 100755
index 5904933..0000000
--- a/games-emulators/dosbox/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-disable_pic &&
-default_games_build
diff --git a/games-emulators/dosbox/HISTORY b/games-emulators/dosbox/HISTORY
index 542ebbc..f6f453a 100644
--- a/games-emulators/dosbox/HISTORY
+++ b/games-emulators/dosbox/HISTORY
@@ -1,3 +1,9 @@
+2012-05-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * pic.patch, PRE_BUILD: Re-add the still needed fix for -DPIC
+ conflict (makes it buildable on x86-64).
+ * BUILD: Fall back to default build, disable_pic misses the point.
+ * PRE_BUILD: use $SCRIPT_DIRECTORY
+
2011-10-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.74
* DEPENDS: renewed g++ dependency
diff --git a/games-emulators/dosbox/PRE_BUILD
b/games-emulators/dosbox/PRE_BUILD
index a778875..3098a99 100755
--- a/games-emulators/dosbox/PRE_BUILD
+++ b/games-emulators/dosbox/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/gcc46.patch"
+patch -p0 < "$SCRIPT_DIRECTORY/gcc46.patch" &&
+# Still needed for 0.74 ... simple local name clash with -DPIC.
+patch -p1 < "$SCRIPT_DIRECTORY/pic.patch"
diff --git a/games-emulators/dosbox/pic.patch
b/games-emulators/dosbox/pic.patch
new file mode 100644
index 0000000..372102e
--- /dev/null
+++ b/games-emulators/dosbox/pic.patch
@@ -0,0 +1,39 @@
+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);
+ }



  • [SM-Commit] GIT changes to master games grimoire by Thomas Orgis (73cac2cef2e6e604499e4c2b901485b5619526fb), Thomas Orgis, 05/19/2012

Archive powered by MHonArc 2.6.24.

Top of Page