Skip to Content.
Sympa Menu

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

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 (b5cd8ce537105d6e55ee1cb84412892e2476fb9d)
  • Date: Tue, 28 Aug 2007 05:43:08 -0500

GIT changes to master games grimoire by Thomas Orgis
<orgis AT adams.agnld.uni-potsdam.de>:

games-emulators/dosbox/BUILD | 2 --
games-emulators/dosbox/CONFIGURE | 7 +++++--
games-emulators/dosbox/DETAILS | 4 ++--
games-emulators/dosbox/HISTORY | 6 ++++++
games-emulators/dosbox/PRE_BUILD | 6 ++++++
5 files changed, 19 insertions(+), 6 deletions(-)

New commits:
commit b5cd8ce537105d6e55ee1cb84412892e2476fb9d
Author: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>
Commit: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>

doxbox: update to 0.72

commit 7298d3669e4d8893e4a73ff49f48e47396f9f351
Author: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>
Commit: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>

dosbox: disable_pic is still needed for puny IA32

commit d3a1001cf5384972ff193e15b5574b4c32807df6
Author: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>
Commit: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>

dosbox: forgotten note for last commit - hiding dynamic cpu core for
non-x86 archs

commit af5394a5985e5c2a28f48ccfc18328cf50165662
Author: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>
Commit: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>

dosbox: adding BUILD again, we need default_games_build in there

commit 4974a47168f566b1af832a3156bac75830ca3423
Author: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>
Commit: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>

dosbox: fixing the PIC issue which is just a name clash

diff --git a/games-emulators/dosbox/BUILD b/games-emulators/dosbox/BUILD
deleted file mode 100755
index d6c4cf1..0000000
--- a/games-emulators/dosbox/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-disable_pic &&
-default_games_build
diff --git a/games-emulators/dosbox/CONFIGURE
b/games-emulators/dosbox/CONFIGURE
index 4241320..38b7c94 100755
--- a/games-emulators/dosbox/CONFIGURE
+++ b/games-emulators/dosbox/CONFIGURE
@@ -3,11 +3,14 @@ config_query_option DOSBOX_CORE_INLINE
\
"n" \
"--enable-core-inline" \
"--disable-core-inline" &&
-config_query_option DOSBOX_X86_DYNAMIC \
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]] ||
+ [[ ${SMGL_COMPAT_ARCHS[1]} == "ia32" ]]; then
+ config_query_option DOSBOX_X86_DYNAMIC \
"Enable x86 dynamic cpu core" \
"y" \
"--enable-dynamic-x86" \
- "--disable-dynamic-x86" &&
+ "--disable-dynamic-x86"
+fi &&
config_query_option DOSBOX_FPU \
"Enable FPU support" \
"y" \
diff --git a/games-emulators/dosbox/DETAILS b/games-emulators/dosbox/DETAILS
index e036751..f9084bc 100755
--- a/games-emulators/dosbox/DETAILS
+++ b/games-emulators/dosbox/DETAILS
@@ -1,10 +1,10 @@
SPELL=dosbox
- VERSION=0.70
+ VERSION=0.72
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
LICENSE[0]=GPL
-
SOURCE_HASH=sha512:c28b353225bf00f7932c50ea8ef8eb4259c86926c049c18b7ed659b6dac3f1eca062905e79512f93ef94dde70b5a52f737c5123374e79e14f703d66d2820a325
+
SOURCE_HASH=sha512:4fb5ca955d9e98d31bd729d746957a3593ab68b427d28acc94f9174de9e5362dd6c5dc7ef5149c90c8c2666a04fe5e6eddafdc928c4a9ee4648ae3c980b8442e
WEB_SITE=http://dosbox.sourceforge.net
ENTERED=20031012
SHORT="Dosbox is a DOS emulator developed mainly for games."
diff --git a/games-emulators/dosbox/HISTORY b/games-emulators/dosbox/HISTORY
index 2f90bfd..bd31e8c 100644
--- a/games-emulators/dosbox/HISTORY
+++ b/games-emulators/dosbox/HISTORY
@@ -1,3 +1,9 @@
+2007-08-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, BUILD: Applying a hack for the PIC issue which is just a
+ name clash with a class definition on Alpha
+ (on ia32, PIC is still disabled due to register starvation)
+ * CONFIGURE: don't ask for dynamic CPU core on non-x86 archs
+
2007-03-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update 0.70

diff --git a/games-emulators/dosbox/PRE_BUILD
b/games-emulators/dosbox/PRE_BUILD
new file mode 100755
index 0000000..1ffcb5d
--- /dev/null
+++ b/games-emulators/dosbox/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# applying to version 0.70:
+# PIC prob is a simple symbol name clash
+find -name '*.cpp' -exec sed -i 's/PIC/BOXPIC/g' '{}' \; &&
+find -name '*.h' -exec sed -i 's/PIC/BOXPIC/g' '{}' \;



  • [SM-Commit] GIT changes to master games grimoire by Thomas Orgis (b5cd8ce537105d6e55ee1cb84412892e2476fb9d), Thomas Orgis, 08/28/2007

Archive powered by MHonArc 2.6.24.

Top of Page