Merge remote-tracking branch 'refs/remotes/origin/Krypton-nossl' into…

… Krypton
djp952 · Mar 28, 2017 · 7548457 · 7548457
2 parents 1d53e42 + 96f4ac3
commit 7548457
Show file tree

Hide file tree

Showing 27 changed files with 185 additions and 246 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,12 +7,6 @@
 [submodule "sqlite"]
 	path = depends/sqlite
 	url = https://github.com/djp952/external-sqlite.git
-[submodule "libcurl"]
-	path = depends/libcurl
-	url = https://github.com/djp952/prebuilt-libcurl.git
-[submodule "libssl"]
-	path = depends/libssl
-	url = https://github.com/djp952/prebuilt-libssl.git
 [submodule "libuuid"]
 	path = depends/libuuid
 	url = https://github.com/djp952/prebuilt-libuuid.git
@@ -22,3 +16,6 @@
 [submodule "libhdhomerun"]
 	path = depends/libhdhomerun
 	url = https://github.com/silicondust/libhdhomerun.git
+[submodule "libcurl-nossl"]
+	path = depends/libcurl-nossl
+	url = https://github.com/djp952/prebuilt-libcurl-nossl.git
diff --git a/Android.mk b/Android.mk
@@ -22,25 +22,11 @@
 
 LOCAL_PATH := $(call my-dir)
 
-# libcrypto
-#
-include $(CLEAR_VARS)
-LOCAL_MODULE := libcrypto-prebuilt
-LOCAL_SRC_FILES := depends/libssl/android-$(TARGET_ARCH_ABI)/lib/libcrypto.a
-include $(PREBUILT_STATIC_LIBRARY)
-
 # libcurl
 #
 include $(CLEAR_VARS)
 LOCAL_MODULE := libcurl-prebuilt
-LOCAL_SRC_FILES := depends/libcurl/android-$(TARGET_ARCH_ABI)/lib/libcurl.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libssl
-#
-include $(CLEAR_VARS)
-LOCAL_MODULE := libssl-prebuilt
-LOCAL_SRC_FILES := depends/libssl/android-$(TARGET_ARCH_ABI)/lib/libssl.a
+LOCAL_SRC_FILES := depends/libcurl-nossl/android-$(TARGET_ARCH_ABI)/lib/libcurl.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 # libuuid
@@ -64,8 +50,7 @@ LOCAL_MODULE := hdhomerundvr
 
 LOCAL_C_INCLUDES += \
 	depends/kodi-addon-dev-kit/kodi \
-	depends/libcurl/android-$(TARGET_ARCH_ABI)/include/curl \
-	depends/libssl/android-$(TARGET_ARCH_ABI)/include \
+	depends/libcurl-nossl/android-$(TARGET_ARCH_ABI)/include/curl \
 	depends/libuuid/android-$(TARGET_ARCH_ABI)/include \
 	depends/libz/android-$(TARGET_ARCH_ABI)/include \
 	depends/libhdhomerun \
@@ -86,12 +71,9 @@ LOCAL_CPPFLAGS += \
 	-Wall \
 	-Wno-unknown-pragmas
 
-# NOTE: The order is important here: libcurl->libssl->libcrypto->libz
 LOCAL_STATIC_LIBRARIES += \
 	libuuid-prebuilt \
 	libcurl-prebuilt \
-	libssl-prebuilt \
-	libcrypto-prebuilt \
 	libz-prebuilt
 
 LOCAL_LDLIBS += \

