\#10: Added pyopengl, custom shell script for miniconda environment

.travis.yml

@@ -3,11 +3,17 @@ language: python
 python: '3.6'
 services:
 - docker
+
 install:
 - make docker-pull
 - pip3 install .
+
 script:
+- echo No test scripts implemented yet. Travis is used only for deploy yet.
+
+before_deploy:
 - package/update_version.sh $TRAVIS_TAG
+
 deploy:
   - provider: releases
     api_key:
@@ -25,4 +31,4 @@ deploy:
     distributions: "bdist_wheel"
     on:
       tags: true
-      repo: kbumsik/VirtScreen
+      repo: kbumsik/VirtScreen

MANIFEST.in

@@ -6,4 +6,4 @@ include LICENSE.txt
 
 # Include data directories
 include data/virtscreen.png
-include data/virtscreen.desktop
+include virtscreen.desktop

Makefile

@@ -95,7 +95,4 @@ arch-clean:
 	cd package/archlinux
 	rm -rf pkg src *.tar*
 
-launch:
-	./launch.sh
-
 clean: arch-clean deb-clean python-clean

launch.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-# Script to run virtscreen locally
-# This is not intended to be included in the distributed package
-virtscreen/virtscreen.py

launch_env.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+# This script is only for isolated miniconda environment
+#   Used in Debian & AppImage package
+ENV=/usr/share/virtscreen/env
+
+export PYTHONPATH=$ENV/lib/python3.6
+export LD_LIBRARY_PATH=$ENV/lib
+export QT_PLUGIN_PATH=$ENV/lib/python3.6/site-packages/PyQt5/Qt/plugins
+export QML2_IMPORT_PATH=$ENV/lib/python3.6/site-packages/PyQt5/Qt/qml
+# export QT_QPA_FONTDIR=/usr/share/fonts
+# export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb
+
+$ENV/bin/python3 $ENV/bin/virtscreen

package/archlinux/PKGBUILD

@@ -8,7 +8,7 @@ arch=("i686" "x86_64")
 url="https://github.com/kbumsik/VirtScreen"
 license=('GPL')
 groups=()
-depends=('xorg-xrandr' 'x11vnc' 'python-pyqt5' 'python-twisted' 'python-netifaces' 'python-qt5reactor')
+depends=('xorg-xrandr' 'x11vnc' 'python-pyqt5' 'python-twisted' 'python-netifaces' 'python-qt5reactor' 'python-opengl')
 makedepends=('python-pip')
 optdepends=(
     'arandr: for display settings option'

package/debian/Makefile.virtualenv

@@ -15,12 +15,12 @@ install:
 	# Fix hashbang and move executable
 	sed -i "1s:.*:#!$(prefix)/share/virtscreen/env/bin/python3:" \
 			$(DESTDIR)$(prefix)/share/virtscreen/env/bin/virtscreen
-	install -D $(DESTDIR)$(prefix)/share/virtscreen/env/bin/virtscreen \
+	install -D launch_env.sh \
 			$(DESTDIR)$(prefix)/bin/virtscreen
 	# Delete unnecessary installed files done by setup.py
 	rm -rf $(DESTDIR)$(prefix)/share/virtscreen/env/lib/python3.6/site-packages/usr
 	# Copy desktop entry and icon
-	install -m 644 -D data/virtscreen.desktop \
+	install -m 644 -D virtscreen.desktop \
 			$(DESTDIR)$(prefix)/share/applications/virtscreen.desktop
 	install -m 644 -D data/virtscreen.png \
 			$(DESTDIR)$(prefix)/share/pixmaps/virtscreen.png

package/debian/control

@@ -10,7 +10,7 @@ X-Python3-Version: >= 3.6
 Package: virtscreen
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${python3:Depends}, x11vnc, python3-pyqt5, qtbase5-dev, python3-twisted, python3-netifaces
+Depends: ${misc:Depends}, ${python3:Depends}, x11vnc, python3-pyqt5, qtbase5-dev, python3-opengl, python3-twisted, python3-netifaces
 Description: Make your iPad/tablet/computer as a secondary monitor on Linux
  VirtScreen is an easy-to-use Linux GUI app that creates a virtual 
  secondary screen and shares it through VNC.

setup.py

@@ -147,7 +147,8 @@ setup(
     install_requires=['PyQt5>=5.10.1',
                       'Twisted>=17.9.0',
                       'qt5reactor>=0.5',
-                      'netifaces>=0.10.6'],  # Optional
+                      'netifaces>=0.10.6',
+                      'PyOpenGL>=3.1.0'],  # Optional
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). Users will be able to install these using the "extras"
@@ -180,7 +181,7 @@ setup(
     data_files=[
         # Desktop entries spec:
         # https://www.freedesktop.org/wiki/Specifications/desktop-entry-spec/
-        ('share/applications', ['data/virtscreen.desktop']),
+        ('share/applications', ['virtscreen.desktop']),
         # $XDG_DATA_DIRS/icons
         # https://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#directory_layout
         ('share/icons', ['data/virtscreen.png']),