adding patch for gcc14 build support

4 files changed, 28 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d93e59aaa865..fd4612996d44 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 = 5
+	pkgrel = 6
 	url = http://dosbox-x.com
 	arch = i686
 	arch = x86_64
@@ -18,6 +18,8 @@ pkgbase = dosbox-x-sdl2
 	conflicts = dosbox-x-sdl2-git
 	options = !debug
 	source = https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v2024.03.01.tar.gz
+	source = speexdsp-gcc14.patch
 	sha256sums = 2a89d3196ddc15361f6dc7e6ab142bfe95945d93d527cfd6bacca1f7a401a513
+	sha256sums = 0126d80aa3223380622aa863712f7bbc29dbcaecea3cb2bcb1e512f12e0b4ccd
 
 pkgname = dosbox-x-sdl2
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index fb8d536d3987..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*
-!/.SRCINFO
-!/.gitignore
-!/PKGBUILD
-!/dosbox-x.desktop
-!/dosbox-x.png
diff --git a/PKGBUILD b/PKGBUILD
index 4af34883f01c..f239486a102a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=dosbox-x-sdl2
 _pkgname=dosbox-x
 pkgver=2024.03.01
-pkgrel=5
+pkgrel=6
 pkgdesc="x86 emulator with builtin DOS, with patches and more features"
 arch=(i686 x86_64 aarch64)
 url="http://dosbox-x.com"
@@ -12,10 +12,20 @@ depends=(fluidsynth libxkbfile libxrandr sdl2_net libslirp)
 makedepends=(glu)
 optdepends=()
 conflicts=('dosbox-x-git' 'dosbox-x' 'dosbox-x-sdl2-git')
-source=(https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v${pkgver}.tar.gz)
-sha256sums=('2a89d3196ddc15361f6dc7e6ab142bfe95945d93d527cfd6bacca1f7a401a513')
+source=(https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v${pkgver}.tar.gz
+	speexdsp-gcc14.patch)
+sha256sums=('2a89d3196ddc15361f6dc7e6ab142bfe95945d93d527cfd6bacca1f7a401a513'
+            '0126d80aa3223380622aa863712f7bbc29dbcaecea3cb2bcb1e512f12e0b4ccd')
+	    
 options=(!debug)
 
+prepare() {
+  # Fix speexdsp compilation error with GCC 14
+  # https://github.com/joncampbell123/dosbox-x/pull/4870
+  cd "$srcdir/$_pkgname-$_pkgname-v$pkgver"
+  patch -p1 -i "$srcdir/speexdsp-gcc14.patch"
+}
+
 build() {
   cd "$srcdir/dosbox-x-dosbox-x-v$pkgver"
   
diff --git a/speexdsp-gcc14.patch b/speexdsp-gcc14.patch
new file mode 100644
index 000000000000..21bbc333717e
--- /dev/null
+++ b/speexdsp-gcc14.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index f0f0dc6..fcc5763 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -379,6 +379,7 @@ AC_CHECK_CXXFLAGS([ -Wextra ])
+ AC_CHECK_CXXFLAGS([ -Wunused ])
+ AC_CHECK_CXXFLAGS([ -pedantic ])
+ AC_CHECK_CXXFLAGS([ -Wno-error=format-security ])     # imfc.cpp and later versions of GCC, see https://github.com/joncampbell123/dosbox-x/issues/4436
++AC_CHECK_CXXFLAGS([ -Wno-error=incompatible-pointer-types ]) # required to compile speexdsp/fftwrap.c with GCC 14
+ #AC_CHECK_CXXFLAGS([ -Wconversion ])      DO NOT ENABLE. THIS WARNING IS WAY TOO PEDANTIC TO BE USEFUL, EXCEPT FOR SPECIFIC CASES
+ #AC_CHECK_CXXFLAGS([ -Wsign-conversion ])
+ AC_CHECK_CXXFLAGS([ -Wlogical-op ])