From f1a2c9d4cabd4259d53c0cc2b51dda7c3733d68c Mon Sep 17 00:00:00 2001
From: Michael Brehm <djp952@gmail.com>
Date: Wed, 15 Feb 2017 23:42:22 -0500
Subject: [PATCH] Use gcc/g++ 4.9 for Linux builds

Not all current Linux systems have support for the gcc/g++ 5.x shared
libraries; this should provide better compatibility
---
 README.md                          |  1 +
 msbuild.proj                       | 44 +++++++++++++++---------------
 pvr.hdhomerundvr/addon-linux.xml   | 10 +++++--
 pvr.hdhomerundvr/addon-windows.xml | 12 ++++++--
 src/version.ini                    |  2 +-
 5 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 39929f1d..38f660e6 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ Open "Bash on Ubuntu on Windows"
 sudo dpkg --add-architecture i386
 sudo apt-get update
 sudo apt-get install gcc g++ gcc-multilib g++-multilib libssl-dev libssl-dev:i386
+sudo apt-get install gcc-4.9 g++-4.9 gcc-4.9-multilib g++-4.9-multilib
 ```
    
 **BUILD**   
diff --git a/msbuild.proj b/msbuild.proj
index 3670ed79..cf4f0ee6 100644
--- a/msbuild.proj
+++ b/msbuild.proj
@@ -33,31 +33,31 @@
 
     <!-- Linux/i686 -->
     <MakeDir Directories="out\i686" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;gcc $(CPPFLAGS) $(CFLAGS) -m32 -DSQLITE_THREADSAFE=2 -DSQLITE_ENABLE_JSON1 -c ../external-sqlite/sqlite3.c -o out/i686/sqlite3.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/addoncallbacks.cpp -o out/i686/addoncallbacks.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/database.cpp -o out/i686/database.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/dbextension.cpp -o out/i686/dbextension.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/livestream.cpp -o out/i686/livestream.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/pvr.cpp -o out/i686/pvr.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/pvrcallbacks.cpp -o out/i686/pvrcallbacks.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/scheduler.cpp -o out/i686/scheduler.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/sqlite_exception.cpp -o out/i686/sqlite_exception.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ -m32 -shared out/i686/addoncallbacks.o out/i686/database.o out/i686/dbextension.o out/i686/livestream.o out/i686/pvr.o out/i686/pvrcallbacks.o out/i686/scheduler.o out/i686/sqlite3.o out/i686/sqlite_exception.o ../prebuilt-libcurl/lib/linux-i686/libcurl.a ../prebuilt-libuuid/lib/linux-i686/libuuid.a -ldl -lpthread -lssl -lcrypto -lz -o out/i686/zuki.pvr.hdhomerundvr.so&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;gcc -I../external-sqlite -m32 -DSQLITE_ENABLE_JSON1 ../external-sqlite/sqlite3.c ../external-sqlite/shell.c -o out/i686/sqlite3 -ldl -lpthread&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;gcc-4.9 $(CPPFLAGS) $(CFLAGS) -m32 -DSQLITE_THREADSAFE=2 -DSQLITE_ENABLE_JSON1 -c ../external-sqlite/sqlite3.c -o out/i686/sqlite3.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/addoncallbacks.cpp -o out/i686/addoncallbacks.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/database.cpp -o out/i686/database.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/dbextension.cpp -o out/i686/dbextension.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/livestream.cpp -o out/i686/livestream.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/pvr.cpp -o out/i686/pvr.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/pvrcallbacks.cpp -o out/i686/pvrcallbacks.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/scheduler.cpp -o out/i686/scheduler.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -m32 -c src/sqlite_exception.cpp -o out/i686/sqlite_exception.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 -m32 -shared out/i686/addoncallbacks.o out/i686/database.o out/i686/dbextension.o out/i686/livestream.o out/i686/pvr.o out/i686/pvrcallbacks.o out/i686/scheduler.o out/i686/sqlite3.o out/i686/sqlite_exception.o ../prebuilt-libcurl/lib/linux-i686/libcurl.a ../prebuilt-libuuid/lib/linux-i686/libuuid.a -ldl -lpthread -lssl -lcrypto -lz -o out/i686/zuki.pvr.hdhomerundvr.so&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;gcc-4.9 -I../external-sqlite -m32 -DSQLITE_ENABLE_JSON1 ../external-sqlite/sqlite3.c ../external-sqlite/shell.c -o out/i686/sqlite3 -ldl -lpthread&quot;" ContinueOnError="false"/>
 
     <!-- Linux/x86_64 -->
     <MakeDir Directories="out\x86_64" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;gcc $(CPPFLAGS) $(CFLAGS) -DSQLITE_THREADSAFE=2 -DSQLITE_ENABLE_JSON1 -c ../external-sqlite/sqlite3.c -o out/x86_64/sqlite3.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -c src/addoncallbacks.cpp -o out/x86_64/addoncallbacks.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -c src/database.cpp -o out/x86_64/database.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -c src/dbextension.cpp -o out/x86_64/dbextension.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -c src/livestream.cpp -o out/x86_64/livestream.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -c src/pvr.cpp -o out/x86_64/pvr.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -c src/pvrcallbacks.cpp -o out/x86_64/pvrcallbacks.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -c src/scheduler.cpp -o out/x86_64/scheduler.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ $(CPPFLAGS) $(CXXFLAGS) -c src/sqlite_exception.cpp -o out/x86_64/sqlite_exception.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;g++ -shared out/x86_64/addoncallbacks.o out/x86_64/database.o out/x86_64/dbextension.o out/x86_64/livestream.o out/x86_64/pvr.o out/x86_64/pvrcallbacks.o out/x86_64/scheduler.o out/x86_64/sqlite3.o out/x86_64/sqlite_exception.o ../prebuilt-libcurl/lib/linux-x86_64/libcurl.a ../prebuilt-libuuid/lib/linux-x86_64/libuuid.a -ldl -lpthread -lssl -lcrypto -lz -o out/x86_64/zuki.pvr.hdhomerundvr.so&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;gcc -I../external-sqlite -DSQLITE_ENABLE_JSON1 ../external-sqlite/sqlite3.c ../external-sqlite/shell.c -o out/x86_64/sqlite3 -ldl -lpthread&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;gcc-4.9 $(CPPFLAGS) $(CFLAGS) -DSQLITE_THREADSAFE=2 -DSQLITE_ENABLE_JSON1 -c ../external-sqlite/sqlite3.c -o out/x86_64/sqlite3.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -c src/addoncallbacks.cpp -o out/x86_64/addoncallbacks.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -c src/database.cpp -o out/x86_64/database.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -c src/dbextension.cpp -o out/x86_64/dbextension.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -c src/livestream.cpp -o out/x86_64/livestream.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -c src/pvr.cpp -o out/x86_64/pvr.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -c src/pvrcallbacks.cpp -o out/x86_64/pvrcallbacks.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -c src/scheduler.cpp -o out/x86_64/scheduler.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 $(CPPFLAGS) $(CXXFLAGS) -c src/sqlite_exception.cpp -o out/x86_64/sqlite_exception.o&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;g++-4.9 -shared out/x86_64/addoncallbacks.o out/x86_64/database.o out/x86_64/dbextension.o out/x86_64/livestream.o out/x86_64/pvr.o out/x86_64/pvrcallbacks.o out/x86_64/scheduler.o out/x86_64/sqlite3.o out/x86_64/sqlite_exception.o ../prebuilt-libcurl/lib/linux-x86_64/libcurl.a ../prebuilt-libuuid/lib/linux-x86_64/libuuid.a -ldl -lpthread -lssl -lcrypto -lz -o out/x86_64/zuki.pvr.hdhomerundvr.so&quot;" ContinueOnError="false"/>
+    <Exec Command="$(BashExe) -c &quot;gcc-4.9 -I../external-sqlite -DSQLITE_ENABLE_JSON1 ../external-sqlite/sqlite3.c ../external-sqlite/shell.c -o out/x86_64/sqlite3 -ldl -lpthread&quot;" ContinueOnError="false"/>
 
   </Target>
 
diff --git a/pvr.hdhomerundvr/addon-linux.xml b/pvr.hdhomerundvr/addon-linux.xml
index f334fa6d..39001fd6 100644
--- a/pvr.hdhomerundvr/addon-linux.xml
+++ b/pvr.hdhomerundvr/addon-linux.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<addon id="pvr.hdhomerundvr" version="1.0.0" name="HDHomeRun DVR PVR Client" provider-name="Michael Brehm (djp952)">
+<addon id="pvr.hdhomerundvr" version="1.0.1" name="HDHomeRun DVR PVR Client" provider-name="Michael Brehm (djp952)">
   <requires>
     <import addon="xbmc.pvr" version="5.2.1"/>
   </requires>
@@ -8,8 +8,12 @@
     <summary lang="en_GB">HDHomeRun DVR PVR Client</summary>
     <description lang="en_GB">HDHomeRun DVR frontend. Supports streaming Live TV, Recordings, Electronic Program Guide (EPG) and Timers. Requires a SiliconDust HDHomeRun DVR Service subscription (https://www.silicondust.com/dvr-service) and an active HDHomeRun RECORD device on the local network.</description>
     <news>
-      v1.0.0
-      - Initial release
+v1.0.1
+  - Fix minor problem with one database table not being truncated at startup
+  - (Linux) Use older GNU C++ Compiler (g++ 4.9) for better system compatibility
+
+v1.0.0
+  - Initial release
     </news>
     <license>MIT License (https://opensource.org/licenses/MIT)</license>
     <website>https://github.com/djp952/pvr.hdhomerundvr/wiki</website>
diff --git a/pvr.hdhomerundvr/addon-windows.xml b/pvr.hdhomerundvr/addon-windows.xml
index 4a0050a4..3b3d0084 100644
--- a/pvr.hdhomerundvr/addon-windows.xml
+++ b/pvr.hdhomerundvr/addon-windows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<addon id="pvr.hdhomerundvr" version="1.0.0" name="HDHomeRun DVR PVR Client" provider-name="Michael Brehm (djp952)">
+<addon id="pvr.hdhomerundvr" version="1.0.1" name="HDHomeRun DVR PVR Client" provider-name="Michael Brehm (djp952)">
   <requires>
     <import addon="xbmc.pvr" version="5.2.1"/>
   </requires>
@@ -7,8 +7,14 @@
   <extension point="xbmc.addon.metadata">
     <summary lang="en_GB">HDHomeRun DVR PVR Client</summary>
     <description lang="en_GB">HDHomeRun DVR frontend. Supports streaming Live TV, Recordings, Electronic Program Guide (EPG) and Timers. Requires a SiliconDust HDHomeRun DVR Service subscription (https://www.silicondust.com/dvr-service) and an active HDHomeRun RECORD device on the local network.</description>
-    <news>v1.0.0
-    - Initial release</news>
+    <news>
+v1.0.1
+  - Fix minor problem with one database table not being truncated at startup
+  - (Linux) Use older GNU C++ Compiler (g++ 4.9) for better system compatibility
+
+v1.0.0
+  - Initial release
+    </news>
     <license>MIT License (https://opensource.org/licenses/MIT)</license>
     <website>https://github.com/djp952/pvr.hdhomerundvr/wiki</website>
     <source>https://github.com/djp952/pvr.hdhomerundvr</source>
diff --git a/src/version.ini b/src/version.ini
index 304abb6a..dab410fa 100644
--- a/src/version.ini
+++ b/src/version.ini
@@ -8,4 +8,4 @@
 Company=Michael G. Brehm
 Copyright=
 Product=zuki.pvr.hdhomerundvr
-Version=1.0.0
+Version=1.0.1