From 18fb62aa2f30797cef5249ac9bdf38f76caad6b6 Mon Sep 17 00:00:00 2001 From: Kitteh Date: Sat, 27 Oct 2018 17:05:14 +0100 Subject: [PATCH] [YTDL] Freeze youtube-dl rather than using anaconda. --- .travis.yml | 2 +- scripts/makeappimage.sh | 11 ++++++++--- src/main.cpp | 3 ++- src/qml/main.qml | 1 + 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7656e0a..683786e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_install: - sudo apt-get update install: - - sudo apt-get -y install libvapoursynth* libxpm-dev libcurl3 libcurl4-openssl-dev automake libtool desktop-file-utils libjack0 libjack-dev nasm ccache qt511-meta-minimal qt511quickcontrols qt511quickcontrols2 qt511imageformats qt511svg libgl1-mesa-dev checkinstall + - sudo apt-get -y install python3-pip libvapoursynth* libxpm-dev libcurl3 libcurl4-openssl-dev automake libtool desktop-file-utils libjack0 libjack-dev nasm ccache qt511-meta-minimal qt511graphicaleffect* qt511quickcontrols qt511quickcontrols2 qt511imageformats qt511svg libgl1-mesa-dev checkinstall - sudo apt-get build-dep libmpv1 - source /opt/qt*/bin/qt*-env.sh diff --git a/scripts/makeappimage.sh b/scripts/makeappimage.sh index bd1cbf6..a676e86 100755 --- a/scripts/makeappimage.sh +++ b/scripts/makeappimage.sh @@ -13,7 +13,7 @@ make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/ #wget "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" wget -nc "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" wget -nc "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage" -wget -nc "https://raw.githubusercontent.com/TheAssassin/linuxdeploy-plugin-conda/master/linuxdeploy-plugin-conda.sh" +#wget -nc "https://raw.githubusercontent.com/TheAssassin/linuxdeploy-plugin-conda/master/linuxdeploy-plugin-conda.sh" chmod +x linux* mkdir -p appdir/usr/lib @@ -33,6 +33,11 @@ cp /usr/bin/appimageupdatetool appdir/usr/bin cp -f /usr/lib/*/libjack.so.0 appdir/usr/lib +sudo pip3 install pyinstaller +sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O ytdl.zip +unzip ytdl.zip +pyinstaller __main__.py -n youtube-dl --onefile +cp dist/youtube-dl appdir/usr/bin + export UPD_INFO="gh-releases-zsync|NamedKitten|KittehPlayer|continuous|KittehPlayer-$ARCH.AppImage.zsync" -export CONDA_PACKAGES=youtube-dl -./linuxdeploy-x86_64.AppImage --appdir appdir --plugin conda --plugin qt --output appimage -v 3 +./linuxdeploy-x86_64.AppImage --appdir appdir --plugin qt --output appimage -v 3 diff --git a/src/main.cpp b/src/main.cpp index 2d6aae4..44e2de7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,8 +46,9 @@ int main( int argc, char *argv[] ) dpms.start("xset", QStringList() << "-dpms"); + QString newpath = QProcessEnvironment::systemEnvironment().value("APPDIR", "") + "/usr/bin:" + QProcessEnvironment::systemEnvironment().value("PATH", ""); - + setenv("Path", newpath.toUtf8().constData(), 1); setenv("QT_QUICK_CONTROLS_STYLE","Desktop",1); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); qmlRegisterType("player", 1, 0, "MpvObject"); diff --git a/src/qml/main.qml b/src/qml/main.qml index dff67d5..26ae16b 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.11 import QtQuick.Window 2.11 import Qt.labs.settings 1.0 import player 1.0 +import QtGraphicalEffects 1.0 import "codes.js" as LanguageCodes