From 0778f137a18df0faf19a8195889c7f1ee1b19cbe Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 22 Feb 2009 18:56:45 -0600
Subject: moving myth to /usr still plenty of changes to be made.

---
 abs/mv-core/MythVantage-config/PKGBUILD                     |  8 ++++----
 abs/mv-core/MythVantage-config/systemconfig.sh              | 11 +++--------
 abs/mv-core/myth/release-fixes/MythVanage-mythmenu/PKGBUILD |  6 +++---
 .../myth/release-fixes/mythtv-release-fixes/PKGBUILD        | 13 +++++++------
 abs/mv-core/runit-scripts-mv/PKGBUILD                       |  2 +-
 .../runit-scripts-mv/runitscripts/services/frontend/run     |  2 ++
 6 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/abs/mv-core/MythVantage-config/PKGBUILD b/abs/mv-core/MythVantage-config/PKGBUILD
index f1e6c40..c2b760a 100755
--- a/abs/mv-core/MythVantage-config/PKGBUILD
+++ b/abs/mv-core/MythVantage-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=MythVantage-config
 pkgver=3.2
-pkgrel=144
+pkgrel=148
 pkgdesc="The Gui-installer"
 depends=(bc mysql-python expect curl dnsutils sg3_utils parted)
 arch=('i686')
