summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hanson <mihanson@linhes.org>2012-02-28 00:45:52 (GMT)
committerMichael Hanson <mihanson@linhes.org>2012-02-28 00:45:52 (GMT)
commitc99bc29e7809e31d4647641dd9152cd9ea2470bf (patch)
tree3576c7b01e7e5a23d2a6d44a7013cfada40465fd
parent71d96013726763f077f74ea3bc96c43db61a8a5f (diff)
parentf5acdc079164abbdcecb95f36eeebd375eb47f8b (diff)
downloadlinhes_pkgbuild-c99bc29e7809e31d4647641dd9152cd9ea2470bf.zip
linhes_pkgbuild-c99bc29e7809e31d4647641dd9152cd9ea2470bf.tar.gz
linhes_pkgbuild-c99bc29e7809e31d4647641dd9152cd9ea2470bf.tar.bz2
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
-rw-r--r--abs/core/linhes-scripts/PKGBUILD6
-rw-r--r--abs/core/linhes-scripts/stop_xss.sh (renamed from abs/extra/web-on-linhes/stop_xss.sh)2
-rw-r--r--abs/extra/huludesktop/PKGBUILD13
-rw-r--r--abs/extra/huludesktop/huludesktop.install3
-rw-r--r--abs/extra/huludesktop/huludesktop.sh7
-rw-r--r--abs/extra/web-on-linhes/PKGBUILD9
-rw-r--r--abs/extra/web-on-linhes/web-on-linhes.install8
7 files changed, 26 insertions, 22 deletions
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index a50faf8..8b7bb1f 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=27
+pkgrel=29
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
@@ -49,6 +49,7 @@ upgrade_screen_rc
upgrade_linhes_script.sh
find_orphans.py
acl_fix_fstab.py
+stop_xss.sh
)
build() {
@@ -101,4 +102,5 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
'974c137d3fcb85942ba8945a1bc815fe'
'4b8671376fad6d76874508434d42fbfd'
'd8838461af9d446a1fd7e7883fdc75d1'
- 'cc9cdabcdfc969c2829b58c0e513488c')
+ 'cc9cdabcdfc969c2829b58c0e513488c'
+ 'cb16a30491c4352eb0eee11c2bca91f9')
diff --git a/abs/extra/web-on-linhes/stop_xss.sh b/abs/core/linhes-scripts/stop_xss.sh
index 5ed0ae1..c600795 100644
--- a/abs/extra/web-on-linhes/stop_xss.sh
+++ b/abs/core/linhes-scripts/stop_xss.sh
@@ -3,7 +3,7 @@
while [ 1=1 ];
do
- if [ "$(pidof chromium)" ]
+ if [ "$(pidof chromium)" -o "$(pidof huludesktop)" ]
then
xscreensaver-command -deactivate
fi
diff --git a/abs/extra/huludesktop/PKGBUILD b/abs/extra/huludesktop/PKGBUILD
index 0eec9b1..58cd1ca 100644
--- a/abs/extra/huludesktop/PKGBUILD
+++ b/abs/extra/huludesktop/PKGBUILD
@@ -1,22 +1,25 @@
pkgname=huludesktop
-pkgver=0.1
-pkgrel=9
+pkgver=0.2
+pkgrel=3
pkgdesc="Hulu Desktop for Linux"
arch=(i686)
url="http://www.hulu.com/labs/hulu-desktop-linux"
license=('unknown')
makedepends=('deb2targz')
-depends=('glib2' 'gtk2' 'lirc' 'flashplugin')
+depends=('glib2' 'gtk2' 'lirc' 'flashplugin' 'linhes-scripts>=7-29')
install=huludesktop.install
options=('')
-source=('http://download.hulu.com/huludesktop_i386.deb' 'huludesktop')
+source=('http://download.hulu.com/huludesktop_i386.deb' 'huludesktop' 'huludesktop.sh')
build() {
cd $startdir/src
deb2targz huludesktop_i386.deb
tar -xzvf huludesktop_i386.tar.gz -C $pkgdir
mkdir -p $pkgdir/home/mythtv
+ mkdir -p $pkgdir/usr/LH/bin
cp huludesktop $pkgdir/home/mythtv/.huludesktop
+ install -D -m755 huludesktop.sh ${pkgdir}/usr/LH/bin
}
md5sums=('d9b27d1837ab86526100964e80c3cdd1'
- 'fc6048cc2a6ee3b90808e0b757f0fc9b')
+ 'fc6048cc2a6ee3b90808e0b757f0fc9b'
+ '8f7dbf19d6168bc3a5b0c1da1c878693')
diff --git a/abs/extra/huludesktop/huludesktop.install b/abs/extra/huludesktop/huludesktop.install
index d2f72a7..33d3d3c 100644
--- a/abs/extra/huludesktop/huludesktop.install
+++ b/abs/extra/huludesktop/huludesktop.install
@@ -6,12 +6,13 @@ post_install() {
echo " <button>" >> /tmp/is.xml.tmp
echo " <type>STREAM</type>" >> /tmp/is.xml.tmp
echo " <text>Hulu Desktop</text>" >> /tmp/is.xml.tmp
- echo " <action>EXEC huludesktop</action>" >> /tmp/is.xml.tmp
+ echo " <action>EXEC huludesktop.sh</action>" >> /tmp/is.xml.tmp
echo " </button>" >> /tmp/is.xml.tmp
echo "<!--#Hulu-->" >> /tmp/is.xml.tmp
echo "" >> /tmp/is.xml.tmp
echo "</mythmenu>" >> /tmp/is.xml.tmp
mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml
+ chown mythtv.mythtv /home/mythtv/.huludesktop
}
# arg 1: the new package version
# arg 2: the old package version
diff --git a/abs/extra/huludesktop/huludesktop.sh b/abs/extra/huludesktop/huludesktop.sh
new file mode 100644
index 0000000..9095984
--- /dev/null
+++ b/abs/extra/huludesktop/huludesktop.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+#Stops xscreensaver from running.
+stop_xss.sh &
+#Launches chromium in full screen
+huludesktop
+#Once done, stop stop_xss.sh
+killall stop_xss.sh
diff --git a/abs/extra/web-on-linhes/PKGBUILD b/abs/extra/web-on-linhes/PKGBUILD
index 2c9f185..267dfe1 100644
--- a/abs/extra/web-on-linhes/PKGBUILD
+++ b/abs/extra/web-on-linhes/PKGBUILD
@@ -3,19 +3,18 @@
pkgname=web-on-linhes
pkgver=1.00.0
-pkgrel=1
+pkgrel=3
pkgdesc="Added multiple websites with 10' UIs to Play Online Streams."
arch=('i686' 'x86_64')
license=('GPL2')
url="http://www.linhes.org/"
-depends=('chromium' 'flashplugin')
+depends=('chromium' 'flashplugin' 'linhes-scripts>=7-29')
install=web-on-linhes.install
-source=('stop_xss.sh' 'web-on-linhes.sh')
+source=('web-on-linhes.sh')
build() {
cd ${srcdir}
install -d ${pkgdir}/usr/LH/bin
install -D -m755 *.sh ${pkgdir}/usr/LH/bin
}
-md5sums=('3f5877b4b44b6fddb3b42491318c6441'
- 'bf15498dcbdc3852aca9cccb0aacd913')
+md5sums=('bf15498dcbdc3852aca9cccb0aacd913')
diff --git a/abs/extra/web-on-linhes/web-on-linhes.install b/abs/extra/web-on-linhes/web-on-linhes.install
index 631806a..c5f2c40 100644
--- a/abs/extra/web-on-linhes/web-on-linhes.install
+++ b/abs/extra/web-on-linhes/web-on-linhes.install
@@ -77,14 +77,6 @@ post_install() {
echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
echo " <button>" >> /tmp/is.xml.tmp
echo " <type>STREAM</type>" >> /tmp/is.xml.tmp
- echo " <text>NowMov</text>" >> /tmp/is.xml.tmp
- echo " <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://nowmov.com</action>" >> /tmp/is.xml.tmp
- echo " </button>" >> /tmp/is.xml.tmp
- echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
- echo "" >> /tmp/is.xml.tmp
- echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
- echo " <button>" >> /tmp/is.xml.tmp
- echo " <type>STREAM</type>" >> /tmp/is.xml.tmp
echo " <text>The Onion</text>" >> /tmp/is.xml.tmp
echo " <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://www.theonion.com/video/googletv/</action>" >> /tmp/is.xml.tmp
echo " </button>" >> /tmp/is.xml.tmp