From aedb5cc7461d80e95b3d7b7809dc06d0a1cbc6a8 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 27 Apr 2018 11:44:11 -0700 Subject: [PATCH 1/4] upgrade to glm-0.9.8.5 --- cmake/externals/glm/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt index bc8089074f..5e47eb08bf 100644 --- a/cmake/externals/glm/CMakeLists.txt +++ b/cmake/externals/glm/CMakeLists.txt @@ -3,8 +3,8 @@ set(EXTERNAL_NAME glm) include(ExternalProject) ExternalProject_Add( ${EXTERNAL_NAME} - URL https://hifi-public.s3.amazonaws.com/dependencies/glm-0.9.8.zip - URL_MD5 579ac77a3110befa3244d68c0ceb7281 + URL https://hifi-public.s3.amazonaws.com/dependencies/glm-0.9.8.5.zip + URL_MD5 456c9f54cf9da189733a74c173b840b5 BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= ${EXTERNAL_ARGS} LOG_DOWNLOAD 1 @@ -18,4 +18,4 @@ set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals") ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR) string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER) -set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "List of glm include directories") \ No newline at end of file +set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "List of glm include directories") From 1c0f6818a3c078aeb7e7988cb39dc010fb9f8488 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 30 Apr 2018 14:10:01 -0700 Subject: [PATCH 2/4] apply orenh1's patch to make GLM-0.9.8.5 compile on updated linux --- cmake/externals/glm/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt index 5e47eb08bf..0a83004438 100644 --- a/cmake/externals/glm/CMakeLists.txt +++ b/cmake/externals/glm/CMakeLists.txt @@ -3,8 +3,8 @@ set(EXTERNAL_NAME glm) include(ExternalProject) ExternalProject_Add( ${EXTERNAL_NAME} - URL https://hifi-public.s3.amazonaws.com/dependencies/glm-0.9.8.5.zip - URL_MD5 456c9f54cf9da189733a74c173b840b5 + URL https://hifi-public.s3.amazonaws.com/dependencies/glm-0.9.8.5-patched.zip + URL_MD5 7d39ecc1cea275427534c3cfd6dd63f0 BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= ${EXTERNAL_ARGS} LOG_DOWNLOAD 1 From d95371ae7972de74fe85901a9e88c4fd570b262f Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 9 May 2018 13:32:46 -0700 Subject: [PATCH 3/4] HACK: bypass android's baseUrl inflexibility --- android/build.gradle | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 1dfef97f91..3d30e95b6d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -66,17 +66,18 @@ ext { def baseFolder = new File(HIFI_ANDROID_PRECOMPILED) def appDir = new File(projectDir, 'app') def jniFolder = new File(appDir, 'src/main/jniLibs/arm64-v8a') -def baseUrl = 'https://hifi-public.s3.amazonaws.com/austin/android/' +//def baseUrl = 'https://hifi-public.s3.amazonaws.com/austin/android/' +def baseUrl = '' -def qtFile='qt-5.9.3_linux_armv8-libcpp_openssl.tgz' +def qtFile='https://hifi-public.s3.amazonaws.com/austin/android/qt-5.9.3_linux_armv8-libcpp_openssl.tgz' def qtChecksum='04599670ccca84bd2b15f6915568eb2d' def qtVersionId='PeoqzN31n.YvLfs9JE2SgHgZ4.IaKAlt' if (Os.isFamily(Os.FAMILY_MAC)) { - qtFile = 'qt-5.9.3_osx_armv8-libcpp_openssl.tgz' + qtFile = 'https://hifi-public.s3.amazonaws.com/austin/android/qt-5.9.3_osx_armv8-libcpp_openssl.tgz' qtChecksum='4b02de9d67d6bfb202355a808d2d9c59' qtVersionId='HygCmtMLPYioyil0DfXckGVzhw2SXZA9' } else if (Os.isFamily(Os.FAMILY_WINDOWS)) { - qtFile = 'qt-5.9.3_win_armv8-libcpp_openssl.tgz' + qtFile = 'https://hifi-public.s3.amazonaws.com/austin/android/qt-5.9.3_win_armv8-libcpp_openssl.tgz' qtChecksum='c3e25db64002d0f43cf565e0ef708911' qtVersionId='HeVObSVLCBoc7yY7He1oBMvPIH0VkClT' } @@ -88,58 +89,58 @@ def packages = [ checksum: qtChecksum, ], bullet: [ - file: 'bullet-2.83_armv8-libcpp.tgz', + file: 'https://hifi-public.s3.amazonaws.com/austin/android/bullet-2.83_armv8-libcpp.tgz', versionId: 'ljb7v.1IjVRqyopUKVDbVnLA4z88J8Eo', checksum: '2c558d604fce337f5eba3eb7ec1252fd', ], draco: [ - file: 'draco_armv8-libcpp.tgz', + file: 'https://hifi-public.s3.amazonaws.com/austin/android/draco_armv8-libcpp.tgz', versionId: 'cA3tVJSmkvb1naA3l6D_Jv2Noh.4yc4m', checksum: '617a80d213a5ec69fbfa21a1f2f738cd', ], glad: [ - file: 'glad_armv8-libcpp.zip', + file: 'https://hifi-public.s3.amazonaws.com/austin/android/glad_armv8-libcpp.zip', versionId: 'Q9szthzeye8fFyAA.cY26Lgn2B8kezEE', checksum: 'a8ee8584cf1ccd34766c7ddd9d5e5449', ], glm: [ - file: 'glm-0.9.8.tgz', + file: 'https://hifi-public.s3.amazonaws.com/austin/android/glm-0.9.8.tgz', versionId: 'BlkJNwaYV2Gfy5XwMeU7K0uzPDRKFMt2', checksum: 'd2b42cee31d2bc17bab6ce69e6b3f30a', ], gvr: [ - file: 'gvrsdk_v1.101.0.tgz', + file: 'https://hifi-public.s3.amazonaws.com/austin/android/gvrsdk_v1.101.0.tgz', versionId: 'UTberAIFraEfF9IVjoV66u1DTPTopgeY', checksum: '57fd02baa069176ba18597a29b6b4fc7', ], nvtt: [ - file: 'nvtt_armv8-libcpp.zip', + file: 'https://hifi-public.s3.amazonaws.com/austin/android/nvtt_armv8-libcpp.zip', versionId: 'vLqrqThvpq4gp75BHMAqO6HhfTXaa0An', checksum: 'eb46d0b683e66987190ed124aabf8910', sharedLibFolder: 'lib', includeLibs: ['libnvtt.so', 'libnvmath.so', 'libnvimage.so', 'libnvcore.so'], ], openssl: [ - file: 'openssl-1.1.0g_armv8.tgz', + file: 'https://hifi-public.s3.amazonaws.com/austin/android/openssl-1.1.0g_armv8.tgz', versionId: 'DmahmSGFS4ltpHyTdyQvv35WOeUOiib9', checksum: 'cabb681fbccd79594f65fcc266e02f32', ], polyvox: [ - file: 'polyvox_armv8-libcpp.tgz', + file: 'https://hifi-public.s3.amazonaws.com/austin/android/polyvox_armv8-libcpp.tgz', versionId: 'LDJtzMTvdm4SAc2KYg8Cg6uwWk4Vq3e3', checksum: '349ad5b72aaf2749ca95d847e60c5314', sharedLibFolder: 'lib', includeLibs: ['Release/libPolyVoxCore.so', 'libPolyVoxUtil.so'], ], tbb: [ - file: 'tbb-2018_U1_armv8_libcpp.tgz', + file: 'https://hifi-public.s3.amazonaws.com/austin/android/tbb-2018_U1_armv8_libcpp.tgz', versionId: 'YZliDD8.Menh1IVXKEuLPeO3xAjJ1UdF', checksum: '20768f298f53b195e71b414b0ae240c4', sharedLibFolder: 'lib/release', includeLibs: ['libtbb.so', 'libtbbmalloc.so'], ], hifiAC: [ - file: 'libplugins_libhifiCodec.zip', + file: 'https://hifi-public.s3.amazonaws.com/austin/android/libplugins_libhifiCodec.zip', versionId: 'mzKhsRCgVmloqq5bvE.0IwYK1NjGQc_G', checksum: '9412a8e12c88a4096c1fc843bb9fe52d', sharedLibFolder: '', @@ -150,15 +151,15 @@ def packages = [ def scribeLocalFile='scribe' + EXEC_SUFFIX -def scribeFile='scribe_linux_x86_64' +def scribeFile='https://hifi-public.s3.amazonaws.com/austin/android/scribe_linux_x86_64' def scribeChecksum='ca4b904f52f4f993c29175ba96798fa6' def scribeVersion='wgpf4dB2Ltzg4Lb2jJ4nPFsHoDkmK_OO' if (Os.isFamily(Os.FAMILY_MAC)) { - scribeFile = 'scribe_osx_x86_64' + scribeFile = 'https://hifi-public.s3.amazonaws.com/austin/android/scribe_osx_x86_64' scribeChecksum='72db9d32d4e1e50add755570ac5eb749' scribeVersion='o_NbPrktzEYtBkQf3Tn7zc1nZWzM52w6' } else if (Os.isFamily(Os.FAMILY_WINDOWS)) { - scribeFile = 'scribe_win32_x86_64.exe' + scribeFile = 'https://hifi-public.s3.amazonaws.com/austin/android/scribe_win32_x86_64.exe' scribeChecksum='678e43d290c90fda670c6fefe038a06d' scribeVersion='GCCJxlmd2irvNOFWfZR0U1UCLHndHQrC' } @@ -608,4 +609,4 @@ task testElf (dependsOn: 'externalNativeBuildDebug') { } } } -*/ \ No newline at end of file +*/ From 30b2eb07407d8afb9bfdd6d4ce2ea4c87ccd24dd Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 9 May 2018 13:35:34 -0700 Subject: [PATCH 4/4] update android glm dependency to 0.9.8.5 --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 3d30e95b6d..74047dccab 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -104,9 +104,9 @@ def packages = [ checksum: 'a8ee8584cf1ccd34766c7ddd9d5e5449', ], glm: [ - file: 'https://hifi-public.s3.amazonaws.com/austin/android/glm-0.9.8.tgz', - versionId: 'BlkJNwaYV2Gfy5XwMeU7K0uzPDRKFMt2', - checksum: 'd2b42cee31d2bc17bab6ce69e6b3f30a', + file: 'https://hifi-public.s3.amazonaws.com/dependencies/android/glm-0.9.8.5-patched.tgz', + versionId: 'cskfMoJrFlAeqI3WPxemyO_Cxt7rT9EJ', + checksum: '067b5fe16b220b5b1a1039ba51b062ae', ], gvr: [ file: 'https://hifi-public.s3.amazonaws.com/austin/android/gvrsdk_v1.101.0.tgz',