@@ -10,7 +10,7 @@ build() {
 
 
     mkdir -p $startdir/pkg/etc
-    mkdir -p $startdir/pkg/usr/local/share/mythtv/themes/default
+    mkdir -p $startdir/pkg/usr/share/mythtv/themes/default
 
 # new stuff
     MVDIR=$startdir/pkg/usr/MythVantage
@@ -48,8 +48,8 @@ build() {
     install -m 0755 issue $startdir/pkg/etc/issue
 
 # copy over the ui files
-    install -m 0755 install-ui.xml $startdir/pkg/usr/local/share/mythtv/themes/default/
-    install -m 0755 bpopup-ui.xml $startdir/pkg/usr/local/share/mythtv/themes/default/
+    install -m 0755 install-ui.xml $startdir/pkg/usr/share/mythtv/themes/default/
+    install -m 0755 bpopup-ui.xml $startdir/pkg/usr/share/mythtv/themes/default/
 #copy in the binaries
     install -g mythtv -m 4750 mythinstall.bin $MVDIR/bin/MythVantage
     cd $MVDIR/bin
diff --git a/abs/mv-core/MythVantage-config/systemconfig.sh b/abs/mv-core/MythVantage-config/systemconfig.sh
index 5884b69..2f4c3e0 100755
--- a/abs/mv-core/MythVantage-config/systemconfig.sh
+++ b/abs/mv-core/MythVantage-config/systemconfig.sh
@@ -879,14 +879,14 @@ then
     ex ${BASE}/etc/dnsmasq.conf <<EOF
     :$COMMAND
     :wq
-    EOF
+EOF
 
     #setup dns to my ip
     COMMAND="%s/^dhcp-option=6.*$/dhcp-option=6,${MYTHIP}/"
     ex ${BASE}/etc/dnsmasq.conf <<EOF
     :$COMMAND
     :wq
-    EOF
+EOF
 
 
     #change nfsroot to my ip
@@ -894,7 +894,7 @@ then
     ex ${BASE}/data/srv/tftp/pxelinux.cfg/default <<EOF
     :$COMMAND
     :wq
-    EOF
+EOF
 
     #add 127.0.0.1 to /etc/resolv.conf
     echo "search lan" > ${BASE}/etc/resolv.conf
@@ -908,11 +908,6 @@ ex ${BASE}/data/srv/tftp/dongle.bin.config <<EOF
 :$COMMAND
 :wq
 EOF
-
-
-
-#setup dongle.config
-
 }
 
 function reloadfe(){
diff --git a/abs/mv-core/myth/release-fixes/MythVanage-mythmenu/PKGBUILD b/abs/mv-core/myth/release-fixes/MythVanage-mythmenu/PKGBUILD
index 888228e..ed3a517 100755
--- a/abs/mv-core/myth/release-fixes/MythVanage-mythmenu/PKGBUILD
+++ b/abs/mv-core/myth/release-fixes/MythVanage-mythmenu/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=MythVantage-mythmenu
 pkgver=1.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Myth menu with MythVantage settings"
 #depends=( mythtv-svn )
 source=()
@@ -8,8 +8,8 @@ arch=('i686')
 build() {
         cd $startdir/src
         rsync -a --exclude=.svn $startdir/MythVantage-menu .
-        mkdir -p  -m 755 $startdir/pkg/usr/local/share/mythtv/themes
-        cp -rp MythVantage-menu $startdir/pkg/usr/local/share/mythtv/themes
+        mkdir -p  -m 755 $startdir/pkg/usr/share/mythtv/themes
+        cp -rp MythVantage-menu $startdir/pkg/usr/share/mythtv/themes
 
 }
 
diff --git a/abs/mv-core/myth/release-fixes/mythtv-release-fixes/PKGBUILD b/abs/mv-core/myth/release-fixes/mythtv-release-fixes/PKGBUILD
index 0c14cfc..6c57b51 100755
--- a/abs/mv-core/myth/release-fixes/mythtv-release-fixes/PKGBUILD
+++ b/abs/mv-core/myth/release-fixes/mythtv-release-fixes/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv-release-fixes
-pkgver=18322
-pkgrel=13
+pkgver=20034
+pkgrel=1
 pkgdesc=".21  A personal video recorder for Linux"
 url="http://www.mythtv.org"
 license="GPL"
@@ -46,7 +46,8 @@ build() {
   	sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgver/" version.pro
          make distclean
 	 make clean
-	 ./configure --prefix=/usr --disable-xvmc --disable-xvmc-pro --enable-opengl-vsync --enable-dvb --enable-firewire --compile-type=release --with-bindings=perl --disable-audio-arts --disable-xrandr  --disable-audio-jack   --disable-directfb
+	 ./configure --prefix=/usr --enable-opengl-vsync --enable-dvb --enable-firewire --compile-type=release --with-bindings=perl --disable-audio-arts --disable-xrandr  --disable-audio-jack   --disable-directfb --disable-xvmc  --disable-xvmcw --enable-xvmc-pro --enable-xvmc-opengl  
+
 . /etc/profile
 
    make
@@ -70,9 +71,9 @@ build() {
     cd $startdir/src/mythtv/contrib
     gcc -Wall -o firewire_tester firewire_tester.c -liec61883 -lraw1394
     install -m0755 firewire_tester $startdir/pkg/usr/bin/firewire_tester
-    install -m0755  $startdir/pkg/usr/share/mythtv/contrib/optimize_mythdb.pl  $startdir/pkg/usr/local/bin/optimize_mythdb.pl
-    cp $startdir/src/myth.find_orphans.pl $startdir/pkg/usr/share/mythtv/contrib/myth.find_orphans.pl
-    install -m0755  $startdir/pkg/usr/share/mythtv/contrib/myth.find_orphans.pl  $startdir/pkg/usr/bin/myth.find_orphans.pl
+#    install -m0755  $startdir/pkg/usr/share/mythtv/contrib/optimize_mythdb.pl  $startdir/pkg/usr/local/bin/optimize_mythdb.pl
+#    cp $startdir/src/myth.find_orphans.pl $startdir/pkg/usr/share/mythtv/contrib/myth.find_orphans.pl
+#    install -m0755  $startdir/pkg/usr/share/mythtv/contrib/myth.find_orphans.pl  $startdir/pkg/usr/bin/myth.find_orphans.pl
 
 
 }
diff --git a/abs/mv-core/runit-scripts-mv/PKGBUILD b/abs/mv-core/runit-scripts-mv/PKGBUILD
index cd5466f..d96b542 100755
--- a/abs/mv-core/runit-scripts-mv/PKGBUILD
+++ b/abs/mv-core/runit-scripts-mv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts-mv
 pkgver=1.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="collection of startup scripts for runit MythVantage styel"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run
index 3b43b4f..35d97d0 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run
@@ -1,5 +1,7 @@
 #!/bin/sh
 exec 2>&1
+sv start dbus
+sv start hal
  grep -q  noautologin /proc/cmdline
  STATUS=$?
   if  [ $STATUS = 0 ]
-- 
cgit v0.12

