[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: update to flac 1.3.4

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC


Commits:
c3e2ac60 by Steve Lhomme at 2022-02-24T08:24:42+01:00
contrib: update to flac 1.3.4

(cherry picked from commit a49cca05d381ce6a0371fd1d15f983f2e4a58c04)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

- - - - -


3 changed files:

- contrib/src/flac/SHA512SUMS
- − contrib/src/flac/mingw-min-max.patch
- contrib/src/flac/rules.mak


Changes:

=====================================
contrib/src/flac/SHA512SUMS
=====================================
@@ -1 +1 @@
-d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28  flac-1.3.3.tar.xz
+4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9  flac-1.3.4.tar.xz


=====================================
contrib/src/flac/mingw-min-max.patch deleted
=====================================
@@ -1,28 +0,0 @@
-From 4a43f2bd4d7e12b5d994f48e18cf014008d204ce Mon Sep 17 00:00:00 2001
-From: sezero <sezero at users.sourceforge.net>
-Date: Mon, 5 Aug 2019 02:00:40 +0300
-Subject: [PATCH] Do not assume that sys/param.h defines MIN and MAX
-
-One such example is sys/param.h from MinGW.
----
- src/libFLAC/include/private/macros.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libFLAC/include/private/macros.h b/src/libFLAC/include/private/macros.h
-index 02eada45..3a8072ec 100644
---- a/src/libFLAC/include/private/macros.h
-+++ b/src/libFLAC/include/private/macros.h
-@@ -51,8 +51,10 @@
- /* Whatever other unix that has sys/param.h */
- #elif defined(HAVE_SYS_PARAM_H)
- #include <sys/param.h>
-+#if defined(MIN) && defined(MAX)
- #define flac_max(a,b) MAX(a,b)
- #define flac_min(a,b) MIN(a,b)
-+#endif
- 
- /* Windows VS has them in stdlib.h.. XXX:Untested */
- #elif defined(_MSC_VER)
--- 
-2.17.1
-


=====================================
contrib/src/flac/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # FLAC
 
-FLAC_VERSION := 1.3.3
+FLAC_VERSION := 1.3.4
 FLAC_URL := http://downloads.xiph.org/releases/flac/flac-$(FLAC_VERSION).tar.xz
 
 PKGS += flac
@@ -15,7 +15,6 @@ $(TARBALLS)/flac-$(FLAC_VERSION).tar.xz:
 
 flac: flac-$(FLAC_VERSION).tar.xz .sum-flac
 	$(UNPACK)
-	$(APPLY) $(SRC)/flac/mingw-min-max.patch
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/flac/console_write.patch
 	$(APPLY) $(SRC)/flac/remove_blocking_code_useless_flaclib.patch



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c3e2ac604aaa528b1bde12d4333e5414ddf3b9b5

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c3e2ac604aaa528b1bde12d4333e5414ddf3b9b5
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance