In response to review feedback: Change basepath of ffmpeg assembly fi…

…x. Add ffmpeg patch also to older 5.15.x releases.
conan-io · Nov 30, 2023 · d06ef6c · d06ef6c
1 parent 3504d53
commit d06ef6c
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 12 deletions.
diff --git a/recipes/qt/5.x.x/conandata.yml b/recipes/qt/5.x.x/conandata.yml
@@ -108,8 +108,8 @@ patches:
       patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
       patch_type: "portability"
       patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
-    - patch_file: "patches/ffmpeg-x86-optimization.patch"
-      base_path: "qt5/qtwebengine"
+    - patch_file: "patches/fix_ffmpeg_assembly_for_binutils_2_41.patch"
+      base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg"
       patch_description: "Fix build error with binutils >= 2.41"
       patch_type: "portability"
       patch_source: "https://trac.ffmpeg.org/ticket/10405"
@@ -146,6 +146,11 @@ patches:
       patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
       patch_type: "portability"
       patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
+    - patch_file: "patches/fix_ffmpeg_assembly_for_binutils_2_41.patch"
+      base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg"
+      patch_description: "Fix build error with binutils >= 2.41"
+      patch_type: "portability"
+      patch_source: "https://trac.ffmpeg.org/ticket/10405"
   "5.15.9":
     - "base_path": "qt5/qtbase"
       "patch_file": "patches/aa2a39dea5.diff"
@@ -179,6 +184,11 @@ patches:
       patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
       patch_type: "portability"
       patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
+    - patch_file: "patches/fix_ffmpeg_assembly_for_binutils_2_41.patch"
+      base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg"
+      patch_description: "Fix build error with binutils >= 2.41"
+      patch_type: "portability"
+      patch_source: "https://trac.ffmpeg.org/ticket/10405"
   "5.15.8":
     - patch_file: "patches/aa2a39dea5.diff"
       base_path: "qt5/qtbase"
@@ -212,6 +222,11 @@ patches:
       patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
       patch_type: "portability"
       patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
+    - patch_file: "patches/fix_ffmpeg_assembly_for_binutils_2_41.patch"
+      base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg"
+      patch_description: "Fix build error with binutils >= 2.41"
+      patch_type: "portability"
+      patch_source: "https://trac.ffmpeg.org/ticket/10405"
   "5.15.7":
     - patch_file: "patches/337f28c9ab.patch"
       base_path: "qt5/qtbase"
@@ -253,3 +268,8 @@ patches:
       patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
       patch_type: "portability"
       patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
+    - patch_file: "patches/fix_ffmpeg_assembly_for_binutils_2_41.patch"
+      base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg"
+      patch_description: "Fix build error with binutils >= 2.41"
+      patch_type: "portability"
+      patch_source: "https://trac.ffmpeg.org/ticket/10405"
diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py
@@ -151,7 +151,7 @@ def validate_build(self):
             # In any case, check its actual version for compatibility
             from six import StringIO  # Python 2 and 3 compatible
             mybuf = StringIO()
-            cmd_v = f"\"{python_exe}\" --version"
+            cmd_v = f"\"{python_exe}\" --version 2>&1"
             self.run(cmd_v, mybuf)
             verstr = mybuf.getvalue().strip().split("Python ")[1]
             if verstr.endswith("+"):
@@ -355,7 +355,7 @@ def requirements(self):
         if self.options.with_doubleconversion and not self.options.multiconfiguration:
             self.requires("double-conversion/3.3.0")
         if self.options.get_safe("with_freetype", False) and not self.options.multiconfiguration:
-            self.requires("freetype/2.13.2")
+            self.requires("freetype/2.13.2", override=True)
         if self.options.get_safe("with_fontconfig", False):
             self.requires("fontconfig/2.14.2")
         if self.options.get_safe("with_icu", False):
@@ -370,7 +370,7 @@ def requirements(self):
         if self.options.get_safe("with_libpng", False) and not self.options.multiconfiguration:
             self.requires("libpng/1.6.40")
         if self.options.with_sqlite3 and not self.options.multiconfiguration:
-            self.requires("sqlite3/3.44.2")
+            self.requires("sqlite3/3.44.2", override=True)
         if self.options.get_safe("with_mysql", False):
             self.requires("libmysqlclient/8.1.0")
         if self.options.with_pq:

diff --git a/...x.x/patches/ffmpeg-x86-optimization.patch → ...x_ffmpeg_assembly_for_binutils_2_41.patch b/...x.x/patches/ffmpeg-x86-optimization.patch → ...x_ffmpeg_assembly_for_binutils_2_41.patch
@@ -1,11 +1,20 @@
-Description: avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
- Fixes assembling with gas from binutils >= 2.41.
-Origin: upstream, https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/effadce6c756247e
-Bug: https://bugs.debian.org/1038132
-Last-Update: 2023-07-21
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
+ instructions within inline assembly
 
---- a/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+Fixes assembling with binutil as >= 2.41
+
+Signed-off-by: James Almer <jamrial@gmail.com>
+---
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
+index 6298f5ed19..ca7e2dffc1 100644
+--- a/libavcodec/x86/mathops.h
++++ b/libavcodec/x86/mathops.h
 @@ -35,12 +35,20 @@
  static av_always_inline av_const int MULL(int a, int b, unsigned shift)
  {
@@ -62,3 +71,6 @@ Last-Update: 2023-07-21
      return a;
  }
 
+-- 
+2.25.1
+