[packages/mpeghdec] - added x32 patch
qboosh
qboosh at pld-linux.org
Sun Jun 21 08:59:27 CEST 2026
commit 84f5412724410c9958f71ba47cab0cccbdd96aae
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jun 21 08:59:53 2026 +0200
- added x32 patch
mpeghdec-x32.patch | 18 ++++++++++++++++++
mpeghdec.spec | 2 ++
2 files changed, 20 insertions(+)
---
diff --git a/mpeghdec.spec b/mpeghdec.spec
index 79197f0..d04634d 100644
--- a/mpeghdec.spec
+++ b/mpeghdec.spec
@@ -19,6 +19,7 @@ Source1: https://github.com/Fraunhofer-IIS/ilo/archive/r%{ilover}/ilo-%{ilover}.
Source2: https://github.com/Fraunhofer-IIS/mmtisobmff/archive/r%{mmtver}/mmtisobmff-%{mmtver}.tar.gz
# Source2-md5: ba89ae2bcbb98b94651415502deba5e9
Patch0: %{name}-soname.patch
+Patch1: %{name}-x32.patch
URL: https://github.com/Fraunhofer-IIS/mpeghdec
BuildRequires: cmake >= 3.16
BuildRequires: libstdc++-devel >= 6:4.7
@@ -50,6 +51,7 @@ Pliki nagłówkowe biblioteki dekodera Fraunhofer MPEG-H.
%prep
%setup -q -n %{name}-r%{version} -a1 -a2
%patch -P0 -p1
+%patch -P1 -p1
%build
# relative INCLUDEDIR and LIBDIR for correct .pc
diff --git a/mpeghdec-x32.patch b/mpeghdec-x32.patch
new file mode 100644
index 0000000..ae5bff6
--- /dev/null
+++ b/mpeghdec-x32.patch
@@ -0,0 +1,18 @@
+Remove duplicate functions (SHORT is equal to FIXP_SNG)
+--- mpeghdec-r3.0.3/src/libFDK/include/common_fix.h.orig 2026-03-30 13:28:00.000000000 +0200
++++ mpeghdec-r3.0.3/src/libFDK/include/common_fix.h 2026-06-21 08:53:40.087126384 +0200
+@@ -450,14 +450,6 @@ FDK_INLINE INT fMax(INT a, INT b) {
+ FDK_INLINE INT fMin(INT a, INT b) {
+ return fixmin_I(a, b);
+ }
+-#if !defined(_MSC_VER) && defined(__x86_64__)
+-FDK_INLINE SHORT fMax(SHORT a, SHORT b) {
+- return fixmax_S(a, b);
+-}
+-FDK_INLINE SHORT fMin(SHORT a, SHORT b) {
+- return fixmin_S(a, b);
+-}
+-#endif
+ #endif
+
+ inline UINT fMax(UINT a, UINT b) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mpeghdec.git/commitdiff/84f5412724410c9958f71ba47cab0cccbdd96aae
More information about the pld-cvs-commit
mailing list