Skip to content

Commit

Permalink
Update many dep libraries. Add SHA256 checking to dep downloads.
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndrewBelt
AndrewBelt committed Jan 22, 2019
1 parent 9ab5244 commit 01c4a24
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 31 deletions.
3 changes: 3 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions dep.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
68 changes: 39 additions & 29 deletions dep/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -124,28 +133,28 @@ 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):
cd rtaudio && mkdir -p build
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/
Expand All @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion dep/glfw
Submodule glfw updated 72 files
+1 −1 .travis.yml
+0 −34 CMake/modules/FindMir.cmake
+0 −5 CMake/modules/FindVulkan.cmake
+9 −26 CMakeLists.txt
+27 −3 README.md
+12,870 −11,048 deps/nuklear.h
+0 −6 deps/vulkan/vulkan.h
+13 −13 docs/CONTRIBUTING.md
+8 −9 docs/Doxyfile.in
+5 −122 docs/DoxygenLayout.xml
+9 −9 docs/build.dox
+4 −9 docs/compat.dox
+3 −9 docs/compile.dox
+3 −3 docs/context.dox
+1 −1 docs/extra.css
+7 −7 docs/extra.less
+4 −4 docs/header.html
+8 −10 docs/input.dox
+3 −3 docs/main.dox
+1 −1 docs/monitor.dox
+4 −4 docs/moving.dox
+22 −4 docs/news.dox
+1 −1 docs/quick.dox
+4 −2 docs/vulkan.dox
+36 −4 docs/window.dox
+3 −3 examples/boing.c
+62 −40 include/GLFW/glfw3.h
+4 −51 include/GLFW/glfw3native.h
+9 −12 src/CMakeLists.txt
+233 −9 src/cocoa_init.m
+5 −8 src/cocoa_monitor.m
+5 −4 src/cocoa_platform.h
+48 −318 src/cocoa_window.m
+1 −1 src/context.c
+0 −4 src/egl_context.h
+3 −3 src/glfw3.pc.in
+2 −2 src/glfw_config.h.in
+24 −0 src/init.c
+1 −1 src/input.c
+6 −6 src/internal.h
+1 −1 src/linux_joystick.c
+0 −240 src/mir_init.c
+0 −218 src/mir_monitor.c
+0 −133 src/mir_platform.h
+0 −975 src/mir_window.c
+21 −12 src/monitor.c
+7 −2 src/nsgl_context.m
+2 −1 src/null_monitor.c
+1 −1 src/osmesa_context.c
+0 −3 src/vulkan.c
+139 −77 src/wgl_context.c
+54 −14 src/win32_init.c
+2 −0 src/win32_joystick.c
+5 −3 src/win32_monitor.c
+55 −14 src/win32_platform.h
+239 −60 src/win32_window.c
+15 −9 src/window.c
+170 −13 src/wl_init.c
+30 −30 src/wl_monitor.c
+18 −2 src/wl_platform.h
+426 −111 src/wl_window.c
+3 −2 src/x11_init.c
+14 −1 src/x11_monitor.c
+53 −46 src/x11_window.c
+1 −1 tests/CMakeLists.txt
+0 −10 tests/events.c
+2 −0 tests/gamma.c
+2 −0 tests/inputlag.c
+2 −0 tests/joysticks.c
+2 −0 tests/opacity.c
+48 −1 tests/tearing.c
+9 −2 tests/windows.c
2 changes: 1 addition & 1 deletion dep/rtaudio
Submodule rtaudio updated 22 files
+1 −0 .gitignore
+0 −6 .travis.yml
+281 −112 CMakeLists.txt
+10 −0 ChangeLog
+1 −0 Makefile.am
+655 −181 RtAudio.cpp
+36 −11 RtAudio.h
+21 −0 cmake/RtAudioConfigUninstall.cmake.in
+141 −104 configure.ac
+2 −2 contrib/go/rtaudio/rtaudio.go
+3 −3 doc/doxygen/compiling.txt
+1 −1 doc/doxygen/probe.txt
+20 −4 include/asio.h
+1 −1 include/asiosys.h
+1 −1 include/ginclude.h
+1 −1 install.txt
+31 −32 rtaudio_c.cpp
+11 −2 rtaudio_c.h
+12 −7 tests/CMakeLists.txt
+4 −1 tests/Makefile.am
+157 −0 tests/apinames.cpp
+2 −1 tests/audioprobe.cpp

0 comments on commit 01c4a24

Please sign in to comment.