[-- Attachment #1: Type: text/plain, Size: 1593 bytes --] There is a new 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 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 --> 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: 3148 bytes --] From 2dcd71af2c5bb65f0ca4c1b2db8f98a6ca599898 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 | 19 +++++++++++++++++++ srcpkgs/etlegacy/REMOVE | 8 ++++++++ srcpkgs/etlegacy/template | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/INSTALL b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..fd472dede498 --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,19 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "Game depends on original package blobs to run, so lets fetch them" + echo "" + curl -o /usr/lib/etlegacy/etmain/pak0.pk3 "https://mirror.etlegacy.com/etmain/pak0.pk3" && \ + curl -o /usr/lib/etlegacy/etmain/pak1.pk3 "https://mirror.etlegacy.com/etmain/pak1.pk3" && \ + curl -o /usr/lib/etlegacy/etmain/pak2.pk3 "https://mirror.etlegacy.com/etmain/pak2.pk3" + res=$? + if test "$res" != "0"; then + echo "" + echo "Download failed, sorry game won't run: exit code $res" + echo "" + fi + fi + ;; +esac 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/template b/srcpkgs/etlegacy/template new file mode 100644 index 000000000000..9f48de65c9e2 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,32 @@ +# 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" +hostmakedepends="libtool pkg-config curl" +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" +depends="curl" +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" +distfiles="https://github.com/etlegacy/etlegacy/archive/refs/tags/v${version}.tar.gz" +checksum=730a8a52435884b922d8c280fcdeace648902399798c7a973da72fbc4163ebe2 + +case "${XBPS_TARGET_MACHINE}" in + x86_64*) configure_args+=" -DCROSS_COMPILE32=0";; + i686*) configure_args+=" -DCROSS_COMPILE32=1";; + *) broken="This architecture is not currently supported";; +esac + +post_install() { + mkdir ${DESTDIR}/usr/share + mv ${DESTDIR}/usr/lib/${pkgname}/share ${DESTDIR}/usr/share/etlegacy +}
[-- Attachment #1: Type: text/plain, Size: 1663 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 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: 3143 bytes --] From 239f4c0253e55a8d38d97a396ab943017a7ba206 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 | 19 +++++++++++++++++++ srcpkgs/etlegacy/REMOVE | 8 ++++++++ srcpkgs/etlegacy/template | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/INSTALL b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..fd472dede498 --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,19 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "Game depends on original package blobs to run, so lets fetch them" + echo "" + curl -o /usr/lib/etlegacy/etmain/pak0.pk3 "https://mirror.etlegacy.com/etmain/pak0.pk3" && \ + curl -o /usr/lib/etlegacy/etmain/pak1.pk3 "https://mirror.etlegacy.com/etmain/pak1.pk3" && \ + curl -o /usr/lib/etlegacy/etmain/pak2.pk3 "https://mirror.etlegacy.com/etmain/pak2.pk3" + res=$? + if test "$res" != "0"; then + echo "" + echo "Download failed, sorry game won't run: exit code $res" + echo "" + fi + fi + ;; +esac 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/template b/srcpkgs/etlegacy/template new file mode 100644 index 000000000000..29da064b4a93 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,32 @@ +# 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" +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" +depends="curl" +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" +distfiles="https://github.com/etlegacy/etlegacy/archive/refs/tags/v${version}.tar.gz" +checksum=730a8a52435884b922d8c280fcdeace648902399798c7a973da72fbc4163ebe2 + +case "${XBPS_TARGET_MACHINE}" in + x86_64*) configure_args+=" -DCROSS_COMPILE32=0";; + i686*) configure_args+=" -DCROSS_COMPILE32=1";; + *) broken="This architecture is not currently supported";; +esac + +post_install() { + mkdir ${DESTDIR}/usr/share + mv ${DESTDIR}/usr/lib/${pkgname}/share ${DESTDIR}/usr/share/etlegacy +}
[-- Attachment #1: Type: text/plain, Size: 162 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r702136019 Comment: vmkdir, vcopy
[-- Attachment #1: Type: text/plain, Size: 211 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r702135875 Comment: Build files suggest that cross compiling for arm is an option.
[-- Attachment #1: Type: text/plain, Size: 268 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r702135302 Comment: Doing that install time is bad idea. This should be left as exercise to the player, or buildtime by restricted package.
[-- Attachment #1: Type: text/plain, Size: 222 bytes --] New review comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r702138851 Comment: Yea, I knew this would be a wrestle of sort, I'll take a new swing at it :)
[-- Attachment #1: Type: text/plain, Size: 419 bytes --] New review comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r702313337 Comment: @Chocimier is it doable to vendor a script for the enduser to manually execute post install time? Im hesitant to restrict it as a first resort, since its expected to know xbps-src. I eyeballed a just nonfree option; would also be considered a misuse and 219MB of bloat.
[-- Attachment #1: Type: text/plain, Size: 322 bytes --] New comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-913017924 Comment: > vendor a script for the enduser to manually execute post install time Fine. Try to use xbps-fetch to minimize dependencies. Please don't call sudo/doas/... on people's behalf.
[-- Attachment #1: Type: text/plain, Size: 410 bytes --] New review comment by q66 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r702314238 Comment: this whole block just looks wrong the purpose of CROSS_COMPILE32 as far as I can tell is to force a 32-bit build on a 64-bit x86 host, since x86_64 game is not compatible with 32-bit x86 binary mods I also don't see anything blocking function on other CPU archs
[-- Attachment #1: Type: text/plain, Size: 294 bytes --] New review comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r702315367 Comment: Ive added the blocking function, just strugling wrapping my head around the cross compile block. I'll ponder some more, thank you for the comment.
[-- Attachment #1: Type: text/plain, Size: 244 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-913034726 Comment: Have you considered making it restricted? Then the game files could be fetched at build time just fine.
[-- Attachment #1: Type: text/plain, Size: 268 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-913038584 Comment: @ericonr `Im hesitant to restrict it as a first resort, since its expected to know xbps-src.` or do I Interpreting it wrongly?
[-- Attachment #1: Type: text/plain, Size: 329 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-913038584 Comment: @ericonr `Im hesitant to restrict it as a first resort, since its expected to know xbps-src.` or do I Interpreting it wrongly? However if its the most sensable approach I'll fly with it.
[-- Attachment #1: Type: text/plain, Size: 520 bytes --] New review comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r703533085 Comment: @q66 mind eyeball this block once more before push.. This eliminates the "--Forcing i386 to cross compile 32bit" build i686 on x86_64 host, however I have'nt tested other way around. ``` archs="i686* x86_64*" if [ -z "$CROSS_BUILD" ] && [ "$XBPS_WORDSIZE" = 32 ]; then configure_args+=" -DCROSS_COMPILE32=1" else configure_args+=" -DCROSS_COMPILE32=0" fi ```
[-- Attachment #1: Type: text/plain, Size: 1663 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 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: 4022 bytes --] From 60f03dc3bcc3ad88ad83474c402f78c5282b0671 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 | 14 ++++++++++++ srcpkgs/etlegacy/REMOVE | 8 +++++++ srcpkgs/etlegacy/files/get-pak.sh | 23 +++++++++++++++++++ srcpkgs/etlegacy/template | 38 +++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE create mode 100755 srcpkgs/etlegacy/files/get-pak.sh create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/INSTALL b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..e28b3c9bfbe0 --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,14 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "*********************************************************************" + echo " !! Important read !! " + echo " The game depends on original package assets to run and must " + echo " be downloaded manually by executing the provided script in " + echo " /usr/lib/etlegacy/get-pak.sh as root. " + echo "*********************************************************************" + fi + ;; +esac 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/get-pak.sh b/srcpkgs/etlegacy/files/get-pak.sh new file mode 100755 index 000000000000..d0d0c7a70b21 --- /dev/null +++ b/srcpkgs/etlegacy/files/get-pak.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +echo "" +echo "Game depends on original package blobs to run, so lets fetch 219MB.." +echo "" + +if [[ $EUID != 0 ]]; then + echo "..and the script must be run as root" + exit 1 +fi + +for i in {0..2}; do + xbps-fetch -o /usr/lib/etlegacy/etmain/pak$i.pk3 https://mirror.etlegacy.com/etmain/pak$i.pk3 +done + +res=$? +if [[ "$res" != "0" ]]; then + echo "" + echo "Download failed, sorry the game won't run." +else + echo "" + echo "Done. Start game with 'etl'" +fi diff --git a/srcpkgs/etlegacy/template b/srcpkgs/etlegacy/template new file mode 100644 index 000000000000..0b99612b8347 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,38 @@ +# 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" +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" +distfiles="https://github.com/etlegacy/etlegacy/archive/refs/tags/v${version}.tar.gz" +checksum=730a8a52435884b922d8c280fcdeace648902399798c7a973da72fbc4163ebe2 +restricted=yes + +archs="i686* x86_64*" +if [ -z "$CROSS_BUILD" ] && [ "$XBPS_WORDSIZE" = 32 ]; then + configure_args+=" -DCROSS_COMPILE32=1" +else + configure_args+=" -DCROSS_COMPILE32=0" +fi + +post_install() { + vlicense COPYING.txt LICENSE + + vcopy ${DESTDIR}/usr/lib/${pkgname}/share usr/share/${pkgname} + rm -rf ${DESTDIR}/usr/lib/${pkgname}/share + + # Vendored script to fetch original pkg blobs + vcopy ${FILESDIR}/get-pak.sh usr/lib/${pkgname} +}
[-- 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: 3979 bytes --] From 2bc84c9f8141a0756614bfe20265309ffac37e1f 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 | 14 ++++++++++++ srcpkgs/etlegacy/REMOVE | 8 +++++++ srcpkgs/etlegacy/files/get-pak.sh | 23 +++++++++++++++++++ srcpkgs/etlegacy/template | 37 +++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE create mode 100755 srcpkgs/etlegacy/files/get-pak.sh create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/INSTALL b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..e28b3c9bfbe0 --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,14 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "*********************************************************************" + echo " !! Important read !! " + echo " The game depends on original package assets to run and must " + echo " be downloaded manually by executing the provided script in " + echo " /usr/lib/etlegacy/get-pak.sh as root. " + echo "*********************************************************************" + fi + ;; +esac 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/get-pak.sh b/srcpkgs/etlegacy/files/get-pak.sh new file mode 100755 index 000000000000..d0d0c7a70b21 --- /dev/null +++ b/srcpkgs/etlegacy/files/get-pak.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +echo "" +echo "Game depends on original package blobs to run, so lets fetch 219MB.." +echo "" + +if [[ $EUID != 0 ]]; then + echo "..and the script must be run as root" + exit 1 +fi + +for i in {0..2}; do + xbps-fetch -o /usr/lib/etlegacy/etmain/pak$i.pk3 https://mirror.etlegacy.com/etmain/pak$i.pk3 +done + +res=$? +if [[ "$res" != "0" ]]; then + echo "" + echo "Download failed, sorry the game won't run." +else + echo "" + echo "Done. Start game with 'etl'" +fi diff --git a/srcpkgs/etlegacy/template b/srcpkgs/etlegacy/template new file mode 100644 index 000000000000..a52157839fe6 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,37 @@ +# 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" +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" +distfiles="https://github.com/etlegacy/etlegacy/archive/refs/tags/v${version}.tar.gz" +checksum=730a8a52435884b922d8c280fcdeace648902399798c7a973da72fbc4163ebe2 +restricted=yes + +archs="i686* x86_64*" +if [ -z "$CROSS_BUILD" ]; then + configure_args+=" -DCROSS_COMPILE32=1" +else + configure_args+=" -DCROSS_COMPILE32=0" +fi + +post_install() { + vmkdir usr/share + vcopy ${DESTDIR}/usr/lib/${pkgname}/share usr/share/${pkgname} + rm -rf ${DESTDIR}/usr/lib/${pkgname}/share + + # Vendored script to fetch original pkg blobs + vcopy ${FILESDIR}/get-pak.sh usr/lib/${pkgname} +}
[-- 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: 3964 bytes --] From 7be288f3c2e8fc3e43b478b96ce75d304e163ce7 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 | 14 ++++++++++++ srcpkgs/etlegacy/REMOVE | 8 +++++++ srcpkgs/etlegacy/files/get-pak.sh | 23 ++++++++++++++++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE create mode 100755 srcpkgs/etlegacy/files/get-pak.sh create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/INSTALL b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..e28b3c9bfbe0 --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,14 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "*********************************************************************" + echo " !! Important read !! " + echo " The game depends on original package assets to run and must " + echo " be downloaded manually by executing the provided script in " + echo " /usr/lib/etlegacy/get-pak.sh as root. " + echo "*********************************************************************" + fi + ;; +esac 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/get-pak.sh b/srcpkgs/etlegacy/files/get-pak.sh new file mode 100755 index 000000000000..d0d0c7a70b21 --- /dev/null +++ b/srcpkgs/etlegacy/files/get-pak.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +echo "" +echo "Game depends on original package blobs to run, so lets fetch 219MB.." +echo "" + +if [[ $EUID != 0 ]]; then + echo "..and the script must be run as root" + exit 1 +fi + +for i in {0..2}; do + xbps-fetch -o /usr/lib/etlegacy/etmain/pak$i.pk3 https://mirror.etlegacy.com/etmain/pak$i.pk3 +done + +res=$? +if [[ "$res" != "0" ]]; then + echo "" + echo "Download failed, sorry the game won't run." +else + echo "" + echo "Done. Start game with 'etl'" +fi diff --git a/srcpkgs/etlegacy/template b/srcpkgs/etlegacy/template new file mode 100644 index 000000000000..06c6fd82cf85 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# 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" +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" +distfiles="https://github.com/etlegacy/etlegacy/archive/refs/tags/v${version}.tar.gz" +checksum=730a8a52435884b922d8c280fcdeace648902399798c7a973da72fbc4163ebe2 + +archs="i686* x86_64*" +if [ -z "$CROSS_BUILD" ]; then + configure_args+=" -DCROSS_COMPILE32=0" +else + configure_args+=" -DCROSS_COMPILE32=1" +fi + +post_install() { + vmkdir usr/share + vcopy ${DESTDIR}/usr/lib/${pkgname}/share usr/share/${pkgname} + rm -rf ${DESTDIR}/usr/lib/${pkgname}/share + + # Vendored script to fetch original pkg blobs + vcopy ${FILESDIR}/get-pak.sh usr/lib/${pkgname} +}
[-- 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: 4002 bytes --] From 4d672f570f3a95153a2750593a79d5f1a6b0f390 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 | 14 ++++++++++++ srcpkgs/etlegacy/REMOVE | 8 +++++++ srcpkgs/etlegacy/files/get-pak.sh | 23 ++++++++++++++++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE create mode 100755 srcpkgs/etlegacy/files/get-pak.sh create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/INSTALL b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..e28b3c9bfbe0 --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,14 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "*********************************************************************" + echo " !! Important read !! " + echo " The game depends on original package assets to run and must " + echo " be downloaded manually by executing the provided script in " + echo " /usr/lib/etlegacy/get-pak.sh as root. " + echo "*********************************************************************" + fi + ;; +esac 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/get-pak.sh b/srcpkgs/etlegacy/files/get-pak.sh new file mode 100755 index 000000000000..d0d0c7a70b21 --- /dev/null +++ b/srcpkgs/etlegacy/files/get-pak.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +echo "" +echo "Game depends on original package blobs to run, so lets fetch 219MB.." +echo "" + +if [[ $EUID != 0 ]]; then + echo "..and the script must be run as root" + exit 1 +fi + +for i in {0..2}; do + xbps-fetch -o /usr/lib/etlegacy/etmain/pak$i.pk3 https://mirror.etlegacy.com/etmain/pak$i.pk3 +done + +res=$? +if [[ "$res" != "0" ]]; then + echo "" + echo "Download failed, sorry the game won't run." +else + echo "" + echo "Done. Start game with 'etl'" +fi diff --git a/srcpkgs/etlegacy/template b/srcpkgs/etlegacy/template new file mode 100644 index 000000000000..b6c4cf5adaa7 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.77.1 +revision=1 +build_style=cmake +archs="arm* i686 x86_64*" +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" +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" +distfiles="https://github.com/etlegacy/etlegacy/archive/refs/tags/v${version}.tar.gz" +checksum=730a8a52435884b922d8c280fcdeace648902399798c7a973da72fbc4163ebe2 + +if [ "$CROSS_BUILD" ] || [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then + configure_args+=" -DCROSS_COMPILE32=0" +else + configure_args+=" -DCROSS_COMPILE32=1" +fi + +post_install() { + vmkdir usr/share + vcopy ${DESTDIR}/usr/lib/${pkgname}/share usr/share/${pkgname} + rm -rf ${DESTDIR}/usr/lib/${pkgname}/share + + # Vendored script to fetch original pkg blobs + vcopy ${FILESDIR}/get-pak.sh usr/lib/${pkgname} +}
[-- 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: 4002 bytes --] From 418a5e92ecc2de8fcf1fd071c2ba616c10cb38b1 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 | 14 ++++++++++++ srcpkgs/etlegacy/REMOVE | 8 +++++++ srcpkgs/etlegacy/files/get-pak.sh | 23 ++++++++++++++++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE create mode 100755 srcpkgs/etlegacy/files/get-pak.sh create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/INSTALL b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..e28b3c9bfbe0 --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,14 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "*********************************************************************" + echo " !! Important read !! " + echo " The game depends on original package assets to run and must " + echo " be downloaded manually by executing the provided script in " + echo " /usr/lib/etlegacy/get-pak.sh as root. " + echo "*********************************************************************" + fi + ;; +esac 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/get-pak.sh b/srcpkgs/etlegacy/files/get-pak.sh new file mode 100755 index 000000000000..d0d0c7a70b21 --- /dev/null +++ b/srcpkgs/etlegacy/files/get-pak.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +echo "" +echo "Game depends on original package blobs to run, so lets fetch 219MB.." +echo "" + +if [[ $EUID != 0 ]]; then + echo "..and the script must be run as root" + exit 1 +fi + +for i in {0..2}; do + xbps-fetch -o /usr/lib/etlegacy/etmain/pak$i.pk3 https://mirror.etlegacy.com/etmain/pak$i.pk3 +done + +res=$? +if [[ "$res" != "0" ]]; then + echo "" + echo "Download failed, sorry the game won't run." +else + echo "" + echo "Done. Start game with 'etl'" +fi diff --git a/srcpkgs/etlegacy/template b/srcpkgs/etlegacy/template new file mode 100644 index 000000000000..174ba0d96675 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.77.1 +revision=1 +archs="arm* i686 x86_64*" +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" +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" +distfiles="https://github.com/etlegacy/etlegacy/archive/refs/tags/v${version}.tar.gz" +checksum=730a8a52435884b922d8c280fcdeace648902399798c7a973da72fbc4163ebe2 + +if [ "$CROSS_BUILD" ] || [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then + configure_args+=" -DCROSS_COMPILE32=0" +else + configure_args+=" -DCROSS_COMPILE32=1" +fi + +post_install() { + vmkdir usr/share + vcopy ${DESTDIR}/usr/lib/${pkgname}/share usr/share/${pkgname} + rm -rf ${DESTDIR}/usr/lib/${pkgname}/share + + # Vendored script to fetch original pkg blobs + vcopy ${FILESDIR}/get-pak.sh usr/lib/${pkgname} +}
[-- Attachment #1: Type: text/plain, Size: 149 bytes --] New review comment by q66 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r706861725 Comment: remove
[-- Attachment #1: Type: text/plain, Size: 149 bytes --] New review comment by q66 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r706861698 Comment: remove
[-- 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: 3819 bytes --] From eda210d5b782dae1f8bce8c44f66159c4dcea2e4 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 | 14 ++++++++++++++ srcpkgs/etlegacy/REMOVE | 8 ++++++++ srcpkgs/etlegacy/files/get-pak.sh | 23 +++++++++++++++++++++++ srcpkgs/etlegacy/template | 29 +++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE create mode 100755 srcpkgs/etlegacy/files/get-pak.sh create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/INSTALL b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..e28b3c9bfbe0 --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,14 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "*********************************************************************" + echo " !! Important read !! " + echo " The game depends on original package assets to run and must " + echo " be downloaded manually by executing the provided script in " + echo " /usr/lib/etlegacy/get-pak.sh as root. " + echo "*********************************************************************" + fi + ;; +esac 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/get-pak.sh b/srcpkgs/etlegacy/files/get-pak.sh new file mode 100755 index 000000000000..d0d0c7a70b21 --- /dev/null +++ b/srcpkgs/etlegacy/files/get-pak.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +echo "" +echo "Game depends on original package blobs to run, so lets fetch 219MB.." +echo "" + +if [[ $EUID != 0 ]]; then + echo "..and the script must be run as root" + exit 1 +fi + +for i in {0..2}; do + xbps-fetch -o /usr/lib/etlegacy/etmain/pak$i.pk3 https://mirror.etlegacy.com/etmain/pak$i.pk3 +done + +res=$? +if [[ "$res" != "0" ]]; then + echo "" + echo "Download failed, sorry the game won't run." +else + echo "" + echo "Done. Start game with 'etl'" +fi diff --git a/srcpkgs/etlegacy/template b/srcpkgs/etlegacy/template new file mode 100644 index 000000000000..e1e9130905c4 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,29 @@ +# 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" +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" +distfiles="https://github.com/etlegacy/etlegacy/archive/refs/tags/v${version}.tar.gz" +checksum=730a8a52435884b922d8c280fcdeace648902399798c7a973da72fbc4163ebe2 + +post_install() { + vmkdir usr/share + vcopy ${DESTDIR}/usr/lib/${pkgname}/share usr/share/${pkgname} + rm -rf ${DESTDIR}/usr/lib/${pkgname}/share + + # Vendored script to fetch original pkg blobs + vcopy ${FILESDIR}/get-pak.sh usr/lib/${pkgname} +}
[-- Attachment #1: Type: text/plain, Size: 236 bytes --] New review comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r706874893 Comment: Sorry, the -DCROSS_COMPILE32 flag has me completely confused. Pushed again omiting flag.
[-- Attachment #1: Type: text/plain, Size: 196 bytes --] New review comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r706875281 Comment: It defaults to 32-bit without -DCROSS_COMPILE32=0
[-- Attachment #1: Type: text/plain, Size: 199 bytes --] New review comment by q66 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r706914932 Comment: then always use -DCROSS_COMPILE32 without any condition
[-- Attachment #1: Type: text/plain, Size: 201 bytes --] New review comment by q66 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r706914932 Comment: then always use -DCROSS_COMPILE32=0 without any condition
[-- 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: 3839 bytes --] From 62c524874d4a6cbf5e194f65db3ee3155898ddd4 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 | 14 ++++++++++++++ srcpkgs/etlegacy/REMOVE | 8 ++++++++ srcpkgs/etlegacy/files/get-pak.sh | 23 +++++++++++++++++++++++ srcpkgs/etlegacy/template | 29 +++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE create mode 100755 srcpkgs/etlegacy/files/get-pak.sh create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/INSTALL b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..e28b3c9bfbe0 --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,14 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "*********************************************************************" + echo " !! Important read !! " + echo " The game depends on original package assets to run and must " + echo " be downloaded manually by executing the provided script in " + echo " /usr/lib/etlegacy/get-pak.sh as root. " + echo "*********************************************************************" + fi + ;; +esac 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/get-pak.sh b/srcpkgs/etlegacy/files/get-pak.sh new file mode 100755 index 000000000000..d0d0c7a70b21 --- /dev/null +++ b/srcpkgs/etlegacy/files/get-pak.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +echo "" +echo "Game depends on original package blobs to run, so lets fetch 219MB.." +echo "" + +if [[ $EUID != 0 ]]; then + echo "..and the script must be run as root" + exit 1 +fi + +for i in {0..2}; do + xbps-fetch -o /usr/lib/etlegacy/etmain/pak$i.pk3 https://mirror.etlegacy.com/etmain/pak$i.pk3 +done + +res=$? +if [[ "$res" != "0" ]]; then + echo "" + echo "Download failed, sorry the game won't run." +else + echo "" + echo "Done. Start game with 'etl'" +fi diff --git a/srcpkgs/etlegacy/template b/srcpkgs/etlegacy/template new file mode 100644 index 000000000000..25f20158d39d --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,29 @@ +# 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" +distfiles="https://github.com/etlegacy/etlegacy/archive/refs/tags/v${version}.tar.gz" +checksum=730a8a52435884b922d8c280fcdeace648902399798c7a973da72fbc4163ebe2 + +post_install() { + vmkdir usr/share + vcopy ${DESTDIR}/usr/lib/${pkgname}/share usr/share/${pkgname} + rm -rf ${DESTDIR}/usr/lib/${pkgname}/share + + # Vendored script to fetch original pkg blobs + vcopy ${FILESDIR}/get-pak.sh usr/lib/${pkgname} +}
[-- Attachment #1: Type: text/plain, Size: 379 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-917875214 Comment: The i686 becomes a multilib x86_64 pkg, I understand this is wrong. I've being strugling isolating this outcome without any sound logic, makes me wonder if I should just override the compiler and the -m32 flag and pass it conditionaly.
[-- Attachment #1: Type: text/plain, Size: 940 bytes --] New comment by q66 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-918149767 Comment: you should set `lib32disabled=yes` in the template (see other templates that set it) the default behavior of xbps-src is to take 32-bit binaries when building for i686 and make them into x86_64 multilib packages; it's not a property of the build you should also create a patch for this file's section and add it into the PR https://github.com/etlegacy/etlegacy/blob/master/src/qcommon/q_platform.h#L220 the patch should add a new conditional branch: ``` #elif defined __aarch64__ #define ARCH_STRING "aarch64" ``` also, this part of the file should get patched https://github.com/etlegacy/etlegacy/blob/master/src/qcommon/q_platform.h#L231 as `__FLOAT_WORD_ORDER` does not exist on musl - so the `__FLOAT_WORD_ORDER == __BIG_ENDIAN` should get changed to `__BYTE_ORDER == __BIG_ENDIAN`
[-- Attachment #1: Type: text/plain, Size: 942 bytes --] New comment by q66 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-918149767 Comment: you should set `lib32disabled=yes` in the template (see other templates that set it) the default behavior of xbps-src is to take 32-bit binaries when building for i686 and make them into x86_64 multilib packages; it's not a property of the build you should also create a patch for this file's section and add it into the PR https://github.com/etlegacy/etlegacy/blob/master/src/qcommon/q_platform.h#L220 the patch should add a new conditional branch: ``` #elif defined __aarch64__ #define ARCH_STRING "arm64-v8a" ``` also, this part of the file should get patched https://github.com/etlegacy/etlegacy/blob/master/src/qcommon/q_platform.h#L231 as `__FLOAT_WORD_ORDER` does not exist on musl - so the `__FLOAT_WORD_ORDER == __BIG_ENDIAN` should get changed to `__BYTE_ORDER == __BIG_ENDIAN`
[-- Attachment #1: Type: text/plain, Size: 428 bytes --] New comment by q66 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-918153662 Comment: you should also patch a new conditional branch here: https://github.com/etlegacy/etlegacy/blob/master/cmake/ETLPlatform.cmake#L282 ``` elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "ppc64*") set(ARCH "ppc64") elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc*") set(ARCH "ppc") ```
[-- Attachment #1: Type: text/plain, Size: 427 bytes --] New comment by q66 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-918153662 Comment: you should also patch a new conditional branch here: https://github.com/etlegacy/etlegacy/blob/master/cmake/ETLPlatform.cmake#L282 ``` elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "ppc64*") set(ARCH "ppc64") elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "ppc*") set(ARCH "ppc") ```
[-- Attachment #1: Type: text/plain, Size: 412 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-918353702 Comment: q66 Thank you for the big help, elaborate explanation and spoonfeed! `lib32disabled=yes` and `CROSS_COMPILE32=0` produces the correct outputs for i686 and x86_64-glibc. I will take the patch suggestions up with upstream as well ,hopefully it will make the next release.
[-- Attachment #1: Type: text/plain, Size: 185 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r707530801 Comment: This fits more into readme.voidlinux
[-- Attachment #1: Type: text/plain, Size: 216 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r707532359 Comment: changelog="https://github.com/etlegacy/etlegacy/wiki/Changelog.md"
[-- Attachment #1: Type: text/plain, Size: 159 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r707531024 Comment: #!/bin/sh
[-- Attachment #1: Type: text/plain, Size: 174 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r707531297 Comment: if [ "$EUID" != 0 ]; then
[-- Attachment #1: Type: text/plain, Size: 168 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r707531452 Comment: for i in 0 1 2; do
[-- Attachment #1: Type: text/plain, Size: 176 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r707531624 Comment: if [ "$res" != "0" ]; then
[-- 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} +}
[-- Attachment #1: Type: text/plain, Size: 1663 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 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: 5050 bytes --] From d1aab97adea5f10ccf23b0708371a8da3420ee8e 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 | 14 +++++++++ srcpkgs/etlegacy/REMOVE | 8 +++++ .../etlegacy/patches/expand_arch_branch.patch | 29 +++++++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 +++++++ srcpkgs/etlegacy/template | 28 ++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE 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 b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..8a54a89f042c --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,14 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "Downloading 219MB essential asset files for game 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 + ecgo "" + echo "Run game with 'etl'" + fi + ;; +esac 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/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..9d26517939e4 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,28 @@ +# 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 +restricted=yes + +post_install() { + vmkdir usr/share + vcopy ${DESTDIR}/usr/lib/${pkgname}/share usr/share/${pkgname} + rm -rf ${DESTDIR}/usr/lib/${pkgname}/share +}
[-- Attachment #1: Type: text/plain, Size: 193 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-932430431 Comment: Reverted changes and made it a restricted package.
[-- Attachment #1: Type: text/plain, Size: 227 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-932430431 Comment: Reverted changes and made it a restricted package. edit: my container tz is messed up
[-- Attachment #1: Type: text/plain, Size: 1663 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 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: 5050 bytes --] From f997b8b999754fcf36b326b9e089afa2b45eccf6 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 | 14 +++++++++ srcpkgs/etlegacy/REMOVE | 8 +++++ .../etlegacy/patches/expand_arch_branch.patch | 29 +++++++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 +++++++ srcpkgs/etlegacy/template | 28 ++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE 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 b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..8a54a89f042c --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,14 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "Downloading 219MB essential asset files for game 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 + ecgo "" + echo "Run game with 'etl'" + fi + ;; +esac 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/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..9d26517939e4 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,28 @@ +# 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 +restricted=yes + +post_install() { + vmkdir usr/share + vcopy ${DESTDIR}/usr/lib/${pkgname}/share usr/share/${pkgname} + rm -rf ${DESTDIR}/usr/lib/${pkgname}/share +}
[-- Attachment #1: Type: text/plain, Size: 1663 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 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: 4714 bytes --] From 0808831cec606d7adf4104dd53326eadba030f7c 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.78.0 --- srcpkgs/etlegacy/INSTALL | 14 ++++++++++ srcpkgs/etlegacy/REMOVE | 8 ++++++ .../etlegacy/patches/expand_arch_branch.patch | 26 +++++++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 ++++++++ srcpkgs/etlegacy/template | 22 ++++++++++++++++ 5 files changed, 81 insertions(+) create mode 100644 srcpkgs/etlegacy/INSTALL create mode 100644 srcpkgs/etlegacy/REMOVE 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 b/srcpkgs/etlegacy/INSTALL new file mode 100644 index 000000000000..8a54a89f042c --- /dev/null +++ b/srcpkgs/etlegacy/INSTALL @@ -0,0 +1,14 @@ +# INSTALL +case "${ACTION}" in + post) + if [ "${UPDATE}" = "no" ]; then + echo "" + echo "Downloading 219MB essential asset files for game 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 + ecgo "" + echo "Run game with 'etl'" + fi + ;; +esac 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/patches/expand_arch_branch.patch b/srcpkgs/etlegacy/patches/expand_arch_branch.patch new file mode 100644 index 000000000000..5f2d7e922f5a --- /dev/null +++ b/srcpkgs/etlegacy/patches/expand_arch_branch.patch @@ -0,0 +1,26 @@ +--- 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 +@@ -279,6 +279,10 @@ + 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..e532cf0ab0ec --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,22 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.78.0 +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=14acf392bb4f0a627842792f96684755d2df6c0c083e61938d2eb8f873652d7b +lib32disabled=yes +restricted=yes
[-- Attachment #1: Type: text/plain, Size: 297 bytes --] New review comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r721519850 Comment: Again, doing that install time is bad idea. If package is restricted, this can be done buildtime with `distfiles`, `skip_extraction` and `vinstall`.
[-- Attachment #1: Type: text/plain, Size: 1663 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 New package: etlegacy-2.78.0 <!-- 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: 4187 bytes --] From 225bbfe40fa8a4f2b257a774a3c34fd4aaad9656 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.78.0 --- .../etlegacy/patches/expand_platform.patch | 26 ++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 ++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 srcpkgs/etlegacy/patches/expand_platform.patch create mode 100644 srcpkgs/etlegacy/patches/fix_musl.patch create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/patches/expand_platform.patch b/srcpkgs/etlegacy/patches/expand_platform.patch new file mode 100644 index 000000000000..5f2d7e922f5a --- /dev/null +++ b/srcpkgs/etlegacy/patches/expand_platform.patch @@ -0,0 +1,26 @@ +--- 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 +@@ -279,6 +279,10 @@ + 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..716fe8322821 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.78.0 +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 + https://mirror.etlegacy.com/etmain/pak0.pk3 + https://mirror.etlegacy.com/etmain/pak1.pk3 + https://mirror.etlegacy.com/etmain/pak2.pk3" +checksum="14acf392bb4f0a627842792f96684755d2df6c0c083e61938d2eb8f873652d7b + 712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5 + 5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d + a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e" +skip_extraction="pak0.pk3 pak1.pk3 pak2.pk3" +lib32disabled=yes +restricted=yes + +post_install() { + for i in 0 1 2; do + vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/pak$i.pk3 644 \ + usr/lib/etlegacy/etmain + done +}
[-- Attachment #1: Type: text/plain, Size: 195 bytes --] New review comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#discussion_r721611326 Comment: @ Chocimier Thank you, nice to learn new things
[-- Attachment #1: Type: text/plain, Size: 1663 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 New package: etlegacy-2.78.0 <!-- 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: 4187 bytes --] From 8f78130025e9ac4134d8f16c1b6fdf378a2846bf 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.78.1 --- .../etlegacy/patches/expand_platform.patch | 26 ++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 ++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 srcpkgs/etlegacy/patches/expand_platform.patch create mode 100644 srcpkgs/etlegacy/patches/fix_musl.patch create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/patches/expand_platform.patch b/srcpkgs/etlegacy/patches/expand_platform.patch new file mode 100644 index 000000000000..5f2d7e922f5a --- /dev/null +++ b/srcpkgs/etlegacy/patches/expand_platform.patch @@ -0,0 +1,26 @@ +--- 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 +@@ -279,6 +279,10 @@ + 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..705b86a9bc6f --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.78.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 + https://mirror.etlegacy.com/etmain/pak0.pk3 + https://mirror.etlegacy.com/etmain/pak1.pk3 + https://mirror.etlegacy.com/etmain/pak2.pk3" +checksum="18713a3bc0b3d62a6b5cb00387238b131db3766301825e6c7e044fba67e44fe3 + 712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5 + 5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d + a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e" +skip_extraction="pak0.pk3 pak1.pk3 pak2.pk3" +lib32disabled=yes +restricted=yes + +post_install() { + for i in 0 1 2; do + vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/pak$i.pk3 644 \ + usr/lib/etlegacy/etmain + done +}
[-- Attachment #1: Type: text/plain, Size: 1663 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 New package: etlegacy-2.78.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: 4187 bytes --] From 0eb318d7ea4b6cd2d58fd69b10072e9959783292 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.79.0 --- .../etlegacy/patches/expand_platform.patch | 26 ++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 ++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 srcpkgs/etlegacy/patches/expand_platform.patch create mode 100644 srcpkgs/etlegacy/patches/fix_musl.patch create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/patches/expand_platform.patch b/srcpkgs/etlegacy/patches/expand_platform.patch new file mode 100644 index 000000000000..5f2d7e922f5a --- /dev/null +++ b/srcpkgs/etlegacy/patches/expand_platform.patch @@ -0,0 +1,26 @@ +--- 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 +@@ -279,6 +279,10 @@ + 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..4c737d98de8a --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.79.0 +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 + https://mirror.etlegacy.com/etmain/pak0.pk3 + https://mirror.etlegacy.com/etmain/pak1.pk3 + https://mirror.etlegacy.com/etmain/pak2.pk3" +checksum="73a59e5e1ca4f95638f9a924a5c150e1773a31e1f6cdea55684533f91e471eac + 712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5 + 5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d + a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e" +skip_extraction="pak0.pk3 pak1.pk3 pak2.pk3" +lib32disabled=yes +restricted=yes + +post_install() { + for i in 0 1 2; do + vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/pak$i.pk3 644 \ + usr/lib/etlegacy/etmain + done +}
[-- Attachment #1: Type: text/plain, Size: 1663 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 New package: etlegacy-2.79.0 <!-- 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: 4187 bytes --] From ce4d17b0593d64406513c73835770f740bce20fd 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.80.0 --- .../etlegacy/patches/expand_platform.patch | 26 ++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 ++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 srcpkgs/etlegacy/patches/expand_platform.patch create mode 100644 srcpkgs/etlegacy/patches/fix_musl.patch create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/patches/expand_platform.patch b/srcpkgs/etlegacy/patches/expand_platform.patch new file mode 100644 index 000000000000..5f2d7e922f5a --- /dev/null +++ b/srcpkgs/etlegacy/patches/expand_platform.patch @@ -0,0 +1,26 @@ +--- 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 +@@ -279,6 +279,10 @@ + 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..8c0201780e60 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.80.0 +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 + https://mirror.etlegacy.com/etmain/pak0.pk3 + https://mirror.etlegacy.com/etmain/pak1.pk3 + https://mirror.etlegacy.com/etmain/pak2.pk3" +checksum="57429806f554dfb9ce4942b14673dd7603f05a6bc716a4ef91ba08faeca195f6 + 712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5 + 5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d + a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e" +skip_extraction="pak0.pk3 pak1.pk3 pak2.pk3" +lib32disabled=yes +restricted=yes + +post_install() { + for i in 0 1 2; do + vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/pak$i.pk3 644 \ + usr/lib/etlegacy/etmain + done +}
[-- Attachment #1: Type: text/plain, Size: 305 bytes --] New comment by github-actions[bot] on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1182688632 Comment: Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
[-- Attachment #1: Type: text/plain, Size: 1663 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 New package: etlegacy-2.79.0 <!-- 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: 4213 bytes --] From f157aff91f1e3548411f8580a55b91597fbd3df4 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.80.2 --- .../etlegacy/patches/expand_platform.patch | 26 ++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 ++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 srcpkgs/etlegacy/patches/expand_platform.patch create mode 100644 srcpkgs/etlegacy/patches/fix_musl.patch create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/patches/expand_platform.patch b/srcpkgs/etlegacy/patches/expand_platform.patch new file mode 100644 index 000000000000..5f2d7e922f5a --- /dev/null +++ b/srcpkgs/etlegacy/patches/expand_platform.patch @@ -0,0 +1,26 @@ +--- 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 +@@ -279,6 +279,10 @@ + 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..f2743e00d43d --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.80.2 +revision=3 +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 -DSDL_RENDER=OFF -Wno-dev" +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 + https://mirror.etlegacy.com/etmain/pak0.pk3 + https://mirror.etlegacy.com/etmain/pak1.pk3 + https://mirror.etlegacy.com/etmain/pak2.pk3" +checksum="1b22c131d6c122b38a88306d8dc81ea0135a0f60f599d6f871a175b311b00409 + 712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5 + 5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d + a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e" +skip_extraction="pak0.pk3 pak1.pk3 pak2.pk3" +lib32disabled=yes +restricted=yes + +post_install() { + for i in 0 1 2; do + vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/pak$i.pk3 644 \ + usr/lib/etlegacy/etmain + done +}
[-- Attachment #1: Type: text/plain, Size: 286 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1182850056 Comment: Game crashes currently using SDL2-2.0.22 (https://github.com/etlegacy/etlegacy/issues/1978) & (https://github.com/etlegacy/etlegacy/issues/1996)
[-- 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.80.2 <!-- 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: 4213 bytes --] From 9d36914c46b29939a11db06c69f4ce051f178038 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.80.2 --- .../etlegacy/patches/expand_platform.patch | 26 ++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 ++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 srcpkgs/etlegacy/patches/expand_platform.patch create mode 100644 srcpkgs/etlegacy/patches/fix_musl.patch create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/patches/expand_platform.patch b/srcpkgs/etlegacy/patches/expand_platform.patch new file mode 100644 index 000000000000..5f2d7e922f5a --- /dev/null +++ b/srcpkgs/etlegacy/patches/expand_platform.patch @@ -0,0 +1,26 @@ +--- 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 +@@ -279,6 +279,10 @@ + 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..f2743e00d43d --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.80.2 +revision=3 +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 -DSDL_RENDER=OFF -Wno-dev" +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 + https://mirror.etlegacy.com/etmain/pak0.pk3 + https://mirror.etlegacy.com/etmain/pak1.pk3 + https://mirror.etlegacy.com/etmain/pak2.pk3" +checksum="1b22c131d6c122b38a88306d8dc81ea0135a0f60f599d6f871a175b311b00409 + 712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5 + 5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d + a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e" +skip_extraction="pak0.pk3 pak1.pk3 pak2.pk3" +lib32disabled=yes +restricted=yes + +post_install() { + for i in 0 1 2; do + vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/pak$i.pk3 644 \ + usr/lib/etlegacy/etmain + done +}
[-- 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.80.2 <!-- 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: 4213 bytes --] From b0b6012d841f05331a0c4eaad03f0dc2158887ef 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.80.2 --- .../etlegacy/patches/expand_platform.patch | 26 ++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 ++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 srcpkgs/etlegacy/patches/expand_platform.patch create mode 100644 srcpkgs/etlegacy/patches/fix_musl.patch create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/patches/expand_platform.patch b/srcpkgs/etlegacy/patches/expand_platform.patch new file mode 100644 index 000000000000..5f2d7e922f5a --- /dev/null +++ b/srcpkgs/etlegacy/patches/expand_platform.patch @@ -0,0 +1,26 @@ +--- 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 +@@ -279,6 +279,10 @@ + 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..f2743e00d43d --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.80.2 +revision=3 +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 -DSDL_RENDER=OFF -Wno-dev" +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 + https://mirror.etlegacy.com/etmain/pak0.pk3 + https://mirror.etlegacy.com/etmain/pak1.pk3 + https://mirror.etlegacy.com/etmain/pak2.pk3" +checksum="1b22c131d6c122b38a88306d8dc81ea0135a0f60f599d6f871a175b311b00409 + 712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5 + 5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d + a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e" +skip_extraction="pak0.pk3 pak1.pk3 pak2.pk3" +lib32disabled=yes +restricted=yes + +post_install() { + for i in 0 1 2; do + vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/pak$i.pk3 644 \ + usr/lib/etlegacy/etmain + done +}
[-- 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.80.2 <!-- 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: 4213 bytes --] From 5070305c7667cdfc53ed423d6b718b4a26e6a7c0 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.80.2 --- .../etlegacy/patches/expand_platform.patch | 26 ++++++++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 ++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 srcpkgs/etlegacy/patches/expand_platform.patch create mode 100644 srcpkgs/etlegacy/patches/fix_musl.patch create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/patches/expand_platform.patch b/srcpkgs/etlegacy/patches/expand_platform.patch new file mode 100644 index 000000000000..5f2d7e922f5a --- /dev/null +++ b/srcpkgs/etlegacy/patches/expand_platform.patch @@ -0,0 +1,26 @@ +--- 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 +@@ -279,6 +279,10 @@ + 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..a91aa060a50c --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.80.2 +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 -DSDL_RENDER=OFF -Wno-dev" +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 + https://mirror.etlegacy.com/etmain/pak0.pk3 + https://mirror.etlegacy.com/etmain/pak1.pk3 + https://mirror.etlegacy.com/etmain/pak2.pk3" +checksum="1b22c131d6c122b38a88306d8dc81ea0135a0f60f599d6f871a175b311b00409 + 712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5 + 5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d + a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e" +skip_extraction="pak0.pk3 pak1.pk3 pak2.pk3" +lib32disabled=yes +restricted=yes + +post_install() { + for i in 0 1 2; do + vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/pak$i.pk3 644 \ + usr/lib/etlegacy/etmain + done +}
[-- Attachment #1: Type: text/plain, Size: 374 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1182850056 Comment: Game crashes currently using SDL2-2.0.22 (https://github.com/etlegacy/etlegacy/issues/1978) & (https://github.com/etlegacy/etlegacy/issues/1996) [Edit] Might be resolved with https://github.com/void-linux/void-packages/pull/39331
[-- Attachment #1: Type: text/plain, Size: 209 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1252065858 Comment: Tested with #39331, this does not resolve the issue of client shutdown.
[-- Attachment #1: Type: text/plain, Size: 274 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1252210913 Comment: @atk awaiting new release as https://github.com/etlegacy/etlegacy/commit/5935e4e52d8c7c69201ca3ce448170d7dece2fe5 has been merged.
[-- Attachment #1: Type: text/plain, Size: 288 bytes --] New comment by rafal1137 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1254132659 Comment: There still some work to be done with splash screen. More changes has been done in pull request. https://github.com/etlegacy/etlegacy/pull/2149
[-- Attachment #1: Type: text/plain, Size: 4499 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1330597825 Comment: Why don't we just extract the required patches and put them in our template in the meantime so we can release this package? I mean, we are already applying two patches, what's one more? Also, I don't see too much progress on that release of etl-2.81.0, there are still 9 issues open. e.g. loading_crash_fix.patch: ```diff diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c index fb629055d..4074a9003 100644 --- a/src/sdl/sdl_glimp.c +++ b/src/sdl/sdl_glimp.c @@ -141,6 +141,28 @@ void GLimp_Minimize(void) SDL_MinimizeWindow(main_window); } +/** + * @brief Flash the game window in the taskbar to alert user of an event + * @param[in] state - SDL_FlashOperation + */ +void GLimp_FlashWindow(int state) +{ +#if SDL_VERSION_ATLEAST(2, 0, 16) + if (state == 1) + { + SDL_FlashWindow(main_window, SDL_FLASH_BRIEFLY); + } + else if (state == 2) + { + SDL_FlashWindow(main_window, SDL_FLASH_UNTIL_FOCUSED); + } + else + { + SDL_FlashWindow(main_window, SDL_FLASH_CANCEL); + } +#endif +} + /** * @brief GLimp_GetModeInfo * @param[in,out] width @@ -1059,51 +1081,34 @@ static qboolean GLimp_StartDriverAndSetMode(glconfig_t *glConfig, int mode, qboo */ void GLimp_Splash(glconfig_t *glConfig) { - unsigned char splashData[SPLASH_DATA_SIZE]; // width * height * bytes_per_pixel - SDL_Surface *splashImage = NULL; - - // decode splash image - SPLASH_IMAGE_RUN_LENGTH_DECODE(splashData, - CLIENT_WINDOW_SPLASH.rle_pixel_data, - CLIENT_WINDOW_SPLASH.width * CLIENT_WINDOW_SPLASH.height, - CLIENT_WINDOW_SPLASH.bytes_per_pixel); - - // get splash image - splashImage = SDL_CreateRGBSurfaceFrom( - (void *)splashData, - CLIENT_WINDOW_SPLASH.width, - CLIENT_WINDOW_SPLASH.height, - CLIENT_WINDOW_SPLASH.bytes_per_pixel * 8, - CLIENT_WINDOW_SPLASH.bytes_per_pixel * CLIENT_WINDOW_SPLASH.width, -#ifdef Q3_LITTLE_ENDIAN - 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 -#else - 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF -#endif - ); - - SDL_Rect dstRect; - dstRect.x = glConfig->windowWidth / 2 - splashImage->w / 2; - dstRect.y = glConfig->windowHeight / 2 - splashImage->h / 2; - dstRect.w = splashImage->w; - dstRect.h = splashImage->h; - - SDL_Surface *surface = SDL_GetWindowSurface(main_window); - if (!surface) - { - // This happens on some platforms, most likely just the SDL build lacking renderers. Does not really matter tho. - // the user just wont see our awesome splash screen, but the renderer should boot up just fine. - // FIXME: maybe checkup on this later on if there's something we should change on the bundled sdl compile settings - Com_DPrintf(S_COLOR_YELLOW "Could not get fetch SDL surface: %s\n", SDL_GetError()); - } - else if (SDL_BlitSurface(splashImage, NULL, surface, &dstRect) == 0) // apply image on surface - { - SDL_UpdateWindowSurface(main_window); - } - else - { - Com_Printf(S_COLOR_YELLOW "SDL_BlitSurface failed - %s\n", SDL_GetError()); - } + const char *image_path = "regular.bmp"; + SDL_Surface *splashImage = NULL; + SDL_Texture *texture = NULL; + + splashImage = SDL_LoadBMP(image_path); + + if(splashImage == NULL) + { + Com_DPrintf(S_COLOR_YELLOW "Could not get image: %s\n", SDL_GetError()); + } + + SDL_Surface *surface = SDL_GetWindowSurface(main_window); + if (!surface) + { + // This happens on some platforms, most likely just the SDL build lacking renderers. Does not really matter tho. + // the user just wont see our awesome splash screen, but the renderer should boot up just fine. + // FIXME: maybe checkup on this later on if there's something we should change on the bundled sdl compile settings + Com_DPrintf(S_COLOR_YELLOW "Could not get fetch SDL surface: %s\n", SDL_GetError()); + } + + texture = SDL_CreateTextureFromSurface(main_renderer, surface); + + if (!texture) + { + Com_DPrintf(S_COLOR_YELLOW "SDL_CreateTextureFromSurface failed - %s\n", SDL_GetError()); + } + SDL_QueryTexture(texture, NULL, NULL, &glConfig->windowWidth, &glConfig->windowHeight); + //SDL_UpdateWindowSurface(main_window); SDL_FreeSurface(splashImage); } ``` That should suffice.
[-- Attachment #1: Type: text/plain, Size: 305 bytes --] New comment by github-actions[bot] on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1447452173 Comment: Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
[-- Attachment #1: Type: text/plain, Size: 209 bytes --] New comment by rafal1137 on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1448099168 Comment: There will be a new patch release comming soon for 2.81.0 Release
[-- 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.80.2 <!-- 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: 3666 bytes --] From 087ecdae3c6acda45fe45a442bc3b14e13d40cd4 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.81.1 --- srcpkgs/etlegacy/patches/add_ppc.patch | 13 +++++++++ srcpkgs/etlegacy/patches/fix_musl.patch | 11 ++++++++ srcpkgs/etlegacy/template | 36 +++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 srcpkgs/etlegacy/patches/add_ppc.patch create mode 100644 srcpkgs/etlegacy/patches/fix_musl.patch create mode 100644 srcpkgs/etlegacy/template diff --git a/srcpkgs/etlegacy/patches/add_ppc.patch b/srcpkgs/etlegacy/patches/add_ppc.patch new file mode 100644 index 000000000000..2ec85cc04de5 --- /dev/null +++ b/srcpkgs/etlegacy/patches/add_ppc.patch @@ -0,0 +1,13 @@ +--- 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 +@@ -320,6 +320,10 @@ + else() + set(ARCH "arm64-v8a") + endif() ++ 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})") 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..40a349616b26 --- /dev/null +++ b/srcpkgs/etlegacy/template @@ -0,0 +1,36 @@ +# Template file for 'etlegacy' +pkgname=etlegacy +version=2.81.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 -DSDL_RENDER=OFF -Wno-dev" +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 cJSON-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 + https://mirror.etlegacy.com/etmain/pak0.pk3 + https://mirror.etlegacy.com/etmain/pak1.pk3 + https://mirror.etlegacy.com/etmain/pak2.pk3" +checksum="687dfea58fe385deaa91f7a9ee7c232e2a79bc059a531934051e569aca6f7fb3 + 712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5 + 5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d + a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e" +skip_extraction="pak0.pk3 pak1.pk3 pak2.pk3" +lib32disabled=yes +restricted=yes + +post_install() { + for i in 0 1 2; do + vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/pak$i.pk3 644 \ + usr/lib/etlegacy/etmain + done +}
[-- Attachment #1: Type: text/plain, Size: 210 bytes --] New comment by biopsin on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1483789275 Comment: cJSON Might relate to https://github.com/etlegacy/etlegacy/pull/2289
[-- Attachment #1: Type: text/plain, Size: 305 bytes --] New comment by github-actions[bot] on void-packages repository https://github.com/void-linux/void-packages/pull/32824#issuecomment-1605233192 Comment: Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
[-- Attachment #1: Type: text/plain, Size: 1512 bytes --] There's a closed pull request on the void-packages repository [WIP] New package: etlegacy-2.81.1 https://github.com/void-linux/void-packages/pull/32824 Description: <!-- 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]