First one that builds

5 files changed, 20 insertions, 198 deletions

diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
index 1089c4c..056a99e 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
@@ -13,7 +13,8 @@ options=(!strip)
 MAKEFLAGS="-j6"
 install='mythtv.install'
 
-patchs=('svn_main_menu_popup.patch' 'smolt_jump.patch' 'DeviceReadBuffer-polltimeout.2.patch' 'mpegrecorder-hdpvr-v2a.patch' 'hdpvr-livetv.patch')
+patchs=('smolt_jump.patch' 'DeviceReadBuffer-polltimeout.2.patch' 'mpegrecorder-hdpvr-v2a.patch' 'hdpvr-livetv.patch')
+#patchs=('svn_main_menu_popup.patch' 'smolt_jump.patch' 'DeviceReadBuffer-polltimeout.2.patch' 'mpegrecorder-hdpvr-v2a.patch' 'hdpvr-livetv.patch')
 source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` )
 arch=('i686')
 md5sums=()
@@ -33,7 +34,7 @@ build() {
 	do
 		echo applying $i
 		echo "-----------------------------"
-		patch -Np0  -i ${startdir}/src/$i  #|| return 1
+		patch -Np0  -i ${startdir}/src/$i  || return 1
 	done
 	echo "--------------------------done applying patches-----------------------------------------------"
 
@@ -61,11 +62,10 @@ build() {
 	# cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ || return 1
 
 	# install contrib
-	mkdir -p $startdir/pkg/usr/share/mythtv/contrib || return 1
-	install -m0755 contrib/* $startdir/pkg/usr/share/mythtv/contrib
+	cp -r contrib $startdir/pkg/usr/share/mythtv/ || return 1
 
 	# patch the xml LinHES style
-	cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv/themes/defaultmenu
+	cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv/themes/defaultmenu/
 	cd $startdir/pkg/usr/share/mythtv/themes/defaultmenu
 	patch -p0 < $startdir/menu-xml/mainmenu.xml.patch
 	patch -p0 < $startdir/menu-xml/optical_menu.xml.patch
diff --git a/abs/core-testing/mythtv/trunk/mythtv/compile_mythtv.sh b/abs/core-testing/mythtv/trunk/mythtv/compile_mythtv.sh
deleted file mode 100755
index ca457e3..0000000
--- a/abs/core-testing/mythtv/trunk/mythtv/compile_mythtv.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-# compile_mythtv.sh
-# rev 0.5 - 1Nov2008
-#
-# This script will compile and install MythTV
-#
-
-PKG_MAINTAINER=nharris@eoimaging.com
-echo PKG_MAINTAINER is set to $PKG_MAINTAINER
-
-PKG_VER=0.22-svn`date +%Y%m%d`
-echo PKG_VER is set to $PKG_VER
-
-cd src/mythtv-trunk
-
-#
-# compile mythtv
-#
-echo Compiling mythtv
-cd mythtv
-export QTDIR=/usr/share/qt
-./configure --enable-opengl-vsync --cpu=i686 --enable-vdpau --enable-opengl-vsync --enable-libfaad --prefix=/usr
-#./configure --cpu=i686 --enable-dvb --enable-xvmc --enable-opengl-vsync --enable-xvmc-pro --enable-libfaad --prefix=/usr
-qmake mythtv.pro
-make || return 1
-
-#
-# install mythtv
-#
-#echo "MythTV 0.22 SVN build" > description-pak
-#checkinstall -D --default --pkgname mythtv --pkgversion $PKG_VER --maintainer $PKG_MAINTAINER
-#mv myth*.deb ../..
-sudo make install
-cd ..
-
-#
-# compile mythplugins
-#
-echo Compiling mythplugings
-cd mythplugins
-./configure --enable-all --cpu=i686 --prefix=/usr
-qmake mythplugins.pro
-make || return 1
-
-#
-# install mythplugins
-#
-#echo "MythTV 0.22 SVN build" > description-pak
-#checkinstall -D --default --pkgname mythplugins --pkgversion $PKG_VER --maintainer $PKG_MAINTAINER
-#mv myth*.deb ../..
-sudo make install
-cd ..
-
-#
-# compile myththemes
-#
-echo Compiling myththemes
-cd myththemes
-./configure --prefix=/usr
-qmake myththemes.pro
-make || return 1
-
-#
-# install myththemes
-#
-#echo "MythTV 0.22 SVN build" > description-pak
-#checkinstall -D --default --pkgname myththemes --pkgversion $PKG_VER --maintainer $PKG_MAINTAINER
-#mv myth*.deb ../..
-sudo make install
-cd ..
-
-#
-# compile additional themes
-#
-echo Compiling additional themes
-cd themes
-./configure --prefix=/usr
-qmake themes.pro
-make || return 1
-
-#
-# install additional themes
-#
-#echo "MythTV 0.22 SVN build" > description-pak
-#checkinstall -D --default --pkgname mythtv-themes --pkgversion $PKG_VER --maintainer $PKG_MAINTAINER
-#mv myth*.deb ../..
-sudo make install
-cd ..
-
-#
-# update mythweb
-#
-cd mythplugins/mythweb
-sudo cp -R * /data/srv/httpd/htdocs/mythweb
-sudo chown -R http:users /data/srv/httpd/htdocs/mythweb
-cd ../..
-
-echo "DONE!"
-
diff --git a/abs/core-testing/mythtv/trunk/mythtv/get_mythtv.sh b/abs/core-testing/mythtv/trunk/mythtv/get_mythtv.sh
deleted file mode 100755
index c01ccf1..0000000
--- a/abs/core-testing/mythtv/trunk/mythtv/get_mythtv.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-# get_mythtv.sh
-# rev 0.5 - 1Nov2008
-BUILD_DIR=/home/nharris/mythtv
-
-cd $BUILD_DIR
-
-#
-# get the latest from SVN
-#
-if [ -d src ]
-then
-	cd src
-else
-	mkdir src
-	cd src
-fi
-
-if [ -d mythtv-trunk ]
-then
-	echo Updating mythtv from svn.
-	cd mythtv-trunk
-	cd mythtv
-	svn update
-	make clean
-	cd ../mythplugins
-	svn update
-	make clean
-	cd ../myththemes
-	svn update
-	make clean
-	cd ../themes
-	svn update
-	make clean
-	cd ..
-else
-	echo Creating mythtv from svn.
-	mkdir mythtv-trunk
-	cd mythtv-trunk
-	svn co http://svn.mythtv.org/svn/trunk/mythtv
-	svn co http://svn.mythtv.org/svn/trunk/mythplugins
-	svn co http://svn.mythtv.org/svn/trunk/myththemes
-	svn co http://svn.mythtv.org/svn/trunk/themes
-fi
-
-#
-# install patches
-#
-MYTH_PATCHES=$BUILD_DIR/patches
-cd $BUILD_DIR/src/mythtv-trunk/mythtv
-
-# HD-PVR support
-patch -p0 < $MYTH_PATCHES/DeviceReadBuffer-polltimeout.2.patch
-patch -p0 < $MYTH_PATCHES/mpegrecorder-hdpvr-v2a.patch
-patch -p0 < $MYTH_PATCHES/hdpvr-livetv.patch
-
-# LinHES popup menu
-patch -p0 < $MYTH_PATCHES/svn_main_menu_popup.patch
-
-# Arch build fix
-cd $BUILD_DIR/src/mythtv-trunk/mythplugins
-patch -p0 < $MYTH_PATCHES/aacdecoder.cpp.patch
-
-# Patch the xml LinHES style
-MENU_DIR=$BUILD_DIR/menu-xml
-MYTH_DIR=$BUILD_DIR/src/mythtv-trunk/mythtv/programs/mythfrontend
-cp $MENU_DIR/*.xml $MYTH_DIR
-cd $MYTH_DIR
-patch -p0 < $MENU_DIR/mainmenu.xml.patch
-patch -p0 < $MENU_DIR/optical_menu.xml.patch
-patch -p0 < $MENU_DIR/library.xml.patch
-
-#
-# END
-#
-cd $BUILD_DIR
-echo "DONE!"
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch
index a299325..2b69210 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch
@@ -1,5 +1,5 @@
---- mainmenu.xml.orig	2009-01-09 02:45:07.000000000 +0000
-+++ mainmenu.xml	2009-01-22 08:04:28.000000000 +0000
+--- mainmenu.xml.orig	2009-02-11 20:23:31.000000000 +0000
++++ mainmenu.xml	2009-02-11 20:27:09.000000000 +0000
 @@ -158,34 +158,8 @@
  
     <button>
@@ -7,10 +7,10 @@
 -     <text>Utilities / Setup</text>
 -     <text lang="IT">Impostazioni</text>
 -     <text lang="ES">Configuración</text>
--     <text lang="CA">Configurar</text>
+-     <text lang="CS">Configurar</text>
 -     <text lang="FR">paramètres</text>
 -     <text lang="DE">Zubehör / Konfiguration</text>
--     <text lang="DK">Tilbehør/Indstillinger</text>
+-     <text lang="DA">Tilbehør/Indstillinger</text>
 -     <text lang="IS">Uppsetning</text>
 -     <text lang="NL">Configuratie</text>
 -     <text lang="PT">Utensílios</text>
@@ -18,10 +18,10 @@
 -     <text lang="JA">設定</text>
 -     <text lang="FI">Oheis/Asetukset</text>
 -     <text lang="ZH_TW">工具/設定</text>
--     <text lang="SI">Nastavitve</text>
+-     <text lang="SL">Nastavitve</text>
 -     <text lang="ET">Utiliidid / sätted</text>
 -     <text lang="NB">Verktøy/Oppsett</text>
--     <text lang="CZ">Pomůcky</text>
+-     <text lang="CS">Pomůcky</text>
 -     <text lang="RU">Утилиты / Настройки</text>
 -     <text lang="AR">تضبيطات</text>
 -     <text lang="PL">Narzędzia / ustawienia</text>
diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch
index 26ac863..6d3325f 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch
+++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch
@@ -1,17 +1,15 @@
---- util_menu.xml.orig	2009-01-09 02:45:07.000000000 +0000
-+++ util_menu.xml	2009-01-22 08:04:28.000000000 +0000
-@@ -76,7 +76,13 @@
-       <action>PLUGIN mythcontrols</action>
-       <depends>mythcontrols</depends>	
+--- util_menu.xml.orig	2009-02-11 19:45:51.000000000 +0000
++++ util_menu.xml	2009-02-11 20:45:12.000000000 +0000
+@@ -54,6 +54,12 @@
     </button>
--      
-+
-+   <button>
+ 
+    <button>
 +      <type>VIDEO_SCREENSHOOTER</type>
 +      <text>Thumbnail Generator</text>
 +      <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action>
 +   </button>
 +
-    <button>
-       <type>SETUP_MENU</type>
-       <text>Setup</text>
++   <button>
+       <type>SETUP_KEYS</type>
+       <text>Edit Keys</text>
+       <text lang="IT">Modifica Tasti</text>