Updated to 2.6.2

3 files changed, 6 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f7bd74c64a2..d118d0959e8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = prboom-plus
 	pkgdesc = An advanced, Vanilla-compatible Doom engine based on PrBoom
-	pkgver = 2.6.1um
+	pkgver = 2.6.2
 	pkgrel = 1
 	url = https://github.com/coelckers/prboom-plus
 	arch = x86_64
@@ -19,9 +19,7 @@ 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.6.1um.tar.gz
-	source = afece38_guard_opengl_call_in_d_display_with_gl_doom.patch
-	sha1sums = 440a5dd10077ea7f8fe0b3cd3384bc757dc92c62
-	sha1sums = e9dad1f15a87be17909d6381b7304041000d6e51
+	source = https://github.com/coelckers/prboom-plus/archive/refs/tags/v2.6.2.tar.gz
+	sha1sums = 363471156b15e3927227ff4406670fdcd9725a74
 
 pkgname = prboom-plus
diff --git a/PKGBUILD b/PKGBUILD
index d33da40f3248..312f859dcbae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Valsu [arch(at)hylia.de]
 
 pkgname=prboom-plus
-pkgver=2.6.1um
+pkgver=2.6.2
 pkgrel=1
 pkgdesc='An advanced, Vanilla-compatible Doom engine based on PrBoom'
 url='https://github.com/coelckers/prboom-plus'
@@ -23,10 +23,8 @@ 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"
-        "afece38_guard_opengl_call_in_d_display_with_gl_doom.patch")
-sha1sums=('440a5dd10077ea7f8fe0b3cd3384bc757dc92c62'
-          'e9dad1f15a87be17909d6381b7304041000d6e51')
+source=("https://github.com/coelckers/prboom-plus/archive/refs/tags/v$pkgver.tar.gz")
+sha1sums=('363471156b15e3927227ff4406670fdcd9725a74')
 
 _rootdir="prboom-plus-${pkgver}/prboom2"
 _builddir="${_rootdir}/cbuild"
@@ -34,9 +32,6 @@ _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
deleted file mode 100644
index 09008b97379d..000000000000
--- a/afece38_guard_opengl_call_in_d_display_with_gl_doom.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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;