summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2011-10-19 18:27:26 (GMT)
committerJames Meyer <james.meyer@operamail.com>2011-10-19 18:27:26 (GMT)
commite114480cade2f8390c395e2fa5c9b54ee7f95746 (patch)
tree916772924f506f7cae050ef715e6a6ab99a0b09c
parent377439c1a78b29841e814298501fc6aa0a3ac643 (diff)
downloadlinhes_pkgbuild-e114480cade2f8390c395e2fa5c9b54ee7f95746.zip
linhes_pkgbuild-e114480cade2f8390c395e2fa5c9b54ee7f95746.tar.gz
linhes_pkgbuild-e114480cade2f8390c395e2fa5c9b54ee7f95746.tar.bz2
mythinstall: update checkout script to work with the new mythvantage build. The mythtv source is no longer required to be present, just that myth installed.
-rw-r--r--abs/core/mythinstall/PKGBUILD2
-rwxr-xr-xabs/core/mythinstall/checkout_MythVantage.sh26
2 files changed, 19 insertions, 9 deletions
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 36114e3..e45be4e 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=3
-pkgrel=9
+pkgrel=11
pkgdesc="LinHES installer/systemconfig GUI."
arch=i686
depends=()
diff --git a/abs/core/mythinstall/checkout_MythVantage.sh b/abs/core/mythinstall/checkout_MythVantage.sh
index 22af46a..a61ed95 100755
--- a/abs/core/mythinstall/checkout_MythVantage.sh
+++ b/abs/core/mythinstall/checkout_MythVantage.sh
@@ -1,7 +1,11 @@
#!/bin/bash
MYDIR=`pwd`
-#MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable\/mythtv\/src\/mythtv-0.23"
-MYTHPATH="\/data\/linhes_pkgbuild\/abs\/core\/mythtv\/stable-0.24\/mythtv\/src\/mythtv"
+
+PREFIX="\/usr\/include\/mythtv"
+LIBVERSION=0.24
+VERSION=0.24.0
+
+
function setup_links {
rm mythinstall.bin
rm mythbeselect.bin
@@ -16,7 +20,7 @@ if [ ! -d MythVantage-app ]
then
git clone http://mythvantage.com/MythVantage-app.git/
cd MythVantage-app
- git checkout --track -b LinHES origin/LinHES
+# git checkout --track -b LinHES origin/LinHES
cd $MYDIR
setup_links
cd -
@@ -36,15 +40,21 @@ git checkout master
}
dl_repo
-sed -i "s/^MYTHPATH.*$/MYTHPATH\=\"$MYTHPATH\"/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+set -x
+sed -i "s/^LIBVERSION.*$/LIBVERSION = $LIBVERSION/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+sed -i "s/^VERSION.*$/VERSION = $VERSION/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+sed -i "s/^PREFIX.*$/PREFIX = $PREFIX/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+
+
+
sed -i "s/#define __MVAPP__/\/\/#define __MVAPP__/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
-echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro
-echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-echo "INCLUDEPATH += /usr/include/mythtv/libmythui/" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+# echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro
+# echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+# echo "INCLUDEPATH += /usr/include/mythtv/libmythui/" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-echo 'INCLUDEPATH += $$MYTHPATH/mythtv/libs/libmythtv/' >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+#echo 'INCLUDEPATH += $$MYTHPATH/mythtv/libs/libmythtv/' >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
cd $MYDIR/src/MythVantage-app/mythinstall && qmake
make || exit 1