Updated: Brought in-line with openra-git, fixed depends.

3 files changed, 32 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b470ee0f3202..30e821fca656 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openra-ra2-git
 	pkgdesc = An OpenRA mod inspired by Command & Conquer: Red Alert 2
-	pkgver = 1053.git.43f28ea
+	pkgver = 1104.git.e655ada
 	pkgrel = 1
 	url = https://github.com/OpenRA/ra2
 	install = openra-ra2.install
@@ -10,6 +10,7 @@ pkgbase = openra-ra2-git
 	makedepends = git
 	makedepends = unzip
 	makedepends = msbuild
+	makedepends = openra-git
 	depends = mono
 	depends = ttf-dejavu
 	depends = openal
@@ -29,9 +30,8 @@ pkgbase = openra-ra2-git
 	source = openra-ra2.appdata.xml
 	source = openra-ra2.desktop
 	md5sums = SKIP
-	md5sums = 868ef09a2ba5fd6907164fb740576c7e
+	md5sums = 4ab1943fe8c3a3510eb675eb8d484834
 	md5sums = 5f9d4e39293302ff69f7a701c870e635
 	md5sums = 882b9d629dde1ecbcd2098a2e0b96b1b
 
 pkgname = openra-ra2-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 0c8ec27be988..0f2772251707 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=openra-ra2-git
 _pkgname=${pkgname/-git}
-pkgver=1053.git.43f28ea
+pkgver=1104.git.e655ada
 pkgrel=1
 pkgdesc="An OpenRA mod inspired by Command & Conquer: Red Alert 2 "
 arch=('any')
@@ -11,7 +11,7 @@ license=('GPL3')
 install=openra-ra2.install
 depends=('mono' 'ttf-dejavu' 'openal' 'libgl' 'freetype2' 'sdl2' 'lua51' 'hicolor-icon-theme' 'gtk-update-icon-cache'
          'desktop-file-utils' 'xdg-utils' 'zenity')
-makedepends=('dos2unix' 'git' 'unzip' 'msbuild')
+makedepends=('dos2unix' 'git' 'unzip' 'msbuild' 'openra-git')
 provides=('openra-ra2')
 options=(!strip)
 source=("git+${url}.git"
@@ -19,7 +19,7 @@ source=("git+${url}.git"
 "openra-ra2.appdata.xml"
 "openra-ra2.desktop")
 md5sums=('SKIP'
-         '868ef09a2ba5fd6907164fb740576c7e'
+         '4ab1943fe8c3a3510eb675eb8d484834'
          '5f9d4e39293302ff69f7a701c870e635'
          '882b9d629dde1ecbcd2098a2e0b96b1b')
 
@@ -34,30 +34,42 @@ prepare() {
     cd $srcdir/ra2
     dos2unix *.md
     chmod +x *.sh
+    
+    if [ ! -e $srcdir/ra2/engine ]; then
+    if [ -e "/usr/lib/openra/src/openra-git/" ]; then
+     ln -s "/usr/lib/openra/src/openra-git" $srcdir/ra2/engine
+     RAVERSION=$(cat $srcdir/ra2/mod.config | grep "ENGINE_VERSION" | head -1 | sed -e 's|=|\n|g;s|"||g' | tail -1)
+     GITVER=$(cat /usr/lib/openra/src/openra-git/VERSION)
+     if [ ! "$RAVERSION" == "$GITVER" ]; then
+        sed -e "s|$RAVERSION|$GITVER|g" $srcdir/ra2/mod.config
+     fi
+     if [ ! $srcdir/ra2/user.config ]; then
+        echo 'AUTOMATIC_ENGINE_MANAGEMENT="False"' > $srcdir/ra2/user.config 
+     fi
+    else
+     echo "openra-git is not installed; exiting." && exit 1;
+    fi
+    fi
 }
 
 build() {
     cd $srcdir/ra2
-    make version VERSION="${pkgver}"
-    make
+    make all
 }
 
 package() {
     cd $srcdir/ra2
-    mkdir -p $pkgdir/usr/{lib/${_pkgname}/mods,bin,share/pixmaps,share/doc/packages/openra-ra2,share/applications,share/appdata}
-    install -dm775 $pkgdir/var/games/openra-ra2
-    cp -r engine/{glsl,lua,AUTHORS,COPYING,*.dll*,GeoLite2-Country.mmdb.gz,'global mix database.dat',launch-dedicated.sh,launch-game.sh,*.exe,VERSION} $pkgdir/usr/lib/openra-ra2
-    cp -r mods/ra2 $pkgdir/usr/lib/${_pkgname}/mods
-    cp -r engine/mods/{common,modcontent} $pkgdir/usr/lib/${_pkgname}/mods
+    mkdir -p $pkgdir/usr/{lib/openra/mods,bin,share/appdata,share/pixmaps,share/applications}
+    install -dm775 $pkgdir/usr/lib/openra/mods/ra2
+    cp -r mods/ra2 $pkgdir/usr/lib/openra/mods
     install -Dm755 $srcdir/openra-ra2 $pkgdir/usr/bin/openra-ra2
     cp -r $srcdir/openra-ra2.appdata.xml $pkgdir/usr/share/appdata/openra-ra2.appdata.xml
-    cp -r README.md $pkgdir/usr/share/doc/packages/${_pkgname}/README.md
-    ln -sf /usr/share/icons/hicolor/512x512/apps/${_pkgname}.png ${pkgdir}/usr/share/pixmaps/${_pkgname}.png
+#    cp $srcdir/ra2/packaging/artwork/icon_512x512.png $pkgdir/usr/share/icons/hicolor/512x512/apps/openra-ra2.png
+    ln -sf /usr/share/icons/hicolor/512x512/apps/openra-ra2.png ${pkgdir}/usr/share/pixmaps/openra-ra2.png
     install -Dm644 $srcdir/openra-ra2.desktop $pkgdir/usr/share/applications/openra-ra2.desktop
-    for size in 16 32 48 64 128 256 512; do
+    for size in 16 32 48 64 128 256 512 1024; do
       size="${size}x${size}"
       mkdir -p "$pkgdir/usr/share/icons/hicolor/${size}/apps"
-      cp packaging/artwork/icon_${size}.png "$pkgdir/usr/share/icons/hicolor/${size}/apps/${_pkgname}.png"
+      cp packaging/artwork/icon_${size}.png "$pkgdir/usr/share/icons/hicolor/${size}/apps/openra-ra2.png"
     done
-    rm $pkgdir/usr/lib/${_pkgname}/*.sh
 }
diff --git a/openra-ra2 b/openra-ra2
index 163ca5fd6131..14c11eaa5225 100755
--- a/openra-ra2
+++ b/openra-ra2
@@ -1,8 +1,8 @@
 #!/bin/sh
-cd "/usr/lib/openra-ra2"
+cd "/usr/lib/openra"
 
 # Run the game
-mono --debug OpenRA.Game.exe Game.Mod=ra2 Engine.LaunchPath="/usr/bin/openra-ra2" "Engine.ModSearchPaths=/usr/lib/openra-ra2/mods" "$@"
+mono --debug OpenRA.Game.exe Game.Mod=ra2 Engine.LaunchPath="/usr/bin/openra-ra2" "Engine.ModSearchPaths=/usr/lib/openra/mods" "$@"
 
 # Show a crash dialog if something went wrong
 if [ $? != 0 ] && [ $? != 1 ]; then
@@ -16,4 +16,3 @@ if [ $? != 0 ] && [ $? != 1 ]; then
   fi
   exit 1
 fi
-