[vlc-commits] [Git][videolan/vlc][master] contrib: amf: update to 1.4.36
Felix Paul Kühne (@fkuehne)
gitlab at videolan.org
Sat Feb 15 15:19:57 UTC 2025
Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
7261d04e by Tristan Matthews at 2025-02-15T14:39:22+00:00
contrib: amf: update to 1.4.36
N.B. The tarball structure as changed, the top-level directory is now
amf-headers-v1.4.36 (rather than AMF).
Since all of robux's patches have been upstreamed we can now drop them.
- - - - -
5 changed files:
- − contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch
- − contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch
- − contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch
- contrib/src/amf/SHA512SUMS
- contrib/src/amf/rules.mak
Changes:
=====================================
contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch deleted
=====================================
@@ -1,38 +0,0 @@
-From 56828b95fc427e8475d0a03ac016fa7edcc0dfc8 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 07:43:32 +0100
-Subject: [PATCH 1/3] Move AMF_UNICODE into Platform.h
-
-It's a common macro that can be used in other places.
----
- core/Platform.h | 14 ++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/core/Platform.h b/core/Platform.h
-index 35cbc9a..2ced091 100644
---- a/core/Platform.h
-+++ b/core/Platform.h
-@@ -66,6 +66,20 @@
-
- #define AMF_TODO(_todo) (__FILE__ "(" AMF_MACRO_STRING(__LINE__) "): TODO: "_todo)
-
-+/**
-+*******************************************************************************
-+* AMF_UNICODE
-+*
-+* @brief
-+* Macro to convert string constant into wide char string constant
-+*
-+* Auxilary AMF_UNICODE_ macro is needed as otherwise it is not possible to use AMF_UNICODE(__FILE__)
-+* Microsoft macro _T also uses 2 passes to accomplish that
-+*******************************************************************************
-+*/
-+#define AMF_UNICODE(s) AMF_UNICODE_(s)
-+#define AMF_UNICODE_(s) L ## s
-+
-
- #if defined(__GNUC__) || defined(__clang__)
- #define AMF_ALIGN(n) __attribute__((aligned(n)))
---
-2.45.0.windows.1
-
=====================================
contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch deleted
=====================================
@@ -1,63 +0,0 @@
-From a2c7dbd97a22febdb19b8a82cfea4fda7af0d4b6 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 07:45:25 +0100
-Subject: [PATCH 2/3] Define LPRI(d|ud|x)64 as Unicode (wide) versions of
- AMFPRI(d|ud|x)64
-
-It's always true for all platforms.
----
- core/Platform.h | 27 ++++-----------------------
- 1 file changed, 4 insertions(+), 23 deletions(-)
-
-diff --git a/core/Platform.h b/core/Platform.h
-index 2ced091..12541f3 100644
---- a/core/Platform.h
-+++ b/core/Platform.h
-@@ -124,13 +110,10 @@ typedef signed int HRESULT;
- #endif
-
- #define AMFPRId64 "I64d"
-- #define LPRId64 L"I64d"
-
- #define AMFPRIud64 "Iu64d"
-- #define LPRIud64 L"Iu64d"
-
- #define AMFPRIx64 "I64x"
-- #define LPRIx64 L"I64x"
-
- #else // !WIN32 - Linux and Mac
-
-@@ -147,26 +130,24 @@ typedef signed int HRESULT;
-
- #if defined(__x86_64__) || defined(__aarch64__)
- #define AMFPRId64 "ld"
-- #define LPRId64 L"ld"
-
- #define AMFPRIud64 "uld"
-- #define LPRIud64 L"uld"
-
- #define AMFPRIx64 "lx"
-- #define LPRIx64 L"lx"
- #else
- #define AMFPRId64 "lld"
-- #define LPRId64 L"lld"
-
- #define AMFPRIud64 "ulld"
-- #define LPRIud64 L"ulld"
-
- #define AMFPRIx64 "llx"
-- #define LPRIx64 L"llx"
- #endif
-
- #endif // WIN32
-
-+#define LPRId64 AMF_UNICODE(AMFPRId64)
-+#define LPRIud64 AMF_UNICODE(AMFPRIud64)
-+#define LPRIx64 AMF_UNICODE(AMFPRIx64)
-+
-
- #if defined(_WIN32)
- #define AMF_WEAK __declspec( selectany )
---
-2.45.0.windows.1
-
=====================================
contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch deleted
=====================================
@@ -1,73 +0,0 @@
-From 3ecced3ba3ad710b6f86104a648f2c1b6dbb86fa Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 07:50:03 +0100
-Subject: [PATCH 3/3] Define AMFPRI(d|ud|x)64 using the standard C++ format for
- C+11 and up
-
-See https://en.cppreference.com/w/cpp/types/integer
-
-When compiled in C, it depends whether it's the Microsoft flavor or the standard C format. Not
-whether it's Win32 or not. Clang or GCC use the proper string formats on windows.
----
- core/Platform.h | 33 +++++++++++++++---------------
- 1 file changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/core/Platform.h b/core/Platform.h
-index 12541f3..a1fa96c 100644
---- a/core/Platform.h
-+++ b/core/Platform.h
-@@ -109,12 +109,6 @@ typedef signed int HRESULT;
- #define AMF_FORCEINLINE __forceinline
- #endif
-
-- #define AMFPRId64 "I64d"
--
-- #define AMFPRIud64 "Iu64d"
--
-- #define AMFPRIx64 "I64x"
--
- #else // !WIN32 - Linux and Mac
-
- #define AMF_STD_CALL
-@@ -128,21 +122,28 @@ typedef signed int HRESULT;
- #define AMF_FORCEINLINE __inline__
- #endif
-
-- #if defined(__x86_64__) || defined(__aarch64__)
-- #define AMFPRId64 "ld"
-+#endif // WIN32
-
-- #define AMFPRIud64 "uld"
-+#if defined(__cplusplus) && (__cplusplus >= 201103L)
-+ #include <cinttypes>
-+ #define AMFPRId64 PRId64
-
-- #define AMFPRIx64 "lx"
-- #else
-- #define AMFPRId64 "lld"
-+ #define AMFPRIud64 PRIu64
-
-- #define AMFPRIud64 "ulld"
-+ #define AMFPRIx64 PRIx64
-+#elif defined(_MSC_VER)
-+ #define AMFPRId64 "I64d"
-
-- #define AMFPRIx64 "llx"
-- #endif
-+ #define AMFPRIud64 "Iu64d"
-
--#endif // WIN32
-+ #define AMFPRIx64 "I64x"
-+#elif !defined(AMFPRId64)
-+ #define AMFPRId64 "lld"
-+
-+ #define AMFPRIud64 "ulld"
-+
-+ #define AMFPRIx64 "llx"
-+#endif
-
- #define LPRId64 AMF_UNICODE(AMFPRId64)
- #define LPRIud64 AMF_UNICODE(AMFPRIud64)
---
-2.45.0.windows.1
-
=====================================
contrib/src/amf/SHA512SUMS
=====================================
@@ -1 +1 @@
-2f6e43908260d9f7cb8b28ab8dd34f8f2a1f61c6f2b24d847f277deb264de74d37e60b71e35f6eb079af5c1a16967d0fb780271aee751c18f2013023dcb96f6c AMF-1.4.34.tar.gz
+e584f0f791aa1999d9047455fbaf62d6519882c6266a9c1fd30fd4f7c392bb06be3157e53aabaa99ab1efac46e86365715a4dd44b16529f55eb3bf50931e8466 AMF-1.4.36.tar.gz
=====================================
contrib/src/amf/rules.mak
=====================================
@@ -1,10 +1,10 @@
# AMF
-AMF_VERSION := 1.4.34
-AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v$(AMF_VERSION)/AMF-headers.tar.gz
+AMF_VERSION := 1.4.36
+AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v$(AMF_VERSION)/AMF-headers-v$(AMF_VERSION).tar.gz
AMF_GITURL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF.git
AMF_BRANCH := v$(AMF_VERSION)
-AMF_GITVERSION := 6d7bec0469961e2891c6e1aaa5122b76ed82e1db
+AMF_GITVERSION := 8f5a645e89380549368eec68935b151b238aa17b
ifeq ($(ARCH),x86_64)
ifdef HAVE_WIN32
@@ -39,16 +39,11 @@ $(TARBALLS)/AMF-$(AMF_GITVERSION).tar.xz:
# $(call check_githash,$(AMF_GITVERSION))
# touch "$@"
+amf: UNPACK_DIR=amf-headers-v$(AMF_VERSION)
amf: AMF-$(AMF_VERSION).tar.gz .sum-amf
# amf: AMF-$(AMF_GITVERSION).tar.xz .sum-amf
$(RM) -Rf AMF
$(UNPACK)
- # the tarball is extracted to AMF but it the filesystem is case insenstive
- # we can't move AMF to amf
- mv -f -- AMF AMF-$(AMF_VERSION)
- $(APPLY) $(SRC)/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch
- $(APPLY) $(SRC)/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch
- $(APPLY) $(SRC)/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch
$(MOVE)
.amf: amf
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/7261d04e5cc82ebdb3b38f6cf86eb0b7f3568962
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/7261d04e5cc82ebdb3b38f6cf86eb0b7f3568962
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list