PKGBUILD clean up and update

2 files changed, 6 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4084baaf2626..8aeea991d41f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dosbox-x-sdl2
 	pkgdesc = x86 emulator with builtin DOS, with patches and more features
 	pkgver = 2024.03.01
-	pkgrel = 1
+	pkgrel = 2
 	url = http://dosbox-x.com
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index ef79944706ea..cc0b37abd7f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=dosbox-x-sdl2
 _pkgname=dosbox-x
 pkgver=2024.03.01
-pkgrel=1
+pkgrel=2
 pkgdesc="x86 emulator with builtin DOS, with patches and more features"
 arch=(i686 x86_64 aarch64)
 url="http://dosbox-x.com"
@@ -20,18 +20,12 @@ build() {
    
   ./autogen.sh
   
-  # Working around bug 4436: https://github.com/joncampbell123/dosbox-x/issues/4436
-  # We need to deactivate -Werror=format-security
-  
-  export CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat \
-        -fstack-clash-protection -fcf-protection"
-  export CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
+  export CFLAGS="${CFLAGS/-Werror=format-security/}"
   export LDFLAGS="${LDFLAGS//,--as-needed}"
-  
-  chmod +x configure
+  export CXXFLAGS="${CXXFLAGS/-Werror=format-security/}"
+    
   ./configure --enable-core-inline --enable-debug --enable-avcodec --prefix=/usr --enable-sdl2
-  make -j$(nproc)
+  make
   
 }