From a2a70fc40c18ff2879815f52c27358d4c1db7a22 Mon Sep 17 00:00:00 2001 From: namedkitten Date: Thu, 23 Apr 2020 15:27:42 +0100 Subject: [PATCH] Remove appimage stuff, add info for pinephone users. --- .travis.yml | 37 ------------------------------------- README.md | 14 ++++++++++---- scripts/makeappimage.sh | 28 ---------------------------- scripts/upload.sh | 9 --------- src/qml/MainMenu.qml | 4 ---- 5 files changed, 10 insertions(+), 82 deletions(-) delete mode 100644 .travis.yml delete mode 100755 scripts/makeappimage.sh delete mode 100755 scripts/upload.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c1bc99b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -language: cpp -compiler: gcc -sudo: require -dist: trusty -cache: - ccache: true - directories: - - $HOME/.ccache - - $HOME/.cache/apt - #- $HOME/.cache/mpv-build - -before_install: - - mkdir -p $HOME/.cache/apt/partial - - sudo rm -rf /var/cache/apt/archives - - sudo ln -s $HOME/.cache/apt /var/cache/apt/archives - - sudo add-apt-repository ppa:beineri/opt-qt-5.10.1-trusty -y - - sudo apt-get update - -install: - - sudo apt-get -y install ccache qt510-meta-minimal qt510quickcontrols python3-setuptools qt510quickcontrols2 qt510svg libgl1-mesa-dev x11proto-xext-dev libx11-dev qt510x11extras - - sudo apt-get build-dep mpv - - source /opt/qt*/bin/qt*-env.sh - -script: - - wget https://github.com/NamedKitten/mpv-builder/releases/download/continuous/deps.tar.xz - - sudo tar xvf deps.tar.xz -C / - - time bash scripts/makeappimage.sh - -after_success: - - time bash scripts/upload.sh - -branches: - except: - - # Do not build tags that we create when we upload to GitHub Releases - - /^(?i:continuous)/ - - diff --git a/README.md b/README.md index c90d9f2..e512f92 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ A video player based on Qt, QML and libmpv with themes for many online video pla - NicoNico ![NicoNico Screenshot](https://raw.githubusercontent.com/NamedKitten/KittehPlayer/master/screenshots/NicoNico.png) - RoosterTeeth ![RoosterTeeth Screenshot](https://raw.githubusercontent.com/NamedKitten/KittehPlayer/master/screenshots/RoosterTeeth.png) +## FOR PINEPHONE USERS +- If you use a pinephone, you'll need config from the gist linked at very bottom. ## How to install @@ -23,10 +25,7 @@ A video player based on Qt, QML and libmpv with themes for many online video pla - Coming Soon:tm: ### Distro Packages -- Arch Linux: `kittehplayer` in the AUR - -### Linux AppImage -- Discontinued for now. +- None right now, if you want to then pop me a message on somewhere linked on [My Website](https://kitteh.pw/) and I'll be happy to help if stuff goes wrong. ### From source #### Dependencies @@ -41,6 +40,12 @@ sudo apt update sudo apt install build-essential git nasm qt511-meta-minimal qt511quickcontrols qt511quickcontrols2 qt511imageformats qt511svg libgl1-mesa-dev libmpv-dev sudo apt-get build-dep mpv libmpv* ffmpeg ``` +##### Debian +``` +sudo apt install build-essential cmake qtquickcontrols2-5-dev qtbase5-dev qtdeclarative5-dev libqt5x11extras5-dev libmpv-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-extras qml-module-qtquick-layouts qml-module-qtquick-dialogs qml-module-qtquick-privatewidgets qml-module-qtquick-localstorage qml-module-qt-labs-settings qml-module-qt-labs-platform qtbase5-private libqt5svg5 +``` +- Note that I don't know if this is the full list yet, pop a issue up if building fails. + #### Instructions - `git clone https://github.com/NamedKitten/KittehPlayer KittehPlayer` - `cd KittehPlayer` @@ -52,3 +57,4 @@ sudo apt-get build-dep mpv libmpv* ffmpeg ## Configuration - For docs on KittehPlayer please view DOCS.md or `man KittehPlayer` +- For pinephone users or people with no opengl fbo support, see [Here](https://gist.github.com/NamedKitten/675ca8587a8f714a856c6d6d14a9562a) here for my pinephone config. \ No newline at end of file diff --git a/scripts/makeappimage.sh b/scripts/makeappimage.sh deleted file mode 100755 index 0cacade..0000000 --- a/scripts/makeappimage.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -ex - -export PATH="/usr/lib/ccache:/usr/lib/ccache/bin:$PATH" - -export QML_SOURCES_PATHS=src/qml -export V=0 VERBOSE=0 - -cmake -DCMAKE_INSTALL_PREFIX=/usr . -make -j$(nproc) -make DESTDIR=appdir -j$(nproc) install ; find appdir/ -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" -chmod +x linux* -mkdir -p appdir/usr/lib - -if [ "$ARCH" == "" ]; then - ARCH="x86_64" -fi -wget https://github.com/AppImage/AppImageUpdate/releases/download/continuous/AppImageUpdate-x86_64.AppImage -O appdir/usr/bin/appimageupdatetool -chmod +x appdir/usr/bin/appimageupdatetool - -wget https://yt-dl.org/downloads/latest/youtube-dl -O appdir/usr/bin/youtube-dl -chmod +x appdir/usr/bin/youtube-dl - -export UPD_INFO="gh-releases-zsync|NamedKitten|KittehPlayer|continuous|KittehPlayer-$ARCH.AppImage.zsync" -time ./linuxdeploy-x86_64.AppImage --appdir appdir --plugin qt --output appimage -v 3 diff --git a/scripts/upload.sh b/scripts/upload.sh deleted file mode 100755 index 5c7d6ac..0000000 --- a/scripts/upload.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e - -export TEXT=`git log -1 --pretty=%B` -export UPLOADTOOL_BODY="$TEXT\nTravis CI build log: https://travis-ci.com/$TRAVIS_REPO_SLUG/builds/$TRAVIS_BUILD_ID/" - -wget https://github.com/probonopd/uploadtool/raw/master/upload.sh -bash upload.sh KittehPlayer*.AppImage* -echo "Done!" \ No newline at end of file diff --git a/src/qml/MainMenu.qml b/src/qml/MainMenu.qml index e87fbbb..9fa35f3 100644 --- a/src/qml/MainMenu.qml +++ b/src/qml/MainMenu.qml @@ -174,10 +174,6 @@ MenuBar { onTriggered: Qt.quit() shortcut: keybinds.quit } - Action { - text: translate.getTranslation("UPDATE", i18n.language) - onTriggered: utils.updateAppImage() - } } CustomMenu {