Do not rename the source clone. Match repository package.

2 files changed, 24 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c55d42e974cb..8b052a8470ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 pkgbase = megaglest-git
 	pkgdesc = Fork of Glest, a 3D real-time strategy game in a fantastic world (git version)
-	pkgver = 3.13.0.r81.g6e8cdcab0
+	pkgver = 3.13.0.r102.ge50e4f300
 	pkgrel = 1
 	url = https://megaglest.org/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = git
+	makedepends = ftjam
 	makedepends = cmake
-	makedepends = xorg-server-xvfb
-	makedepends = help2man
+	makedepends = mesa
 	depends = curl
 	depends = xerces-c
 	depends = sdl2
 	depends = libvorbis
 	depends = openal
 	depends = libgl
-	depends = lua
+	depends = lua51
 	depends = icu
 	depends = ftgl
 	depends = glew
@@ -25,23 +25,11 @@ pkgbase = megaglest-git
 	depends = wxgtk3
 	depends = glu
 	depends = libx11
-	depends = fontconfig
-	depends = freetype2
-	depends = fribidi
-	depends = libjpeg-turbo
-	depends = vlc
-	depends = libxml2
-	depends = openssl
-	depends = libpng
-	depends = zlib
-	depends = glib2
-	depends = libxext
-	depends = libsm
-	depends = libice
+	depends = libminiupnpc.so
 	depends = megaglest-data-git
 	provides = megaglest
 	conflicts = megaglest
-	source = megaglest-git::git+https://github.com/MegaGlest/megaglest-source.git
+	source = git+https://github.com/MegaGlest/megaglest-source.git
 	sha256sums = SKIP
 
 pkgname = megaglest-git
diff --git a/PKGBUILD b/PKGBUILD
index 80c4f19098d4..c8f359c841b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer : Daniel Bermond < yahoo-com: danielbermond >
+# Maintainer : Daniel Bermond < gmail-com: danielbermond >
 
 pkgname=megaglest-git
-pkgver=3.13.0.r81.g6e8cdcab0
+_srcname=megaglest-source
+pkgver=3.13.0.r102.ge50e4f300
 pkgrel=1
 pkgdesc='Fork of Glest, a 3D real-time strategy game in a fantastic world (git version)'
 arch=('i686' 'x86_64')
@@ -9,75 +10,51 @@ url='https://megaglest.org/'
 license=('GPL3')
 depends=(
     # official repositories:
-        'curl' 'xerces-c' 'sdl2' 'libvorbis' 'openal' 'libgl' 'lua' 'icu'
-        'ftgl' 'glew' 'libircclient' 'miniupnpc' 'wxgtk3' 'glu' 'libx11'
-        'fontconfig' 'freetype2' 'fribidi' 'libjpeg-turbo' 'vlc' 'libxml2'
-        'openssl' 'libpng' 'zlib' 'glib2' 'libxext' 'libsm' 'libice'
+        'curl' 'xerces-c' 'sdl2' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl'
+        'glew' 'libircclient' 'miniupnpc' 'wxgtk3' 'glu' 'libx11' 'libminiupnpc.so'
     # AUR:
         'megaglest-data-git'
 )
-makedepends=('git' 'cmake' 'xorg-server-xvfb' 'help2man')
+makedepends=('git' 'ftjam' 'cmake' 'mesa')
 provides=('megaglest')
 conflicts=('megaglest')
-source=("$pkgname"::'git+https://github.com/MegaGlest/megaglest-source.git')
+source=('git+https://github.com/MegaGlest/megaglest-source.git')
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "$pkgname"
+    cd "$_srcname"
     
     # git, tags available
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
 build() {
+    cd "$_srcname"
+    
     # - SSE is available only from Pentium 3 onwards (i686 is way older)
     # - SSE and SSE2 are availabe on all x86_64 CPUs
     [ "$CARCH" = 'i686'   ] && local _sse='0'
     [ "$CARCH" = 'x86_64' ] && local _sse='2' # (supported: 0-3)
     
-    cd "$pkgname"
-    
     rm -rf build
     mkdir -p build
     cd build
     
-    cmake \
-        -DBUILD_MEGAGLEST:BOOL='ON' \
-        -DBUILD_MEGAGLEST_MAP_EDITOR:BOOL='ON' \
-        -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS:BOOL='ON' \
-        -DBUILD_MEGAGLEST_MODEL_VIEWER:BOOL='ON' \
-        -DBUILD_MEGAGLEST_TESTS:BOOL='OFF' \
-        -DCMAKE_COLOR_MAKEFILE:BOOL='ON' \
-        -DCMAKE_CXX_FLAGS='-lX11' \
-        -DCMAKE_INSTALL_PREFIX='/usr' \
-        -DCMAKE_VERBOSE_MAKEFILE:BOOL='FALSE' \
-        -DFORCE_EMBEDDED_LIBS:BOOL='OFF' \
-        -DFORCE_LUA_VERSION:STRING='OFF' \
-        -DFORCE_MAX_SSE_LEVEL:STRING="$_sse" \
-        -DWANT_DEPRECATION_WARNINGS:BOOL='OFF' \
-        -DWANT_DEV_OUTPATH:BOOL='OFF' \
-        -DWANT_GIT_STAMP:BOOL='ON' \
-        -DWANT_SINGLE_INSTALL_DIRECTORY:BOOL='OFF' \
-        -DWANT_STATIC_LIBS:BOOL='OFF' \
-        -DWANT_USE_FTGL:BOOL='ON' \
-        -DWANT_USE_FontConfig:BOOL='ON' \
-        -DWANT_USE_FriBiDi:BOOL='ON' \
-        -DWANT_USE_GoogleBreakpad:BOOL='OFF' \
-        -DWANT_USE_Ircclient:BOOL='ON' \
-        -DWANT_USE_OpenSSL:BOOL='ON' \
-        -DWANT_USE_STREFLOP:BOOL='ON' \
-        -DWANT_USE_VLC:BOOL='ON' \
-        -DWANT_USE_XercesC:BOOL='ON' \
-        -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-gtk3' \
+    cmake .. \
+       -DCMAKE_INSTALL_PREFIX='/usr' \
+       -DCMAKE_BUILD_TYPE='Release' \
+       -DCMAKE_CXX_FLAGS="-lX11 ${CXXFLAGS}" \
+       -DWANT_GIT_STAMP='0' \
+       -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-gtk3' \
         -Wno-dev \
         ..
         
-    # using '-j1' will avoid errors when building manpages with xvfb
+    # using '-j1' will prevent errors if xvfb is installed (will build manpages)
     make -j1
 }
 
 package() {
-    cd "${pkgname}/build"
+    cd "${_srcname}/build"
     
     make -j1 DESTDIR="$pkgdir" install
 }