From 885372851f47073e05c14eaef48072bb363ce2a3 Mon Sep 17 00:00:00 2001 From: ologantr Date: Thu, 13 Jan 2022 18:56:35 +0100 Subject: [PATCH 1/2] New package: megaglest-data-3.13.0 --- srcpkgs/megaglest-data/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/megaglest-data/template diff --git a/srcpkgs/megaglest-data/template b/srcpkgs/megaglest-data/template new file mode 100644 index 000000000000..4a30fe38798d --- /dev/null +++ b/srcpkgs/megaglest-data/template @@ -0,0 +1,13 @@ +# Template file for 'megaglest-data' +# Keep this package in sync with megaglest +pkgname=megaglest-data +version=3.13.0 +revision=1 +wrksrc="megaglest-${version}" +build_style=cmake +short_desc="Fork of Glest, a 3D real-time strategy game in a fantastic world" +maintainer="ologantr " +license="CC-BY-SA-3.0" +homepage="https://megaglest.org" +distfiles="https://github.com/MegaGlest/megaglest-data/releases/download/${version}/megaglest-data-${version}.tar.xz" +checksum=43de3ca668f0419e84ec6b37fa41dd6eb88052752a8a11f5e02ea13f86faef46 From 857a3f3f52ef55c235e13b8388c7fa6d7c6ae6ac Mon Sep 17 00:00:00 2001 From: ologantr Date: Thu, 13 Jan 2022 18:57:03 +0100 Subject: [PATCH 2/2] New package: megaglest-3.13.0 --- srcpkgs/megaglest/patches/fix-linking.patch | 58 +++++++++++++++++++++ srcpkgs/megaglest/template | 24 +++++++++ 2 files changed, 82 insertions(+) create mode 100644 srcpkgs/megaglest/patches/fix-linking.patch create mode 100644 srcpkgs/megaglest/template diff --git a/srcpkgs/megaglest/patches/fix-linking.patch b/srcpkgs/megaglest/patches/fix-linking.patch new file mode 100644 index 000000000000..22a62c2ac627 --- /dev/null +++ b/srcpkgs/megaglest/patches/fix-linking.patch @@ -0,0 +1,58 @@ +From 5a3520540276a6fd06f7c88e571b6462978e3eab Mon Sep 17 00:00:00 2001 +From: Jammyjamjamman +Date: Sat, 20 Jun 2020 19:30:01 +0100 +Subject: [PATCH] Add ftp fixes + +--- + source/shared_lib/include/feathery_ftp/ftpTypes.h | 12 ++++++------ + source/shared_lib/sources/feathery_ftp/ftpRuntime.c | 7 +++++++ + 2 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/source/shared_lib/include/feathery_ftp/ftpTypes.h b/source/shared_lib/include/feathery_ftp/ftpTypes.h +index 893102289..ca7310666 100644 +--- a/source/shared_lib/include/feathery_ftp/ftpTypes.h ++++ b/source/shared_lib/include/feathery_ftp/ftpTypes.h +@@ -69,7 +69,7 @@ typedef uint16_t port_t; + extern "C" { + #endif + +-int VERBOSE_MODE_ENABLED; ++extern int VERBOSE_MODE_ENABLED; + + typedef ip_t (*ftpFindExternalFTPServerIpType)(ip_t clientIp); + typedef void (*ftpAddUPNPPortForwardType)(int internalPort, int externalPort); +@@ -77,11 +77,11 @@ typedef void (*ftpRemoveUPNPPortForwardType)(int internalPort, int externalPort) + typedef int (*ftpIsValidClientType)(ip_t clientIp); + typedef int (*ftpIsClientAllowedToGetFileType)(ip_t clientIp, const char *username, const char *filename); + +-ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; +-ftpAddUPNPPortForwardType ftpAddUPNPPortForward; +-ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; +-ftpIsValidClientType ftpIsValidClient; +-ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; ++extern ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; ++extern ftpAddUPNPPortForwardType ftpAddUPNPPortForward; ++extern ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; ++extern ftpIsValidClientType ftpIsValidClient; ++extern ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; + + #ifdef __cplusplus + } +diff --git a/source/shared_lib/sources/feathery_ftp/ftpRuntime.c b/source/shared_lib/sources/feathery_ftp/ftpRuntime.c +index f30c3a732..b49abeda6 100644 +--- a/source/shared_lib/sources/feathery_ftp/ftpRuntime.c ++++ b/source/shared_lib/sources/feathery_ftp/ftpRuntime.c +@@ -30,6 +30,13 @@ + #include "ftp.h" + #include "ftpMessages.h" + ++int VERBOSE_MODE_ENABLED; ++ ++ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; ++ftpAddUPNPPortForwardType ftpAddUPNPPortForward; ++ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; ++ftpIsValidClientType ftpIsValidClient; ++ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; + + /** + * @brief server-sockets that listens for incoming connections diff --git a/srcpkgs/megaglest/template b/srcpkgs/megaglest/template new file mode 100644 index 000000000000..0622b7a1feda --- /dev/null +++ b/srcpkgs/megaglest/template @@ -0,0 +1,24 @@ +# Template file for 'megaglest' +pkgname=megaglest +version=3.13.0 +revision=1 +build_style=cmake +configure_args="-Wno-dev" +hostmakedepends="pkg-config" +makedepends="libcurl-devel SDL2-devel libopenal-devel lua54-devel +libjpeg-turbo-devel libpng-devel freetype-devel +fontconfig-devel glew-devel wxWidgets-devel libxml2-devel +libircclient-devel miniupnpc-devel ftgl-devel +glu-devel libvorbis-devel fribidi-devel libglib-devel" +depends="megaglest-data" +short_desc="Fork of Glest, a 3D real-time strategy game in a fantastic world" +maintainer="ologantr " +license="GPL-3.0-or-later" +homepage="https://megaglest.org" +distfiles="https://github.com/MegaGlest/megaglest-source/releases/download/${version}/megaglest-source-${version}.tar.xz" +checksum=09fef67bc6878b1afbb0b403fec9fcf7dc270d500fdc62ed98e5f210e398ccb9 + +if [ "$XBPS_TARGET_LIBC" = musl ]; then + makedepends+=" libexecinfo-devel" + export LDLIBS="-lexecinfo" +fi