chaos/VideoPlayer
1
0
Fork 0
Code Activity

[YTDL] Freeze youtube-dl rather than using anaconda.

Browse source
This commit is contained in:
Kitteh 2018-10-27 17:05:14 +01:00
parent e73190de93
commit 18fb62aa2f
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -18,7 +18,7 @@ before_install:
- sudo apt-get update - sudo apt-get update
install: 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 - sudo apt-get build-dep libmpv1
- source /opt/qt*/bin/qt*-env.sh - source /opt/qt*/bin/qt*-env.sh

11
scripts/makeappimage.sh
View file

@ -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 "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/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://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* chmod +x linux*
mkdir -p appdir/usr/lib 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 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 UPD_INFO="gh-releases-zsync|NamedKitten|KittehPlayer|continuous|KittehPlayer-$ARCH.AppImage.zsync"
export CONDA_PACKAGES=youtube-dl ./linuxdeploy-x86_64.AppImage --appdir appdir --plugin qt --output appimage -v 3
./linuxdeploy-x86_64.AppImage --appdir appdir --plugin conda --plugin qt --output appimage -v 3

3
src/main.cpp
View file

@ -46,8 +46,9 @@ int main( int argc, char *argv[] )
dpms.start("xset", QStringList() << "-dpms"); 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); setenv("QT_QUICK_CONTROLS_STYLE","Desktop",1);
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
qmlRegisterType<MpvObject>("player", 1, 0, "MpvObject"); qmlRegisterType<MpvObject>("player", 1, 0, "MpvObject");

1
src/qml/main.qml
View file

@ -5,6 +5,7 @@ import QtQuick.Layouts 1.11
import QtQuick.Window 2.11 import QtQuick.Window 2.11
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import player 1.0 import player 1.0
import QtGraphicalEffects 1.0
import "codes.js" as LanguageCodes import "codes.js" as LanguageCodes