From e3155d475aa15a26c786c20f69e1b9febcfeb1ec Mon Sep 17 00:00:00 2001
From: Rémi Verschelde <rverschelde@gmail.com>
Date: May 01 2019 06:26:58 +0000
Subject: Unbundle zstd, 1.4.0 is now packaged


---

diff --git a/godot.spec b/godot.spec
index 78b0256..5e3d6c9 100644
--- a/godot.spec
+++ b/godot.spec
@@ -33,7 +33,7 @@ BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libwebp)
-#BuildRequires:  pkgconfig(libzstd)
+BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(opus)
 BuildRequires:  pkgconfig(opusfile)
@@ -89,10 +89,6 @@ Provides:       bundled(nanosvg)
 Provides:       bundled(squish) = 1.15
 # Could be unbundled if packaged.
 Provides:       bundled(tinyexr)
-# Can be unbundled once we provide 1.4.0, as it uses some of the advanced APIs
-# added in that release.
-# Cf: https://github.com/godotengine/godot/issues/17374
-Provides:       bundled(zstd) = 1.4.0
 
 %if 0%{?rhel} && 0%{?rhel} < 8
 # Can't be unbundled on RHEL 7 which has libvpx 1.3.0, too old for Godot
@@ -192,10 +188,9 @@ by pointing to the location of the game's data package.
 # Needs to be in %%build so that system_libs stays in scope
 # We don't unbundle enet and minizip as they have necessary custom changes
 # We can't unbundle bullet yet as 2.88+ is required
-# We can't unbundle zstd yet as it's using advanced APIs only available in 1.4.0+
 # FIXME: Not unbundling libwebsockets right now as it fails building with system one:
 # https://github.com/godotengine/godot/issues/27632
-to_unbundle="freetype libogg libpng libtheora libvorbis libwebp mbedtls miniupnpc opus pcre2 zlib"
+to_unbundle="freetype libogg libpng libtheora libvorbis libwebp mbedtls miniupnpc opus pcre2 zlib zstd"
 # Godot's libsimplewebm doesn't build against EPEL7's older libvpx
 %if ! 0%{?rhel} || 0%{?rhel} > 7
 to_unbundle+=" libvpx"