The following commit has been merged in the master branch:
commit c72afc2d9442437629ee72aaac8649015dfbd786
Author: Scott Howard <[email protected]>
Date: Tue Oct 4 10:11:52 2011 -0400
refreshed patches, the lilendian patch may need to be redone
diff --git a/debian/changelog b/debian/changelog
index f575270..29b0aec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sandboxgamemaker (2.7+dfsg-1) UNRELEASED; urgency=low
+
+ * New release
+
+ -- Scott Howard <[email protected]> Mon, 03 Oct 2011 21:45:52 -0400
+
sandboxgamemaker (2.6.1+dfsg-7) unstable; urgency=low
* S-V 3.9.2 (no changes)
diff --git a/debian/patches/debianizing_makefiles.patch
b/debian/patches/debianizing_makefiles.patch
index caa6fe6..8905434 100644
--- a/debian/patches/debianizing_makefiles.patch
+++ b/debian/patches/debianizing_makefiles.patch
@@ -3,8 +3,8 @@ Description: Patch to use a shared enet library, generate
binaries without 32 or
Author: Scott Howard <[email protected]>
Index: sandboxgamemaker/src/Makefile
===================================================================
---- sandboxgamemaker.orig/src/Makefile 2010-11-08 09:56:08.851379211 -0500
-+++ sandboxgamemaker/src/Makefile 2010-11-08 09:56:15.011009700 -0500
+--- sandboxgamemaker.orig/src/Makefile 2011-10-03 21:50:32.856775219 -0400
++++ sandboxgamemaker/src/Makefile 2011-10-03 21:51:06.924775205 -0400
@@ -7,7 +7,7 @@
PLATFORM= $(shell uname -s)
PLATFORM_PREFIX=sandbox
@@ -18,21 +18,21 @@ Index: sandboxgamemaker/src/Makefile
CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32
-lenet -lws2_32 -lwinmm
else
CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs`
-lSDL_image -lSDL_mixer -lz -lGL
-+CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image
-lSDL_mixer -lz -lGL
+-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs`
-lSDL_image -lSDL_mixer -lz -lGL -lX11
++CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image
-lSDL_mixer -lz -lGL -lX11
endif
ifeq ($(PLATFORM),Linux)
CLIENT_LIBS+= -lrt
@@ -175,7 +175,7 @@
- SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
+ MASTER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
else
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
-SERVER_LIBS= -Lenet/.libs -lenet -lz
+SERVER_LIBS= -lenet -lz
+ MASTER_LIBS= $(SERVER_LIBS)
endif
- SERVER_OBJS= \
-@@ -220,15 +220,6 @@
+@@ -224,15 +224,6 @@
all: client server
@@ -48,7 +48,7 @@ Index: sandboxgamemaker/src/Makefile
clean:
-$(RM) $(SERVER_OBJS) $(FPSSERVER_OBJS) $(MOVIESERVER_OBJS)
$(CLIENT_PCH) $(CLIENT_OBJS) $(SSPCLIENT_OBJS) $(RPGCLIENT_OBJS)
$(FPSCLIENT_OBJS) $(MOVIECLIENT_OBJS) $(KRSCLIENT_OBJS) $(PZLCLIENT_OBJS)
$(LAUNCHER_OBJS) $(MASTER_OBJS) $(PLATFORM_PREFIX)_server_*
$(PLATFORM_PREFIX)_client_*
-@@ -317,40 +308,41 @@
+@@ -316,40 +307,41 @@
install: all
else
@@ -93,8 +93,8 @@ Index: sandboxgamemaker/src/Makefile
+ $(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_server_movie $(SERVER_OBJS)
$(MOVIESERVER_OBJS) $(SERVER_LIBS)
-master: libenet $(MASTER_OBJS)
-+master: $(MASTER_OBJS)
- $(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_master $(MASTER_OBJS)
$(SERVER_LIBS)
++master: $(MASTER_OBJS)
+ $(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_master $(MASTER_OBJS)
$(MASTER_LIBS)
install: all
@@ -105,7 +105,7 @@ Index: sandboxgamemaker/src/Makefile
- chmod +x ../bin/$(PLATFORM_PREFIX)_??????_$(MACHINENAME)*
+ chmod +x ../bin/$(PLATFORM_PREFIX)_??????*
+ install -d $(DESTDIR)/usr/lib/sandboxgamemaker
-+ install ../bin/$(PLATFORM_PREFIX)_??????_*
$(DESTDIR)/usr/lib/sandboxgamemaker
++ install ../bin/$(PLATFORM_PREFIX)_??????_* $(DESTDIR)/usr/lib
endif
diff --git a/debian/patches/fix_ftbfs_bigendian.patch
b/debian/patches/fix_ftbfs_bigendian.patch
index c462b3a..46af30c 100644
--- a/debian/patches/fix_ftbfs_bigendian.patch
+++ b/debian/patches/fix_ftbfs_bigendian.patch
@@ -3,42 +3,12 @@ Description: Fixed a FTBFS on big endian machines due to
wrong type used in
Author: Scott Howard <[email protected]>
Index: sandboxgamemaker/src/rpggame/rpgio.cpp
===================================================================
---- sandboxgamemaker.orig/src/rpggame/rpgio.cpp 2010-11-10
19:37:42.000000000 -0500
-+++ sandboxgamemaker/src/rpggame/rpgio.cpp 2010-11-10 19:41:33.551787089
-0500
-@@ -309,11 +309,12 @@
- lilswap(&base->base.experience, 3);
- lilswap(&base->base.baseattrs[0], STAT_MAX * 2 + SKILL_MAX * 2);
-
-- lilswap(&base->base.bonusthresh, ATTACK_MAX * 2);
-+ lilswap(&base->base.bonusthresh[0], ATTACK_MAX * 2);
- lilswap(&base->base.bonushealth, 6);
-+
- lilswap(&base->base.bonushregen, 2);
-
-- lilswap(&base->base.deltathresh, ATTACK_MAX * 2);
-+ lilswap(&base->base.deltathresh[0], ATTACK_MAX * 2);
- lilswap(&base->base.deltahealth, 6);
- lilswap(&base->base.deltahregen, 2);
-
-@@ -972,11 +973,11 @@
- lilswap(&tmp.experience, 3);
- lilswap(&tmp.baseattrs[0], STAT_MAX * 2 + SKILL_MAX * 2);
-
-- lilswap(&tmp.bonusthresh, ATTACK_MAX * 2);
-+ lilswap(&tmp.bonusthresh[0], ATTACK_MAX * 2);
- lilswap(&tmp.bonushealth, 6);
- lilswap(&tmp.bonushregen, 2);
-
-- lilswap(&tmp.deltathresh, ATTACK_MAX * 2);
-+ lilswap(&tmp.deltathresh[0], ATTACK_MAX * 2);
- lilswap(&tmp.deltahealth, 6);
- lilswap(&tmp.deltahregen, 2);
-
-@@ -1003,6 +1004,7 @@
- f->putlil(fact->relations[i]);
+--- sandboxgamemaker.orig/src/rpggame/rpgio.cpp 2011-10-03
20:55:39.000000000 -0400
++++ sandboxgamemaker/src/rpggame/rpgio.cpp 2011-10-03 21:41:08.624775450
-0400
+@@ -1213,4 +1213,4 @@
+ reloadtexture(file);
}
-
-+
- void writeobject(stream *f, object_base *obj)
- {
- writestring(f, obj->mdl);
+ COMMAND(savegame, "s");
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/linux_launcher.patch
b/debian/patches/linux_launcher.patch
index 3f21018..35b351b 100644
--- a/debian/patches/linux_launcher.patch
+++ b/debian/patches/linux_launcher.patch
@@ -1,14 +1,14 @@
Description: Takes new sandbox_unix_usr script from upstream
Author: Scott Howard <[email protected]>
-Index: sandboxgamemaker/sandbox_unix_usr
+Index: sandboxgamemaker/sandbox_unix
===================================================================
---- sandboxgamemaker.orig/sandbox_unix_usr 2010-11-08 09:30:03.000000000
-0500
-+++ sandboxgamemaker/sandbox_unix_usr 2010-11-08 09:40:27.590268368 -0500
+--- sandboxgamemaker.orig/sandbox_unix 2011-10-03 21:29:18.184775740 -0400
++++ sandboxgamemaker/sandbox_unix 2011-10-03 21:38:23.264775517 -0400
@@ -2,7 +2,7 @@
- # SANDBOX_DIR should refer to the directory in which sandbox is placed.
+ # SANDBOX_DIR should refer to the directory in which sandbox is placed, the
default should be good enough.
#SANDBOX_DIR=~/sandbox
- #SANDBOX_DIR=.
--SANDBOX_DIR=/usr/local/sandbox
+ #SANDBOX_DIR=/usr/local/sandbox
+-SANDBOX_DIR=$(dirname $(readlink -f $0))
+SANDBOX_DIR=/usr/share/sandboxgamemaker
SANDBOX_OPTIONS=""
@@ -20,8 +20,8 @@ Index: sandboxgamemaker/sandbox_unix_usr
+ echo " --launcher start the graphical
launcher GUI"
echo " --server launch dedicated server
binary instead"
echo " --master launch a masterserver
for server registration"
- echo " compiled
masterserver not included"
-@@ -86,6 +87,9 @@
+ echo " NOTE: compiled
masterserver not included"
+@@ -88,6 +89,9 @@
"master")
SANDBOX_TYPE="master"
;;
@@ -31,7 +31,7 @@ Index: sandboxgamemaker/sandbox_unix_usr
"debug")
SANDBOX_PREFIX="debug"
SANDBOX_EXEC="gdb --args"
-@@ -100,22 +104,13 @@
+@@ -102,22 +106,13 @@
shift
done
@@ -52,15 +52,15 @@ Index: sandboxgamemaker/sandbox_unix_usr
echo "3) the executable was moved"
- echo "please make sure that
${SANDBOX_DIR}/bin/${SANDBOX_PREFIX}_${SANDBOX_TYPE}_${MACHINE_BIT}_${SANDBOX_MODULE}
exists. If it doesn't..."
+ echo "please make sure that
/usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_${SANDBOX_TYPE}_${SANDBOX_MODULE}
exists. If it doesn't..."
- echo "install the sdl, sdl-image and sdl-mixer DEVELOPMENT libraries
and use \"sudo make -C ${SANDBOX_DIR}/src install\" to compile a binary"
+ echo "install the sdl, sdl-image and sdl-mixer DEVELOPMENT libraries
and use \"make -C ${SANDBOX_DIR}/src install\" to compile a binary"
echo ""
exit 1
-@@ -125,25 +120,33 @@
+@@ -127,27 +122,35 @@
cd ${SANDBOX_DIR}
case ${SANDBOX_TYPE} in
"client")
-- if [ -a bin/sandbox_client_${MACHINE_BIT}_${SANDBOX_MODULE} ]
-+ if [ -a
/usr/lib/sandboxgamemaker/sandbox_client_${SANDBOX_MODULE} ]
+- if [ -a
bin/${SANDBOX_PREFIX}_client_${MACHINE_BIT}_${SANDBOX_MODULE} ]
++ if [ -a
/usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_client_${SANDBOX_MODULE} ]
then
- eval ${SANDBOX_EXEC}
./bin/${SANDBOX_PREFIX}_client_${MACHINE_BIT}_${SANDBOX_MODULE}
-q${SANDBOX_HOME} -r ${SANDBOX_OPTIONS}
+ eval ${SANDBOX_EXEC}
/usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_client_${SANDBOX_MODULE}
-q${SANDBOX_HOME} -r ${SANDBOX_OPTIONS}
@@ -69,8 +69,8 @@ Index: sandboxgamemaker/sandbox_unix_usr
fi
;;
"server")
-- if [ -a bin/sandbox_server_${MACHINE_BIT}_${SANDBOX_MODULE} ]
-+ if [ -a
/usr/lib/sandboxgamemaker/sandbox_server_${SANDBOX_MODULE} ]
+- if [ -a
bin/${SANDBOX_PREFIX}_server_${MACHINE_BIT}_${SANDBOX_MODULE} ]
++ if [ a
/usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_server_${SANDBOX_MODULE} ]
then
- eval ${SANDBOX_EXEC}
./bin/${SANDBOX_PREFIX}_server_${MACHINE_BIT}_${SANDBOX_MODULE}
-q${SANDBOX_HOME} ${SANDBOX_OPTIONS}
+ eval ${SANDBOX_EXEC}
/usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_server_${SANDBOX_MODULE}
-q${SANDBOX_HOME} ${SANDBOX_OPTIONS}
@@ -78,20 +78,23 @@ Index: sandboxgamemaker/sandbox_unix_usr
failed
fi
;;
- "master")
-- if [ -a bin/sandbox_master ]
+- "master")
+- if [ -a bin/${SANDBOX_PREFIX}_master ]
++ "master")
+ if [ -a /usr/lib/sandboxgamemaker/sandbox_master ]
-+ then
-+ eval ${SANDBOX_EXEC}
/usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_master
-+ else
-+ failed
-+ fi
-+ ;;
-+ "launcher")
-+ if [ -a /usr/lib/sandboxgamemaker/sandboxgamemaker_glauncher ]
then
- eval ${SANDBOX_EXEC} ./bin/${SANDBOX_PREFIX}_master
-+ eval ${SANDBOX_EXEC}
/usr/lib/sandboxgamemaker/sandboxgamemaker_glauncher
++ eval ${SANDBOX_EXEC}
/usr/lib/sandboxgamemaker/${SANDBOX_PREFIX}_master
else
failed
fi
+ ;;
++ "launcher")
++ if [ -a /usr/lib/sandboxgamemaker/sandboxgamemaker_glauncher ]
++ then
++ eval ${SANDBOX_EXEC}
/usr/lib/sandboxgamemaker/sandboxgamemaker_glauncher
++ else
++ failed
++ fi
++ ;;
+ esac
diff --git a/debian/patches/series b/debian/patches/series
index abbe437..3c88b07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
wx_launcher_paths.patch
debianizing_makefiles.patch
linux_launcher.patch
-fix_ftbfs_bigendian.patch
-binutils-gold_X11.patch
librt_linking.patch
diff --git a/debian/patches/wx_launcher_paths.patch
b/debian/patches/wx_launcher_paths.patch
index 3e2c625..3619a89 100644
--- a/debian/patches/wx_launcher_paths.patch
+++ b/debian/patches/wx_launcher_paths.patch
@@ -3,8 +3,8 @@ Author: Scott Howard <[email protected]>
Index: sandboxgamemaker/src/launcher/pasl.cpp
===================================================================
---- sandboxgamemaker.orig/src/launcher/pasl.cpp 2010-11-08
09:56:04.851619159 -0500
-+++ sandboxgamemaker/src/launcher/pasl.cpp 2010-11-08 09:56:08.851379211
-0500
+--- sandboxgamemaker.orig/src/launcher/pasl.cpp 2011-10-03
21:58:29.800775024 -0400
++++ sandboxgamemaker/src/launcher/pasl.cpp 2011-10-03 21:58:39.648775020
-0400
@@ -461,28 +461,28 @@
if(wxIsPlatform64Bit())
{
@@ -51,12 +51,12 @@ Index: sandboxgamemaker/src/launcher/pasl.cpp
Index: sandboxgamemaker/src/Makefile
===================================================================
---- sandboxgamemaker.orig/src/Makefile 2010-11-08 09:56:04.871617959 -0500
-+++ sandboxgamemaker/src/Makefile 2010-11-08 09:56:08.851379211 -0500
-@@ -215,9 +215,8 @@
+--- sandboxgamemaker.orig/src/Makefile 2011-10-03 21:58:29.824775024 -0400
++++ sandboxgamemaker/src/Makefile 2011-10-03 21:59:07.252775009 -0400
+@@ -219,9 +219,8 @@
pasl: $(LAUNCHER_OBJS)
- $(CXX) $(CXXFLAGS) $(LAUNCHER_FLAGS) -o launch $(LAUNCHER_OBJS)
$(LAUNCHER_LIBS)
+ $(CXX) $(CXXFLAGS) -o launch $(LAUNCHER_OBJS) $(LAUNCHER_LIBS)
- cp launch ../launcher
- strip ../launcher
- chmod +x ../launcher
diff --git a/debian/sandboxgamemaker.desktop b/debian/sandboxgamemaker.desktop
index bd9393e..39455a1 100644
--- a/debian/sandboxgamemaker.desktop
+++ b/debian/sandboxgamemaker.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Platinum Arts Sandbox Gamemaker
Comment=Create 3D games and worlds
-Exec=sandbox_unix_usr --launcher
+Exec=sandbox_unix --launcher
Icon=sandboxgamemaker
Terminal=false
Type=Application
diff --git a/debian/sandboxgamemaker.install b/debian/sandboxgamemaker.install
index 244aa95..9b42282 100644
--- a/debian/sandboxgamemaker.install
+++ b/debian/sandboxgamemaker.install
@@ -1,6 +1,6 @@
*.cfg /usr/share/sandboxgamemaker
debian/*.desktop /usr/share/applications/
debian/sandboxgamemaker.xpm /usr/share/pixmaps
-sandbox_unix_usr /usr/games
+sandbox_unix /usr/games
sandboxgamemaker_glauncher /usr/lib/sandboxgamemaker/
src/sandbox_* /usr/lib/sandboxgamemaker/
--
Standalone 3D Game Maker and 3D Game Design program
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
