Github messages for voidlinux
 help / color / mirror / Atom feed
From: biopsin <biopsin@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] New package: etlegacy-2.77.1
Date: Tue, 14 Sep 2021 08:57:27 +0200	[thread overview]
Message-ID: <20210914065727.oZ5pcd07PDgi5mhLsST2n6eQKQ4c6K6enrYN4QyFI_c@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32824@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1669 bytes --]

There is an updated pull request by biopsin against master on the void-packages repository

https://github.com/biopsin/void-packages etlegacy
https://github.com/void-linux/void-packages/pull/32824

[WIP] New package: etlegacy-2.77.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glib)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
[closes https://github.com/void-linux/void-packages/issues/32406]

A patch file from https://github.com/void-linux/void-packages/pull/32824.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-etlegacy-32824.patch --]
[-- Type: text/x-diff, Size: 6452 bytes --]

From 6c515ce0fa13576df734d66a5f614f54f709f17e Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sun, 8 Aug 2021 10:16:06 +0000
Subject: [PATCH] New package: etlegacy-2.77.1

---
 srcpkgs/etlegacy/INSTALL.msg                  |  2 ++
 srcpkgs/etlegacy/REMOVE                       |  8 +++++
 srcpkgs/etlegacy/files/README.voidlinux       | 14 +++++++++
 srcpkgs/etlegacy/files/get-pak.sh             | 16 ++++++++++
 .../etlegacy/patches/expand_arch_branch.patch | 29 +++++++++++++++++
 srcpkgs/etlegacy/patches/fix_musl.patch       | 11 +++++++
 srcpkgs/etlegacy/template                     | 31 +++++++++++++++++++
 7 files changed, 111 insertions(+)
 create mode 100644 srcpkgs/etlegacy/INSTALL.msg
 create mode 100644 srcpkgs/etlegacy/REMOVE
 create mode 100644 srcpkgs/etlegacy/files/README.voidlinux
 create mode 100755 srcpkgs/etlegacy/files/get-pak.sh
 create mode 100644 srcpkgs/etlegacy/patches/expand_arch_branch.patch
 create mode 100644 srcpkgs/etlegacy/patches/fix_musl.patch
 create mode 100644 srcpkgs/etlegacy/template

diff --git a/srcpkgs/etlegacy/INSTALL.msg b/srcpkgs/etlegacy/INSTALL.msg
new file mode 100644
index 000000000000..bf134e9dd5ea
--- /dev/null
+++ b/srcpkgs/etlegacy/INSTALL.msg
@@ -0,0 +1,2 @@
+See /usr/share/doc/etlegacy/README.voidlinux for further 
+installation instructions and troubleshooting information.
diff --git a/srcpkgs/etlegacy/REMOVE b/srcpkgs/etlegacy/REMOVE
new file mode 100644
index 000000000000..5241941773ad
--- /dev/null
+++ b/srcpkgs/etlegacy/REMOVE
@@ -0,0 +1,8 @@
+# REMOVE
+case "${ACTION}" in
+	pre)
+		if [ "${UPDATE}" = "no" ]; then
+			rm /usr/lib/etlegacy/etmain/pak*.pk3
+		fi
+		;;
+esac
diff --git a/srcpkgs/etlegacy/files/README.voidlinux b/srcpkgs/etlegacy/files/README.voidlinux
new file mode 100644
index 000000000000..97c15ba29cec
--- /dev/null
+++ b/srcpkgs/etlegacy/files/README.voidlinux
@@ -0,0 +1,14 @@
+Game depends on original package assets to run and must be
+downloaded manually after the install by executing the 
+provided script in /usr/lib/etlegacy/get-pak.sh as root
+
+    # /usr/lib/etlegacy/get-pak.sh
+
+If download fails, check if host server is reachable
+
+    $  ping -c3 mirror.etlegacy.com 
+
+please reach out on https://teammuppet.com/home/forums/
+for any game issues or just for a general chat.
+
+Have a nice game!
diff --git a/srcpkgs/etlegacy/files/get-pak.sh b/srcpkgs/etlegacy/files/get-pak.sh
new file mode 100755
index 000000000000..c85daa96a91e
--- /dev/null
+++ b/srcpkgs/etlegacy/files/get-pak.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+[ "$(id -u)" -ne 0 ] && echo "Run as root" && exit 1
+
+echo "Downloading 219MB package asset files to run"
+for i in 0 1 2; do
+	xbps-fetch -o /usr/lib/etlegacy/etmain/pak$i.pk3 https://mirror.etlegacy.com/etmain/pak$i.pk3
+done
+
+if [ "$?" -ne 0 ]; then
+	echo ""
+	echo "See /usr/share/doc/etlegacy/README.voidlinux"
+else
+	echo ""
+	echo "Start game with 'etl'"
+fi
diff --git a/srcpkgs/etlegacy/patches/expand_arch_branch.patch b/srcpkgs/etlegacy/patches/expand_arch_branch.patch
new file mode 100644
index 000000000000..352355a09f1b
--- /dev/null
+++ b/srcpkgs/etlegacy/patches/expand_arch_branch.patch
@@ -0,0 +1,29 @@
+--- a/cmake/ETLPlatform.cmake.ori	2021-03-17 09:51:48.000000000 +0100
++++ b/cmake/ETLPlatform.cmake	2021-09-13 21:57:30.274791781 +0200
+@@ -259,6 +259,14 @@
+ 		message(STATUS "Detected ARMV7 target processor")
+ 		set(ARCH "arm")
+ 		#add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1)
++	elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a")
++		set(ARCH "armeabi-v7a")
++	elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
++		set(ARCH "arm64-v8a")
++	elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "ppc64*")
++		set(ARCH "ppc64")
++	elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "ppc*")
++		set(ARCH "ppc")
+ 	else()
+ 		set(ARCH "${CMAKE_SYSTEM_PROCESSOR}")
+ 		message(STATUS "Warning: processor architecture not recognised (${CMAKE_SYSTEM_PROCESSOR})")
+
+--- a/src/qcommon/q_platform.h.ori	2021-03-17 09:51:48.000000000 +0100
++++ b/src/qcommon/q_platform.h	2021-09-13 22:17:09.146901486 +0200
+@@ -218,6 +218,8 @@
+ #define ARCH_STRING "sparc"
+ #elif defined __arm__
+ #define ARCH_STRING "arm" // __ARM_ARCH_'V'__ FIXME: add ARM version to the ARCH_STRING
++#elif defined __aarch64__
++#define ARCH_STRING "arm64-v8a"
+ #elif defined __cris__
+ #define ARCH_STRING "cris"
+ #elif defined __hppa__
diff --git a/srcpkgs/etlegacy/patches/fix_musl.patch b/srcpkgs/etlegacy/patches/fix_musl.patch
new file mode 100644
index 000000000000..9ac2c2f6a6a1
--- /dev/null
+++ b/srcpkgs/etlegacy/patches/fix_musl.patch
@@ -0,0 +1,11 @@
+--- a/src/qcommon/q_platform.h.ori	2021-03-17 09:51:48.000000000 +0100
++++ b/src/qcommon/q_platform.h	2021-09-13 22:14:56.029889098 +0200
+@@ -228,7 +228,7 @@
+ #define ARCH_STRING "sh"
+ #endif
+ 
+-#if __FLOAT_WORD_ORDER == __BIG_ENDIAN
++#if __BYTE_ORDER == __BIG_ENDIAN
+ #define Q3_BIG_ENDIAN
+ #else
+ #define Q3_LITTLE_ENDIAN
diff --git a/srcpkgs/etlegacy/template b/srcpkgs/etlegacy/template
new file mode 100644
index 000000000000..237b5748b308
--- /dev/null
+++ b/srcpkgs/etlegacy/template
@@ -0,0 +1,31 @@
+# Template file for 'etlegacy'
+pkgname=etlegacy
+version=2.77.1
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=/usr \
+ -DCMAKE_INSTALL_PREFIX=/usr -DINSTALL_DEFAULT_BASEDIR=/usr/lib/etlegacy \
+ -DCLIENT_GLVND=1 -DBUNDLED_LIBS=0 -DFEATURE_AUTOUPDATE=0 \
+ -DINSTALL_OMNIBOT=0 -DCROSS_COMPILE32=0"
+hostmakedepends="libtool pkg-config"
+makedepends="libglvnd-devel glew-devel SDL2-devel zlib-devel minizip-devel
+ libjpeg-turbo-devel libcurl-devel lua54-devel libvorbis-devel libtheora-devel freetype-devel
+ libpng-devel sqlite-devel libopenal-devel"
+short_desc="Project based on Wolfenstein: Enemy Territory"
+maintainer="biopsin <biopsin@teknik.io>"
+license="GPL-3.0-or-later"
+homepage="https://www.etlegacy.com"
+changelog="https://github.com/etlegacy/etlegacy/wiki/Changelog.md"
+distfiles="https://github.com/etlegacy/etlegacy/archive/refs/tags/v${version}.tar.gz"
+checksum=730a8a52435884b922d8c280fcdeace648902399798c7a973da72fbc4163ebe2
+lib32disabled=yes
+
+post_install() {
+	vmkdir usr/share
+	vcopy ${DESTDIR}/usr/lib/${pkgname}/share usr/share/${pkgname}
+	rm -rf ${DESTDIR}/usr/lib/${pkgname}/share
+
+	# Readme and vendor script to fetch original pkg assets
+	vdoc $FILESDIR/README.voidlinux
+	vcopy $FILESDIR/get-pak.sh usr/lib/${pkgname}
+}

  parent reply	other threads:[~2021-09-14  6:57 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-03 19:07 [PR PATCH] " biopsin
2021-09-03 19:34 ` [PR PATCH] [Updated] " biopsin
2021-09-03 20:05 ` [PR REVIEW] " Chocimier
2021-09-03 20:05 ` Chocimier
2021-09-03 20:05 ` Chocimier
2021-09-03 20:11 ` biopsin
2021-09-04 18:17 ` biopsin
2021-09-04 18:24 ` Chocimier
2021-09-04 18:27 ` [PR REVIEW] " q66
2021-09-04 18:38 ` biopsin
2021-09-04 20:16 ` ericonr
2021-09-04 20:47 ` biopsin
2021-09-04 20:50 ` biopsin
2021-09-07 13:54 ` [PR REVIEW] " biopsin
2021-09-11 15:09 ` [PR PATCH] [Updated] " biopsin
2021-09-11 15:20 ` [PR PATCH] [Updated] [WIP] " biopsin
2021-09-11 15:28 ` biopsin
2021-09-12  9:02 ` biopsin
2021-09-12  9:03 ` biopsin
2021-09-12 16:31 ` [PR REVIEW] " q66
2021-09-12 16:31 ` q66
2021-09-12 18:21 ` [PR PATCH] [Updated] " biopsin
2021-09-12 18:23 ` [PR REVIEW] " biopsin
2021-09-12 18:26 ` biopsin
2021-09-12 21:26 ` q66
2021-09-12 21:26 ` q66
2021-09-13  5:45 ` [PR PATCH] [Updated] " biopsin
2021-09-13  6:16 ` biopsin
2021-09-13 12:39 ` q66
2021-09-13 12:42 ` q66
2021-09-13 12:44 ` q66
2021-09-13 12:46 ` q66
2021-09-13 16:15 ` biopsin
2021-09-13 17:16 ` [PR REVIEW] " Chocimier
2021-09-13 17:16 ` Chocimier
2021-09-13 17:16 ` Chocimier
2021-09-13 17:16 ` Chocimier
2021-09-13 17:16 ` Chocimier
2021-09-13 17:16 ` Chocimier
2021-09-14  6:57 ` biopsin [this message]
2021-10-01 17:40 ` [PR PATCH] [Updated] " biopsin
2021-10-01 17:41 ` biopsin
2021-10-01 18:19 ` biopsin
2021-10-01 19:48 ` [PR PATCH] [Updated] " biopsin
2021-10-04  7:01 ` biopsin
2021-10-04 16:20 ` [PR REVIEW] New package: etlegacy-2.78.0 Chocimier
2021-10-04 18:25 ` [PR PATCH] [Updated] " biopsin
2021-10-04 18:26 ` [PR REVIEW] " biopsin
2021-11-03 11:49 ` [PR PATCH] [Updated] " biopsin
2021-12-26  9:22 ` [PR PATCH] [Updated] New package: etlegacy-2.78.1 biopsin
2022-04-13  6:03 ` [PR PATCH] [Updated] New package: etlegacy-2.79.0 biopsin
2022-07-13  2:15 ` github-actions
2022-07-13  7:07 ` [PR PATCH] [Updated] " biopsin
2022-07-13  7:11 ` [WIP] New package: etlegacy-2.80.2 biopsin
2022-07-13  7:11 ` [PR PATCH] [Updated] " biopsin
2022-07-13  7:15 ` biopsin
2022-07-13  7:17 ` biopsin
2022-09-18 13:29 ` biopsin
2022-09-20  9:12 ` atk
2022-09-20 11:22 ` biopsin
2022-09-21 19:24 ` rafal1137
2022-11-29 12:43 ` atk
2023-02-28  2:01 ` github-actions
2023-02-28 12:29 ` rafal1137
2023-03-25 10:09 ` [PR PATCH] [Updated] " biopsin
2023-03-25 10:30 ` [WIP] New package: etlegacy-2.81.1 biopsin
2023-06-24  2:05 ` github-actions
2023-07-08  2:05 ` [PR PATCH] [Closed]: " github-actions

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210914065727.oZ5pcd07PDgi5mhLsST2n6eQKQ4c6K6enrYN4QyFI_c@z \
    --to=biopsin@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).