merge latest master branch

.gitignore

@@ -1,60 +1,19 @@
-# links
+# av-caster
 cppcheck-filtered
 dbg
 mk
 mk-clean
 mk-reset
+Builds/Makefile/.gdbinit
+Builds/Makefile/debug.log
 
-# builds
-Builds/*
-!Builds/*/
-Builds/*/*
-!Builds/CodeBlocksLinux/AvCaster.cbp
-!Builds/CodeBlocksWindows/AvCaster.cbp
-!Builds/Makefile/Makefile
-!Builds/MacOSX/AvCaster.xcodeproj
-!Builds/MacOSX/Info.plist
-!Builds/MacOSX/RecentFilesMenuTemplate.nib
-!Builds/Packaging/_service
-!Builds/Packaging/av-caster.dsc
-!Builds/Packaging/av-caster.spec
-!Builds/Packaging/debian.changelog
-!Builds/Packaging/debian.control
-!Builds/Packaging/debian.rules
-!Builds/Packaging/PKGBUILD
-!Builds/Packaging/README.md
-!Builds/Scripts/cppcheck-filtered
-!Builds/Scripts/dbg
-!Builds/Scripts/mk
-!Builds/Scripts/mk-clean
-!Builds/Scripts/mk-reset
-!Builds/Scripts/README.md
-!Builds/Scripts/setup-build-helpers
-!Builds/VisualStudio2008/AvCaster.sln
-!Builds/VisualStudio2008/AvCaster.vcproj
-!Builds/VisualStudio2008/resources.rc
-!Builds/VisualStudio2015/AvCaster.sln
-!Builds/VisualStudio2015/AvCaster.vcxproj
-!Builds/VisualStudio2015/AvCaster.vcxproj.filters
-!Builds/VisualStudio2015/resources.rc
-
-# JUCE 4
-JuceLibraryCode/modules/juce_core/native/juce_curl_Network.cpp
-JuceLibraryCode/modules/juce_core/text/juce_Base64.cpp
-JuceLibraryCode/modules/juce_core/text/juce_Base64.h
-JuceLibraryCode/modules/juce_data_structures/values/juce_ValueTreeSynchroniser.cpp
-JuceLibraryCode/modules/juce_data_structures/values/juce_ValueTreeSynchroniser.h
-JuceLibraryCode/modules/juce_core/containers/juce_ListenerList.h
-JuceLibraryCode/modules/juce_core/maths/juce_StatisticsAccumulator.h
-JuceLibraryCode/modules/juce_core/native/java/AndroidMidi.java
-JuceLibraryCode/modules/juce_core/native/java/AndroidMidiFallback.java
-JuceLibraryCode/modules/juce_core/native/juce_mac_ClangBugWorkaround.h
 
 # nix
 *~
 *.kate-swp
 .kateproject*
 
+
 # win
 *Debug
 *Release
@@ -64,5 +23,49 @@ JuceLibraryCode/modules/juce_core/native/juce_mac_ClangBugWorkaround.h
 [Tt]humbs.db
 *.DS_Store
 
+
 # c::b
 *.layout
+
+
+# juce
+._*
+*.mode1v3
+*.pbxuser
+*.perspectivev3
+*.user
+*.ncb
+*.suo
+*.ilk
+*.pch
+*.pdb
+*.dep
+*.idb
+*.manifest
+*.manifest.res
+*.o
+*.d
+*.sdf
+*.opensdf
+*.VC.db
+*.VC.opendb
+xcuserdata
+*.xccheckout
+contents.xcworkspacedata
+.DS_Store
+.svn
+profile
+**/MacOSX/build
+**/iOS/build
+**/Makefile/build
+**/VisualStudio*/Debug
+**/VisualStudio*/Release
+**/VisualStudio*/x64
+**/Android*/bin
+**/Android*/libs
+**/Android*/gen
+**/Android*/obj
+**/CodeBlocks*/bin
+**/CodeBlocks*/obj
+**/CodeBlocks*/*.depend
+**/CodeBlocks*/*.layout

.travis.yml

@@ -4,6 +4,12 @@ sudo:     required
 dist:     trusty
 group:    edge
 
+git:
+  depth: 1
+
+branches:
+  except: master
+
 notifications:
   email: false
   irc:
@@ -12,16 +18,15 @@ notifications:
     on_failure: always
     on_start:   never
   webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/1fcf27221a4243f787d8
+    urls: https://webhooks.gitter.im/e/1fcf27221a4243f787d8
     on_success: always
     on_failure: always
     on_start:   never
 
 before_install:
   - PROJECT_NAME='av-caster'
   - DEPS='libfreetype6-dev libgstreamer-plugins-base1.0-dev libx11-dev
-          libxcursor-dev libxinerama-dev'
+          libxcursor-dev libxinerama-dev libxrandr-dev'
   - # the trusty version of libircclient is incompatible
   - LIBIRCCLIENT_MIRROR="http://mirrors.kernel.org/ubuntu/pool/universe/libi/libircclient"
   - LIBIRCCLIENT="libircclient1_1.8-2_amd64.deb"
@@ -37,11 +42,7 @@ script:
   - wget $LIBIRCCLIENT_MIRROR/$LIBIRCCLIENTDEV
   - sudo dpkg -i $LIBIRCCLIENT
   - sudo dpkg -i $LIBIRCCLIENTDEV
-  - mkdir libircclient
-  - cp /usr/include/libirc* libircclient/
-  - sudo mv libircclient/ /usr/include/
-  - make CONFIG=Release # TARGET_ARCH='-march=x86-64'
-  - # $BUILD_DIR/build/$PROJECT_NAME --version
+  - CFLAGS="-Wno-dangling-else -Wno-deprecated-register" make
 
 after_script:
   - echo "build stage ended"