[arch-commits] Commit in frogatto/trunk (PKGBUILD rm_glBlendEquationOES.patch)

[Sven-Hendrik Haase]

    Date: Monday, May 2, 2022 @ 12:55:37
  Author: svenstaro
Revision: 1192234

upgpkg: frogatto 1.3.1-37: Fix crash (FS#74482)

Added:
  frogatto/trunk/rm_glBlendEquationOES.patch
Modified:
  frogatto/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   13 ++++++++-----
 rm_glBlendEquationOES.patch |   21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-02 12:52:00 UTC (rev 1192233)
+++ PKGBUILD	2022-05-02 12:55:37 UTC (rev 1192234)
@@ -1,4 +1,4 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
 # Contributor: Federico CInelli <cinelli at aur.archlinux.org>
 # Contributor: Tom Wambold <tom5760 at gmail.com>
 
@@ -5,7 +5,7 @@
 pkgname=frogatto
 arch=('x86_64')
 pkgver=1.3.1
-pkgrel=36
+pkgrel=37
 pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog"
 url="http://www.frogatto.com"
 license=('GPL')
@@ -15,17 +15,20 @@
         launcher
         frogatto.desktop
         fbsd-fixes.patch
-        frogatto-boost-1.70.patch)
+        frogatto-boost-1.70.patch
+        rm_glBlendEquationOES.patch)
 sha512sums=('bb1c5e765a456abedd7b80cce99b7be62734a6163c2e2beb9776c6a61eba779a916ea99a3c113be0626a4d238f10dcdf360d26f993f1d9ac4e381d711b27be23'
             'f10944f8b4c2e2704ceda533d6c6768c653f4c42b8628ccccffc035122f0f5b02e3dfa600dc251440f2f4245c6d1def309556d39ea11b7aa9b6ff58751d89c00'
             '7381f54bc8d406c7669bc1d36cd04c30f80d7eec03808ad69156317b811528830ae40a22e48a8a18e2a00e15cd0ee3f8b9a0248c08b2bce30bc8d8f57b5e6038'
             '10ddc0cdebe1abb4f28b3afd9c1c3b1e887f47262424aa73c2a61d09375aa69287c28e0206041de5bfc2534c498c73710b98432ed538f3b900ec220541f47062'
-            '4c7f3a4bdb0fead85cb4d650761f4b8458a9f3fbe77f6e77d902a261efdae5f35808784f9ea85556b2f01d203dade9ca9224bc46c49fe38d27681e67e88a907a')
+            '4c7f3a4bdb0fead85cb4d650761f4b8458a9f3fbe77f6e77d902a261efdae5f35808784f9ea85556b2f01d203dade9ca9224bc46c49fe38d27681e67e88a907a'
+            'ea713507b60be9f035bb84bed2c79392eac7119696956d24a659f2a0b89cffa738e460b35a744ded3a0b35c52303a1d67ac911d9ddf7a4ee2484708342e66e2e')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i ../fbsd-fixes.patch
   patch -p0 -i ../frogatto-boost-1.70.patch # Fix build with boost 1.70 (freebsd)
+  patch -p1 -i ../rm_glBlendEquationOES.patch # Fix crash when exiting first house
 }
 
 build() {
@@ -36,7 +39,7 @@
   sed -i 's/-lprofiler//g' Makefile
   sed -i 's/\.io_service/\.get_io_service/g' src/server.cpp
   sed -i 's/\%lu\\n/\%zu\\n/g' src/server.cpp
-  make game server
+  make CFLAGS='-DUSE_GLES2' game server
 }
 
 package() {

Added: rm_glBlendEquationOES.patch
===================================================================
--- rm_glBlendEquationOES.patch	                        (rev 0)
+++ rm_glBlendEquationOES.patch	2022-05-02 12:55:37 UTC (rev 1192234)
@@ -0,0 +1,21 @@
+diff -upr frogatto-1.3.1.orig/src/water.cpp frogatto-1.3.1/src/water.cpp
+--- frogatto-1.3.1.orig/src/water.cpp	2020-12-26 10:32:22.419994864 +0300
++++ frogatto-1.3.1/src/water.cpp	2020-12-26 10:33:18.116224965 +0300
+@@ -165,8 +165,6 @@
+ 	if (glBlendEquationOES) {
+ 		glBlendEquationOES(GL_FUNC_REVERSE_SUBTRACT_OES);
+ 	}
+-#elif defined(GL_OES_blend_subtract)
+-	glBlendEquationOES(GL_FUNC_REVERSE_SUBTRACT_OES);
+ #elif defined(USE_GLES2)
+ 	glBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
+ #else
+@@ -212,8 +210,6 @@
+ 	if (glBlendEquationOES) {
+ 		glBlendEquationOES(GL_FUNC_ADD_OES);
+ 	}
+-#elif defined(GL_OES_blend_subtract)
+-	glBlendEquationOES(GL_FUNC_ADD_OES);
+ #elif defined(USE_GLES2)
+ 	glBlendEquation(GL_FUNC_ADD);
+ #else