Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -17,4 +17,5 @@ airtime_mvc/tests/log/*.log
 .DS_Store
 .idea/
 /docs/_site/*
-/docs/.jekyll-cache/*
+/docs/.jekyll-cache/*
+/docs/.gems/*

Vagrantfile

@@ -67,9 +67,6 @@ Vagrant.configure("2") do |config|
 
     # Provision LibreTime
     config.vm.provision "install", type: "shell", inline: "cd /vagrant; ./install %s --web-port=8080" % installer_args
-
-    # Provision docs
-    config.vm.provision "build-site-jekyll", type: "shell", path: "docs/jekyll.sh"
   end
 
 end

docs/gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gem 'kramdown', '>= 2.3.0'
 
-gem 'jekyll', '~> 4.1'
+gem 'jekyll', '~> 4.1'

installer/lib/requirements-debian-buster.apt

@@ -4,6 +4,8 @@ curl
 ecasound
 flac
 git
+gcc
+gir1.2-gtk-3.0
 gstreamer1.0-plugins-bad
 gstreamer1.0-plugins-good
 gstreamer1.0-plugins-ugly
@@ -14,6 +16,8 @@ libapache2-mod-php7.3
 libcairo2-dev
 libcamomile-ocaml-data
 libfaad2
+libglib2.0-dev
+libgirepository1.0-dev
 libmad-ocaml
 libopus0
 libportaudio2
@@ -43,6 +47,8 @@ postgresql
 postgresql-client
 pwgen
 python3
+python3-gi
+python3-gi-cairo
 python3-gst-1.0
 python3-pika
 python3-pip

installer/lib/requirements-ubuntu-bionic.apt

@@ -4,6 +4,8 @@ coreutils
 curl
 ecasound
 flac
+gcc
+gir1.2-gtk-3.0
 gstreamer1.0-plugins-bad
 gstreamer1.0-plugins-good
 gstreamer1.0-plugins-ugly
@@ -51,23 +53,24 @@ php-apcu
 php-bcmath
 php-mbstring
 php-pear
-pkg_config
+pkg-config
 postgresql
 postgresql-client
 pwgen
 python3
+python3-cairo
 python3-dev
+python3-gi
+python3-gi-cairo
 python3-gst-1.0
 python3-pika
 python3-pip
 python3-virtualenv
-python3-cairo
 rabbitmq-server
 silan
 sysvinit-utils
 unzip
 vorbisgain
 vorbis-tools
-vorbis-tools
 xmlstarlet
 zip

installer/lib/requirements-ubuntu-xenial.apt

@@ -4,6 +4,8 @@ coreutils
 curl
 ecasound
 flac
+gcc
+gir1.2-gtk-3.0
 gstreamer1.0-plugins-bad
 gstreamer1.0-plugins-good
 gstreamer1.0-plugins-ugly
@@ -12,8 +14,11 @@ lame
 libao-ocaml
 libapache2-mod-php7.0
 libcamomile-ocaml-data
+libcairo2-dev
 libfaad2
 libffi-dev
+libglib2.0-dev
+libgirepository1.0-dev
 libmad-ocaml
 libopus0
 libportaudio2
@@ -48,11 +53,14 @@ php-apcu
 php-bcmath
 php-mbstring
 php-pear
+pkg-config
 postgresql
 postgresql-client
 pwgen
 python3
 python3-dev
+python3-gi
+python3-gi-cairo
 python3-gst-1.0
 python3-pika
 python3-pip

jekyll.sh

@@ -0,0 +1,15 @@
+#/bin/bash
+
+echo "Installing Ruby"
+apt-get update -y && apt-get install -y ruby-full build-essential zlib1g-dev
+
+export GEM_HOME=".gems"
+export PATH=".gems/bin:$PATH"
+
+echo "Installing Jekyll"
+
+cd docs
+gem install jekyll bundler
+
+# Running Jekyll
+jekyll serve

python_apps/airtime_analyzer/setup.py

@@ -29,7 +29,7 @@ setup(name='airtime_analyzer',
       packages=['airtime_analyzer'],
       scripts=['bin/airtime_analyzer'],
       install_requires=[
-          'mutagen~=1.43',
+          'mutagen==1.42.0',
           'pika~=1.1.0',
           'file-magic',
           'nose',
@@ -37,7 +37,9 @@ setup(name='airtime_analyzer',
           'mock',
           'python-daemon',
           'requests>=2.7.0',
-          'rgain3',
+          'rgain3==1.0.0',
+          'pycairo==1.19.1',
+          'PyGObject<=3.36.1',
           # These next 3 are required for requests to support SSL with SNI. Learned this the hard way...
           # What sucks is that GCC is required to pip install these. 
           #'ndg-httpsclient',