chaos/VideoPlayer
1
0
Fork 0
Code Activity

Add instructions and wrapper for ubuntu bionic.

Browse source
This commit is contained in:
namedkitten 2020-05-05 14:55:49 +01:00
parent 0d8e27ce7b
commit ed8548ae28
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -17,7 +17,7 @@ before_install:
- sudo apt-get update - sudo apt-get update
install: install:
- sudo apt-get -y install ccache qt510-meta-minimal qt510quickcontrols python3-setuptools qt510quickcontrols2 qt510svg libgl1-mesa-dev x11proto-xext-dev libx11-dev qt510x11extras qt510graphicaleffects - sudo apt-get -y install ccache qt510-meta-minimal qt510quickcontrols qt510quickcontrols2 qt510svg qt510x11extras qt510graphicaleffects libgl1-mesa-dev x11proto-xext-dev libx11-dev python3-setuptools
- sudo apt-get build-dep mpv - sudo apt-get build-dep mpv
- source /opt/qt*/bin/qt*-env.sh - source /opt/qt*/bin/qt*-env.sh

8
CMakeLists.txt
View file

@ -17,6 +17,8 @@ if(QML_DEBUG)
add_definitions(-DQT_QML_DEBUG) add_definitions(-DQT_QML_DEBUG)
endif() endif()
option(OLD_UBUNTU "old ubuntu" OFF)
find_package(Qt5QuickCompiler) find_package(Qt5QuickCompiler)
if(Qt5QuickCompiler_FOUND) if(Qt5QuickCompiler_FOUND)
qtquick_compiler_add_resources(qml_QRC src/qml/qml.qrc) qtquick_compiler_add_resources(qml_QRC src/qml/qml.qrc)
@ -103,6 +105,12 @@ target_link_libraries(KittehPlayer ${MPV_LIBRARIES} ${X11_LIBRARIES} ${Xext_LIBR
include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS}) include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS})
qt5_use_modules(KittehPlayer Qml Quick Core Gui Widgets X11Extras) qt5_use_modules(KittehPlayer Qml Quick Core Gui Widgets X11Extras)
if(OLD_UBUNTU)
install (FILES "${PROJECT_NAME}-Wrapper" DESTINATION bin RENAME "${PROJECT_NAME}")
install (FILES "${PROJECT_NAME}-Wrapper" DESTINATION bin RENAME "${PROJECT_NAME}-bin")
else()
install (TARGETS ${PROJECT_NAME} DESTINATION bin) install (TARGETS ${PROJECT_NAME} DESTINATION bin)
endif()
install (FILES "${PROJECT_NAME}.desktop" DESTINATION share/applications) install (FILES "${PROJECT_NAME}.desktop" DESTINATION share/applications)
install (FILES "${PROJECT_NAME}.png" DESTINATION share/icons/hicolor/256x256/apps) install (FILES "${PROJECT_NAME}.png" DESTINATION share/icons/hicolor/256x256/apps)

3
KittehPlayer-Wrapper Executable file
View file

@ -0,0 +1,3 @@
#!/bin/bash
source /opt/qt512/bin/qt512-env.sh
exec KittehPlayer-bin

10
README.md
View file

@ -33,12 +33,11 @@ A video player based on Qt, QML and libmpv with themes for many online video pla
``` ```
pacman -S git cmake qt5-svg qt5-declarative qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects mpv pacman -S git cmake qt5-svg qt5-declarative qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects mpv
``` ```
##### Ubuntu Xenial ##### Ubuntu Bionic
``` ```
sudo add-apt-repository ppa:beineri/opt-qt-5.11.1-xenial -y sudo add-apt-repository ppa:beineri/opt-qt-5.12.6-bionic -y
sudo apt update sudo apt update
sudo apt install build-essential git nasm qt511-meta-minimal qt511quickcontrols qt511quickcontrols2 qt511imageformats qt511svg libgl1-mesa-dev libmpv-dev sudo apt install build-essential git qt512-meta-minimal qt512quickcontrols qt512quickcontrols2 qt512svg qt512x11extras qt512graphicaleffects qt512svg libgl1-mesa-dev libmpv-dev
sudo apt-get build-dep mpv libmpv* ffmpeg
``` ```
##### Debian ##### Debian
``` ```
@ -50,6 +49,7 @@ sudo apt install build-essential cmake qtquickcontrols2-5-dev qtbase5-dev qtdecl
- `git clone https://github.com/NamedKitten/KittehPlayer KittehPlayer` - `git clone https://github.com/NamedKitten/KittehPlayer KittehPlayer`
- `cd KittehPlayer` - `cd KittehPlayer`
- `mkdir build && cd build` - `mkdir build && cd build`
- If you are on ubuntu bionic, run `source /opt/qt512/bin/qt512-env.sh` and add `-DOLD_UBUNTU=on` to the cmake command next.
- `cmake .. -DCMAKE_INSTALL_PREFIX=/usr` - `cmake .. -DCMAKE_INSTALL_PREFIX=/usr`
- `make` - `make`
- `sudo make install` - `sudo make install`