From 07f751b983264cb0bc4607589e937a2339cf8f25 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Thu, 8 Aug 2019 14:46:23 +0200
Subject: [PATCH] multimedia-tools: drop mesa-demos and mpv

both these programs are only useful for testing outside of kodi
so they shouldn't be in the multimedia-tools package

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 .../addons/tools/multimedia-tools/changelog.txt |  3 +++
 .../addons/tools/multimedia-tools/package.mk    | 17 ++---------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/packages/addons/tools/multimedia-tools/changelog.txt b/packages/addons/tools/multimedia-tools/changelog.txt
index 39c5ade74e..b3c81b88cb 100644
--- a/packages/addons/tools/multimedia-tools/changelog.txt
+++ b/packages/addons/tools/multimedia-tools/changelog.txt
@@ -1,3 +1,6 @@
+111
+- drop mesa-demos and mpv
+
 110
 - Add mpv
 
diff --git a/packages/addons/tools/multimedia-tools/package.mk b/packages/addons/tools/multimedia-tools/package.mk
index d6423cfe4c..c5426ddc52 100644
--- a/packages/addons/tools/multimedia-tools/package.mk
+++ b/packages/addons/tools/multimedia-tools/package.mk
@@ -3,7 +3,7 @@
 
 PKG_NAME="multimedia-tools"
 PKG_VERSION="1.0"
-PKG_REV="110"
+PKG_REV="111"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -11,7 +11,7 @@ PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="A bundle of multimedia tools and programs"
-PKG_LONGDESC="This bundle currently includes alsamixer, mediainfo, mesa-demos, mpg123, mpv, opencaster, squeezelite, tsdecrypt and tstools."
+PKG_LONGDESC="This bundle currently includes alsamixer, mediainfo, mpg123, opencaster, squeezelite, tsdecrypt and tstools."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Multimedia Tools"
@@ -22,16 +22,11 @@ PKG_DEPENDS_TARGET="toolchain \
                     alsa-utils \
                     mediainfo \
                     mpg123 \
-                    mpv-drmprime \
                     opencaster \
                     squeezelite \
                     tsdecrypt \
                     tstools"
 
-if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mesa-demos"
-fi
-
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
     # alsamixer
@@ -40,17 +35,9 @@ addon() {
     # mediainfo
     cp -P $(get_build_dir mediainfo)/Project/GNU/CLI/mediainfo $ADDON_BUILD/$PKG_ADDON_ID/bin
 
-    # mesa-demos
-    cp -P $(get_build_dir mesa-demos)/.$TARGET_NAME/src/xdemos/glxdemo $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
-    cp -P $(get_build_dir mesa-demos)/.$TARGET_NAME/src/xdemos/glxgears $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
-    cp -P $(get_build_dir mesa-demos)/.$TARGET_NAME/src/xdemos/glxinfo $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
-
     # mpg123
     cp -P $(get_build_dir mpg123)/.install_pkg/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
 
-    # mpv
-    cp -P $(get_build_dir mpv-drmprime)/.install_pkg/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
-
     # opencaster
     cp -P $(get_build_dir opencaster)/.install_pkg/* $ADDON_BUILD/$PKG_ADDON_ID/bin/