update to checkout from 2022-09-06. This bumps the emulated Steam SDK
version to 1.55. ok op@
This commit is contained in:
parent
b5880430bc
commit
9e6315d88b
|
@ -1,14 +1,14 @@
|
|||
COMMENT = emulator for Steam online features
|
||||
|
||||
# commit from 2021-12-06
|
||||
GL_V = 0.2.5pl1
|
||||
# commit from 2022-09-06
|
||||
GL_V = 0.2.5pl2
|
||||
GL_ACCOUNT = Mr_Goldberg
|
||||
GL_PROJECT = goldberg_emulator
|
||||
GL_COMMIT = 1bd90756d1adb62b94ba41d50570c34241b9e16f
|
||||
GL_COMMIT = 802d8bcc8fc33fed263b98590373a3bacaa19a9c
|
||||
DISTNAME = ${GL_PROJECT}-${GL_V}{${GL_COMMIT}}
|
||||
PKGNAME = ${GL_PROJECT}-${GL_V}
|
||||
|
||||
SHARED_LIBS += steam_api 1.0 # 2.5
|
||||
SHARED_LIBS += steam_api 2.0 # 2022-08-05 (sdk 1.55)
|
||||
CATEGORIES = games
|
||||
HOMEPAGE = https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}
|
||||
MAINTAINER = Thomas Frohwein <thfr@openbsd.org>
|
||||
|
@ -19,7 +19,8 @@ PERMIT_PACKAGE = Yes
|
|||
WANTLIB += ${COMPILER_LIBCXX} m protobuf-lite
|
||||
MASTER_SITES = https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/-/archive/${GL_COMMIT}/
|
||||
FIX_CRLF_FILES = sdk_includes/isteamuser.h \
|
||||
sdk_includes/steamclientpublic.h
|
||||
sdk_includes/steamclientpublic.h \
|
||||
sdk_includes/steam_gameserver.h
|
||||
|
||||
# C++14
|
||||
COMPILER = base-clang ports-gcc
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (goldberg_emulator-0.2.5pl1.tar.gz) = yPvah1i0+bvQQB37dyO+BPp0L+clujxadn0/nOTEY1Q=
|
||||
SIZE (goldberg_emulator-0.2.5pl1.tar.gz) = 2072218
|
||||
SHA256 (goldberg_emulator-0.2.5pl2.tar.gz) = uGsKf+MgLt+zfKNGhRVvOHY4yhWxuNXeQAYD4eYdnWE=
|
||||
SIZE (goldberg_emulator-0.2.5pl2.tar.gz) = 2255882
|
||||
|
|
|
@ -4,7 +4,7 @@ return "." for get_lib_path
|
|||
Index: dll/base.cpp
|
||||
--- dll/base.cpp.orig
|
||||
+++ dll/base.cpp
|
||||
@@ -188,6 +188,10 @@ std::string get_lib_path() {
|
||||
@@ -201,6 +201,10 @@ std::string get_lib_path() {
|
||||
|
||||
return ".";
|
||||
}
|
||||
|
@ -15,7 +15,7 @@ Index: dll/base.cpp
|
|||
#endif
|
||||
|
||||
std::string get_full_lib_path()
|
||||
@@ -224,6 +228,9 @@ std::string get_current_path()
|
||||
@@ -237,6 +241,9 @@ std::string get_current_path()
|
||||
std::string path;
|
||||
#if defined(STEAM_WIN32)
|
||||
char *buffer = _getcwd( NULL, 0 );
|
||||
|
@ -25,7 +25,7 @@ Index: dll/base.cpp
|
|||
#else
|
||||
char *buffer = get_current_dir_name();
|
||||
#endif
|
||||
@@ -246,7 +253,13 @@ std::string canonical_path(std::string path)
|
||||
@@ -259,7 +266,13 @@ std::string canonical_path(std::string path)
|
||||
free(buffer);
|
||||
}
|
||||
#else
|
||||
|
|
|
@ -3,8 +3,8 @@ add OpenBSD includes
|
|||
Index: dll/common_includes.h
|
||||
--- dll/common_includes.h.orig
|
||||
+++ dll/common_includes.h
|
||||
@@ -105,7 +105,7 @@ inline std::wstring utf8_decode(const std::string &str
|
||||
return wstrTo;
|
||||
@@ -104,7 +104,7 @@ inline void reset_LastError()
|
||||
SetLastError(0);
|
||||
}
|
||||
|
||||
-#elif defined(__LINUX__)
|
||||
|
@ -12,20 +12,20 @@ Index: dll/common_includes.h
|
|||
#include <arpa/inet.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
@@ -118,7 +118,11 @@ inline std::wstring utf8_decode(const std::string &str
|
||||
#include <sys/time.h>
|
||||
@@ -118,7 +118,11 @@ inline void reset_LastError()
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
||||
- #include <linux/netdevice.h>
|
||||
+ #if defined(__LINUX__)
|
||||
+ #include <linux/netdevice.h>
|
||||
+ #elif defined(__OpenBSD__)
|
||||
+ #include <net/if.h>
|
||||
+ #include <net/if.h>
|
||||
+ #endif
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
@@ -198,4 +202,4 @@ inline std::wstring utf8_decode(const std::string &str
|
||||
@@ -205,4 +209,4 @@ inline std::string ascii_to_lowercase(std::string data
|
||||
|
||||
#define LOBBY_CONNECT_APPID ((uint32)-2)
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ enable get_broadcast_info for OpenBSD
|
|||
Index: dll/network.cpp
|
||||
--- dll/network.cpp.orig
|
||||
+++ dll/network.cpp
|
||||
@@ -120,7 +120,7 @@ static void get_broadcast_info(uint16 port)
|
||||
@@ -122,7 +122,7 @@ static void get_broadcast_info(uint16 port)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
remove duplicate function definition with only different return type
|
||||
|
||||
Index: sdk_includes/steam_gameserver.h
|
||||
--- sdk_includes/steam_gameserver.h.orig
|
||||
+++ sdk_includes/steam_gameserver.h
|
||||
@@ -62,9 +62,6 @@ const uint16 STEAMGAMESERVER_QUERY_PORT_SHARED = 0xfff
|
||||
// ISteamGameServer::GetNextOutgoingPacket.)
|
||||
// - The version string should be in the form x.x.x.x, and is used by the master server to detect when the
|
||||
// server is out of date. (Only servers with the latest version will be listed.)
|
||||
-#ifndef STEAM_API_EXPORTS
|
||||
-S_API steam_bool SteamGameServer_Init( uint32 unIP, uint16 usSteamPort, uint16 usGamePort, uint16 usQueryPort, EServerMode eServerMode, const char *pchVersionString );
|
||||
-#endif
|
||||
S_API steam_bool S_CALLTYPE SteamInternal_GameServer_Init( uint32 unIP, uint16 usPort, uint16 usGamePort, uint16 usQueryPort, EServerMode eServerMode, const char *pchVersionString );
|
||||
|
||||
// Shutdown SteamGameSeverXxx interfaces, log out, and free resources.
|
|
@ -3,7 +3,7 @@ fix error on 32bit arches with size of ValvePackingSentinel_t
|
|||
Index: sdk_includes/steamclientpublic.h
|
||||
--- sdk_includes/steamclientpublic.h.orig
|
||||
+++ sdk_includes/steamclientpublic.h
|
||||
@@ -1481,7 +1481,7 @@ enum ESteamIPv6ConnectivityState
|
||||
@@ -1521,7 +1521,7 @@ enum ESteamIPv6ConnectivityState
|
||||
// Define compile time assert macros to let us validate the structure sizes.
|
||||
#define VALVE_COMPILE_TIME_ASSERT( pred ) typedef char compile_time_assert_type[(pred) ? 1 : -1];
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@ include/goldberg_emulator/steam/isteamcontroller005.h
|
|||
include/goldberg_emulator/steam/isteamcontroller006.h
|
||||
include/goldberg_emulator/steam/isteamcontroller007.h
|
||||
include/goldberg_emulator/steam/isteamfriends.h
|
||||
include/goldberg_emulator/steam/isteamfriends003.h
|
||||
include/goldberg_emulator/steam/isteamfriends004.h
|
||||
include/goldberg_emulator/steam/isteamfriends005.h
|
||||
include/goldberg_emulator/steam/isteamfriends006.h
|
||||
|
@ -48,6 +49,7 @@ include/goldberg_emulator/steam/isteamfriends015.h
|
|||
include/goldberg_emulator/steam/isteamfriends016.h
|
||||
include/goldberg_emulator/steam/isteamgamecoordinator.h
|
||||
include/goldberg_emulator/steam/isteamgameserver.h
|
||||
include/goldberg_emulator/steam/isteamgameserver004.h
|
||||
include/goldberg_emulator/steam/isteamgameserver005.h
|
||||
include/goldberg_emulator/steam/isteamgameserver008.h
|
||||
include/goldberg_emulator/steam/isteamgameserver009.h
|
||||
|
@ -67,11 +69,16 @@ include/goldberg_emulator/steam/isteamhttp002.h
|
|||
include/goldberg_emulator/steam/isteaminput.h
|
||||
include/goldberg_emulator/steam/isteaminput001.h
|
||||
include/goldberg_emulator/steam/isteaminput002.h
|
||||
include/goldberg_emulator/steam/isteaminput005.h
|
||||
include/goldberg_emulator/steam/isteaminventory.h
|
||||
include/goldberg_emulator/steam/isteaminventory001.h
|
||||
include/goldberg_emulator/steam/isteaminventory002.h
|
||||
include/goldberg_emulator/steam/isteammasterserverupdater.h
|
||||
include/goldberg_emulator/steam/isteammatchmaking.h
|
||||
include/goldberg_emulator/steam/isteammatchmaking002.h
|
||||
include/goldberg_emulator/steam/isteammatchmaking003.h
|
||||
include/goldberg_emulator/steam/isteammatchmaking004.h
|
||||
include/goldberg_emulator/steam/isteammatchmaking005.h
|
||||
include/goldberg_emulator/steam/isteammatchmaking006.h
|
||||
include/goldberg_emulator/steam/isteammatchmaking007.h
|
||||
include/goldberg_emulator/steam/isteammatchmaking008.h
|
||||
|
@ -96,6 +103,7 @@ include/goldberg_emulator/steam/isteamnetworkingsocketsserialized.h
|
|||
include/goldberg_emulator/steam/isteamnetworkingutils.h
|
||||
include/goldberg_emulator/steam/isteamnetworkingutils001.h
|
||||
include/goldberg_emulator/steam/isteamnetworkingutils002.h
|
||||
include/goldberg_emulator/steam/isteamnetworkingutils003.h
|
||||
include/goldberg_emulator/steam/isteamparentalsettings.h
|
||||
include/goldberg_emulator/steam/isteamps3overlayrenderer.h
|
||||
include/goldberg_emulator/steam/isteamremoteplay.h
|
||||
|
@ -130,6 +138,7 @@ include/goldberg_emulator/steam/isteamugc010.h
|
|||
include/goldberg_emulator/steam/isteamugc012.h
|
||||
include/goldberg_emulator/steam/isteamugc013.h
|
||||
include/goldberg_emulator/steam/isteamugc014.h
|
||||
include/goldberg_emulator/steam/isteamugc015.h
|
||||
include/goldberg_emulator/steam/isteamunifiedmessages.h
|
||||
include/goldberg_emulator/steam/isteamuser.h
|
||||
include/goldberg_emulator/steam/isteamuser009.h
|
||||
|
@ -177,6 +186,7 @@ include/goldberg_emulator/steam/steamdatagram_ticketgen.h
|
|||
include/goldberg_emulator/steam/steamdatagram_tickets.h
|
||||
include/goldberg_emulator/steam/steamencryptedappticket.h
|
||||
include/goldberg_emulator/steam/steamhttpenums.h
|
||||
include/goldberg_emulator/steam/steamnetworkingfakeip.h
|
||||
include/goldberg_emulator/steam/steamnetworkingsockets.h
|
||||
include/goldberg_emulator/steam/steamnetworkingtypes.h
|
||||
include/goldberg_emulator/steam/steamps3params.h
|
||||
|
|
Loading…
Reference in New Issue