| 1 |
commit: 9591e8238da4f5ddab702a01f93fba05943f2a0d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 1 15:45:57 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 1 15:45:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9591e823 |
| 7 |
|
| 8 |
media-libs/x265: rebase 9999 patches |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/808462 |
| 11 |
Thanks-to: soundbastlerlive <AT> gmx.at (rebasing ppc64) |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/x265/files/x265-9999-arm.patch | 64 +++++++++++++++++++++++++++++ |
| 15 |
media-libs/x265/files/x265-9999-ppc64.patch | 11 +++++ |
| 16 |
media-libs/x265/x265-9999.ebuild | 6 +-- |
| 17 |
3 files changed, 78 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/x265/files/x265-9999-arm.patch b/media-libs/x265/files/x265-9999-arm.patch |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..218d92a0ab41 |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-libs/x265/files/x265-9999-arm.patch |
| 24 |
@@ -0,0 +1,64 @@ |
| 25 |
+From 85ee373b0d1f03e7600366eae64a767e07298688 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Sam James <sam@g.o> |
| 27 |
+Date: Wed, 1 Dec 2021 15:42:38 +0000 |
| 28 |
+Subject: [PATCH] Respect CFLAGS for arm* |
| 29 |
+ |
| 30 |
+--- |
| 31 |
+ CMakeLists.txt | 6 +++--- |
| 32 |
+ dynamicHDR10/CMakeLists.txt | 8 ++++---- |
| 33 |
+ 2 files changed, 7 insertions(+), 7 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 36 |
+index 9580413..737bf14 100755 |
| 37 |
+--- a/CMakeLists.txt |
| 38 |
++++ b/CMakeLists.txt |
| 39 |
+@@ -249,14 +249,14 @@ if(GCC) |
| 40 |
+ endif() |
| 41 |
+ if(ARM AND CROSS_COMPILE_ARM) |
| 42 |
+ message(STATUS "cross compile arm") |
| 43 |
+- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) |
| 44 |
++ set(ARM_ARGS -fPIC) |
| 45 |
+ elseif(ARM) |
| 46 |
+ find_package(Neon) |
| 47 |
+ if(CPU_HAS_NEON) |
| 48 |
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) |
| 49 |
++ set(ARM_ARGS -mfpu=neon -fPIC) |
| 50 |
+ add_definitions(-DHAVE_NEON) |
| 51 |
+ else() |
| 52 |
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) |
| 53 |
++ set(ARM_ARGS -fPIC) |
| 54 |
+ endif() |
| 55 |
+ endif() |
| 56 |
+ if(ARM64 OR CROSS_COMPILE_ARM64) |
| 57 |
+diff --git a/dynamicHDR10/CMakeLists.txt b/dynamicHDR10/CMakeLists.txt |
| 58 |
+index 22fb79d..3639281 100644 |
| 59 |
+--- a/dynamicHDR10/CMakeLists.txt |
| 60 |
++++ b/dynamicHDR10/CMakeLists.txt |
| 61 |
+@@ -43,14 +43,14 @@ if(GCC) |
| 62 |
+ endif() |
| 63 |
+ endif() |
| 64 |
+ if(ARM AND CROSS_COMPILE_ARM) |
| 65 |
+- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) |
| 66 |
++ set(ARM_ARGS -fPIC) |
| 67 |
+ elseif(ARM) |
| 68 |
+ find_package(Neon) |
| 69 |
+ if(CPU_HAS_NEON) |
| 70 |
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) |
| 71 |
++ set(ARM_ARGS -mfpu=neon -fPIC) |
| 72 |
+ add_definitions(-DHAVE_NEON) |
| 73 |
+ else() |
| 74 |
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) |
| 75 |
++ set(ARM_ARGS -fPIC) |
| 76 |
+ endif() |
| 77 |
+ endif() |
| 78 |
+ add_definitions(${ARM_ARGS}) |
| 79 |
+@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") |
| 80 |
+ option(ENABLE_SHARED "Build shared library" OFF) |
| 81 |
+ |
| 82 |
+ install(FILES hdr10plus.h DESTINATION include) |
| 83 |
+-endif() |
| 84 |
+\ No newline at end of file |
| 85 |
++endif() |
| 86 |
+-- |
| 87 |
+2.34.1 |
| 88 |
+ |
| 89 |
|
| 90 |
diff --git a/media-libs/x265/files/x265-9999-ppc64.patch b/media-libs/x265/files/x265-9999-ppc64.patch |
| 91 |
new file mode 100644 |
| 92 |
index 000000000000..8219dabf7c4f |
| 93 |
--- /dev/null |
| 94 |
+++ b/media-libs/x265/files/x265-9999-ppc64.patch |
| 95 |
@@ -0,0 +1,11 @@ |
| 96 |
+--- a/CMakeLists.txt |
| 97 |
++++ b/CMakeLists.txt |
| 98 |
+@@ -49,7 +49,7 @@ |
| 99 |
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) |
| 100 |
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) |
| 101 |
+ list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH) |
| 102 |
+-set(POWER_ALIASES ppc64 ppc64le) |
| 103 |
++set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le) |
| 104 |
+ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH) |
| 105 |
+ if(X86MATCH GREATER "-1") |
| 106 |
+ set(X86 1) |
| 107 |
|
| 108 |
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild |
| 109 |
index 58018488f52c..d686f028c1da 100644 |
| 110 |
--- a/media-libs/x265/x265-9999.ebuild |
| 111 |
+++ b/media-libs/x265/x265-9999.ebuild |
| 112 |
@@ -31,9 +31,9 @@ BDEPEND=" |
| 113 |
abi_x86_64? ( ${ASM_DEPEND} )" |
| 114 |
|
| 115 |
PATCHES=( |
| 116 |
- "${FILESDIR}/arm-r1.patch" |
| 117 |
- "${FILESDIR}/neon.patch" |
| 118 |
- "${FILESDIR}/x265-3.3-ppc64.patch" |
| 119 |
+ "${FILESDIR}/${PN}-9999-arm.patch" |
| 120 |
+ #"${FILESDIR}/neon.patch" |
| 121 |
+ "${FILESDIR}/${PN}-9999-ppc64.patch" |
| 122 |
"${FILESDIR}/tests.patch" |
| 123 |
"${FILESDIR}/test-ns.patch" |
| 124 |
) |
Archives