Update to build latest flightgear-git

3 files changed, 63 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1bce320fa83c..7da85f6c98f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flightgear-git
 	pkgdesc = An open-source, multi-platform flight simulator
-	pkgver = 2019.2.0r13934.f007dd3ea
+	pkgver = 2020.3.0r14711.df67cc2bd
 	pkgrel = 1
 	url = https://home.flightgear.org
 	arch = x86_64
@@ -9,25 +9,26 @@ pkgbase = flightgear-git
 	makedepends = cmake
 	makedepends = mesa
 	makedepends = sharutils
+	makedepends = simgear
+	makedepends = qt5-base
+	makedepends = qt5-declarative
+	makedepends = qt5-svg
 	depends = libxmu
 	depends = libxi
 	depends = zlib
+	depends = openscenegraph
 	depends = libxrandr
 	depends = glu
-	depends = glew
 	depends = openal
-	depends = openscenegraph34
-	depends = subversion
-	depends = simgear-git
-	depends = qt5-base
-	depends = qt5-declarative
-	depends = qt5-tools
-	depends = qt5-svg
-	optdepends = flightgear-data-git
-	provides = flightgear=2019.2.0
+	optdepends = qt5-base: fgfs --launcher
+	optdepends = qt5-declarative: fgfs --launcher
+	optdepends = flightgear-data
+	provides = flightgear
 	conflicts = flightgear
 	source = flightgear::git+https://git.code.sf.net/p/flightgear/flightgear#branch=next
-	md5sums = SKIP
+	source = fg-cmake-fixes.patch
+	sha256sums = SKIP
+	sha256sums = 94c91b5008506fd8c0fe090f5f6bf96ad5e2228360bc913f49b9008c99adb4a3
 
 pkgname = flightgear-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 005656550b14..d4281672eed2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,59 @@
-# Maintainer: Glen D'souza <gdsouza@linuxmail.org>
+# Maintainer: Andrew Whatson <whatson@gmail.com>
+# Contributor: Glen D'souza <gdsouza@linuxmail.org>
 # Contributor: jmf <jmf at mesecons dot net>
 # Contributor: Pascal Groschwitz <p.groschwitz@googlemail.com>
 
 pkgname=flightgear-git
-pkgver=2019.2.0r13934.f007dd3ea
-_pkgver=2019.2.0
+pkgver=2020.3.0r14711.df67cc2bd
 pkgrel=1
 pkgdesc="An open-source, multi-platform flight simulator"
 arch=('x86_64')
 url="https://home.flightgear.org"
 license=('GPL')
-depends=('libxmu' 'libxi' 'zlib' 'libxrandr' 'glu' 'glew' 'openal' 'openscenegraph34' 'subversion' 'simgear-git' 'qt5-base' 'qt5-declarative' 'qt5-tools' 'qt5-svg')
-makedepends=('boost' 'cmake' 'mesa' 'sharutils')
-optdepends=('flightgear-data-git')
-provides=('flightgear=2019.2.0')
+depends=('libxmu' 'libxi' 'zlib' 'openscenegraph' 'libxrandr' 'glu' 'openal')
+makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear' 'qt5-base' 'qt5-declarative' 'qt5-svg')
+optdepends=('qt5-base: fgfs --launcher'
+            'qt5-declarative: fgfs --launcher'
+            'flightgear-data')
+provides=('flightgear')
 conflicts=('flightgear')
-source=("flightgear::git+https://git.code.sf.net/p/flightgear/flightgear#branch=next")
-md5sums=('SKIP')
+source=("flightgear::git+https://git.code.sf.net/p/flightgear/flightgear#branch=next"
+        'fg-cmake-fixes.patch')
+sha256sums=('SKIP'
+            '94c91b5008506fd8c0fe090f5f6bf96ad5e2228360bc913f49b9008c99adb4a3')
 
 pkgver() {
-  cd "${srcdir}/${pkgname%-git}"
-  printf "%sr%s.%s" "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$srcdir"/flightgear
+  printf "%sr%s.%s" \
+    "$(tr -d '\n' < flightgear-version)" \
+    "$(git rev-list --count HEAD)" \
+    "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd "$srcdir"/flightgear
+  patch -p1 -i ../fg-cmake-fixes.patch
+  sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/org.flightgear.FlightGear.desktop
 }
 
 build() {
-  cd "$srcdir/${pkgname%-git}"
+  mkdir -p "$srcdir"/flightgear-build
+  cd "$srcdir"/flightgear-build
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" \
     -DCMAKE_BUILD_TYPE=Release \
     -DFG_BUILD_TYPE=Release \
-    .
+    ../flightgear
   make
-  sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data --launcher|' package/org.flightgear.FlightGear.desktop
 }
 
 package() {
-  cd "$srcdir/${pkgname%-git}"
+  cd "$srcdir"/flightgear-build
   make DESTDIR="$pkgdir" install
 
+  cd "$srcdir"/flightgear
   install -Dm0644 package/flightgear.ico "$pkgdir"/usr/share/icons/flightgear.ico
   install -Dm0644 scripts/completion/fg-completion.bash "$pkgdir"/usr/share/bash-completion/completions/fgfs
   install -Dm0644 scripts/completion/fg-completion.zsh "$pkgdir"/usr/share/zsh/site-functions/_fgfs
diff --git a/fg-cmake-fixes.patch b/fg-cmake-fixes.patch
new file mode 100644
index 000000000000..84db4df9cb0c
--- /dev/null
+++ b/fg-cmake-fixes.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeModules/FindGsm.cmake b/CMakeModules/FindGsm.cmake
+index 1add357c1..a138ebe99 100644
+--- a/CMakeModules/FindGsm.cmake
++++ b/CMakeModules/FindGsm.cmake
+@@ -31,7 +31,6 @@ else (GSM_LIBRARIES AND GSM_INCLUDE_DIRS)
+ 
+   find_path(GSM_INCLUDE_DIR
+     NAMES
+-      gsm/gsm.h
+       gsm.h
+     PATHS
+       ${_GsmIncDir}
+@@ -39,6 +38,8 @@ else (GSM_LIBRARIES AND GSM_INCLUDE_DIRS)
+       /usr/local/include
+       /opt/local/include
+       /sw/include
++    PATH_SUFFIXES
++      gsm
+   )
+ 
+   find_library(GSM_LIBRARY