[vlc-commits] [Git][videolan/vlc][master] contrib: amf: update to 1.4.34
Steve Lhomme (@robUx4)
gitlab at videolan.org
Tue Sep 3 13:51:12 UTC 2024
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
fb18df85 by Steve Lhomme at 2024-09-03T13:10:25+00:00
contrib: amf: update to 1.4.34
It now comes with a nicer header-only package.
- - - - -
10 changed files:
- − contrib/src/amf/0001-Differentiate-the-AMF_NO_VTABLE-based-on-the-compile.patch
- − contrib/src/amf/0001-Don-t-cast-amf_int64-when-using-a-format-string.patch
- − contrib/src/amf/0001-Fix-const-on-return-by-value-AMF_DECLARE_IID.patch
- − contrib/src/amf/0001-Fix-warning-when-_MSC_VER-is-not-defined.patch
- 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/0002-Fix-const-on-return-by-value-Variant-values.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-Differentiate-the-AMF_NO_VTABLE-based-on-the-compile.patch deleted
=====================================
@@ -1,47 +0,0 @@
-From cf190d084644d3d3e2ea1ffbb740ad8e7aede760 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 08:18:19 +0100
-Subject: [PATCH] Differentiate the AMF_NO_VTABLE based on the compiler
-
-This is a Microsoft specific extension: https://learn.microsoft.com/en-us/cpp/cpp/novtable
-Clang and gcc can compile for Windows but don't support this.
----
- amf/public/include/core/Platform.h | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h
-index d6496d4..378f789 100644
---- a/amf/public/include/core/Platform.h
-+++ b/amf/public/include/core/Platform.h
-@@ -100,6 +100,12 @@ typedef signed int HRESULT;
- #include <stdint.h>
- #include <string.h>
-
-+#if defined(_MSC_VER)
-+ #define AMF_NO_VTABLE __declspec(novtable)
-+#else
-+ #define AMF_NO_VTABLE
-+#endif
-+
- #if defined(_WIN32)
-
-
-@@ -116,7 +122,6 @@ typedef signed int HRESULT;
- #define AMF_INLINE __inline
- #define AMF_FORCEINLINE __forceinline
- #endif
-- #define AMF_NO_VTABLE __declspec(novtable)
-
- #else // !WIN32 - Linux and Mac
-
-@@ -130,7 +135,6 @@ typedef signed int HRESULT;
- #define AMF_INLINE __inline__
- #define AMF_FORCEINLINE __inline__
- #endif
-- #define AMF_NO_VTABLE
-
- #endif // WIN32
-
---
-2.37.3.windows.1
-
=====================================
contrib/src/amf/0001-Don-t-cast-amf_int64-when-using-a-format-string.patch deleted
=====================================
@@ -1,34 +0,0 @@
-From e5498eb5e82c54c93fdd56127a8bb6dc96961e46 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 08:05:13 +0100
-Subject: [PATCH] Don't cast amf_int64 when using a format string
-
-The format string is designed to match amf_int64.
----
- amf/public/include/core/Variant.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/amf/public/include/core/Variant.h b/amf/public/include/core/Variant.h
-index edf14ae..a44fbf5 100644
---- a/amf/public/include/core/Variant.h
-+++ b/amf/public/include/core/Variant.h
-@@ -872,14 +872,14 @@ namespace amf
- {
- res = AMF_OK;
- char buff[0xFF];
-- sprintf(buff, "%" AMFPRId64, (long long)value);
-+ sprintf(buff, "%" AMFPRId64, value);
- return buff;
- }
- static AMF_INLINE AMFVariant::WString AMFConvertInt64ToWString(amf_int64 value, AMF_RESULT& res)
- {
- res = AMF_OK;
- wchar_t buff[0xFF];
-- swprintf(buff, 0xFF, L"%" LPRId64, (long long)value);
-+ swprintf(buff, 0xFF, L"%" LPRId64, value);
- return buff;
- }
-
---
-2.37.3.windows.1
-
=====================================
contrib/src/amf/0001-Fix-const-on-return-by-value-AMF_DECLARE_IID.patch deleted
=====================================
@@ -1,29 +0,0 @@
-From 17cc77f3185ca562c7c0aa4e439c8f4bace1360a Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 08:12:20 +0100
-Subject: [PATCH 1/2] Fix const on return by value AMF_DECLARE_IID()
-
-The returned value won't be const in C.
-
-Fixes this kind of warning:
-include/AMF/core/../components/Component.h:326:5: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
----
- amf/public/include/core/Interface.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amf/public/include/core/Interface.h b/amf/public/include/core/Interface.h
-index 9ac7e41..96117f0 100644
---- a/amf/public/include/core/Interface.h
-+++ b/amf/public/include/core/Interface.h
-@@ -49,7 +49,7 @@ namespace amf
- }
- #else
- #define AMF_DECLARE_IID(name, _data1, _data2, _data3, _data41, _data42, _data43, _data44, _data45, _data46, _data47, _data48) \
-- AMF_INLINE static const AMFGuid IID_##name(void) \
-+ AMF_INLINE static AMFGuid IID_##name(void) \
- { \
- AMFGuid uid = {_data1, _data2, _data3, _data41, _data42, _data43, _data44, _data45, _data46, _data47, _data48}; \
- return uid; \
---
-2.37.3.windows.1
-
=====================================
contrib/src/amf/0001-Fix-warning-when-_MSC_VER-is-not-defined.patch deleted
=====================================
@@ -1,52 +0,0 @@
-From 6c26950f67fb07550b86f3064fb0f7b7b53eec5d Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 08:57:46 +0100
-Subject: [PATCH] Fix warning when _MSC_VER is not defined
-
----
- amf/public/include/core/Variant.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/amf/public/include/core/Variant.h b/amf/public/include/core/Variant.h
-index edf14ae..879f092 100644
---- a/amf/public/include/core/Variant.h
-+++ b/amf/public/include/core/Variant.h
-@@ -365,7 +365,7 @@ namespace amf
- operator=(p_other);
- }
-
--#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (_MSC_VER >= 1600)
-+#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (defined(_MSC_VER) && _MSC_VER >= 1600)
- #pragma warning (push)
- #pragma warning (disable : 26439) //This kind of function may not throw. Declare it 'noexcept'.
- String(String&& p_other) : m_Str(nullptr)
-@@ -393,7 +393,7 @@ namespace amf
- m_Str = AMFVariantDuplicateString(p_other.m_Str);
- return *this;
- }
--#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (_MSC_VER >= 1600)
-+#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (defined(_MSC_VER) && _MSC_VER >= 1600)
- String& operator=(String&& p_other)
- {
- Free();
-@@ -475,7 +475,7 @@ namespace amf
- {
- operator=(p_other);
- }
--#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (_MSC_VER >= 1600)
-+#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (defined(_MSC_VER) && _MSC_VER >= 1600)
- WString(WString&& p_other) : m_Str(nullptr)
- {
- operator=(p_other);
-@@ -492,7 +492,7 @@ namespace amf
- m_Str = AMFVariantDuplicateWString(p_other.m_Str);
- return *this;
- }
--#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (_MSC_VER >= 1600)
-+#if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (defined(_MSC_VER) && _MSC_VER >= 1600)
- WString& operator=(WString&& p_other)
- {
- Free();
---
-2.37.3.windows.1
-
=====================================
contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch
=====================================
@@ -1,17 +1,17 @@
-From a9ee7691cf2535f58695769893e92a634f810523 Mon Sep 17 00:00:00 2001
+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/4] Move AMF_UNICODE into Platform.h
+Subject: [PATCH 1/3] Move AMF_UNICODE into Platform.h
It's a common macro that can be used in other places.
---
- amf/public/include/core/Platform.h | 14 ++++++++++++++
- 2 files changed, 14 insertions(+), 14 deletions(-)
+ core/Platform.h | 14 ++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
-diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h
-index 3f997fe..cdab1b2 100644
---- a/amf/public/include/core/Platform.h
-+++ b/amf/public/include/core/Platform.h
+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)
@@ -34,5 +34,5 @@ index 3f997fe..cdab1b2 100644
#if defined(__GNUC__) || defined(__clang__)
#define AMF_ALIGN(n) __attribute__((aligned(n)))
--
-2.37.3.windows.1
+2.45.0.windows.1
=====================================
contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch
=====================================
@@ -1,20 +1,20 @@
-From 7a0df0c174dce8d383be26e7b96d410865c62cf1 Mon Sep 17 00:00:00 2001
+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/4] Define LPRI(d|ud|x)64 as Unicode (wide) versions of
+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.
---
- amf/public/include/core/Platform.h | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
+ core/Platform.h | 27 ++++-----------------------
+ 1 file changed, 4 insertions(+), 23 deletions(-)
-diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h
-index cdab1b2..12ee75c 100644
---- a/amf/public/include/core/Platform.h
-+++ b/amf/public/include/core/Platform.h
-@@ -119,13 +119,10 @@ typedef signed int HRESULT;
- #define AMF_NO_VTABLE __declspec(novtable)
+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"
@@ -27,9 +27,18 @@ index cdab1b2..12ee75c 100644
#else // !WIN32 - Linux and Mac
-@@ -143,17 +140,18 @@ typedef signed int HRESULT;
+@@ -147,26 +130,24 @@ typedef signed int HRESULT;
- #if !defined(AMFPRId64)
+ #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"
@@ -50,5 +59,5 @@ index cdab1b2..12ee75c 100644
#if defined(_WIN32)
#define AMF_WEAK __declspec( selectany )
--
-2.37.3.windows.1
+2.45.0.windows.1
=====================================
contrib/src/amf/0002-Fix-const-on-return-by-value-Variant-values.patch deleted
=====================================
@@ -1,49 +0,0 @@
-From 18c87b557f7d5b9f1850a66705b551ac482e47e3 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 08:50:28 +0100
-Subject: [PATCH 2/2] Fix const on return by value Variant values
-
-Fix const on return by value AMF_DECLARE_IID()
-
-The returned value won't be const in C.
-
-Fixes this kind of warning:
-include/AMF/core/Variant.h:135:23: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
----
- amf/public/include/core/Variant.h | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/amf/public/include/core/Variant.h b/amf/public/include/core/Variant.h
-index edf14ae..a0a7eb8 100644
---- a/amf/public/include/core/Variant.h
-+++ b/amf/public/include/core/Variant.h
-@@ -132,16 +132,16 @@ namespace amf
- static AMF_INLINE const AMFRatio& AMF_STD_CALL AMFVariantGetRatio(const AMFVariantStruct* _variant) { return (_variant)->ratioValue; }
- static AMF_INLINE const AMFColor& AMF_STD_CALL AMFVariantGetColor(const AMFVariantStruct* _variant) { return (_variant)->colorValue; }
- #else // #if defined(__cplusplus)
-- static AMF_INLINE const AMFRect AMF_STD_CALL AMFVariantGetRect (const AMFVariantStruct* _variant) { return (_variant)->rectValue; }
-- static AMF_INLINE const AMFSize AMF_STD_CALL AMFVariantGetSize (const AMFVariantStruct* _variant) { return (_variant)->sizeValue; }
-- static AMF_INLINE const AMFPoint AMF_STD_CALL AMFVariantGetPoint(const AMFVariantStruct* _variant) { return (_variant)->pointValue; }
-- static AMF_INLINE const AMFFloatSize AMF_STD_CALL AMFVariantGetFloatSize(const AMFVariantStruct* _variant) { return (_variant)->floatSizeValue; }
-- static AMF_INLINE const AMFFloatPoint2D AMF_STD_CALL AMFVariantGetFloatPoint2D(const AMFVariantStruct* _variant) { return (_variant)->floatPoint2DValue; }
-- static AMF_INLINE const AMFFloatPoint3D AMF_STD_CALL AMFVariantGetFloatPoint3D(const AMFVariantStruct* _variant) { return (_variant)->floatPoint3DValue; }
-- static AMF_INLINE const AMFFloatVector4D AMF_STD_CALL AMFVariantGetFloatVector4D(const AMFVariantStruct* _variant) { return (_variant)->floatVector4DValue; }
-- static AMF_INLINE const AMFRate AMF_STD_CALL AMFVariantGetRate (const AMFVariantStruct* _variant) { return (_variant)->rateValue; }
-- static AMF_INLINE const AMFRatio AMF_STD_CALL AMFVariantGetRatio(const AMFVariantStruct* _variant) { return (_variant)->ratioValue; }
-- static AMF_INLINE const AMFColor AMF_STD_CALL AMFVariantGetColor(const AMFVariantStruct* _variant) { return (_variant)->colorValue; }
-+ static AMF_INLINE AMFRect AMF_STD_CALL AMFVariantGetRect (const AMFVariantStruct* _variant) { return (_variant)->rectValue; }
-+ static AMF_INLINE AMFSize AMF_STD_CALL AMFVariantGetSize (const AMFVariantStruct* _variant) { return (_variant)->sizeValue; }
-+ static AMF_INLINE AMFPoint AMF_STD_CALL AMFVariantGetPoint(const AMFVariantStruct* _variant) { return (_variant)->pointValue; }
-+ static AMF_INLINE AMFFloatSize AMF_STD_CALL AMFVariantGetFloatSize(const AMFVariantStruct* _variant) { return (_variant)->floatSizeValue; }
-+ static AMF_INLINE AMFFloatPoint2D AMF_STD_CALL AMFVariantGetFloatPoint2D(const AMFVariantStruct* _variant) { return (_variant)->floatPoint2DValue; }
-+ static AMF_INLINE AMFFloatPoint3D AMF_STD_CALL AMFVariantGetFloatPoint3D(const AMFVariantStruct* _variant) { return (_variant)->floatPoint3DValue; }
-+ static AMF_INLINE AMFFloatVector4D AMF_STD_CALL AMFVariantGetFloatVector4D(const AMFVariantStruct* _variant) { return (_variant)->floatVector4DValue; }
-+ static AMF_INLINE AMFRate AMF_STD_CALL AMFVariantGetRate (const AMFVariantStruct* _variant) { return (_variant)->rateValue; }
-+ static AMF_INLINE AMFRatio AMF_STD_CALL AMFVariantGetRatio(const AMFVariantStruct* _variant) { return (_variant)->ratioValue; }
-+ static AMF_INLINE AMFColor AMF_STD_CALL AMFVariantGetColor(const AMFVariantStruct* _variant) { return (_variant)->colorValue; }
- #endif // #if defined(__cplusplus)
-
-
---
-2.37.3.windows.1
-
=====================================
contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch
=====================================
@@ -1,7 +1,7 @@
-From 4069f86effdc36ba3f12d120212c8f077b96cdb0 Mon Sep 17 00:00:00 2001
+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/4] Define AMFPRI(d|ud|x)64 using the standard C++ format for
+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
@@ -9,16 +9,16 @@ 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.
---
- amf/public/include/core/Platform.h | 29 ++++++++++++++++++++---------
- 1 file changed, 20 insertions(+), 9 deletions(-)
+ core/Platform.h | 33 +++++++++++++++---------------
+ 1 file changed, 17 insertions(+), 16 deletions(-)
-diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h
-index 12ee75c..d6496d4 100644
---- a/amf/public/include/core/Platform.h
-+++ b/amf/public/include/core/Platform.h
-@@ -118,12 +118,6 @@ typedef signed int HRESULT;
+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 AMF_NO_VTABLE __declspec(novtable)
- #define AMFPRId64 "I64d"
-
@@ -29,42 +29,45 @@ index 12ee75c..d6496d4 100644
#else // !WIN32 - Linux and Mac
#define AMF_STD_CALL
-@@ -138,15 +132,32 @@ typedef signed int HRESULT;
+@@ -128,21 +122,28 @@ typedef signed int HRESULT;
+ #define AMF_FORCEINLINE __inline__
#endif
- #define AMF_NO_VTABLE
+- #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
-+#else
-+#if defined(_MSC_VER)
++#elif defined(_MSC_VER)
+ #define AMFPRId64 "I64d"
-+
-+ #define AMFPRIud64 "Iu64d"
-+
-+ #define AMFPRIx64 "I64x"
-+#else
- #if !defined(AMFPRId64)
- #define AMFPRId64 "lld"
-- #define AMFPRIud64 "ulld"
-+ #define AMFPRIud64 "ulld"
+- #define AMFPRIx64 "llx"
+- #endif
++ #define AMFPRIud64 "Iu64d"
- #define AMFPRIx64 "llx"
- #endif
--
-#endif // WIN32
-+#endif
++ #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.37.3.windows.1
+2.45.0.windows.1
=====================================
contrib/src/amf/SHA512SUMS
=====================================
@@ -1 +1 @@
-
+2f6e43908260d9f7cb8b28ab8dd34f8f2a1f61c6f2b24d847f277deb264de74d37e60b71e35f6eb079af5c1a16967d0fb780271aee751c18f2013023dcb96f6c AMF-1.4.34.tar.gz
=====================================
contrib/src/amf/rules.mak
=====================================
@@ -1,10 +1,10 @@
# AMF
-AMF_VERSION := 1.4.33
-AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/archive/refs/tags/v$(AMF_VERSION).tar.gz
+AMF_VERSION := 1.4.34
+AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v$(AMF_VERSION)/AMF-headers.tar.gz
AMF_GITURL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF.git
AMF_BRANCH := v$(AMF_VERSION)
-AMF_GITVERSION := e8c7cd7c10d4e05c1913aa8dfd2be9f9dbdb03d6
+AMF_GITVERSION := 6d7bec0469961e2891c6e1aaa5122b76ed82e1db
ifeq ($(ARCH),x86_64)
ifdef HAVE_WIN32
@@ -17,9 +17,14 @@ endif
endif
endif
+$(TARBALLS)/AMF-$(AMF_VERSION).tar.gz:
+ $(call download,$(AMF_URL))
+
+.sum-amf: AMF-$(AMF_VERSION).tar.gz
+
$(TARBALLS)/AMF-$(AMF_GITVERSION).tar.xz:
- rm -rf "$@" "$(@:.tar.xz=.githash)"
- rm -rf "$(@:.tar.xz=)"
+ $(RM) -Rf "$@" "$(@:.tar.xz=.githash)"
+ $(RM) -Rf "$(@:.tar.xz=)"
mkdir "$(@:.tar.xz=)"
# clone the top of the branch and only checkout amf/public/include
cd "$(@:.tar.xz=)" && git clone -n --depth=1 --filter=blob:none --no-checkout --branch $(AMF_BRANCH) $(AMF_GITURL) "$(notdir $(@:.tar.xz=))"
@@ -28,26 +33,26 @@ $(TARBALLS)/AMF-$(AMF_GITVERSION).tar.xz:
cd "$(@:.tar.xz=)/$(notdir $(@:.tar.xz=))" && echo "`git rev-parse HEAD` $(@)" > "../tmp.githash"
mv -f -- "$(@:.tar.xz=)/tmp.githash" "$(@:.tar.xz=.githash)"
mv -f -- "$(@:.tar.xz=)/$(notdir $(@))" "$@"
- rm -rf "$(@:.tar.xz=)"
+ $(RM) -Rf "$(@:.tar.xz=)"
-.sum-amf: AMF-$(AMF_GITVERSION).tar.xz
- $(call check_githash,$(AMF_GITVERSION))
- touch "$@"
+# .sum-amf: AMF-$(AMF_GITVERSION).tar.xz
+# $(call check_githash,$(AMF_GITVERSION))
+# touch "$@"
-# amf: AMF-$(AMF_VERSION).tar.gz .sum-amf
-amf: AMF-$(AMF_GITVERSION).tar.xz .sum-amf
+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
- $(APPLY) $(SRC)/amf/0001-Don-t-cast-amf_int64-when-using-a-format-string.patch
- $(APPLY) $(SRC)/amf/0001-Differentiate-the-AMF_NO_VTABLE-based-on-the-compile.patch
- $(APPLY) $(SRC)/amf/0001-Fix-const-on-return-by-value-AMF_DECLARE_IID.patch
- $(APPLY) $(SRC)/amf/0002-Fix-const-on-return-by-value-Variant-values.patch
- $(APPLY) $(SRC)/amf/0001-Fix-warning-when-_MSC_VER-is-not-defined.patch
$(MOVE)
.amf: amf
+ $(RM) -Rf $(PREFIX)/include/AMF
mkdir -p $(PREFIX)/include/AMF
- cp -R $(UNPACK_DIR)/amf/public/include/* $(PREFIX)/include/AMF
+ cp -R $</* $(PREFIX)/include/AMF
touch $@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/fb18df85ca73deffe66bb83a06fd09bb9de4b09d
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/fb18df85ca73deffe66bb83a06fd09bb9de4b09d
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