Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] dhewm3: update to 1.5.1.
@ 2021-03-31  9:17 4ricci
  2021-03-31 18:44 ` ericonr
  2021-03-31 18:44 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 2 replies; 3+ messages in thread
From: 4ricci @ 2021-03-31  9:17 UTC (permalink / raw)
  To: ml

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

There is a new pull request by 4ricci against master on the void-packages repository

https://github.com/4ricci/void-packages dhewm3
https://github.com/void-linux/void-packages/pull/29904

dhewm3: update to 1.5.1.
<!-- Mark items with [x] where applicable -->
On `arm*` it builds even without `makedepends+=" libX11-devel"`, but I did not test if it works too.

#### General
- [ ] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] 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/29904.patch is attached

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

From 7cc815e7f8948e87f9354b04188074a425351a94 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 30 Mar 2021 16:14:58 +0200
Subject: [PATCH] dhewm3: update to 1.5.1.

---
 .../patches/musl-temp_failure_retry.patch     |  2 +-
 srcpkgs/dhewm3/patches/ppc64.patch            | 26 -------------------
 srcpkgs/dhewm3/template                       | 10 +++----
 3 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/dhewm3/patches/ppc64.patch

diff --git a/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch b/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch
index 0954b6527256..c31a74af3e89 100644
--- a/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch
+++ b/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch
@@ -15,4 +15,4 @@
 +
  idPort clientPort, serverPort;
  
- idCVar net_ip( "net_ip", "localhost", CVAR_SYSTEM, "local IP address" );
+ IDcVar net_ip( "net_ip", "localhost", CVAR_SYSTEM, "local IP address" );
diff --git a/srcpkgs/dhewm3/patches/ppc64.patch b/srcpkgs/dhewm3/patches/ppc64.patch
deleted file mode 100644
index 087cb3973d55..000000000000
--- a/srcpkgs/dhewm3/patches/ppc64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fixes build as the altivec bits include a MacOS-specific header.
-
-Original author: <frediz@linux.vnet.ibm.com>
-
---- neo/idlib/math/Simd_AltiVec.cpp	2017-07-12 12:34:33.000000000 +0000
-+++ neo/idlib/math/Simd_AltiVec.cpp	2017-07-12 12:43:51.863029647 +0000
-@@ -45,7 +45,7 @@
- //
- //===============================================================
- 
--#if defined(__GNUC__) && defined(__ALTIVEC__)
-+#if defined(MACOS_X) && defined(__GNUC__) && defined(__ALTIVEC__)
- 
- #ifdef PPC_INTRINSICS
- 	// for square root estimate instruction
---- neo/idlib/math/Simd_AltiVec.h	2017-07-12 12:34:33.000000000 +0000
-+++ neo/idlib/math/Simd_AltiVec.h	2017-07-12 12:38:38.083750262 +0000
-@@ -110,7 +110,7 @@
- //#define DRAWVERT_PADDED
- 
- class idSIMD_AltiVec : public idSIMD_Generic {
--#if defined(__GNUC__) && defined(__ALTIVEC__)
-+#if defined(MACOS_X) && defined(__GNUC__) && defined(__ALTIVEC__)
- public:
- 
- 	virtual const char * VPCALL GetName( void ) const;
diff --git a/srcpkgs/dhewm3/template b/srcpkgs/dhewm3/template
index 5d94c096afe6..5509900e8c0b 100644
--- a/srcpkgs/dhewm3/template
+++ b/srcpkgs/dhewm3/template
@@ -1,6 +1,6 @@
 # Template file for 'dhewm3'
 pkgname=dhewm3
-version=1.5.0
+version=1.5.1
 revision=1
 build_wrksrc="neo"
 build_style=cmake
@@ -9,9 +9,5 @@ short_desc="Doom 3 GPL source port"
 maintainer="John Rowley <enterthevoid@codesector.co>"
 license="GPL-3.0-or-later"
 homepage="https://dhewm3.org/"
-distfiles="https://github.com/dhewm/dhewm3/archive/${version}.tar.gz"
-checksum=fd299c8a2db1ecde15f861e4a883a5d61e5da0c74e26f89fb50b52b978fe8212
-
-case "$XBPS_TARGET_MACHINE" in
-	arm*) makedepends+=" libX11-devel";;
-esac
+distfiles="https://github.com/dhewm/dhewm3/releases/download/${version}/dhewm3-${version}-src.tar.xz"
+checksum=31671f35fb6f83272dfa2a27c0dad6183bc228f1f1a448ef925052cf4dcf4b68

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: dhewm3: update to 1.5.1.
  2021-03-31  9:17 [PR PATCH] dhewm3: update to 1.5.1 4ricci
@ 2021-03-31 18:44 ` ericonr
  2021-03-31 18:44 ` [PR PATCH] [Merged]: " ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2021-03-31 18:44 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29904#issuecomment-811335183

Comment:
Build logs for ARM looks exactly the same like the native ones.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: dhewm3: update to 1.5.1.
  2021-03-31  9:17 [PR PATCH] dhewm3: update to 1.5.1 4ricci
  2021-03-31 18:44 ` ericonr
@ 2021-03-31 18:44 ` ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2021-03-31 18:44 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

dhewm3: update to 1.5.1.
https://github.com/void-linux/void-packages/pull/29904

Description:
<!-- Mark items with [x] where applicable -->
On `arm*` it builds even without `makedepends+=" libX11-devel"`, but I did not test if it works too.

#### General
- [ ] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-03-31 18:44 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-31  9:17 [PR PATCH] dhewm3: update to 1.5.1 4ricci
2021-03-31 18:44 ` ericonr
2021-03-31 18:44 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).