Skip to content

Commit

Permalink
project: add zstd library
Browse files Browse the repository at this point in the history
Resolves #4211
  • Loading branch information
osy committed Jul 31, 2022
1 parent 10166e3 commit 9985b22
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
10 changes: 10 additions & 0 deletions UTM.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@
84909A9127CADAE0005605F1 /* UTMUnavailableVMView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84909A9027CADAE0005605F1 /* UTMUnavailableVMView.swift */; };
84909A9227CADAE0005605F1 /* UTMUnavailableVMView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84909A9027CADAE0005605F1 /* UTMUnavailableVMView.swift */; };
84909A9327CADAE0005605F1 /* UTMUnavailableVMView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84909A9027CADAE0005605F1 /* UTMUnavailableVMView.swift */; };
84937EFF28960789003148F4 /* zstd.1.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84937EFE28960789003148F4 /* zstd.1.framework */; };
84937F0028960789003148F4 /* zstd.1.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 84937EFE28960789003148F4 /* zstd.1.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
84937F01289607E5003148F4 /* zstd.1.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84937EFE28960789003148F4 /* zstd.1.framework */; };
84937F02289607E6003148F4 /* zstd.1.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84937EFE28960789003148F4 /* zstd.1.framework */; };
84A381AA268CB30C0048EE4D /* VMDrivesSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A381A9268CB30C0048EE4D /* VMDrivesSettingsView.swift */; };
84B36D1E27B3264600C22685 /* CocoaSpice in Frameworks */ = {isa = PBXBuildFile; productRef = 84B36D1D27B3264600C22685 /* CocoaSpice */; };
84B36D2027B3264E00C22685 /* CocoaSpiceNoUsb in Frameworks */ = {isa = PBXBuildFile; productRef = 84B36D1F27B3264E00C22685 /* CocoaSpiceNoUsb */; };
Expand Down Expand Up @@ -1331,6 +1335,7 @@
CE0DF19625A83C1700A51894 /* qemu-arm-softmmu.framework in Embed Libraries */,
CE0DF19725A83C1700A51894 /* qemu-cris-softmmu.framework in Embed Libraries */,
CE0DF19825A83C1700A51894 /* qemu-hppa-softmmu.framework in Embed Libraries */,
84937F0028960789003148F4 /* zstd.1.framework in Embed Libraries */,
CEA9054225F982C400801E7C /* usb-1.0.0.framework in Embed Libraries */,
CE0DF19925A83C1700A51894 /* qemu-i386-softmmu.framework in Embed Libraries */,
CE0DF19A25A83C1700A51894 /* qemu-m68k-softmmu.framework in Embed Libraries */,
Expand Down Expand Up @@ -1631,6 +1636,7 @@
84909A8827CABA54005605F1 /* UTMWrappedVirtualMachine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTMWrappedVirtualMachine.swift; sourceTree = "<group>"; };
84909A8C27CACD5C005605F1 /* UTMPlaceholderVMView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTMPlaceholderVMView.swift; sourceTree = "<group>"; };
84909A9027CADAE0005605F1 /* UTMUnavailableVMView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTMUnavailableVMView.swift; sourceTree = "<group>"; };
84937EFE28960789003148F4 /* zstd.1.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = zstd.1.framework; path = "$(SYSROOT_DIR)/Frameworks/zstd.1.framework"; sourceTree = "<group>"; };
84A381A9268CB30C0048EE4D /* VMDrivesSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VMDrivesSettingsView.swift; sourceTree = "<group>"; };
84B36D2427B704C200C22685 /* UTMDownloadVMTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTMDownloadVMTask.swift; sourceTree = "<group>"; };
84B36D2827B790BE00C22685 /* DestructiveButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DestructiveButton.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2201,6 +2207,7 @@
B3DDF57226E9BBA300CE47F0 /* AltKit in Frameworks */,
CE2D933B24AD46670059923A /* libgstvideofilter.a in Frameworks */,
84018695288B66370050AC51 /* SwiftUIVisualEffects in Frameworks */,
84937F02289607E6003148F4 /* zstd.1.framework in Frameworks */,
CE2D933C24AD46670059923A /* libgstapp.a in Frameworks */,
CE2D933D24AD46670059923A /* libgstgio.a in Frameworks */,
CE2D933E24AD46670059923A /* libgsttypefindfunctions.a in Frameworks */,
Expand Down Expand Up @@ -2307,6 +2314,7 @@
CE0B6EF924AD677200FE012D /* libgstaudioresample.a in Frameworks */,
CE0B6EE724AD677200FE012D /* libgstvideotestsrc.a in Frameworks */,
CE0B6EBB24AD677200FE012D /* libgstgio.a in Frameworks */,
84937EFF28960789003148F4 /* zstd.1.framework in Frameworks */,
CE0B6EE224AD677200FE012D /* gstnet-1.0.0.framework in Frameworks */,
CE03D08624D90F0700F76B84 /* gmodule-2.0.0.framework in Frameworks */,
CE03D0CA24D9142000F76B84 /* ssl.1.1.framework in Frameworks */,
Expand Down Expand Up @@ -2384,6 +2392,7 @@
CEA45F51263519B5002FA97D /* gstvideo-1.0.0.framework in Frameworks */,
CEA45F52263519B5002FA97D /* spice-client-glib-2.0.8.framework in Frameworks */,
CEA45F53263519B5002FA97D /* gstrtsp-1.0.0.framework in Frameworks */,
84937F01289607E5003148F4 /* zstd.1.framework in Frameworks */,
CEA45F54263519B5002FA97D /* opus.0.framework in Frameworks */,
84B36D2027B3264E00C22685 /* CocoaSpiceNoUsb in Frameworks */,
CEA45F55263519B5002FA97D /* glib-2.0.0.framework in Frameworks */,
Expand Down Expand Up @@ -2456,6 +2465,7 @@
CE2D63D622653C7300FC7E63 /* Frameworks */ = {
isa = PBXGroup;
children = (
84937EFE28960789003148F4 /* zstd.1.framework */,
848308D4278A1F2200E3E474 /* Virtualization.framework */,
8453DCB0278CE33E0037A0DA /* qemu-img.framework */,
CE5451A426AF5F0F008594E5 /* EGL.framework */,
Expand Down
1 change: 1 addition & 0 deletions patches/sources
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ GCRYPT_SRC="https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.4.tar.gz"
PIXMAN_SRC="https://www.cairographics.org/releases/pixman-0.38.0.tar.gz"
OPENSSL_SRC="https://www.openssl.org/source/old/1.1.1/openssl-1.1.1b.tar.gz"
OPUS_SRC="https://archive.mozilla.org/pub/opus/opus-1.3.tar.gz"
ZSTD_SRC="https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz"
SPICE_PROTOCOL_SRC="https://www.spice-space.org/download/releases/spice-protocol-0.14.4.tar.xz"
SPICE_SERVER_SRC="https://www.spice-space.org/download/releases/spice-server/spice-0.14.3.tar.bz2"
USB_SRC="https://github.com/libusb/libusb/releases/download/v1.0.25/libusb-1.0.25.tar.bz2"
Expand Down
3 changes: 3 additions & 0 deletions scripts/build_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ download_all () {
download $SOUP_SRC
download $PHODAV_SRC
download $SPICE_CLIENT_SRC
download $ZSTD_SRC
download $QEMU_SRC
if [ -z "$SKIP_USB_BUILD" ]; then
download $USB_SRC
Expand Down Expand Up @@ -450,6 +451,8 @@ build_qemu_dependencies () {
build $PIXMAN_SRC
build_openssl $OPENSSL_SRC
build $OPUS_SRC
ZSTD_BASENAME="$(basename $ZSTD_SRC)"
meson_build "$BUILD_DIR/${ZSTD_BASENAME%.tar.*}/build/meson"
meson_build $GST_SRC -Dtests=disabled -Ddefault_library=both -Dregistry=false
meson_build $GST_BASE_SRC -Dtests=disabled -Ddefault_library=both
meson_build $GST_GOOD_SRC -Dtests=disabled -Ddefault_library=both
Expand Down

0 comments on commit 9985b22

Please sign in to comment.