diff options
author | 2024-05-04 19:29:36 +0200 | |
---|---|---|
committer | 2024-05-04 19:29:36 +0200 | |
commit | 6bf80bab2b76f3e35646012c17765ab8cea4a621 (patch) | |
tree | cff7b3fc38a5f8191322f68588b6f9e071caf49e /games | |
parent | e14be76d4f9cd1877b4e5f2449b0a44df8f58430 (diff) | |
download | slackbuilds-6bf80bab2b76f3e35646012c17765ab8cea4a621.tar.gz |
20240504.1 global branch merge.current-20240504.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games')
26 files changed, 968 insertions, 36 deletions
diff --git a/games/0ad-data/0ad-data.SlackBuild b/games/0ad-data/0ad-data.SlackBuild index f0e3c22489..c9a70929ef 100644 --- a/games/0ad-data/0ad-data.SlackBuild +++ b/games/0ad-data/0ad-data.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=0ad-data DATANAM=0ad -VERSION=${VERSION:-0.0.26} +VERSION=${VERSION:-r28035} RELEASE=${RELEASE:-alpha} ARCH=noarch BUILD=${BUILD:-1} diff --git a/games/0ad-data/0ad-data.info b/games/0ad-data/0ad-data.info index 6f9a2ab55c..6065c561ab 100644 --- a/games/0ad-data/0ad-data.info +++ b/games/0ad-data/0ad-data.info @@ -1,8 +1,8 @@ PRGNAM="0ad-data" -VERSION="0.0.26" +VERSION="r28035" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.26-alpha-unix-data.tar.xz" -MD5SUM="b023f0f7045dc020f97be6c0df9f9a7e" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/0ad-r28035-alpha-unix-data.tar.xz" +MD5SUM="103758c3fdd8df505d40f8d7eb3b039f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild index b6c52e7c61..d79e586be8 100644 --- a/games/0ad/0ad.SlackBuild +++ b/games/0ad/0ad.SlackBuild @@ -29,9 +29,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=0ad -VERSION=${VERSION:-0.0.26} +VERSION=${VERSION:-r28035} RELEASE=${RELEASE:-alpha} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} TMP=${TMP:-/tmp/SBo} @@ -93,10 +93,6 @@ export SDL2_CONFIG="/usr/bin/sdl2-config" mkdir -p cargoh export CARGO_HOME="$TMP/$PRGNAM-$VERSION-$RELEASE/cargoh" -#add patches for fmt>9.1.0 ie. 10.1.1 -sed -i 's/, header.GetType()/, static_cast<int>(header.GetType())/g' source/network/NetMessage.cpp -sed -i 's/, arrayType/, static_cast<int>(arrayType)/g' source/simulation2/serialization/BinarySerializer.cpp - # Fix boost names, include paths and remove isystem. commented stuff is fixed upstream already sed -i 's|-mt||g' build/premake/extern_libs5.lua || exit 1 #sed -i 's|/usr/local/include|/usr/include|' build/premake/{extern_libs5.lua,premake5.lua} || exit 1 @@ -113,6 +109,9 @@ sed -i 's|-isystem |-I|' build/premake/premake5/{src/tools/gcc.lua,tests/tools/t # have a root check, let's disable it. patch -p1 < $CWD/disable-root-check.patch +sed -i '/Pyrogenesis/i #include <iomanip>' source/ps/Util.cpp + +CXX=clang++ \ build/workspaces/update-workspaces.sh \ --without-pch \ --bindir=/usr/games \ diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info index 59eb4a4fdf..f1aaf3606a 100644 --- a/games/0ad/0ad.info +++ b/games/0ad/0ad.info @@ -1,10 +1,10 @@ PRGNAM="0ad" -VERSION="0.0.26" +VERSION="r28035" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.26-alpha-unix-build.tar.xz" -MD5SUM="d0d3ed10769dee2254aa196a9619bd57" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/0ad-r28035-alpha-unix-build.tar.xz" +MD5SUM="45c9ebe38e0578c6eade09da81b10105" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="0ad-data enet fmt gloox miniupnpc wxGTK3" +REQUIRES="0ad-data enet fmt gloox miniupnpc wxWidgets" MAINTAINER="Tim Dickson" EMAIL="dickson.tim@googlemail.com" diff --git a/games/astromenace/astromenace.SlackBuild b/games/astromenace/astromenace.SlackBuild index 111003453d..e1efecf581 100644 --- a/games/astromenace/astromenace.SlackBuild +++ b/games/astromenace/astromenace.SlackBuild @@ -79,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i s/\#include\ \<cmath\>/\#include\ \<cmath\>\\n\#include\ \<cstdint\>/ ./src/core/model3d/model3d.cpp + cmake ./ # create Makefile make # build game diff --git a/games/d1x-rebirth/d1x-rebirth.SlackBuild b/games/d1x-rebirth/d1x-rebirth.SlackBuild index f9b3e8f86c..f917151022 100644 --- a/games/d1x-rebirth/d1x-rebirth.SlackBuild +++ b/games/d1x-rebirth/d1x-rebirth.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d1x-rebirth SRCNAM=dxx-rebirth -VERSION=${VERSION:-20220130_7258b7f} +VERSION=${VERSION:-20230520_695e8b9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/d1x-rebirth/d1x-rebirth.info b/games/d1x-rebirth/d1x-rebirth.info index f20bb59a15..488e219d16 100644 --- a/games/d1x-rebirth/d1x-rebirth.info +++ b/games/d1x-rebirth/d1x-rebirth.info @@ -1,8 +1,8 @@ PRGNAM="d1x-rebirth" -VERSION="20220130_7258b7f" +VERSION="20230520_695e8b9" HOMEPAGE="https://www.dxx-rebirth.com/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz" -MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20230520_695e8b9.tar.xz" +MD5SUM="20daa2377b7cd13ada79b12da2b762d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs" diff --git a/games/d2x-rebirth/d2x-rebirth.SlackBuild b/games/d2x-rebirth/d2x-rebirth.SlackBuild index 0cafd4fd74..1145e2fe58 100644 --- a/games/d2x-rebirth/d2x-rebirth.SlackBuild +++ b/games/d2x-rebirth/d2x-rebirth.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d2x-rebirth SRCNAM=dxx-rebirth -VERSION=${VERSION:-20220130_7258b7f} +VERSION=${VERSION:-20230520_695e8b9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/d2x-rebirth/d2x-rebirth.info b/games/d2x-rebirth/d2x-rebirth.info index 4c1f7a9b2e..a35c67c150 100644 --- a/games/d2x-rebirth/d2x-rebirth.info +++ b/games/d2x-rebirth/d2x-rebirth.info @@ -1,8 +1,8 @@ PRGNAM="d2x-rebirth" -VERSION="20220130_7258b7f" +VERSION="20230520_695e8b9" HOMEPAGE="https://www.dxx-rebirth.com/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz" -MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20230520_695e8b9.tar.xz" +MD5SUM="20daa2377b7cd13ada79b12da2b762d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs" diff --git a/games/etlegacy/etlegacy.SlackBuild b/games/etlegacy/etlegacy.SlackBuild index 8e6f118c35..5320f26836 100644 --- a/games/etlegacy/etlegacy.SlackBuild +++ b/games/etlegacy/etlegacy.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Slackware build script for etlegacy -# Copyright 2013-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=etlegacy -VERSION=${VERSION:-2.81.1} +VERSION=${VERSION:-2.82.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/etlegacy/etlegacy.info b/games/etlegacy/etlegacy.info index abc9dc421a..83415083af 100644 --- a/games/etlegacy/etlegacy.info +++ b/games/etlegacy/etlegacy.info @@ -1,10 +1,10 @@ PRGNAM="etlegacy" -VERSION="2.81.1" +VERSION="2.82.0" HOMEPAGE="https://www.etlegacy.com" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.81.1-i386.tar.gz" -MD5SUM="0770c036845a6aae69e984d5403785c6" -DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.81.1-x86_64.tar.gz" -MD5SUM_x86_64="4ccc5fde6b993dc2a4387fd62dba204b" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.82.0-i386.tar.gz" +MD5SUM="0b1a73b1d0b30805d4990aff6067385b" +DOWNLOAD_x86_64="https://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.82.0-x86_64.tar.gz" +MD5SUM_x86_64="18fe1febf6fe32954a6d504b56b35d4a" REQUIRES="%README% etlegacy-data" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/games/higan/higan.SlackBuild b/games/higan/higan.SlackBuild index 39d9901f01..31cd37b92a 100644 --- a/games/higan/higan.SlackBuild +++ b/games/higan/higan.SlackBuild @@ -116,6 +116,8 @@ chown -R root:root . # for its support files if they're not found in ~/.local/share/higan. patch -p1 -i $CWD/higan-flags.diff patch -p1 -i $CWD/higan-paths.diff +# 20240131 KEC: gcc-13.x compatibility +patch -p1 -i $CWD/includes.diff # 20181212 bkw: audio system stuff. Upstream doesn't give us a way to # disable these on the make command line, but hacking this file works: diff --git a/games/higan/includes.diff b/games/higan/includes.diff new file mode 100644 index 0000000000..09b1a5bc2b --- /dev/null +++ b/games/higan/includes.diff @@ -0,0 +1,8 @@ +--- higan-106.orig/nall/arithmetic/natural.hpp 2024-01-31 09:12:37.166634947 +0900 ++++ higan-106/nall/arithmetic/natural.hpp 2024-01-31 09:12:58.147526383 +0900 +@@ -1,3 +1,5 @@ ++#include <stdexcept> ++ + #define ConcatenateType(Size) uint##Size##_t + #define DeclareType(Size) ConcatenateType(Size) + diff --git a/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch b/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch new file mode 100644 index 0000000000..9f8a1111e4 --- /dev/null +++ b/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch @@ -0,0 +1,374 @@ +From f42fa9a604f9f4faa1addd1b02c491cd0fe59736 Mon Sep 17 00:00:00 2001 +From: "grover92000@gmail.com" <grover92000@gmail.com> +Date: Sat, 20 Apr 2024 13:29:24 -0400 +Subject: [PATCH] Changes for boost-1.85 + +--- + src/core/common/avatarmanager.cpp | 49 +++++++++++++++++++ + src/core/common/loghelper_server.cpp | 4 ++ + src/engine/log.cpp | 4 ++ + src/engine/log.h | 4 ++ + .../qt/qttools/nonqthelper/nonqthelper.cpp | 8 +++ + src/net/common/clientstate.cpp | 19 +++++++ + src/net/common/clientthread.cpp | 4 ++ + src/net/common/downloaderthread.cpp | 8 +++ + src/net/common/serverlobbythread.cpp | 8 +++ + src/net/common/uploaderthread.cpp | 4 ++ + src/pokerth_server.cpp | 4 ++ + 11 files changed, 116 insertions(+) + +diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp +index d137a5c44..9b2f4abaa 100644 +--- a/src/core/common/avatarmanager.cpp ++++ b/src/core/common/avatarmanager.cpp +@@ -87,20 +87,36 @@ AvatarManager::Init(const string &dataDir, const string &cacheDir) + path tmpDataPath(dataDir); + { + boost::mutex::scoped_lock lock(m_cacheDirMutex); ++#if BOOST_VERSION < 108500 + m_cacheDir = tmpCachePath.directory_string(); ++#else ++ m_cacheDir = tmpCachePath.string(); ++#endif + } + { + boost::mutex::scoped_lock lock(m_avatarsMutex); ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").directory_string(), m_avatars); ++#else ++ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").string(), m_avatars); ++#endif + retVal = retVal && tmpRet; ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").directory_string(), m_avatars); ++#else ++ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").string(), m_avatars); ++#endif + retVal = retVal && tmpRet; + } + if (cacheDir.empty() || tmpCachePath.empty()) + LOG_ERROR("Cache directory was not set!"); + else { + boost::mutex::scoped_lock lock(m_cachedAvatarsMutex); ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory(tmpCachePath.directory_string(), m_cachedAvatars); ++#else ++ tmpRet = InternalReadDirectory(tmpCachePath.string(), m_cachedAvatars); ++#endif + retVal = retVal && tmpRet; + } + +@@ -113,7 +129,11 @@ AvatarManager::AddSingleAvatar(const std::string &fileName) + { + bool retVal = false; + path filePath(fileName); ++#if BOOST_VERSION < 108500 + string tmpFileName(filePath.file_string()); ++#else ++ string tmpFileName(filePath.string()); ++#endif + + if (!fileName.empty() && !tmpFileName.empty()) { + unsigned outFileSize = 0; +@@ -240,7 +260,11 @@ AvatarManager::GetAvatarFileType(const string &fileName) + AvatarFileType fileType; + + path filePath(fileName); ++#if BOOST_VERSION < 108500 + string ext(extension(filePath)); ++#else ++ string ext(filePath.extension().string()); ++#endif + if (boost::algorithm::iequals(ext, ".png")) + fileType = AVATAR_FILE_TYPE_PNG; + else if (boost::algorithm::iequals(ext, ".jpg") || boost::algorithm::iequals(ext, ".jpeg")) +@@ -362,7 +386,11 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil + if (IsValidAvatarFileType(avatarFileType, data, size)) { + path tmpPath(cacheDir); + tmpPath /= (md5buf.ToString() + ext); ++#if BOOST_VERSION < 108500 + string fileName(tmpPath.file_string()); ++#else ++ string fileName(tmpPath.string()); ++#endif + std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); + if (!o.fail()) { + o.write((const char *)data, size); +@@ -426,7 +454,11 @@ AvatarManager::RemoveOldAvatarCacheEntries() + } + try { + path cachePath(cacheDir); ++#if BOOST_VERSION < 108500 + cacheDir = cachePath.directory_string(); ++#else ++ cacheDir = cachePath.string(); ++#endif + // Never delete anything if we do not have a special cache dir set. + if (!cacheDir.empty()) { + boost::mutex::scoped_lock lock(m_cachedAvatarsMutex); +@@ -441,12 +473,20 @@ AvatarManager::RemoveOldAvatarCacheEntries() + while (i != end) { + bool keepFile = false; + path filePath(i->second); ++#if BOOST_VERSION < 108500 + string fileString(filePath.file_string()); ++#else ++ string fileString(filePath.string()); ++#endif + // Only consider files which are definitely in the cache dir. + if (fileString.size() > cacheDir.size() && fileString.substr(0, cacheDir.size()) == cacheDir) { + // Only consider files with MD5 as file name. + MD5Buf tmpBuf; ++#if BOOST_VERSION < 108500 + if (exists(filePath) && tmpBuf.FromString(basename(filePath))) { ++#else ++ if (exists(filePath) && tmpBuf.FromString(filePath.stem().string())) { ++#endif + timeMap.insert(TimeAvatarMap::value_type(last_write_time(filePath), i->first)); + keepFile = true; + } +@@ -520,10 +560,19 @@ AvatarManager::InternalReadDirectory(const std::string &dir, AvatarMap &avatars) + directory_iterator end; + + while (i != end) { ++#if BOOST_VERSION < 108500 + if (is_regular(i->status())) { + string md5sum(basename(i->path())); ++#else ++ if (is_regular_file(i->status())) { ++ string md5sum(i->path().stem().string()); ++#endif + MD5Buf md5buf; ++#if BOOST_VERSION < 108500 + string fileName(i->path().file_string()); ++#else ++ string fileName(i->path().string()); ++#endif + if (md5buf.FromString(md5sum)) { + // Only consider files with md5sum as name. + avatars.insert(AvatarMap::value_type(md5buf, fileName)); +diff --git a/src/core/common/loghelper_server.cpp b/src/core/common/loghelper_server.cpp +index a0d0350ed..f3e8366b2 100644 +--- a/src/core/common/loghelper_server.cpp ++++ b/src/core/common/loghelper_server.cpp +@@ -59,7 +59,11 @@ loghelper_init(const string &logDir, int logLevel) + path tmpLogFile(logDir); + tmpLogFile /= SERVER_MSG_LOG_FILE_NAME; + ++#if BOOST_VERSION < 108500 + g_logFile = tmpLogFile.directory_string(); ++#else ++ g_logFile = tmpLogFile.string(); ++#endif + g_logLevel = logLevel; + } + +diff --git a/src/engine/log.cpp b/src/engine/log.cpp +index 1f50fde2e..c6fe7f8e1 100644 +--- a/src/engine/log.cpp ++++ b/src/engine/log.cpp +@@ -84,7 +84,11 @@ Log::init() + mySqliteLogFileName /= string("pokerth-log-") + curDateTime + ".pdb"; + + // open sqlite-db ++#if BOOST_VERSION < 108500 + sqlite3_open(mySqliteLogFileName.directory_string().c_str(), &mySqliteLogDb); ++#else ++ sqlite3_open(mySqliteLogFileName.string().c_str(), &mySqliteLogDb); ++#endif + if( mySqliteLogDb != 0 ) { + + int i; +diff --git a/src/engine/log.h b/src/engine/log.h +index 7dbf2514d..0a79c5377 100644 +--- a/src/engine/log.h ++++ b/src/engine/log.h +@@ -73,7 +73,11 @@ class Log + + std::string getMySqliteLogFileName() + { ++#if BOOST_VERSION < 108500 + return mySqliteLogFileName.directory_string(); ++#else ++ return mySqliteLogFileName.string(); ++#endif + } + + private: +diff --git a/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp b/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp +index 2acfeeb45..bdc625b4a 100644 +--- a/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp ++++ b/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp +@@ -65,7 +65,15 @@ std::string + NonQtHelper::getDataPathStdString(const char *argv0) + { + boost::filesystem::path startPath(argv0); ++#if BOOST_VERSION < 108500 + startPath = startPath.remove_leaf(); ++#else ++ startPath = startPath.remove_filename(); ++#endif + startPath /= "data"; ++#if BOOST_VERSION < 108500 + return stringToUtf8(startPath.directory_string()); ++#else ++ return stringToUtf8(startPath.string()); ++#endif + } +diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp +index d7fc7285a..9d35e99ff 100644 +--- a/src/net/common/clientstate.cpp ++++ b/src/net/common/clientstate.cpp +@@ -211,7 +211,11 @@ ClientStateStartServerListDownload::Enter(boost::shared_ptr<ClientThread> client + } else { + // Download the server list. + boost::shared_ptr<DownloadHelper> downloader(new DownloadHelper); ++#if BOOST_VERSION < 108500 + downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.directory_string()); ++#else ++ downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.string()); ++#endif + ClientStateDownloadingServerList::Instance().SetDownloadHelper(downloader); + client->SetState(ClientStateDownloadingServerList::Instance()); + } +@@ -303,13 +307,24 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client) + path zippedServerListPath(context.GetCacheDir()); + zippedServerListPath /= context.GetServerListUrl().substr(context.GetServerListUrl().find_last_of('/') + 1); + path xmlServerListPath; ++#if BOOST_VERSION < 108500 + if (extension(zippedServerListPath) == ".z") { + xmlServerListPath = change_extension(zippedServerListPath, ""); ++#else ++ if (zippedServerListPath.extension().string() == ".z") { ++ xmlServerListPath = zippedServerListPath; ++ xmlServerListPath.replace_extension(""); ++#endif + + // Unzip the file using zlib. + try { ++#if BOOST_VERSION < 108500 + std::ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary); + std::ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc); ++#else ++ std::ifstream inFile(zippedServerListPath.string().c_str(), ios_base::in | ios_base::binary); ++ std::ofstream outFile(xmlServerListPath.string().c_str(), ios_base::out | ios_base::trunc); ++#endif + boost::iostreams::filtering_streambuf<boost::iostreams::input> in; + in.push(boost::iostreams::zlib_decompressor()); + in.push(inFile); +@@ -321,7 +336,11 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client) + xmlServerListPath = zippedServerListPath; + + // Parse the server address. ++#if BOOST_VERSION < 108500 + TiXmlDocument doc(xmlServerListPath.directory_string()); ++#else ++ TiXmlDocument doc(xmlServerListPath.string()); ++#endif + + if (doc.LoadFile()) { + client->ClearServerInfoMap(); +diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp +index dee5daf68..e24413d14 100644 +--- a/src/net/common/clientthread.cpp ++++ b/src/net/common/clientthread.cpp +@@ -977,7 +977,11 @@ ClientThread::GetCacheServerListFileName() + size_t pos = serverListUrl.find_last_of('/'); + if (!GetContext().GetCacheDir().empty() && !serverListUrl.empty() && pos != string::npos && ++pos < serverListUrl.length()) { + tmpServerListPath /= serverListUrl.substr(pos); ++#if BOOST_VERSION < 108500 + fileName = tmpServerListPath.directory_string(); ++#else ++ fileName = tmpServerListPath.string(); ++#endif + } + return fileName; + } +diff --git a/src/net/common/downloaderthread.cpp b/src/net/common/downloaderthread.cpp +index 56a9526ec..7984cb410 100644 +--- a/src/net/common/downloaderthread.cpp ++++ b/src/net/common/downloaderthread.cpp +@@ -96,7 +96,11 @@ DownloaderThread::Main() + // Previous download was finished. + if (m_curDownloadData) { + path filepath(m_curDownloadData->filename); ++#if BOOST_VERSION < 108500 + std::ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary); ++#else ++ std::ifstream instream(filepath.string().c_str(), ios_base::in | ios_base::binary); ++#endif + // Find out file size. + // Not fully portable, but works on win/linux/mac. + instream.seekg(0, ios_base::beg); +@@ -132,7 +136,11 @@ DownloaderThread::Main() + } + if (m_curDownloadData && !m_curDownloadData->filename.empty()) { + path filepath(m_curDownloadData->filename); ++#if BOOST_VERSION < 108500 + m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string()); ++#else ++ m_downloadHelper->Init(m_curDownloadData->address, filepath.string()); ++#endif + m_downloadInProgress = true; + } + } +diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp +index 1cb341eaa..d3964895d 100644 +--- a/src/net/common/serverlobbythread.cpp ++++ b/src/net/common/serverlobbythread.cpp +@@ -277,7 +277,11 @@ ServerLobbyThread::Init(const string &logDir) + boost::filesystem::path logPath(logDir); + if (!logDir.empty()) { + logPath /= SERVER_STATISTICS_FILE_NAME; ++#if BOOST_VERSION < 108500 + m_statisticsFileName = logPath.directory_string(); ++#else ++ m_statisticsFileName = logPath.string(); ++#endif + ReadStatisticsFile(); + } + } +@@ -1264,7 +1268,11 @@ ServerLobbyThread::HandleNetPacketAvatarEnd(boost::shared_ptr<SessionData> sessi + // Init finished - start session. + EstablishSession(session); + LOG_MSG("Client \"" << session->GetClientAddr() << "\" uploaded avatar \"" ++#if BOOST_VERSION < 108500 + << boost::filesystem::path(avatarFileName).file_string() << "\"."); ++#else ++ << boost::filesystem::path(avatarFileName).string() << "\"."); ++#endif + } else + SessionError(session, ERR_NET_WRONG_AVATAR_SIZE); + } +diff --git a/src/net/common/uploaderthread.cpp b/src/net/common/uploaderthread.cpp +index f1eefea6c..ecf1436d9 100644 +--- a/src/net/common/uploaderthread.cpp ++++ b/src/net/common/uploaderthread.cpp +@@ -94,7 +94,11 @@ UploaderThread::Main() + url += filepath.filename().string(); + #endif + } ++#if BOOST_VERSION < 108500 + m_uploadHelper->Init(url, filepath.file_string(), data.user, data.pwd, data.filesize, data.httpPost); ++#else ++ m_uploadHelper->Init(url, filepath.string(), data.user, data.pwd, data.filesize, data.httpPost); ++#endif + m_uploadInProgress = true; + } + } +diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp +index 450a47e9d..1ee0db80e 100644 +--- a/src/pokerth_server.cpp ++++ b/src/pokerth_server.cpp +@@ -158,7 +158,11 @@ main(int argc, char *argv[]) + if (pidFile.empty()) { + path tmpPidPath(myConfig->readConfigString("LogDir")); + tmpPidPath /= "pokerth.pid"; ++#if BOOST_VERSION < 108500 + pidFile = tmpPidPath.directory_string(); ++#else ++ pidFile = tmpPidPath.string(); ++#endif + } + { + std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc); diff --git a/games/pokerth/pokerth.SlackBuild b/games/pokerth/pokerth.SlackBuild index 338635b115..456fff3fc5 100644 --- a/games/pokerth/pokerth.SlackBuild +++ b/games/pokerth/pokerth.SlackBuild @@ -88,6 +88,7 @@ find -L . \ patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch ) patch -p1 < $CWD/patches/pokerth-1.1.2-newer-protobuf.patch +patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.85.patch qmake-qt5 QMAKE_CFLAGS_ISYSTEM= -spec linux-g++ pokerth.pro make diff --git a/games/ppsspp/ppsspp.SlackBuild b/games/ppsspp/ppsspp.SlackBuild index cda92afb6c..7282983268 100644 --- a/games/ppsspp/ppsspp.SlackBuild +++ b/games/ppsspp/ppsspp.SlackBuild @@ -87,6 +87,10 @@ sed -i -e '/include(ccache)/d' CMakeLists.txt # set git-version sed -i "s/unknown/${VERSION}/" git-version.cmake +# Build the internal ffmpeg (it's the only one supported by upstream) +( cd ffmpeg + ./linux_x86-64.sh ) + if [ "${QT:-OFF}" = "ON" ]; then cmake -B build-qt \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -95,7 +99,6 @@ if [ "${QT:-OFF}" = "ON" ]; then -DCMAKE_SKIP_RPATH=TRUE \ -DUSING_QT_UI=ON \ -DUSE_SYSTEM_LIBZIP=ON \ - -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_DISCORD=OFF \ -DUSE_SYSTEM_ZSTD=ON \ -DCMAKE_BUILD_TYPE=Release @@ -111,7 +114,6 @@ cmake -B build-sdl \ -DCMAKE_SKIP_RPATH=TRUE \ -DUSING_QT_UI=OFF \ -DUSE_SYSTEM_LIBZIP=ON \ - -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_DISCORD=OFF \ -DUSE_SYSTEM_ZSTD=ON \ -DCMAKE_BUILD_TYPE=Release diff --git a/games/snes9x/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch b/games/snes9x/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch new file mode 100644 index 0000000000..cb08f0d87a --- /dev/null +++ b/games/snes9x/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch @@ -0,0 +1,29 @@ +From 2afe4a11d43e8767cbeb90372177d4b580384e9a Mon Sep 17 00:00:00 2001 +From: BearOso <bearoso@gmail.com> +Date: Mon, 1 May 2023 11:38:54 -0500 +Subject: [PATCH] CI acting funky. See if this fixes it. + +--- + vulkan/vulkan_context.hpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/vulkan/vulkan_context.hpp b/vulkan/vulkan_context.hpp +index cfc29eda2..33ec20c5f 100644 +--- a/vulkan/vulkan_context.hpp ++++ b/vulkan/vulkan_context.hpp +@@ -7,6 +7,8 @@ + #undef WINVER + #define WINVER 0x599 + #endif ++#include <cstdio> ++#include <cstdint> + #include "vk_mem_alloc.hpp" + #include "vulkan/vulkan.hpp" + #include "vulkan_swapchain.hpp" +@@ -64,4 +66,4 @@ class Context + vk::CommandBuffer one_time_use_cmd; + }; + +-} // namespace Vulkan +\ No newline at end of file ++} // namespace Vulkan diff --git a/games/snes9x/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch b/games/snes9x/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch new file mode 100644 index 0000000000..af1866533e --- /dev/null +++ b/games/snes9x/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch @@ -0,0 +1,28 @@ +From b383b94c8c94e3a28b09e7dd3d72cac2a783ba55 Mon Sep 17 00:00:00 2001 +From: BearOso <bearoso@gmail.com> +Date: Sun, 30 Apr 2023 17:18:39 -0500 +Subject: [PATCH] slang: Fix CI build. + +--- + vulkan/slang_shader.hpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/vulkan/slang_shader.hpp b/vulkan/slang_shader.hpp +index 8af9f48d9..6e24bcd8d 100644 +--- a/vulkan/slang_shader.hpp ++++ b/vulkan/slang_shader.hpp +@@ -1,6 +1,7 @@ + #pragma once + #include <string> + #include <vector> ++#include <cstdint> + + struct SlangShader + { +@@ -101,4 +102,4 @@ struct SlangShader + int ubo_binding; + std::vector<Uniform> uniforms; + std::vector<Sampler> samplers; +-}; +\ No newline at end of file ++}; diff --git a/games/snes9x/snes9x.SlackBuild b/games/snes9x/snes9x.SlackBuild index ad26551806..a48e38a0a1 100644 --- a/games/snes9x/snes9x.SlackBuild +++ b/games/snes9x/snes9x.SlackBuild @@ -84,6 +84,9 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +patch -p1 < $CWD/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch +patch -p1 < $CWD/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch + WITHPULSE=yes if [ "$PULSE" = "no" ] || ! pkg-config --exists libpulse; then PULSEOPT="-DUSE_PULSEAUDIO=OFF" diff --git a/games/supertux/gcc12.patch b/games/supertux/gcc12.patch new file mode 100644 index 0000000000..f5e7392c3c --- /dev/null +++ b/games/supertux/gcc12.patch @@ -0,0 +1,11 @@ +diff -upr SuperTux-v0.6.3-Source.orig/external/partio_zip/zip_manager.cpp SuperTux-v0.6.3-Source/external/partio_zip/zip_manager.cpp +--- SuperTux-v0.6.3-Source.orig/external/partio_zip/zip_manager.cpp 2021-12-23 01:01:58.000000000 +0200 ++++ SuperTux-v0.6.3-Source/external/partio_zip/zip_manager.cpp 2022-06-13 15:20:45.305976668 +0300 +@@ -47,6 +47,7 @@ extern "C"{ + #include <stdexcept> + #include <cstring> + #include <string> ++#include <memory> + + #include "zip_manager.hpp" + diff --git a/games/supertux/missing-include-for-FLT_EPSILON.patch b/games/supertux/missing-include-for-FLT_EPSILON.patch new file mode 100644 index 0000000000..44bc370a74 --- /dev/null +++ b/games/supertux/missing-include-for-FLT_EPSILON.patch @@ -0,0 +1,13 @@ +diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp +index 41de52e..a8ebfc9 100644 +--- a/src/supertux/game_session.cpp ++++ b/src/supertux/game_session.cpp +@@ -14,6 +14,8 @@ + // You should have received a copy of the GNU General Public License + // along with this program. If not, see <http://www.gnu.org/licenses/>. + ++#include <cfloat> ++ + #include "supertux/game_session.hpp" + + #include "audio/sound_manager.hpp" diff --git a/games/supertux/supertux.SlackBuild b/games/supertux/supertux.SlackBuild index a492e216aa..26795a4bbd 100644 --- a/games/supertux/supertux.SlackBuild +++ b/games/supertux/supertux.SlackBuild @@ -84,6 +84,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/gcc12.patch +patch -p1 < $CWD/missing-include-for-FLT_EPSILON.patch + mkdir -p build cd build cmake \ diff --git a/games/tome/aur-tome4.patch b/games/tome/aur-tome4.patch new file mode 100644 index 0000000000..7c24269af3 --- /dev/null +++ b/games/tome/aur-tome4.patch @@ -0,0 +1,457 @@ +diff -Naur orig/build/runner.lua new/build/runner.lua +--- orig/build/runner.lua 2014-05-19 10:42:12.000000000 +0200 ++++ new/build/runner.lua 2020-10-30 23:01:51.861023690 +0100 +@@ -24,28 +24,28 @@ + files { "../src/runner/main.c", "../src/getself.c" } + links { "m" } + +- configuration "linux" ++ filter "system:linux" + links { "dl", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + +- configuration "bsd" ++ filter "system:bsd" + links { "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32", "wsock32" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + linkoptions { "../src/windows/icon.res" } + +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + linkoptions { "-framework SDL", "-framework SDL_image", "-framework SDL_ttf", "-framework SDL_mixer", "-framework Cocoa", "-framework OpenGL" } + links { "IOKit" } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/t-engine ../t-engine", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/t-engine ../t-engine", } + + project "te4runner" +@@ -58,19 +58,19 @@ + files { "../src/runner/runner.c", "../src/physfs.c", "../src/auxiliar.c" } + links { "runner-physfs", "runner-lua", "m" } + +- configuration "linux" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } +- configuration "bsd" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } +- +- configuration "windows" +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:linux" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } ++ filter "system:bsd" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } ++ ++ filter "system:windows" ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/te4runner.tec ../", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/te4runner.tec ../", } + + project "runner-physfs" +@@ -83,13 +83,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL.framework/Headers" } + +diff -Naur orig/build/te4core.lua new/build/te4core.lua +--- orig/build/te4core.lua 2019-10-03 15:35:43.000000000 +0200 ++++ new/build/te4core.lua 2020-10-30 23:05:15.066698600 +0100 +@@ -40,11 +40,11 @@ + links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip", "te4-wfc", "utf8proc" } + if _OPTIONS.discord then defines { "DISCORD_TE4" } end + defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "TE4CORE_VERSION="..TE4CORE_VERSION } + buildoptions { "-O3" } + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + + if _OPTIONS.relpath == "32" then defines{"TE4_RELPATH32"} end + if _OPTIONS.relpath == "64" then defines{"TE4_RELPATH64"} end +@@ -63,7 +63,7 @@ + prelinkcommands { "i686-pc-mingw32-ranlib ../bin/Debug/*.a" } + end + +- configuration "macosx" ++ filter "system:macosx" + files { "../src/mac/SDL*" } + includedirs { + "/System/Library/Frameworks/OpenGL.framework/Headers", +@@ -84,7 +84,7 @@ + "/usr/local/include", + "/usr/local/opt/libpng12/include", + } +- defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH='"/Library/Application Support/T-Engine/"']] } ++ defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH="/Library/Application Support/T-Engine/"]] } + linkoptions { + "-framework Cocoa", + "-framework OpenGL", +@@ -108,9 +108,9 @@ + targetdir "." + links { "IOKit" } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "OpenAL32", "vorbisfile", "opengl32", "glu32", "wsock32", "png" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + if _OPTIONS.wincross then + prebuildcommands { "i686-pc-mingw32-windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + else +@@ -118,33 +118,33 @@ + end + linkoptions { "../src/windows/icon.res" } + linkoptions { "-mwindows" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + libdirs {"/opt/SDL-2.0/lib/"} + links { "dl", "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } + linkoptions { "-Wl,-E" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + if steamlin64 then steamlin64() end + +- configuration "bsd" ++ filter "system:bsd" + libdirs {"/usr/local/lib/"} + links { "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Debug/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Release/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +@@ -165,13 +165,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL2.framework/Headers" } + +@@ -230,7 +230,7 @@ + defines { "LJ_ABI_SOFTFP=0" } + end + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"', +@@ -238,7 +238,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/minilua ../src/luajit2/src/host/", } +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"', +@@ -332,7 +332,7 @@ + + files { "../src/luajit2/src/host/buildvm*.c" } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"', +@@ -344,7 +344,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/buildvm ../src/luajit2/src/", } +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"', +@@ -367,7 +367,7 @@ + files { "../src/luajit2/src/*.c", "../src/luajit2/src/*.s", "../src/luajit2/src/lj_vm.s", "../src/luajit2/src/lj_bcdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_libdef.h", "../src/luajit2/src/lj_recdef.h", "../src/luajit2/src/lj_folddef.h" } + excludes { "../src/luajit2/src/buildvm*.c", "../src/luajit2/src/luajit.c", "../src/luajit2/src/ljamalg.c" } + +- configuration "linux" ++ filter "system:linux" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -381,7 +381,7 @@ + } + end + +- configuration "bsd" ++ filter "system:bsd" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -395,7 +395,7 @@ + } + end + +- configuration "macosx" ++ filter "system:macosx" + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ + "../src/luajit2/src/buildvm -m machasm -o ../src/luajit2/src/lj_vm.s", +@@ -407,7 +407,7 @@ + "../src/luajit2/src/buildvm -m folddef -o ../src/luajit2/src/lj_folddef.h ../src/luajit2/src/lj_opt_fold.c", + } + +- configuration "windows" ++ filter "system:windows" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -429,7 +429,7 @@ + targetname "luasocket" + buildoptions { "-O2" } + +- configuration "not windows" ++ filter "system:not windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -445,7 +445,7 @@ + "../src/luasocket/usocket.c", + "../src/luasocket/mime.c", + } +- configuration "windows" ++ filter "system:windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -583,21 +583,21 @@ + buildoptions { "-O3", "-std=c++11" } + cppconfig("web") + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end + + files { "../src/web-cef3/*.cpp", } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "windows" ++ filter "system:windows" + defines { 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"} + libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"} + includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"} +@@ -619,19 +619,19 @@ + "../src/web-cef3/spawn.cpp", + } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "linux" ++ filter "system:linux" + buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"} + libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"} + includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"} + links { "cef", "cef_dll_wrapper" } +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + defines { 'SELFEXE_LINUX' } + end + +@@ -641,7 +641,7 @@ + + if _OPTIONS.discord and not _OPTIONS['discord-nolib'] then + project "te4-discord" +- configuration "linux" ++ filter "system:linux" + kind "SharedLib" + language "C++" + targetname "discord-rpc" +@@ -654,11 +654,11 @@ + files { "../src/discord-rpc/src/discord-rpc.cpp", "../src/discord-rpc/src/rpc_connection.cpp", "../src/discord-rpc/src/serialization.cpp", } + files { "../src/discord-rpc/src/connection_unix.cpp", "../src/discord-rpc/src/discord_register_linux.cpp", } + +- configuration "windows" ++ filter "system:windows" + kind "SharedLib" + -- Empty + +- configuration "macosx" ++ filter "system:macosx" + kind "SharedLib" + -- Empty + end +diff -Naur orig/premake5.lua new/premake5.lua +--- orig/premake5.lua 2019-09-13 11:46:14.000000000 +0200 ++++ new/premake5.lua 2020-10-30 23:04:41.500196031 +0100 +@@ -1,6 +1,6 @@ + dofile("build/options.lua") + +-solution "TEngine" ++workspace "TEngine" + configurations { "Debug", "Release" } + objdir "obj" + defines {"GLEW_STATIC"} +@@ -30,7 +30,7 @@ + } + else + includedirs { +- "/opt/SDL-2.0/include/SDL2", ++ "/usr/include/SDL2", + "/usr/include/GL", + } + end +@@ -42,7 +42,7 @@ + dofile("steamworks/build/steam-def.lua") + end + +-configuration "bsd" ++filter "system:bsd" + libdirs { + "/usr/local/lib", + } +@@ -51,7 +51,7 @@ + } + + if _OPTIONS.wincross then +-configuration "windows" ++filter "system:windows" + libdirs { + "/Test/xcompile/local//lib", + } +@@ -60,7 +60,7 @@ + "/Test/xcompile/local/include", + } + else +-configuration "windows" ++filter "system:windows" + libdirs { + "/c/code/SDL/lib", + } +@@ -72,7 +72,7 @@ + end + + cppconfig = function(what) +- if os.get() == "macosx" then ++ if os.target() == "macosx" then + if what == "web" then + buildoptions { "-stdlib=libstdc++" } + linkoptions { "-stdlib=libstdc++" } +@@ -84,9 +84,8 @@ + -- links { "stdc++" } + end + +-configuration "macosx" +- premake.gcc.cc = 'clang' +- premake.gcc.cxx = 'clang++' ++filter "system:macosx" ++ toolset("clang") + + buildoptions { "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk", "-mmacosx-version-min=10.7" } + includedirs { +@@ -95,9 +94,9 @@ + "/Library/Frameworks/SDL2_ttf.framework/Headers", + } + +-configuration "Debug" ++filter "Debug" + defines { } +- flags { "Symbols" } ++ symbols "On" + buildoptions { "-ggdb" } + -- buildoptions { "-O3" } + targetdir "bin/Debug" +@@ -105,9 +104,10 @@ + if _OPTIONS.pedantic then buildoptions { "-Wall" } end + defines {"TE4_LUA_ALLOW_GENERIC_IO"} + +-configuration "Release" ++filter "Release" + defines { "NDEBUG=1" } +- flags { "Optimize", "NoFramePointer" } ++ optimize "On" ++ omitframepointer "On" + buildoptions { "-O2" } + targetdir "bin/Release" + diff --git a/games/tome/tome.SlackBuild b/games/tome/tome.SlackBuild index 403559c078..b31b3aa0b6 100644 --- a/games/tome/tome.SlackBuild +++ b/games/tome/tome.SlackBuild @@ -79,11 +79,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# correction of SDL2 headers directory -sed -i "s/opt\/SDL-2.0/usr/" premake4.lua +cp premake4.lua premake5.lua +patch -p1 < $CWD/aur-tome4.patch # build game -premake4 gmake +premake5 gmake env -u ARCH make find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/games/tome/tome.info b/games/tome/tome.info index 0c38f5245c..506961c8cf 100644 --- a/games/tome/tome.info +++ b/games/tome/tome.info @@ -5,6 +5,6 @@ DOWNLOAD="https://te4.org/dl/t-engine/t-engine4-src-1.7.6.tar.bz2" MD5SUM="31e78cd88b383a3a8667e2fd90abfd2b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="premake" +REQUIRES="premake5" MAINTAINER="Dimitris Zlatanidis" EMAIL="dslackw@gmail.com" diff --git a/games/warzone2100/warzone2100.SlackBuild b/games/warzone2100/warzone2100.SlackBuild index 5cf5a0cef6..e7f643a08f 100644 --- a/games/warzone2100/warzone2100.SlackBuild +++ b/games/warzone2100/warzone2100.SlackBuild @@ -95,7 +95,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=alloc-zero -Wno-error=array-bounds" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_MANDIR=/usr/man \ |