Merge branch 'testing'HEADmaster

21 files changed, 127 insertions, 185 deletions

diff --git a/abs/extra/google-chrome/.SRCINFO b/abs/extra/google-chrome/.SRCINFO
deleted file mode 100644
index c524c00..0000000
--- a/abs/extra/google-chrome/.SRCINFO
+++ /dev/null
@@ -1,32 +0,0 @@
-pkgbase = google-chrome
-	pkgdesc = The popular and trusted web browser by Google (Stable Channel)
-	pkgver = 72.0.3626.119
-	pkgrel = 1
-	url = https://www.google.com/chrome
-	install = google-chrome.install
-	arch = x86_64
-	license = custom:chrome
-	depends = alsa-lib
-	depends = gtk3
-	depends = libcups
-	depends = libxss
-	depends = libxtst
-	depends = nss
-	optdepends = kdialog: for file dialogs in KDE
-	optdepends = gnome-keyring: for storing passwords in GNOME keyring
-	optdepends = kwallet: for storing passwords in KWallet
-	optdepends = gtk3-print-backends: for printing
-	optdepends = libunity: for download progress on KDE
-	optdepends = ttf-liberation: fix fonts for some PDFs (CRBug #369991)
-	optdepends = xdg-utils
-	options = !emptydirs
-	options = !strip
-	source = google-chrome-stable_72.0.3626.119_amd64.deb::https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-	source = eula_text.html
-	source = google-chrome-stable.sh
-	md5sums = 337c55d76bc54503cbadaa8d67e05446
-	md5sums = d50d8f0a6940791eabc41c4f64e6a3cf
-	md5sums = ed4cf73982461af7d0d944c1cbf9f4e8
-
-pkgname = google-chrome
-
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index f483bde..3fcfdbc 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
 # or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
 
 pkgname=google-chrome
-pkgver=72.0.3626.119
+pkgver=73.0.3683.103
 pkgrel=1
 pkgdesc="The popular and trusted web browser by Google (Stable Channel)"
 arch=('x86_64')
@@ -55,6 +55,6 @@ package() {
   rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
   rm "$pkgdir"/opt/google/chrome/product_logo_*.png
 }
-md5sums=('337c55d76bc54503cbadaa8d67e05446'
+md5sums=('fd012dfba1d044dbbbb07a468984ef5e'
          'd50d8f0a6940791eabc41c4f64e6a3cf'
          'ed4cf73982461af7d0d944c1cbf9f4e8')
diff --git a/abs/extra/google-chrome/update_version.sh b/abs/extra/google-chrome/update_version.sh
index 0a11328..2a48b8f 100755
--- a/abs/extra/google-chrome/update_version.sh
+++ b/abs/extra/google-chrome/update_version.sh
@@ -3,7 +3,7 @@ set -euxo pipefail
 
 # Get channel
 CHANNEL=$(awk -F '=' '/^_channel/{ print $2 }' PKGBUILD)
-PKG="google-chrome-${CHANNEL}"
+PKG="google-chrome"
 
 # Get latest version
 VER=$(curl -sL "https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz" | gzip -df |
@@ -24,8 +24,11 @@ if (git diff --exit-code PKGBUILD); then
 fi
 
 # Update .SRCINFO
-makepkg --printsrcinfo >.SRCINFO
+#makepkg --printsrcinfo >.SRCINFO
+
+# Build
+mpv2.py --rmold
 
 # Commit changes
-git add PKGBUILD .SRCINFO
-git commit -m "${PKG} v${VER}"
+git add PKGBUILD
+git commit -m "${PKG}: update to  v${VER}"
diff --git a/abs/extra/huludesktop/PKGBUILD b/abs/extra/huludesktop/PKGBUILD
deleted file mode 100644
index c896f7e..0000000
--- a/abs/extra/huludesktop/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-pkgname=huludesktop
-pkgver=0.9.8
-pkgrel=1
-pkgdesc="Hulu Desktop for Linux"
-arch=('x86_64')
-url="http://www.hulu.com/labs/hulu-desktop-linux"
-license=('custom')
-depends=('glib2' 'gtk2' 'lirc' 'flashplugin')
-backup=('home/mythtv/.huludesktop')
-install=huludesktop.install
-options=('')
-source=('http://download.hulu.com/huludesktop_amd64.deb' 'huludesktop' 'huludesktop.sh' 'huludesktop_is.conf')
-. /usr/MythVantage/bin/install_functions.sh
-home_check
-
-package() {
-    cd $srcdir
-    ar p huludesktop_amd64.deb data.tar.gz | (cd $pkgdir; bsdtar xf -)
-    mkdir -p $pkgdir/$MYTHHOME
-    mkdir -p $pkgdir/usr/LH/bin
-    cp huludesktop $pkgdir/$MYTHHOME/.huludesktop
-    install -D -m755 huludesktop.sh ${pkgdir}/usr/LH/bin
-
-    #add in file for gen_is.xml
-    install -D -m0744 ${srcdir}/huludesktop_is.conf ${pkgdir}/etc/gen_is_xml.d/huludesktop_is.conf 
-}
-
-md5sums=('bccc94d7f327989dab2653d254f40869'
-         '77b7241a4ec8402ba37f1f1811336ea3'
-         '8f7dbf19d6168bc3a5b0c1da1c878693'
-         '224ed61a3ecfd6aa37d27d1c71426a3c')
diff --git a/abs/extra/huludesktop/__changelog b/abs/extra/huludesktop/__changelog
deleted file mode 100644
index 93ed61a..0000000
--- a/abs/extra/huludesktop/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-gen_is_xml.py huludesktop_is.xml
diff --git a/abs/extra/huludesktop/huludesktop b/abs/extra/huludesktop/huludesktop
deleted file mode 100644
index dee8778..0000000
--- a/abs/extra/huludesktop/huludesktop
+++ /dev/null
@@ -1,25 +0,0 @@
-[display]
-fullscreen = TRUE
-width = 1920
-height = 1080
-pos_x = 0
-pos_y = 0
-
-[remote]
-lirc_device = /var/run/lirc/lircd
-lirc_remote_identifier = mceusb
-lirc_release_suffix = _UP
-lirc_repeat_threshold = 10
-button_name_up = Up
-button_name_down = Down
-button_name_left = Left
-button_name_right = Right
-button_name_select = OK
-button_name_menu = Home
-
-[flash]
-flash_location = /usr/lib/mozilla/plugins/libflashplayer.so
-
-[version]
-latest = (null)
-eula_version = 1
diff --git a/abs/extra/huludesktop/huludesktop.install b/abs/extra/huludesktop/huludesktop.install
deleted file mode 100644
index abe069f..0000000
--- a/abs/extra/huludesktop/huludesktop.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  gen_is_xml.py
-  chown mythtv.mythtv $MYTHHOME/.huludesktop
-  echo "Set your screen width and height in ~/.huludesktop to avoid a segfault."
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    gen_is_xml.py
-    echo "Set your screen width and height in ~/.huludesktop to avoid a segfault."
-}
-post_remove() {
-    gen_is_xml.py
-}
-. /usr/MythVantage/bin/install_functions.sh
-home_check
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/huludesktop/huludesktop.sh b/abs/extra/huludesktop/huludesktop.sh
deleted file mode 100644
index 9095984..0000000
--- a/abs/extra/huludesktop/huludesktop.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/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/huludesktop/huludesktop_is.conf b/abs/extra/huludesktop/huludesktop_is.conf
deleted file mode 100644
index 2a83db7..0000000
--- a/abs/extra/huludesktop/huludesktop_is.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--#Hulu-->
-    <button>
-        <type>STREAM</type>
-        <text>Hulu Desktop</text>
-        <description>Open Hulu Desktop</description>
-        <action>EXEC huludesktop.sh</action>
-    </button>
-<!--#Hulu-->
-
diff --git a/abs/extra/intel-gmmlib/PKGBUILD b/abs/extra/intel-gmmlib/PKGBUILD
new file mode 100644
index 0000000..eaa609d
--- /dev/null
+++ b/abs/extra/intel-gmmlib/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Bruno Pagani <archange@archlinux.org>
+# Contributor: Daniel Bermond < yahoo-com: danielbermond >
+
+pkgname=intel-gmmlib
+pkgver=19.1.1
+pkgrel=1
+pkgdesc="Intel Graphics Memory Management Library"
+arch=('x86_64')
+url="https://github.com/intel/gmmlib/"
+license=('MIT')
+depends=('gcc-libs')
+makedepends=('cmake')
+provides=('gmmlib')
+conflicts=('gmmlib')
+replaces=('gmmlib')
+options=('!emptydirs')
+source=("https://github.com/${pkgname/-//}/archive/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('aab4241bde754225a84d71a459f5734c311a6437305ca7e99cd5cbeaab5ff6d5')
+
+prepare() {
+    mkdir -p build
+}
+
+build() {
+    cd build
+    cmake ../${pkgname#*-}-${pkgname}-${pkgver} \
+        -DCMAKE_BUILD_TYPE='None' \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=lib \
+        -DRUN_TEST_SUITE=ON \
+        -Wno-dev
+    make
+}
+
+package() {
+    cd build
+    make DESTDIR="${pkgdir}" install
+    install -Dm644 ../${pkgname#*-}-${pkgname}-${pkgver}/LICENSE.md -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
diff --git a/abs/extra/libva-utils/PKGBUILD b/abs/extra/libva-utils/PKGBUILD
new file mode 100644
index 0000000..61b65dc
--- /dev/null
+++ b/abs/extra/libva-utils/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archange@archlinux.org>
+# Contributor: Sean V Kelley <seanvk@posteo.de>
+
+pkgname=libva-utils
+pkgver=2.4.0
+pkgrel=1
+pkgdesc="Intel VA-API Media Applications and Scripts for libva"
+arch=('x86_64')
+url="https://github.com/intel/libva-utils"
+license=('custom')
+depends=('libva')
+makedepends=('mesa')
+source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz")
+sha256sums=('13d15bf464e5a452f5243a6ca5988d3841c8bbbb017b75d73254acc0e4d6740c')
+
+build() {
+    cd ${pkgname}-${pkgver}
+    ./autogen.sh \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var
+    make
+}
+
+package() {
+    cd ${pkgname}-${pkgver}
+    make DESTDIR="$pkgdir" install
+    install -Dm644 COPYING "$pkgdir"/usr/share/licenses/${pkgname}/COPYING
+}
diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD
index 8122125..7ace53b 100644
--- a/abs/extra/plex-media-server/PKGBUILD
+++ b/abs/extra/plex-media-server/PKGBUILD
@@ -1,4 +1,6 @@
-# Maintainer: Tom Moore <t.moore01@gmail.com>
+# Maintainer: Donald Webster <fryfrog@gmail.com>
+# Contributor: Tom Moore <t.moore01@gmail.com>
+# Contributor: Mikael Eriksson <mikael_eriksson@miffe.org>
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: Rob Sletten <rsletten@gmail.com>
 # Contributor: monty <linksoft@gmx.de>
@@ -7,42 +9,54 @@
 # Contributor: Praekon <praekon@googlemail.com>
 
 pkgname=plex-media-server
-pkgver=1.14.1.5488
-_pkgsum=cc260c476
-pkgrel=1
+pkgver=1.15.3.876
+_pkgsum=ad6e39743
+pkgrel=2
 pkgdesc='Plex Media Server'
 arch=('x86_64')
 url='https://plex.tv/'
 license=('custom')
-depends=('systemd')
-provides=('plex-media-server')
+options=('!emptydirs')
 conflicts=('plex-media-server-plexpass')
-backup=('etc/conf.d/plexmediaserver')
+# Commented to override user version
+#backup=('etc/conf.d/plexmediaserver')
 install='plex-media-server.install'
 source=('plexmediaserver.conf.d'
         'plexmediaserver.service'
         'plex.sysusers'
+        'plex.tmpfiles'
         'plexmediascanner.sh'
-        'terms.txt'
-        "https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.x86_64.rpm")
+        'terms.txt')
+
+#source_aarch64=("https://downloads.plex.tv/plex-media-server-new/${pkgver}-${_pkgsum}/debian/plexmediaserver_${pkgver}-${_pkgsum}_arm64.deb")
+#source_armv7h=("https://downloads.plex.tv/plex-media-server-new/${pkgver}-${_pkgsum}/debian/plexmediaserver_${pkgver}-${_pkgsum}_armhf.deb")
+source_x86_64=("https://downloads.plex.tv/plex-media-server-new/${pkgver}-${_pkgsum}/redhat/plexmediaserver-${pkgver}-${_pkgsum}.x86_64.rpm")
+
+
+prepare() {
+  if [[ $CARCH = armv7h ]] || [[ $CARCH = aarch64 ]]; then
+    bsdtar -xf data.tar.xz
+  fi
+}
 
 package() {
-  install -dm 755 "${pkgdir}"/{opt,etc/conf.d,usr/lib/systemd/system}
-  cp -dr --no-preserve='ownership' usr/lib/plexmediaserver "${pkgdir}"/opt/
-  install -m 644 plexmediaserver.service "${pkgdir}"/usr/lib/systemd/system/
-  install -m 644 plexmediaserver.conf.d "${pkgdir}"/etc/conf.d/plexmediaserver
-  install -Dm 644 "$srcdir/plex.sysusers" "$pkgdir/usr/lib/sysusers.d/plex.conf"
+  install -d -m 755 "${pkgdir}/usr/lib/plexmediaserver"
+  cp -dr --no-preserve='ownership' "${srcdir}/usr/lib/plexmediaserver" "${pkgdir}/usr/lib/"
 
-  install -m 755 -D plexmediascanner.sh "${pkgdir}"/usr/LH/bin/plexmediascanner.sh
+  install -D -m 644 "${srcdir}/plexmediaserver.conf.d" "${pkgdir}/etc/conf.d/plexmediaserver"
+  install -D -m 644 "${srcdir}/plexmediaserver.service" "${pkgdir}/usr/lib/systemd/system/plexmediaserver.service"
+  install -D -m 644 "${srcdir}/plex.sysusers" "${pkgdir}/usr/lib/sysusers.d/plex.conf"
+  install -D -m 644 "${srcdir}/plex.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/plex.conf"
 
-  install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m 644 terms.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
+  install -D -m 644 "${srcdir}/terms.txt" "${pkgdir}/usr/share/licenses/${pkgname}/terms.txt"
+  install -m 755 -D plexmediascanner.sh "${pkgdir}"/usr/LH/bin/plexmediascanner.sh
 }
 
 # vim: ts=2 sw=2 et:
-md5sums=('dfd6778f5c0d3d64c2c3a71dca02b7cc'
-         '3f39ee0e8b1ebb1c7ca714f67fa88641'
-         '97241861f2c0b7c82d1945a6c5de8e35'
-         '506ec15815bba749a743780edd2323c8'
-         'af6d0a81c7821b2eddb1bc137310ca1b'
-         'fafb64a6cc876478964e563af35ea1bd')
+md5sums=('16f212dc586df577fa116d80adf1ebf6'
+         '6920747dc9155847688f9d69b8099168'
+         'd9f76e547b6c31912efa19463af0f3c6'
+         'b926b4b845120bd37b640a4982a667dc'
+         'f70da65876e2caac21dc463df234c726'
+         'af6d0a81c7821b2eddb1bc137310ca1b')
+md5sums_x86_64=('3f957448ed6a22c5fc8c87cc3230d845')
diff --git a/abs/extra/plex-media-server/plex-media-server.install b/abs/extra/plex-media-server/plex-media-server.install
index 96a77a7..e626eda 100644
--- a/abs/extra/plex-media-server/plex-media-server.install
+++ b/abs/extra/plex-media-server/plex-media-server.install
@@ -7,6 +7,7 @@ post_install() {
 }
 
 post_upgrade() {
+  systemd-sysusers plex.conf
   [[ -d /data/storage/disk0/media/plex ]] && chown -R plex:plex /data/storage/disk0/media/plex
 }
 
diff --git a/abs/extra/plex-media-server/plex.sysusers b/abs/extra/plex-media-server/plex.sysusers
index e23680f..848eba4 100644
--- a/abs/extra/plex-media-server/plex.sysusers
+++ b/abs/extra/plex-media-server/plex.sysusers
@@ -1,2 +1 @@
-u plex - "Plex Media Server" /opt/plexmediaserver
-
+u plex - "Plex Media Server" /usr/lib/plexmediaserver
diff --git a/abs/extra/plex-media-server/plex.tmpfiles b/abs/extra/plex-media-server/plex.tmpfiles
new file mode 100644
index 0000000..130fc6f
--- /dev/null
+++ b/abs/extra/plex-media-server/plex.tmpfiles
@@ -0,0 +1 @@
+d /data/storage/disk0/media/plex 0755 plex plex
diff --git a/abs/extra/plex-media-server/plexmediascanner.sh b/abs/extra/plex-media-server/plexmediascanner.sh
index 9ac16c7..6ce2f5d 100755
--- a/abs/extra/plex-media-server/plexmediascanner.sh
+++ b/abs/extra/plex-media-server/plexmediascanner.sh
@@ -3,4 +3,4 @@ exec 2>&1
 export TERM=linux
 . /etc/conf.d/plexmediaserver
 
-sudo -uplex -gplex LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PLEX_MEDIA_SERVER_HOME="${PLEX_MEDIA_SERVER_HOME}" PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" /opt/plexmediaserver/Plex\ Media\ Scanner $@
+sudo -uplex -gplex LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PLEX_MEDIA_SERVER_HOME="${PLEX_MEDIA_SERVER_HOME}" PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" /usr/lib/plexmediaserver/Plex\ Media\ Scanner $@
diff --git a/abs/extra/plex-media-server/plexmediaserver.conf.d b/abs/extra/plex-media-server/plexmediaserver.conf.d
index 85ff7a1..253da0b 100644
--- a/abs/extra/plex-media-server/plexmediaserver.conf.d
+++ b/abs/extra/plex-media-server/plexmediaserver.conf.d
@@ -1,5 +1,5 @@
-LD_LIBRARY_PATH=/opt/plexmediaserver
-PLEX_MEDIA_SERVER_HOME=/opt/plexmediaserver
+LD_LIBRARY_PATH=/usr/lib/plexmediaserver/lib
+PLEX_MEDIA_SERVER_HOME=/usr/lib/plexmediaserver
 PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=/data/storage/disk0/media/plex
 PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6
 PLEX_MEDIA_SERVER_TMPDIR=/data/storage/disk0/media/plex/tmp
diff --git a/abs/extra/plex-media-server/plexmediaserver.service b/abs/extra/plex-media-server/plexmediaserver.service
index 55b3325..1bcd541 100644
--- a/abs/extra/plex-media-server/plexmediaserver.service
+++ b/abs/extra/plex-media-server/plexmediaserver.service
@@ -3,9 +3,8 @@ Description=Plex Media Server
 After=network.target
 
 [Service]
-WorkingDirectory=/opt/plexmediaserver
 EnvironmentFile=/etc/conf.d/plexmediaserver
-ExecStart=/opt/plexmediaserver/Plex\x20Media\x20Server
+ExecStart=/usr/lib/plexmediaserver/Plex\x20Media\x20Server
 Type=simple
 User=plex
 Group=plex
@@ -13,7 +12,6 @@ Restart=on-failure
 RestartSec=5
 StartLimitInterval=60s
 StartLimitBurst=3
-StandardOutput=null
 
 [Install]
 WantedBy=multi-user.target
diff --git a/abs/extra/web-on-linhes/PKGBUILD b/abs/extra/web-on-linhes/PKGBUILD
index 0746933..6512914 100644
--- a/abs/extra/web-on-linhes/PKGBUILD
+++ b/abs/extra/web-on-linhes/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=web-on-linhes
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Added multiple websites with 10' UIs to Play Online Streams."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -22,6 +22,6 @@ package() {
     #add wol-custom-cmds file
     install -D -o1000 -g1000 -m755 ${srcdir}/wol-custom-cmds.sh ${pkgdir}/home/mythtv/.wol-custom-cmds.sh
 }
-md5sums=('f37e208b713ee5b5b3ac54b63597f39f'
-         '7eb75860715a84e7e75b804e159adf35'
+md5sums=('fb0878e348ebc3de11f155ad811fa3c7'
+         'b53251102bb3d075b2307a8991d6f7bb'
          '9f59fabdf944a7381919d4c8407ac21c')
diff --git a/abs/extra/web-on-linhes/web-on-linhes.sh b/abs/extra/web-on-linhes/web-on-linhes.sh
index 3c458dd..bf5c794 100644
--- a/abs/extra/web-on-linhes/web-on-linhes.sh
+++ b/abs/extra/web-on-linhes/web-on-linhes.sh
@@ -6,12 +6,12 @@ irxPID=$!
 #Stops xscreensaver from running.
 stop_xss.sh &
 xssPID=$!
-#Launches chrome in full screen
-(sleep 3; wmctrl -r "Google Chrome" -b add,fullscreen) &
+#Launches chrome in full screen; isn't needed as --start-maximized is working again
+#(sleep 3; wmctrl -r "Google Chrome" -b add,fullscreen) &
 #Launches file to run any custom cmds
 (sleep 4; /home/mythtv/.wol-custom-cmds.sh $@) &
 #Launch chrome
-google-chrome --no-first-run --kiosk $@
+google-chrome --no-first-run --kiosk --start-maximized $@
 #Once done, stops irxevent and stop_xss.sh
 kill $irxPID
 kill $xssPID
diff --git a/abs/extra/web-on-linhes/web-on-linhes_is.conf b/abs/extra/web-on-linhes/web-on-linhes_is.conf
index 2913ec0..5cfa217 100755
--- a/abs/extra/web-on-linhes/web-on-linhes_is.conf
+++ b/abs/extra/web-on-linhes/web-on-linhes_is.conf
@@ -25,22 +25,6 @@
   <!--#WebOnTV-->
      <button>
        <type>STREAM</type>
-       <text>TuneIn</text>
-       <action>EXEC /usr/LH/bin/web-on-linhes.sh http://tv.tunein.com/</action>
-     </button>
-  <!--#WebOnTV-->
-
-  <!--#WebOnTV-->
-     <button>
-       <type>STREAM</type>
-       <text>Vimeo</text>
-       <action>EXEC /usr/LH/bin/web-on-linhes.sh http://www.vimeo.com/couchmode</action>
-     </button>
-  <!--#WebOnTV-->
-
-  <!--#WebOnTV-->
-     <button>
-       <type>STREAM</type>
        <text>YouTube</text>
        <action>EXEC /usr/LH/bin/web-on-linhes.sh http://www.youtube.com/tv</action>
      </button>