From 01c4a24ca8f17dbf3aa29baf2d45f500d51a22d2 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 22 Jan 2019 07:59:49 -0500 Subject: [PATCH] Update many dep libraries. Add SHA256 checking to dep downloads. --- Makefile | 3 +++ dep.mk | 4 ++++ dep/Makefile | 68 ++++++++++++++++++++++++++++++---------------------- dep/glfw | 2 +- dep/rtaudio | 2 +- 5 files changed, 48 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 79141167..25c1d3f3 100644 --- a/Makefile +++ b/Makefile @@ -73,9 +73,12 @@ ifdef ARCH_LIN endif perf: $(TARGET) + # Requires gperftools ifdef ARCH_LIN perf record --call-graph dwarf -o perf.data ./$< -d endif + # Analyze with hotspot (https://github.com/KDAB/hotspot) for example + # hotspot perf.data clean: rm -rfv $(TARGET) libRack.a Rack.res build dist diff --git a/dep.mk b/dep.mk index f6fa0d0f..682a8032 100644 --- a/dep.mk +++ b/dep.mk @@ -25,6 +25,10 @@ ifdef ARCH_WIN else CMAKE := cmake -DCMAKE_INSTALL_PREFIX="$(DEP_PATH)" endif +# Some platforms try to install to lib64 +CMAKE += -DCMAKE_INSTALL_LIBDIR=lib + +SHA256 := sha256sum -c - <<< # Export environment for all dependency targets $(DEPS): export CFLAGS = $(DEP_CFLAGS) diff --git a/dep/Makefile b/dep/Makefile index e2c3f621..3d6393d2 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -59,59 +59,68 @@ include $(RACK_DIR)/dep.mk $(glew): $(WGET) "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz" + $(SHA256) "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95 glew-2.1.0.tgz" $(UNTAR) glew-2.1.0.tgz cd glew-2.1.0 && mkdir -p build - cd glew-2.1.0/build && $(CMAKE) -DCMAKE_INSTALL_LIBDIR=lib ./cmake + cd glew-2.1.0/build && $(CMAKE) ./cmake $(MAKE) -C glew-2.1.0/build $(MAKE) -C glew-2.1.0/build install $(glfw): - cd glfw && $(CMAKE) . \ + cd glfw && mkdir -p build + cd glfw/build && $(CMAKE) .. \ -DGLFW_COCOA_CHDIR_RESOURCES=OFF -DGLFW_COCOA_MENUBAR=ON -DGLFW_COCOA_RETINA_FRAMEBUFFER=ON - $(MAKE) -C glfw - $(MAKE) -C glfw install + $(MAKE) -C glfw/build + $(MAKE) -C glfw/build install $(jansson): - $(WGET) "http://www.digip.org/jansson/releases/jansson-2.10.tar.gz" - $(UNTAR) jansson-2.10.tar.gz - cd jansson-2.10 && $(CONFIGURE) - $(MAKE) -C jansson-2.10 - $(MAKE) -C jansson-2.10 install + $(WGET) "http://www.digip.org/jansson/releases/jansson-2.12.tar.gz" + $(SHA256) "5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c7027d2c9 jansson-2.12.tar.gz" + $(UNTAR) jansson-2.12.tar.gz + cd jansson-2.12 && $(CONFIGURE) + $(MAKE) -C jansson-2.12 + $(MAKE) -C jansson-2.12 install $(libspeexdsp): $(WGET) "https://vcvrack.com/downloads/dep/speexdsp-SpeexDSP-1.2rc3.tgz" + $(SHA256) "c8dded1454747f65956f981c95e7f89a06abdaa2a53e8aeaa66bab2a3d59cebd speexdsp-SpeexDSP-1.2rc3.tgz" $(UNTAR) speexdsp-SpeexDSP-1.2rc3.tgz cd speexdsp-SpeexDSP-1.2rc3 && $(CONFIGURE) $(MAKE) -C speexdsp-SpeexDSP-1.2rc3 $(MAKE) -C speexdsp-SpeexDSP-1.2rc3 install $(openssl): - $(WGET) "https://www.openssl.org/source/openssl-1.1.0h.tar.gz" - $(UNTAR) openssl-1.1.0h.tar.gz + $(WGET) "https://www.openssl.org/source/openssl-1.1.1a.tar.gz" + $(SHA256) "fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41 openssl-1.1.1a.tar.gz" + $(UNTAR) openssl-1.1.1a.tar.gz @# ./config ignores CFLAGS, so hack it in with CC - cd openssl-1.1.0h && CC="$(CC) $(CFLAGS)" ./config --prefix="$(realpath $(DEP_LOCAL))" - $(MAKE) -C openssl-1.1.0h - $(MAKE) -C openssl-1.1.0h install_sw + cd openssl-1.1.1a && CC="$(CC) $(CFLAGS)" ./config --prefix="$(realpath $(DEP_LOCAL))" + $(MAKE) -C openssl-1.1.1a + $(MAKE) -C openssl-1.1.1a install_sw $(libcurl): $(openssl) - $(WGET) "https://curl.haxx.se/download/curl-7.59.0.tar.gz" - $(UNTAR) curl-7.59.0.tar.gz - cd curl-7.59.0 && PKG_CONFIG_PATH= $(CONFIGURE) \ + $(WGET) "https://curl.haxx.se/download/curl-7.63.0.tar.gz" + $(SHA256) "d483b89062832e211c887d7cf1b65c902d591b48c11fe7d174af781681580b41 curl-7.63.0.tar.gz" + $(UNTAR) curl-7.63.0.tar.gz + cd curl-7.63.0 && PKG_CONFIG_PATH= $(CONFIGURE) \ --disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-shared --disable-symbol-hiding \ --without-zlib --without-libpsl --without-libmetalink --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2 --without-brotli \ --without-ca-bundle --with-ca-fallback --with-ssl=$(realpath $(DEP_LOCAL)) - $(MAKE) -C curl-7.59.0 - $(MAKE) -C curl-7.59.0 install + $(MAKE) -C curl-7.63.0 + $(MAKE) -C curl-7.63.0 install $(libzip): $(zlib) - $(WGET) "https://nih.at/libzip/libzip-1.2.0.tar.gz" - $(UNTAR) libzip-1.2.0.tar.gz - cd libzip-1.2.0 && $(CONFIGURE) - $(MAKE) -C libzip-1.2.0 - $(MAKE) -C libzip-1.2.0 install + $(WGET) "https://libzip.org/download/libzip-1.5.1.tar.xz" + $(SHA256) "04ea35b6956c7b3453f1ed3f3fe40e3ddae1f43931089124579e8384e79ed372 libzip-1.5.1.tar.xz" + $(UNTAR) libzip-1.5.1.tar.xz + cd libzip-1.5.1 && mkdir -p build + cd libzip-1.5.1/build && $(CMAKE) .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=ON -DCMAKE_FIND_ROOT_PATH="$(realpath $(DEP_LOCAL))" + $(MAKE) -C libzip-1.5.1/build + $(MAKE) -C libzip-1.5.1/build install $(zlib): $(WGET) "https://www.zlib.net/zlib-1.2.11.tar.gz" + $(SHA256) "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 zlib-1.2.11.tar.gz" $(UNTAR) zlib-1.2.11.tar.gz ifdef ARCH_WIN $(MAKE) -C zlib-1.2.11 -f win32/Makefile.gcc @@ -124,19 +133,20 @@ endif $(rtmidi): $(WGET) "https://vcvrack.com/downloads/dep/rtmidi.tgz" + $(SHA256) "b66ddc090eec2f3d05bdbe863760be9dce77cd525c3ca7c3a47cbabe035ebde1 rtmidi.tgz" $(UNTAR) rtmidi.tgz cd rtmidi && $(CONFIGURE) $(MAKE) -C rtmidi $(MAKE) -C rtmidi install ifdef ARCH_MAC -RTAUDIO_FLAGS += -DAUDIO_OSX_CORE=ON +RTAUDIO_FLAGS += -DRTAUDIO_API_CORE=ON endif ifdef ARCH_WIN -RTAUDIO_FLAGS += -DAUDIO_WINDOWS_DS=ON -DAUDIO_WINDOWS_WASAPI=ON -DAUDIO_WINDOWS_ASIO=ON +RTAUDIO_FLAGS += -DRTAUDIO_API_DS=ON -DRTAUDIO_API_WASAPI=ON -DRTAUDIO_API_ASIO=ON endif ifdef ARCH_LIN -RTAUDIO_FLAGS += -DAUDIO_LINUX_ALSA=ON -DAUDIO_UNIX_JACK=ON +RTAUDIO_FLAGS += -DRTAUDIO_API_ALSA=ON -DRTAUDIO_API_JACK=ON -DRTAUDIO_API_PULSE=OFF endif $(rtaudio): @@ -144,8 +154,7 @@ $(rtaudio): cd rtaudio/build && $(CMAKE) $(RTAUDIO_FLAGS) .. $(MAKE) -C rtaudio/build $(MAKE) -C rtaudio/build install - @# For some reason, it doesn't install the static library - cp rtaudio/build/librtaudio_static.a lib/librtaudio.a + cp lib/librtaudio_static.a lib/librtaudio.a $(nanovg): $(wildcard nanovg/src/*.h) cp $^ include/ @@ -161,6 +170,7 @@ $(osdialog): $(wildcard osdialog/*.h) $(pffft): $(WGET) "https://bitbucket.org/jpommier/pffft/get/29e4f76ac53b.zip" + $(SHA256) "bb10afba127904a0c6c553fa445082729b7d72373511bda1b12a5be0e03f318a 29e4f76ac53b.zip" $(UNZIP) 29e4f76ac53b.zip cp jpommier-pffft-29e4f76ac53b/*.h include/ diff --git a/dep/glfw b/dep/glfw index 617a322b..29d8ca4c 160000 --- a/dep/glfw +++ b/dep/glfw @@ -1 +1 @@ -Subproject commit 617a322bd88c1b27f1fd7d05dc3723b6c5461a68 +Subproject commit 29d8ca4ce4aef8e0afca62b8ace9ee18a24a9ffd diff --git a/dep/rtaudio b/dep/rtaudio index ce13dfbf..b9468aa6 160000 --- a/dep/rtaudio +++ b/dep/rtaudio @@ -1 +1 @@ -Subproject commit ce13dfbf30fd1ab4e7f7eff8886a80f144c75e5d +Subproject commit b9468aa6f82fdea1f3dc364f477e859b39f0bb2a