Merge pull request #3749 from HiassofT/le10-multimedia-tools-drop-devtools

multimedia-tools: drop mesa-demos and mpv
This commit is contained in:
MilhouseVH 2019-08-15 17:31:26 +01:00 committed by GitHub
commit 0c7ef9e3a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 15 deletions

View File

@ -1,3 +1,6 @@
111
- drop mesa-demos and mpv
110
- Add mpv

View File

@ -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/