Update

6 files changed, 97 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 01afb7c2d293..a73c3304e0f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,36 @@
+# Generated by mksrcinfo v8
+# Fri Mar  9 04:58:33 UTC 2018
 pkgbase = dofus-beta
 	pkgdesc = A manga inspired, Massively Multiplayer Online Role-playing Game (MMORPG) for Adobe AIR (Beta version).
-	pkgver = 2.21
-	pkgrel = 2
+	pkgver = 2.46
+	pkgrel = 1
 	url = http://www.dofus.com/
 	install = dofus-beta.install
 	arch = i686
 	arch = x86_64
 	license = custom:Dofus License
-	depends = ankama-transition>=3.8.1-3
 	depends = adobe-air-sdk
-	backup = opt/ankama/dofus-beta/transition.conf
-	source = dofus-beta.sh
+	depends = qt5-base
+	depends = libpng12
+	optdepends = pulseaudio-alsa: Required for the game to play sounds with PulseAudio
 	source = dofus-beta.desktop
+	source = dofus-beta.sh
 	source = air-generic-launcher.sh
-	source = transition.conf
-	md5sums = 91023d67a519421912b3d101ded7ca12
+	source = transition.conf.patch
 	md5sums = 0e797e4fcf39e1d06f68b51bfd215040
-	md5sums = f179eaa5e6e6674b1853cf826fc33c3a
-	md5sums = fa976733b3be4df63e157ee6c3dd1186
-	source_i686 = http://dl.ak.ankama.com/games/dofus2-beta/setup/setup-beta-transition-x86.tar.gz
+	md5sums = cecd52aa9a58f756fa15925528400d66
+	md5sums = 092f6852a6ea603a7b8c7175a13eb416
+	md5sums = 28fa5927aad634debf7f1ff9f549f59c
+	source_i686 = http://dl.ak.ankama.com/games/installers/beta/dofus-beta-x86.tar.gz
 	depends_i686 = gtk2
 	depends_i686 = alsa-lib
-	md5sums_i686 = 7dac81b01102aeafc0664e0e5e1d7106
-	source_x86_64 = http://dl.ak.ankama.com/games/dofus2-beta/setup/setup-beta-transition-amd64.tar.gz
+	depends_i686 = alsa-plugins
+	md5sums_i686 = 01ce4e20df355f9a5724ef5c5b880cbf
+	source_x86_64 = http://dl.ak.ankama.com/games/installers/beta/dofus-beta-amd64.tar.gz
 	depends_x86_64 = lib32-gtk2
 	depends_x86_64 = lib32-alsa-lib
-	md5sums_x86_64 = 2daef0db4643b34688ba67793412f07b
+	depends_x86_64 = lib32-alsa-plugins
+	md5sums_x86_64 = 7566e58290a158e12156ef8ab608c7d0
 
 pkgname = dofus-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index a5cb8d4b1ec0..b0a073f747ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,58 +3,77 @@
 # Contributor: p2k <Patrick.Schneider@uni-ulm.de>
 # Contributor: Schtroumpfette <fpeterschmitt@voila.fr>
 
+# 1: use adl to launch the game. Otherwise, use official game binaries directly.
+USE_ADL=1
+
 pkgname=dofus-beta
-pkgver=2.21
-pkgrel=2
-pkgdesc='A manga inspired, Massively Multiplayer Online Role-playing Game (MMORPG) for Adobe AIR  (Beta version).'
+pkgver=2.46
+pkgrel=1
+pkgdesc='A manga inspired, Massively Multiplayer Online Role-playing Game (MMORPG) for Adobe AIR (Beta version).'
 arch=('i686' 'x86_64')
 url='http://www.dofus.com/'
 license=('custom:Dofus License')
 install='dofus-beta.install'
-backup=('opt/ankama/dofus-beta/transition.conf')
-depends=('ankama-transition>=3.8.1-3' 'adobe-air-sdk')
-depends_i686=('gtk2' 'alsa-lib')
-depends_x86_64=('lib32-gtk2' 'lib32-alsa-lib')
+depends=('adobe-air-sdk' 'qt5-base' 'libpng12')
+depends_x86_64+=('lib32-gtk2' 'lib32-alsa-lib' 'lib32-alsa-plugins')
+depends_i686+=('gtk2' 'alsa-lib' 'alsa-plugins')
+optdepends=('pulseaudio-alsa: Required for the game to play sounds with PulseAudio')
 
