dolphin-emu: changed to make use of gen_game_xml.py

Also using master branch instead of 3.0   the 3.0 branch fails to compile

5 files changed, 22 insertions, 34 deletions

diff --git a/abs/extra/dolphin-emu/PKGBUILD b/abs/extra/dolphin-emu/PKGBUILD
index b25032e..04547f2 100644
--- a/abs/extra/dolphin-emu/PKGBUILD
+++ b/abs/extra/dolphin-emu/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=dolphin-emu
 pkgver=3.0
-pkgrel=11
+pkgrel=12
 epoch=1
 pkgdesc="A GameCube and Wii emulator (stable git branch)"
 arch=('i686' 'x86_64')
@@ -27,7 +27,8 @@ source=('dolphin-emu.desktop'
         'Dolphin_Logo.png'
 	'dolphin-emu.xml'
 	'dolphin-emu_games.xml'
-	'dolphin-emu_scan.sh')
+	'dolphin-emu_scan.sh'
+	'gen_lib_dolphin-emu.conf')
 
 _gitroot=https://code.google.com/p/dolphin-emu/
 _gitname=dolphin-emu-3.0
@@ -50,8 +51,8 @@ build() {
   git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
   cd "$srcdir/$_gitname-build"
 
-  msg "Checking out at stable 3.0 branch"
-  git checkout 3.0
+#  msg "Checking out at stable 3.0 branch"
+#  git checkout 3.0
 
   msg "GIT checkout done or server timeout"
 
@@ -67,7 +68,7 @@ package() {
   cd "${srcdir}/dolphin-emu-3.0-build/build"
 
   make DESTDIR=${pkgdir} install
-  
+
   mkdir -p "${pkgdir}"/usr/share/mythtv/themes/defaultmenu
   mkdir -p "${pkgdir}"/usr/LH/bin
 
@@ -76,6 +77,8 @@ package() {
   cp "${srcdir}/dolphin-emu.xml" "${pkgdir}/usr/share/mythtv/themes/defaultmenu"
   cp "${srcdir}/dolphin-emu_games.xml" "${pkgdir}/usr/share/mythtv/themes/defaultmenu"
   install -m755 "${srcdir}/dolphin-emu_scan.sh" "${pkgdir}/usr/LH/bin"
+  #add in file for gen_game.xml
+  install -D -m0744 ${srcdir}/gen_lib_dolphin-emu.conf ${pkgdir}/etc/gen_game_xml.d/dolphin-emu.conf
 }
 
 # vim:set ts=2 sw=2 et:
@@ -85,4 +88,5 @@ md5sums=('feed4580c2e6bfbc7f6c67dad861daae'
          'd15c51f547b4bd47e510faac40bcc9d6'
          'ab7a9b9cfe03db65c881134c0f02bda0'
          '1d03499e0abab56285bc97176d311bf1'
-         'af44dd20626ce26d0a07dadc37c20233')
+         'af44dd20626ce26d0a07dadc37c20233'
+         '9884a9769c1954ab9dcb0727c8c81984')
diff --git a/abs/extra/dolphin-emu/__changelog b/abs/extra/dolphin-emu/__changelog
index e9f68e8..113934d 100644
--- a/abs/extra/dolphin-emu/__changelog
+++ b/abs/extra/dolphin-emu/__changelog
@@ -1,3 +1,5 @@
 6/9/12 -chw-
 Added install file, and mythtv menu files.
 removed portaudio because it drug in jack
+
+--converted .install file to use gen_game_xml.py
diff --git a/abs/extra/dolphin-emu/dolphin-emu.install b/abs/extra/dolphin-emu/dolphin-emu.install
index 6acdd50..84b587f 100644
--- a/abs/extra/dolphin-emu/dolphin-emu.install
+++ b/abs/extra/dolphin-emu/dolphin-emu.install
@@ -1,36 +1,11 @@
 post_install() {
-  mv /usr/share/mythtv/themes/defaultmenu/game.xml /tmp
-  grep -v -e /mythmenu /tmp/game.xml > /tmp/game.xml.tmp
-  echo "<!--#Dolphin-Emu-->" >> /tmp/game.xml.tmp
-  echo "   <button>" >> /tmp/game.xml.tmp
-  echo "     <type>MENU_GAME</type>" >> /tmp/game.xml.tmp
-  echo "     <text>Dolphin Emulator</text>" >> /tmp/game.xml.tmp
-  echo "     <action>MENU dolphin-emu.xml</action>" >> /tmp/game.xml.tmp 
-  echo "   </button>" >> /tmp/game.xml.tmp
-  echo "<!--#Dolphin-Emu-->" >> /tmp/game.xml.tmp
-  echo "" >> /tmp/game.xml.tmp
-  echo "</mythmenu>" >> /tmp/game.xml.tmp
-  mv /tmp/game.xml.tmp /usr/share/mythtv/themes/defaultmenu/game.xml
+    gen_game_xml.py
 }
 
 post_upgrade() {
-  mv /usr/share/mythtv/themes/defaultmenu/game.xml /tmp/game.xml.tmp
-  sed -e '/\#Dolphin-Emu/,/\#Dolphin-Emu/d' < /tmp/game.xml.tmp > /usr/share/mythtv/themes/defaultmenu/game.xml
-  mv /usr/share/mythtv/themes/defaultmenu/game.xml /tmp
-  grep -v -e /mythmenu /tmp/game.xml > /tmp/game.xml.tmp
-  echo "<!--#Dolphin-Emu-->" >> /tmp/game.xml.tmp
-  echo "   <button>" >> /tmp/game.xml.tmp
-  echo "     <type>MENU_GAME</type>" >> /tmp/game.xml.tmp
-  echo "     <text>Dolphin Emulator</text>" >> /tmp/game.xml.tmp
-  echo "     <action>MENU dolphin-emu.xml</action>" >> /tmp/game.xml.tmp 
-  echo "   </button>" >> /tmp/game.xml.tmp
-  echo "<!--#Dolphin-Emu-->" >> /tmp/game.xml.tmp
-  echo "" >> /tmp/game.xml.tmp
-  echo "</mythmenu>" >> /tmp/game.xml.tmp
-  mv /tmp/game.xml.tmp /usr/share/mythtv/themes/defaultmenu/game.xml
+    gen_game_xml.py
 }
 
 post_remove() {
-  mv /usr/share/mythtv/themes/defaultmenu/game.xml /tmp/game.xml.tmp
-  sed -e '/\#Dolphin-Emu/,/\#Dolphin-Emu/d' < /tmp/game.xml.tmp > /usr/share/mythtv/themes/defaultmenu/game.xml
+    gen_game_xml.py
 }
diff --git a/abs/extra/dolphin-emu/dolphin_emu.confcd b/abs/extra/dolphin-emu/dolphin_emu.confcd
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/abs/extra/dolphin-emu/dolphin_emu.confcd
diff --git a/abs/extra/dolphin-emu/gen_lib_dolphin-emu.conf b/abs/extra/dolphin-emu/gen_lib_dolphin-emu.conf
new file mode 100644
index 0000000..51b89d0
--- /dev/null
+++ b/abs/extra/dolphin-emu/gen_lib_dolphin-emu.conf
@@ -0,0 +1,7 @@
+<!--#Dolphin-Emu-->
+    <button>
+        <type>MENU_GAME</type>
+        <text>Dolphin Emulator</text>
+        <action>MENU dolphin-emu.xml</action>
+    </button>
+<!--#Dolphin-Emu-->