[7kaa] 01/06: Refresh patches.
Bertrand Marc
bmarc at moszumanska.debian.org
Thu Jul 27 13:28:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
bmarc pushed a commit to annotated tag debian/2.14.7+dfsg-1
in repository 7kaa.
commit faadc57eb4dee944c4e4638756f48bf3e3ad92d3
Author: Bertrand Marc <bmarc at debian.org>
Date: Wed Jul 26 14:35:45 2017 +0200
Refresh patches.
---
debian/patches/abs_dir.patch | 46 ++++++------
debian/patches/use_system_libuuid.patch | 119 ++++++++++++++++++++++----------
2 files changed, 104 insertions(+), 61 deletions(-)
diff --git a/debian/patches/abs_dir.patch b/debian/patches/abs_dir.patch
index 37eb66e..a1a63cb 100644
--- a/debian/patches/abs_dir.patch
+++ b/debian/patches/abs_dir.patch
@@ -6,28 +6,28 @@ Description: Hardcode game data paths.
#define CONFIG_APPLICATION_NAME "7kaa"
// top level data dirs
--#define DEFAULT_DIR_RES "resource"PATH_DELIM
--#define DEFAULT_DIR_SPRITE "sprite"PATH_DELIM
--#define DEFAULT_DIR_SOUND "sound"PATH_DELIM
--#define DEFAULT_DIR_IMAGE "image"PATH_DELIM
--#define DEFAULT_DIR_ENCYC "encyc"PATH_DELIM
--#define DEFAULT_DIR_ENCYC2 "encyc2"PATH_DELIM
--#define DEFAULT_DIR_MOVIE "movie"PATH_DELIM
--#define DEFAULT_DIR_MUSIC "music"PATH_DELIM
--#define DEFAULT_DIR_TUTORIAL "tutorial"PATH_DELIM
--#define DEFAULT_DIR_SCENARIO "scenario"PATH_DELIM
--#define DEFAULT_DIR_SCENARI2 "scenari2"PATH_DELIM
-+#define DEFAULT_DIR_RES PACKAGE_DATA_PATH PATH_DELIM"resource"PATH_DELIM
-+#define DEFAULT_DIR_SPRITE PACKAGE_DATA_PATH PATH_DELIM"sprite"PATH_DELIM
-+#define DEFAULT_DIR_SOUND PACKAGE_DATA_PATH PATH_DELIM"sound"PATH_DELIM
-+#define DEFAULT_DIR_IMAGE PACKAGE_DATA_PATH PATH_DELIM"image"PATH_DELIM
-+#define DEFAULT_DIR_ENCYC PACKAGE_DATA_PATH PATH_DELIM"encyc"PATH_DELIM
-+#define DEFAULT_DIR_ENCYC2 PACKAGE_DATA_PATH PATH_DELIM"encyc2"PATH_DELIM
-+#define DEFAULT_DIR_MOVIE PACKAGE_DATA_PATH PATH_DELIM"movie"PATH_DELIM
-+#define DEFAULT_DIR_MUSIC PACKAGE_DATA_PATH PATH_DELIM"music"PATH_DELIM
-+#define DEFAULT_DIR_TUTORIAL PACKAGE_DATA_PATH PATH_DELIM"tutorial"PATH_DELIM
-+#define DEFAULT_DIR_SCENARIO PACKAGE_DATA_PATH PATH_DELIM"scenario"PATH_DELIM
-+#define DEFAULT_DIR_SCENARI2 PACKAGE_DATA_PATH PATH_DELIM"scenari2"PATH_DELIM
+-#define DEFAULT_DIR_RES "resource" PATH_DELIM
+-#define DEFAULT_DIR_SPRITE "sprite" PATH_DELIM
+-#define DEFAULT_DIR_SOUND "sound" PATH_DELIM
+-#define DEFAULT_DIR_IMAGE "image" PATH_DELIM
+-#define DEFAULT_DIR_ENCYC "encyc" PATH_DELIM
+-#define DEFAULT_DIR_ENCYC2 "encyc2" PATH_DELIM
+-#define DEFAULT_DIR_MOVIE "movie" PATH_DELIM
+-#define DEFAULT_DIR_MUSIC "music" PATH_DELIM
+-#define DEFAULT_DIR_TUTORIAL "tutorial" PATH_DELIM
+-#define DEFAULT_DIR_SCENARIO "scenario" PATH_DELIM
+-#define DEFAULT_DIR_SCENARI2 "scenari2" PATH_DELIM
++#define DEFAULT_DIR_RES PACKAGE_DATA_PATH PATH_DELIM "resource" PATH_DELIM
++#define DEFAULT_DIR_SPRITE PACKAGE_DATA_PATH PATH_DELIM "sprite" PATH_DELIM
++#define DEFAULT_DIR_SOUND PACKAGE_DATA_PATH PATH_DELIM "sound" PATH_DELIM
++#define DEFAULT_DIR_IMAGE PACKAGE_DATA_PATH PATH_DELIM "image" PATH_DELIM
++#define DEFAULT_DIR_ENCYC PACKAGE_DATA_PATH PATH_DELIM "encyc" PATH_DELIM
++#define DEFAULT_DIR_ENCYC2 PACKAGE_DATA_PATH PATH_DELIM "encyc2" PATH_DELIM
++#define DEFAULT_DIR_MOVIE PACKAGE_DATA_PATH PATH_DELIM "movie" PATH_DELIM
++#define DEFAULT_DIR_MUSIC PACKAGE_DATA_PATH PATH_DELIM "music" PATH_DELIM
++#define DEFAULT_DIR_TUTORIAL PACKAGE_DATA_PATH PATH_DELIM "tutorial" PATH_DELIM
++#define DEFAULT_DIR_SCENARIO PACKAGE_DATA_PATH PATH_DELIM "scenario" PATH_DELIM
++#define DEFAULT_DIR_SCENARI2 PACKAGE_DATA_PATH PATH_DELIM "scenari2" PATH_DELIM
// encylopedia chapter dirs
- #define DEFAULT_DIR_ENCYC_UNIT "unit"PATH_DELIM
+ #define DEFAULT_DIR_ENCYC_UNIT "unit" PATH_DELIM
diff --git a/debian/patches/use_system_libuuid.patch b/debian/patches/use_system_libuuid.patch
index 860eecf..770d540 100644
--- a/debian/patches/use_system_libuuid.patch
+++ b/debian/patches/use_system_libuuid.patch
@@ -33,7 +33,7 @@ Author: Bertrand Marc <bmarc at debian.org>
};
--- a/include/multiplayer.h
+++ b/include/multiplayer.h
-@@ -74,8 +74,8 @@
+@@ -76,8 +76,8 @@
struct MpMsgUserSessionStatus {
uint32_t msg_id;
@@ -44,7 +44,7 @@ Author: Bertrand Marc <bmarc at debian.org>
uint32_t player_id;
uint32_t flags;
char session_name[MP_FRIENDLY_NAME_LEN];
-@@ -86,37 +86,37 @@
+@@ -88,37 +88,37 @@
};
struct MpMsgLoginId {
uint32_t msg_id;
@@ -90,7 +90,18 @@ Author: Bertrand Marc <bmarc at debian.org>
uint32_t host;
uint16_t port;
uint16_t reserved0;
-@@ -135,7 +135,7 @@
+@@ -128,8 +128,8 @@
+ };
+ struct MpMsgReqHostNatPunch {
+ uint32_t msg_id;
+- guuid_t login_id;
+- guuid_t session_id;
++ uuid_t login_id;
++ uuid_t session_id;
+ char session_password[MP_FRIENDLY_NAME_LEN];
+ };
+ struct MpMsgHostNatPunch {
+@@ -149,7 +149,7 @@
{
char session_name[MP_FRIENDLY_NAME_LEN+1];
char password[MP_FRIENDLY_NAME_LEN+1];
@@ -99,7 +110,7 @@ Author: Bertrand Marc <bmarc at debian.org>
uint32_t flags;
int max_players;
int player_count;
-@@ -149,7 +149,7 @@
+@@ -163,7 +163,7 @@
SessionDesc(MpMsgSession *m);
char *name_str() { return session_name; };
@@ -108,7 +119,7 @@ Author: Bertrand Marc <bmarc at debian.org>
};
-@@ -177,7 +177,7 @@
+@@ -191,7 +191,7 @@
ENetSocket session_monitor;
ENetAddress service_provider;
@@ -117,7 +128,7 @@ Author: Bertrand Marc <bmarc at debian.org>
int update_available;
-@@ -211,7 +211,7 @@
+@@ -225,7 +225,7 @@
int close_session();
SessionDesc* get_session(int i);
SessionDesc* get_session(ENetAddress *address);
@@ -126,9 +137,9 @@ Author: Bertrand Marc <bmarc at debian.org>
SessionDesc* get_current_session();
// -------- functions on player management -------//
---- a/src/client/OGAMEMP.cpp
-+++ b/src/client/OGAMEMP.cpp
-@@ -1538,8 +1538,8 @@
+--- a/src/OGAMEMP.cpp
++++ b/src/OGAMEMP.cpp
+@@ -1829,8 +1829,8 @@
int refreshFlag = SSOPTION_ALL;
int pollStatus = MP_POLL_NO_UPDATE;
int choice = 0;
@@ -139,7 +150,7 @@ Author: Bertrand Marc <bmarc at debian.org>
// ------- initialized button -----------//
-@@ -1645,7 +1645,7 @@
+@@ -1936,7 +1936,7 @@
choice = 0;
for( s = 1; mp_obj.get_session(s); ++s )
{
@@ -148,7 +159,7 @@ Author: Bertrand Marc <bmarc at debian.org>
choice = s;
}
if( choice > 0)
-@@ -1756,7 +1756,7 @@
+@@ -2047,7 +2047,7 @@
SESSION_DESC_X2, SESSION_BUTTON_Y1 + (b+1)*SESSION_BUTTON_Y_SPACING -1 ) )
{
choice = s;
@@ -157,8 +168,8 @@ Author: Bertrand Marc <bmarc at debian.org>
refreshFlag |= SSOPTION_DISP_SESSION;
joinButton.enable();
---- a/src/multiplayer/common/multiplayer.cpp
-+++ b/src/multiplayer/common/multiplayer.cpp
+--- a/src/enet/multiplayer.cpp
++++ b/src/enet/multiplayer.cpp
@@ -38,7 +38,7 @@
SessionDesc::SessionDesc()
@@ -246,7 +257,7 @@ Author: Bertrand Marc <bmarc at debian.org>
if (login_failed)
return MP_POLL_LOGIN_FAILED;
send_req_login_id();
-@@ -467,12 +467,12 @@
+@@ -466,12 +466,12 @@
return NULL;
}
@@ -261,7 +272,7 @@ Author: Bertrand Marc <bmarc at debian.org>
return p;
}
return NULL;
-@@ -518,9 +518,9 @@
+@@ -517,9 +517,9 @@
if (joined_session.player_count >= joined_session.max_players)
joined_session.flags |= SESSION_FULL;
if (service_provider.host != ENET_HOST_ANY)
@@ -273,7 +284,7 @@ Author: Bertrand Marc <bmarc at debian.org>
joined_session.address.host = host->address.host;
joined_session.address.port = host->address.port;
-@@ -873,7 +873,7 @@
+@@ -874,7 +874,7 @@
ENetBuffer b;
if (joined_session.flags & SESSION_HOSTING) {
@@ -282,7 +293,7 @@ Author: Bertrand Marc <bmarc at debian.org>
send_req_session_id();
poll_time = 300;
ret = MP_POLL_LOGIN_PENDING;
-@@ -892,13 +892,13 @@
+@@ -896,13 +896,13 @@
case MPMSG_LOGIN_ID: {
MpMsgLoginId *m = (MpMsgLoginId*)recv_buf;
@@ -298,7 +309,7 @@ Author: Bertrand Marc <bmarc at debian.org>
break;
}
-@@ -908,7 +908,7 @@
+@@ -912,7 +912,7 @@
if (a.host != service_provider.host)
break;
@@ -307,7 +318,7 @@ Author: Bertrand Marc <bmarc at debian.org>
break;
}
case MPMSG_SESSION_ADDR: {
-@@ -916,13 +916,13 @@
+@@ -920,13 +920,13 @@
if (joined_session.address.host != ENET_HOST_ANY)
break;
@@ -323,7 +334,7 @@ Author: Bertrand Marc <bmarc at debian.org>
break;
joined_session.address.host = m->host;
-@@ -934,7 +934,7 @@
+@@ -949,7 +949,7 @@
}
}
@@ -332,7 +343,7 @@ Author: Bertrand Marc <bmarc at debian.org>
send_req_login_id();
poll_time = 300;
} else {
-@@ -1129,7 +1129,7 @@
+@@ -1150,7 +1150,7 @@
if (!host)
return;
@@ -341,7 +352,7 @@ Author: Bertrand Marc <bmarc at debian.org>
return;
b.data = &m;
-@@ -1137,11 +1137,11 @@
+@@ -1158,11 +1158,11 @@
m.msg_id = MPMSG_USER_SESSION_STATUS;
if (a->host == service_provider.host) {
@@ -356,7 +367,7 @@ Author: Bertrand Marc <bmarc at debian.org>
m.player_id = my_player_id;
m.flags = joined_session.flags;
strncpy(m.session_name, joined_session.session_name, MP_FRIENDLY_NAME_LEN);
-@@ -1172,7 +1172,7 @@
+@@ -1193,7 +1193,7 @@
b.dataLength = sizeof(MpMsgPollSessions);
m.msg_id = MPMSG_POLL_SESSIONS;
@@ -365,7 +376,7 @@ Author: Bertrand Marc <bmarc at debian.org>
enet_socket_send(session_monitor, &service_provider, &b, 1);
}
-@@ -1182,14 +1182,14 @@
+@@ -1203,14 +1203,14 @@
ENetBuffer b;
MpMsgReqSessionId m;
@@ -382,7 +393,7 @@ Author: Bertrand Marc <bmarc at debian.org>
memcpy(m.session_name, joined_session.session_name, MP_FRIENDLY_NAME_LEN);
memcpy(m.session_password, joined_session.password, MP_FRIENDLY_NAME_LEN);
-@@ -1201,15 +1201,15 @@
+@@ -1222,15 +1222,15 @@
ENetBuffer b;
MpMsgReqSessionAddr m;
@@ -401,29 +412,61 @@ Author: Bertrand Marc <bmarc at debian.org>
memcpy(m.session_password, joined_session.password, MP_FRIENDLY_NAME_LEN);
enet_socket_send(session_monitor, &service_provider, &b, 1);
---- a/src/common/Makefile.am
-+++ b/src/common/Makefile.am
-@@ -6,5 +6,4 @@
- OMEM.cpp \
- OMISC.cpp \
- OSTR.cpp \
-- dbglog.cpp \
-- misc_uuid.cpp
-+ dbglog.cpp
+@@ -1243,7 +1243,7 @@
+
+ if (!host)
+ return;
+- if (misc.uuid_is_null(joined_session.id))
++ if (uuid_is_null(joined_session.id))
+ return;
+
+ b.data = &m;
+@@ -1261,17 +1261,17 @@
+
+ if (!host)
+ return;
+- if (misc.uuid_is_null(joined_session.id))
++ if (uuid_is_null(joined_session.id))
+ return;
+- if (misc.uuid_is_null(service_login_id))
++ if (uuid_is_null(service_login_id))
+ return;
+
+ b.data = &m;
+ b.dataLength = sizeof(MpMsgReqHostNatPunch);
+
+ m.msg_id = MPMSG_REQ_HOST_NAT_PUNCH;
+- misc.uuid_copy(m.login_id, service_login_id);
+- misc.uuid_copy(m.session_id, joined_session.id);
++ uuid_copy(m.login_id, service_login_id);
++ uuid_copy(m.session_id, joined_session.id);
+ memcpy(m.session_password, joined_session.password, MP_FRIENDLY_NAME_LEN);
+
+ enet_socket_send(host->socket, &service_provider, &b, 1);
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -278,7 +278,6 @@
+ file_writer.cpp \
+ input_stream.cpp \
+ mem_input_stream.cpp \
+- misc_uuid.cpp \
+ output_stream.cpp \
+ player_desc.cpp \
+ surface_sdl.cpp \
--- a/include/Makefile.am
+++ b/include/Makefile.am
-@@ -170,7 +170,6 @@
+@@ -171,7 +171,6 @@
gettext-gnu.h \
input_stream.h \
mem_input_stream.h \
- misc_uuid.h \
- mouse_none.h \
mouse_sdl.h \
multiplayer.h \
+ openal_audio.h \
--- a/configure.ac
+++ b/configure.ac
-@@ -201,6 +201,19 @@
- LIBS="$LIBS $ENET_LIBS"
+@@ -223,6 +223,19 @@
+ LIBS="$LIBS $CURL_LIBS"
])
+PKG_CHECK_MODULES([UUID], [libuuid],, [
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/7kaa.git
More information about the Pkg-games-commits
mailing list