summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Brinister2021-09-21 22:25:36 -0400
committerAlex Brinister2021-09-21 22:25:36 -0400
commitf0ab69f4377c27947d59f9219de2eef2b0dee46c (patch)
tree6d1d1b9b8d9afa4dcf268d83fe384517b19c4256
parent345a745f76375995892ad8775fca017b18b749a5 (diff)
downloadaur-f0ab69f4377c27947d59f9219de2eef2b0dee46c.tar.gz
Updated to 2.6.1um
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD13
-rw-r--r--afece38_guard_opengl_call_in_d_display_with_gl_doom.patch15
3 files changed, 30 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f0a7c8f7a94b..6f7bd74c64a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = prboom-plus
pkgdesc = An advanced, Vanilla-compatible Doom engine based on PrBoom
- pkgver = 2.6um
- pkgrel = 2
+ pkgver = 2.6.1um
+ pkgrel = 1
url = https://github.com/coelckers/prboom-plus
arch = x86_64
license = GPL2
@@ -19,7 +19,9 @@ pkgbase = prboom-plus
optdepends = sdl2_net
conflicts = prboom-plus-svn
conflicts = prboom-plus-um
- source = https://github.com/coelckers/prboom-plus/archive/refs/tags/v2.6um.tar.gz
- sha1sums = cd56bf4751fd48ee2a703d8f99b000925bd6af38
+ source = https://github.com/coelckers/prboom-plus/archive/refs/tags/v2.6.1um.tar.gz
+ source = afece38_guard_opengl_call_in_d_display_with_gl_doom.patch
+ sha1sums = 440a5dd10077ea7f8fe0b3cd3384bc757dc92c62
+ sha1sums = e9dad1f15a87be17909d6381b7304041000d6e51
pkgname = prboom-plus
diff --git a/PKGBUILD b/PKGBUILD
index c962427dd107..d33da40f3248 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
# Contributor: Valsu [arch(at)hylia.de]
pkgname=prboom-plus
-pkgver=2.6um
-pkgrel=2
+pkgver=2.6.1um
+pkgrel=1
pkgdesc='An advanced, Vanilla-compatible Doom engine based on PrBoom'
url='https://github.com/coelckers/prboom-plus'
arch=('x86_64')
@@ -23,8 +23,10 @@ optdepends=('dumb'
'sdl2_net')
makedepends=('cmake')
conflicts=('prboom-plus-svn' 'prboom-plus-um')
-source=("https://github.com/coelckers/prboom-plus/archive/refs/tags/v$pkgver.tar.gz")
-sha1sums=('cd56bf4751fd48ee2a703d8f99b000925bd6af38')
+source=("https://github.com/coelckers/prboom-plus/archive/refs/tags/v$pkgver.tar.gz"
+ "afece38_guard_opengl_call_in_d_display_with_gl_doom.patch")
+sha1sums=('440a5dd10077ea7f8fe0b3cd3384bc757dc92c62'
+ 'e9dad1f15a87be17909d6381b7304041000d6e51')
_rootdir="prboom-plus-${pkgver}/prboom2"
_builddir="${_rootdir}/cbuild"
@@ -32,6 +34,9 @@ _builddir="${_rootdir}/cbuild"
prepare() {
cd "${srcdir}"
sed -i -E 's/mktemp/mkstemp/g' $(find "${_rootdir}" -type f -name r_demo.c)
+
+ cd "prboom-plus-${pkgver}"
+ patch -p1 < "${srcdir}/afece38_guard_opengl_call_in_d_display_with_gl_doom.patch"
}
build() {
diff --git a/afece38_guard_opengl_call_in_d_display_with_gl_doom.patch b/afece38_guard_opengl_call_in_d_display_with_gl_doom.patch
new file mode 100644
index 000000000000..09008b97379d
--- /dev/null
+++ b/afece38_guard_opengl_call_in_d_display_with_gl_doom.patch
@@ -0,0 +1,15 @@
+diff --git a/prboom2/src/d_main.c b/prboom2/src/d_main.c
+index 16a9efc2..4fe97465 100644
+--- a/prboom2/src/d_main.c
++++ b/prboom2/src/d_main.c
+@@ -395,8 +395,10 @@ void D_Display (fixed_t frac)
+ R_DrawViewBorder();
+ HU_Drawer();
+
++#ifdef GL_DOOM
+ if (V_GetMode() == VID_MODEGL)
+ gld_ProcessExtraAlpha();
++#endif
+ }
+
+ isborderstate = isborder;