diff --git a/README.md b/README.md
@@ -7,21 +7,22 @@ Copyright (C)2017 Michael G. Brehm
 [MIT LICENSE](https://opensource.org/licenses/MIT)   
 
 [__CURL__](https://curl.haxx.se/) - Copyright (C)1996 - 2017, Daniel Stenberg, [email protected], and many contributors   
-[__OPENSSL__](https://www.openssl.org/) - Copyright (C)1998-2016 The OpenSSL Project   
 [__ZLIB__](http://www.zlib.net/) - Copyright (C)1995-2017 Jean-loup Gailly and Mark Adler   
 [__LIBHDHOMERUN__](https://github.com/Silicondust/libhdhomerun) - Copyright (C)2005-2016 Silicondust USA Inc     
 
 **BUILD ENVIRONMENT**  
-* Windows 10 x64 15058   
+* Windows 10 x64 15063   
 * Visual Studio 2015 (with Git for Windows)   
 * Bash on Ubuntu on Windows 16.04.1 LTS   
 * Android NDK r12b for Windows 64-bit
 
 **CONFIGURE BASH ON UBUNTU ON WINDOWS**   
 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 gcc-4.9 g++-4.9 gcc-4.9-multilib g++-4.9-multilib
+sudo apt-get install gcc-4.9 g++-4.9 libc6-dev:i386 libstdc++-4.9-dev:i386 lib32gcc-4.9-dev 
+sudo apt-get install gcc-4.9-arm-linux-gnueabihf g++-4.9-arm-linux-gnueabihf gcc-4.9-arm-linux-gnueabi g++-4.9-arm-linux-gnueabi gcc-4.9-aarch64-linux-gnu g++-4.9-aarch64-linux-gnu
 ```
 
 **CONFIGURE ANDROID NDK**   
@@ -46,9 +47,13 @@ cd pvr.hdhomerundvr
 git submodule update --init
 msbuild msbuild.proj
 
-> out\zuki.pvr.hdhomerundvr-win32-krypton-x.x.x.x.zip (windows-Win32)
+> out\zuki.pvr.hdhomerundvr-windows-win32-krypton-x.x.x.x.zip (windows-Win32)
+> out\zuki.pvr.hdhomerundvr-windows-x64-krypton-x.x.x.x.zip (windows-x64)
 > out\zuki.pvr.hdhomerundvr-linux-i686-krypton-x.x.x.x.zip (linux-i686)
 > out\zuki.pvr.hdhomerundvr-linux-x86_64-krypton-x.x.x.x.zip (linux-x86_64)
+> out\zuki.pvr.hdhomerundvr-linux-armel-krypton-x.x.x.x.zip (linux-armel)
+> out\zuki.pvr.hdhomerundvr-linux-armhf-krypton-x.x.x.x.zip (linux-armhf)
+> out\zuki.pvr.hdhomerundvr-linux-aarch64-krypton-x.x.x.x.zip (linux-aarch64)
 > out\zuki.pvr.hdhomerundvr-android-arm-krypton-x.x.x.x.zip (android-arm)
 > out\zuki.pvr.hdhomerundvr-android-aarch64-krypton-x.x.x.x.zip (android-aarch64)
 > out\zuki.pvr.hdhomerundvr-android-x86-krypton-x.x.x.x.zip (android-x86)

diff --git a/depends/libcurl b/depends/libcurl
diff --git a/depends/libcurl-nossl b/depends/libcurl-nossl
diff --git a/depends/libssl b/depends/libssl
diff --git a/depends/libuuid b/depends/libuuid
diff --git a/depends/libz b/depends/libz
diff --git a/manifest/linux-aarch64.manifest b/manifest/linux-aarch64.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<zip>
+  <file path="pvr.hdhomerundvr\addon.xml" source="tmp\addon-linux.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\LICENSE.txt" source="LICENSE" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\zuki.pvr.hdhomerundvr.so" source="out\linux-aarch64\zuki.pvr.hdhomerundvr.so"/>
+  <file path="pvr.hdhomerundvr\resources\icon.png" source="pvr.hdhomerundvr\resources\icon.png"/>
+  <file path="pvr.hdhomerundvr\resources\settings.xml" source="pvr.hdhomerundvr\resources\settings.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" source="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" normalize="unix"/>
+</zip>
diff --git a/manifest/linux-armel.manifest b/manifest/linux-armel.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<zip>
+  <file path="pvr.hdhomerundvr\addon.xml" source="tmp\addon-linux.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\LICENSE.txt" source="LICENSE" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\zuki.pvr.hdhomerundvr.so" source="out\linux-armel\zuki.pvr.hdhomerundvr.so"/>
+  <file path="pvr.hdhomerundvr\resources\icon.png" source="pvr.hdhomerundvr\resources\icon.png"/>
+  <file path="pvr.hdhomerundvr\resources\settings.xml" source="pvr.hdhomerundvr\resources\settings.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" source="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" normalize="unix"/>
+</zip>
diff --git a/manifest/linux-armhf.manifest b/manifest/linux-armhf.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<zip>
+  <file path="pvr.hdhomerundvr\addon.xml" source="tmp\addon-linux.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\LICENSE.txt" source="LICENSE" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\zuki.pvr.hdhomerundvr.so" source="out\linux-armhf\zuki.pvr.hdhomerundvr.so"/>
+  <file path="pvr.hdhomerundvr\resources\icon.png" source="pvr.hdhomerundvr\resources\icon.png"/>
+  <file path="pvr.hdhomerundvr\resources\settings.xml" source="pvr.hdhomerundvr\resources\settings.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" source="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" normalize="unix"/>
+</zip>
diff --git a/manifest/windows-win32.manifest b/manifest/windows-win32.manifest
@@ -2,7 +2,7 @@
 <zip>
   <file path="pvr.hdhomerundvr\addon.xml" source="tmp\addon-windows.xml" normalize="windows"/>
   <file path="pvr.hdhomerundvr\LICENSE.txt" source="LICENSE" normalize="windows"/>
-  <file path="pvr.hdhomerundvr\zuki.pvr.hdhomerundvr.dll" source="out\Win32\Release\zuki.pvr.hdhomerundvr.dll"/>
+  <file path="pvr.hdhomerundvr\zuki.pvr.hdhomerundvr.dll" source="out\windows-Win32\Release\zuki.pvr.hdhomerundvr.dll"/>
   <file path="pvr.hdhomerundvr\resources\icon.png" source="pvr.hdhomerundvr\resources\icon.png"/>
   <file path="pvr.hdhomerundvr\resources\settings.xml" source="pvr.hdhomerundvr\resources\settings.xml" normalize="windows"/>
   <file path="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" source="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" normalize="windows"/>

diff --git a/manifest/windows-x64.manifest b/manifest/windows-x64.manifest
@@ -2,7 +2,7 @@
 <zip>
   <file path="pvr.hdhomerundvr\addon.xml" source="tmp\addon-windows.xml" normalize="windows"/>
   <file path="pvr.hdhomerundvr\LICENSE.txt" source="LICENSE" normalize="windows"/>
-  <file path="pvr.hdhomerundvr\zuki.pvr.hdhomerundvr.dll" source="out\x64\Release\zuki.pvr.hdhomerundvr.dll"/>
+  <file path="pvr.hdhomerundvr\zuki.pvr.hdhomerundvr.dll" source="out\windows-x64\Release\zuki.pvr.hdhomerundvr.dll"/>
   <file path="pvr.hdhomerundvr\resources\icon.png" source="pvr.hdhomerundvr\resources\icon.png"/>
   <file path="pvr.hdhomerundvr\resources\settings.xml" source="pvr.hdhomerundvr\resources\settings.xml" normalize="windows"/>
   <file path="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" source="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" normalize="windows"/>
+65 −5		README.md
+104 −0		linux-aarch64/include/uuid/uuid.h
+ −		linux-aarch64/lib/libuuid.a
+104 −0		linux-armel/include/uuid/uuid.h
+ −		linux-armel/lib/libuuid.a
+104 −0		linux-armhf/include/uuid/uuid.h
+ −		linux-armhf/lib/libuuid.a
+ −		linux-x86_64/lib/libuuid.a
+56 −5		README.md
+511 −0		linux-aarch64/include/zconf.h
+1,768 −0		linux-aarch64/include/zlib.h
+ −		linux-aarch64/lib/libz.a
+511 −0		linux-armel/include/zconf.h
+1,768 −0		linux-armel/include/zlib.h
+ −		linux-armel/lib/libz.a
+511 −0		linux-armhf/include/zconf.h
+1,768 −0		linux-armhf/include/zlib.h
+ −		linux-armhf/lib/libz.a