-source=('dofus-beta.sh'
-        'dofus-beta.desktop'
+source=('dofus-beta.desktop'
+        'dofus-beta.sh'
         'air-generic-launcher.sh'
-        'transition.conf')
-source_i686=('http://dl.ak.ankama.com/games/dofus2-beta/setup/setup-beta-transition-x86.tar.gz')
-source_x86_64=('http://dl.ak.ankama.com/games/dofus2-beta/setup/setup-beta-transition-amd64.tar.gz')
+        'transition.conf.patch')
+source_i686=('http://dl.ak.ankama.com/games/installers/beta/dofus-beta-x86.tar.gz')
+source_x86_64=('http://dl.ak.ankama.com/games/installers/beta/dofus-beta-amd64.tar.gz')
+md5sums=('0e797e4fcf39e1d06f68b51bfd215040'
+         'cecd52aa9a58f756fa15925528400d66'
+         '092f6852a6ea603a7b8c7175a13eb416'
+         '28fa5927aad634debf7f1ff9f549f59c')
+md5sums_i686=('01ce4e20df355f9a5724ef5c5b880cbf')
+md5sums_x86_64=('7566e58290a158e12156ef8ab608c7d0')
 
-md5sums=('91023d67a519421912b3d101ded7ca12'
-         '0e797e4fcf39e1d06f68b51bfd215040'
-         'f179eaa5e6e6674b1853cf826fc33c3a'
-         'fa976733b3be4df63e157ee6c3dd1186')
-md5sums_i686=('7dac81b01102aeafc0664e0e5e1d7106')
-md5sums_x86_64=('2daef0db4643b34688ba67793412f07b')
+prepare() {
+  if [ "$USE_ADL" -eq "1" ]
+  then
+    cd "$srcdir"
+    msg2 'Modifying transition configuration to use adl-based launchers'
+    patch -p0 < transition.conf.patch
+  fi
+}
 
 package() {
-  _installdir="$pkgdir/opt/ankama/dofus-beta"
-  install -d "$_installdir"
-
-  cd "$srcdir"
-  msg2 'Installing menu entry...'
-  install -Dm755 'dofus-beta.sh' "$pkgdir/usr/bin/dofus-beta"
-  install -Dm644 'dofus-beta.desktop' "$pkgdir/usr/share/applications/dofus-beta.desktop"
-  install -Dm644 'DofusBeta/share/icon/dofus-icon-128.png' "$pkgdir/usr/share/pixmaps/dofus-beta.png"
-
   msg2 'Installing main applications...'
-  mv "DofusBeta/"{bin,share} "$_installdir"
-  install -Dm644 transition.conf "$_installdir"
+  installdir='opt/ankama/dofus-beta'
+  install -d "$pkgdir/$installdir"
+  cp -r "$srcdir/DofusBeta/"* "$pkgdir/$installdir"
 
   msg2 'Setting up game file permissions...'
-  chgrp -R games $_installdir
-  chmod -R g+w $_installdir
-  chmod 666 "$_installdir/share/META-INF/AIR/application.xml"
+  chgrp -R games "$pkgdir/$installdir"
+  chmod -R g+w "$pkgdir/$installdir"
+  install -dm775 "$pkgdir/$installdir/bin"
+  install -dm775 "$pkgdir/$installdir/share/reg/"
+  install -dm775 "$pkgdir/$installdir/share/reg/bin"
+
+  msg2 'Installing launcher...'
+  install -Dm755 "$srcdir/dofus-beta.sh" "$pkgdir/usr/bin/dofus-beta"
+  install -Dm644 "$srcdir/dofus-beta.desktop" "$pkgdir/usr/share/applications/dofus-beta.desktop"
 
-  msg2 'Installing adl based launchers...'
-  install -Dm755 'air-generic-launcher.sh' "$_installdir/bin"
-  install -Dm755 'air-generic-launcher.sh' "$_installdir/share/reg/bin"
+  msg2 'Installing icons...'
+  for icon in "$srcdir/DofusBeta/share/updater_data/icons/game_icon_"*'.png'
+  do
+    size="$(basename "$icon" | grep -o '[0-9]\+x[0-9]\+')"
+    install -Dm644 "$icon" "$pkgdir/usr/share/icons/hicolor/$size/apps/dofus-beta.png"
+  done
 
-  msg2 'Installing transition update file...'
-  ln -s '/opt/ankama/transition/' "$_installdir/transition"
+  if [ "$USE_ADL" -eq "1" ]
+  then
+    msg2 'Installing adl based launchers...'
+    install -Dm755 'air-generic-launcher.sh' "$pkgdir/$installdir/bin/air-generic-launcher.sh"
+    install -Dm755 'air-generic-launcher.sh' "$pkgdir/$installdir/share/reg/bin/air-generic-launcher.sh"
+  else
+    msg2 'Installing link to bypass Adobe Air detection...'
+    ln -s '/opt/adobe-air-sdk/runtimes/air/linux/Adobe AIR/' "$pkgdir/opt/Adobe AIR"
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/air-generic-launcher.sh b/air-generic-launcher.sh
index 5271757d3b10..9adfca72eaee 100644
--- a/air-generic-launcher.sh
+++ b/air-generic-launcher.sh
@@ -7,9 +7,8 @@ SCRIPT_DIR=`dirname $SCRIPT_PATH`
 BASE_DIR=`readlink -f $SCRIPT_DIR/..`
 
 if [ "`uname -m`" == "x86_64" ]; then
-	export GTK_PATH=/usr/lib32/gtk-2.0
-	export G_FILENAME_ENCODING=UTF-8
+  export GTK_PATH=/usr/lib32/gtk-2.0
+  export G_FILENAME_ENCODING=UTF-8
 fi
 
 /opt/adobe-air-sdk/bin/adl -nodebug $BASE_DIR/share/META-INF/AIR/application.xml $BASE_DIR/share -- $*
-
diff --git a/dofus-beta.install b/dofus-beta.install
index 05a5113a3a55..5d625724e335 100644
--- a/dofus-beta.install
+++ b/dofus-beta.install
@@ -3,7 +3,6 @@ post_install() {
   chmod -R g+w /opt/ankama/dofus-beta
   touch /opt/ankama/dofus-beta/share/log4as.xml
   chmod 666 /opt/ankama/dofus-beta/share/log4as.xml
-  chmod 666 /opt/ankama/dofus-beta/share/META-INF/AIR/application.xml
   cat <<END
 The game files are installed under group "games". Please add your user
 to this group with "usermod -a -G games", otherwise you will need to
@@ -14,4 +13,3 @@ END
 post_upgrade() {
   post_install
 }
-
diff --git a/dofus-beta.sh b/dofus-beta.sh
index 4e37e2dd8858..52d26c0cac64 100644
--- a/dofus-beta.sh
+++ b/dofus-beta.sh
@@ -1,4 +1,10 @@
 #!/bin/sh
-/usr/bin/transition \
-  --configuration_file=/opt/ankama/dofus-beta/transition.conf \
-  --application-id=ankama-dofus-beta-transition
+
+game=/opt/ankama/dofus-beta/DofusBeta
+# Use padsp or the game may not play sounds with PulseAudio
+if which padsp
+then
+  padsp "$game" "$@"
+else
+  "$game" "$@"
+fi
diff --git a/transition.conf.patch b/transition.conf.patch
new file mode 100644
index 000000000000..96ede184f6a7
--- /dev/null
+++ b/transition.conf.patch
@@ -0,0 +1,12 @@
+--- DofusBeta/transition.conf	2018-03-08 21:20:39.591423448 +0100
++++ DofusBeta/transition.conf	2018-03-08 21:20:50.366295198 +0100
+@@ -21,3 +21,9 @@
+ update.projects *= "transition"
+ update.projects *= "game"
+ 
++bypass_air_installation = true
++dofus.reg.path = "${root}/share/reg/bin/air-generic-launcher.sh"
++
++launcher.command = """
++"${root}/bin/air-generic-launcher.sh" --lang=${i18n.lang} --update-server-port=${service_port} --updater_version=v2
++"""