fix: multimedia arches (#2993)

* Update ffmpeg anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Change: Move to Multimedia folder * Update anda/multimedia/x264-bootstrap/anda.hcl Co-authored-by: madomado <madonuko@outlook.com> Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Changes: Pain? * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * Update anda.hcl Signed-off-by: Gil <rockgrub@protonmail.com> * include cstdint Signed-off-by: madomado <madonuko@outlook.com> * try this now Signed-off-by: madomado <madonuko@outlook.com> --------- Signed-off-by: Gil <rockgrub@protonmail.com> Signed-off-by: madomado <madonuko@outlook.com> Co-authored-by: madomado <madonuko@outlook.com>
2026-05-31 09:01:55 +00:00 · 2025-01-17 00:38:35 -06:00
parent 77f475d710
commit d40e8a24d4
13 changed files with 111 additions and 0 deletions
@@ -1,8 +1,10 @@
 project pkg {
+  arches = ["x86_64", "aarch64", "i386"]
  rpm {
    spec = "libfreeaptx.spec"
  }
  labels {
        weekly = 1
+        mock = 1
    }
 }
@@ -1,5 +1,9 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
  rpm {
    spec = "rtmpdump.spec"
  }
+  labels {
+    mock =1
+  }
 }
@@ -1,8 +1,10 @@
 project pkg {
+  arches = ["x86_64", "aarch64", "i386"]
  rpm {
    spec = "vo-aacenc.spec"
  }
  labels {
        weekly = 1
+        mock = 1
    }
 }
@@ -1,5 +1,9 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
    rpm {
        spec = "faad2.spec"
    }
+    labels {
+        mock = 1
+   }
 }
@@ -1,8 +1,10 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
    rpm {
        spec = "ffmpeg.spec"
    }
    labels {
        updbranch = 1
+        mock = 1
    }
 }
@@ -1,5 +1,9 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
    rpm {
        spec = "x264-bootstrap.spec"
    }
+    labels {
+        mock = 1
+    }
 }
@@ -1,5 +1,9 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
    rpm {
        spec = "x264.spec"
    }
+    labels { 
+        mock = 1
+    }
 }
@@ -1,5 +1,9 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
    rpm {
        spec = "x265.spec"
    }
+    labels {
+        mock =1
+   }
 }
@@ -0,0 +1,31 @@
+--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
+@@ -611,7 +611,15 @@
+     if(MSVC)
+         set_target_properties(x265-shared PROPERTIES OUTPUT_NAME libx265)
+     else()
+-        set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265)
+        if(HIGH_BIT_DEPTH)
+            if(MAIN12)
+                set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265_main12)
+            else()
+                set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265_main10)
+            endif()
+        else()
+            set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265)
+        endif(HIGH_BIT_DEPTH)
+     endif()
+     if(UNIX)
+         set_target_properties(x265-shared PROPERTIES VERSION ${X265_BUILD})
+--- a/source/encoder/api.cpp
+++ b/source/encoder/api.cpp
+@@ -704,7 +704,7 @@
+ #define ext ".dylib"
+ #else
+ #include <dlfcn.h>
+-#define ext ".so"
+#define ext ".so." xstr(X265_BUILD)
+ #endif
+ #if defined(__GNUC__) && __GNUC__ >= 8
+ #pragma GCC diagnostic ignored "-Wcast-function-type"
+
@@ -0,0 +1,11 @@
+--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
+@@ -212,7 +212,7 @@
+         add_definitions(-std=gnu++98)
+     endif()
+     if(ENABLE_PIC)
+-         add_definitions(-fPIC)
+         add_definitions(-fPIC -DPIC)
+     endif(ENABLE_PIC)
+     if(NATIVE_BUILD)
+         if(INTEL_CXX)
@@ -0,0 +1,11 @@
+--- a/source/x265.pc.in
+++ b/source/x265.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/@LIB_INSTALL_DIR@
+libdir=@LIB_INSTALL_DIR@
+ includedir=${prefix}/include
+ 
+ Name: @CMAKE_PROJECT_NAME@
+
@@ -0,0 +1,29 @@
+From 8454caf458c5f5d20cce711ff8ea8de55ec1ae50 Mon Sep 17 00:00:00 2001
+From: harlanc <hailiang8@staff.weibo.com>
+Date: Thu, 1 Dec 2022 07:46:13 +0000
+Subject: [PATCH] fix crash when SEI length is variable
+
+---
+ source/encoder/encoder.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+index 0fea6553c..5a3fcafc7 100644
+--- a/source/encoder/encoder.cpp
+++ b/source/encoder/encoder.cpp
+@@ -1103,6 +1103,12 @@ void Encoder::copyUserSEIMessages(Frame *frame, const x265_picture* pic_in)
+                 input = seiMsg;
+             else
+                 input = pic_in->userSEI.payloads[i];
+            
+            if (frame->m_userSEI.payloads[i].payload && (frame->m_userSEI.payloads[i].payloadSize < input.payloadSize))
+            {
+                delete[] frame->m_userSEI.payloads[i].payload;
+                frame->m_userSEI.payloads[i].payload = NULL;
+            }
+ 
+             if (!frame->m_userSEI.payloads[i].payload)
+                 frame->m_userSEI.payloads[i].payload = new uint8_t[input.payloadSize];
+-- 
+2.45.0
+
@@ -1,3 +1,5 @@
+%global build_cxxflags %{__build_flags_lang_cxx} %{?_distro_extra_cxxflags} -include %_includedir/c++/*/cstdint
+
 # Use old cmake macro
 %global __cmake_in_source_build 1

@@ -24,6 +26,7 @@ Patch2:     https://raw.githubusercontent.com/terrapkg/pkg-x265/%terrasrc_commit
 Patch3:     https://bitbucket.org/harlancc/x265_git/commits/8454caf458c5f5d20cce711ff8ea8de55ec1ae50/raw#/x265-sei-length-crash-fix.patch

 BuildRequires:  gcc-c++
+BuildRequires:  libstdc++-devel
 BuildRequires:  git
 BuildRequires:  cmake
 %{?el7:BuildRequires: epel-rpm-macros}