diff options
| author |   Sam James <sam@gentoo.org> | 2021-12-01 15:45:57 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-12-01 15:45:57 +0000 |
| commit | 9591e8238da4f5ddab702a01f93fba05943f2a0d (patch) | |
| tree | b6d69687f990e528d6ec764db63958f3d6f6d9ad /media-libs/x265 | |
| parent | xorg-3.eclass: don't override XORG_EAUTORECONF from ebuilds in 9999 (diff) | |
| download | gentoo-9591e8238da4f5ddab702a01f93fba05943f2a0d.tar.gz gentoo-9591e8238da4f5ddab702a01f93fba05943f2a0d.tar.bz2 gentoo-9591e8238da4f5ddab702a01f93fba05943f2a0d.zip | |
media-libs/x265: rebase 9999 patches
Closes: https://bugs.gentoo.org/808462
Thanks-to: soundbastlerlive@gmx.at (rebasing ppc64)
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/x265')
| -rw-r--r-- | media-libs/x265/files/x265-9999-arm.patch | 64 | ||||
| -rw-r--r-- | media-libs/x265/files/x265-9999-ppc64.patch | 11 | ||||
| -rw-r--r-- | media-libs/x265/x265-9999.ebuild | 6 |
3 files changed, 78 insertions, 3 deletions
diff --git a/media-libs/x265/files/x265-9999-arm.patch b/media-libs/x265/files/x265-9999-arm.patch new file mode 100644 index 000000000000..218d92a0ab41 --- /dev/null +++ b/media-libs/x265/files/x265-9999-arm.patch @@ -0,0 +1,64 @@ +From 85ee373b0d1f03e7600366eae64a767e07298688 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 1 Dec 2021 15:42:38 +0000 +Subject: [PATCH] Respect CFLAGS for arm* + +--- + CMakeLists.txt | 6 +++--- + dynamicHDR10/CMakeLists.txt | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9580413..737bf14 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -249,14 +249,14 @@ if(GCC) + endif() + if(ARM AND CROSS_COMPILE_ARM) + message(STATUS "cross compile arm") +- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) ++ set(ARM_ARGS -fPIC) + elseif(ARM) + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) ++ set(ARM_ARGS -mfpu=neon -fPIC) + add_definitions(-DHAVE_NEON) + else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) + endif() + endif() + if(ARM64 OR CROSS_COMPILE_ARM64) +diff --git a/dynamicHDR10/CMakeLists.txt b/dynamicHDR10/CMakeLists.txt +index 22fb79d..3639281 100644 +--- a/dynamicHDR10/CMakeLists.txt ++++ b/dynamicHDR10/CMakeLists.txt +@@ -43,14 +43,14 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) +- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) ++ set(ARM_ARGS -fPIC) + elseif(ARM) + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) ++ set(ARM_ARGS -mfpu=neon -fPIC) + add_definitions(-DHAVE_NEON) + else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) + endif() + endif() + add_definitions(${ARM_ARGS}) +@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") + option(ENABLE_SHARED "Build shared library" OFF) + + install(FILES hdr10plus.h DESTINATION include) +-endif() +\ No newline at end of file ++endif() +-- +2.34.1 + diff --git a/media-libs/x265/files/x265-9999-ppc64.patch b/media-libs/x265/files/x265-9999-ppc64.patch new file mode 100644 index 000000000000..8219dabf7c4f --- /dev/null +++ b/media-libs/x265/files/x265-9999-ppc64.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,7 +49,7 @@ + list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) + list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) + list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH) +-set(POWER_ALIASES ppc64 ppc64le) ++set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le) + list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH) + if(X86MATCH GREATER "-1") + set(X86 1) diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index 58018488f52c..d686f028c1da 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -31,9 +31,9 @@ BDEPEND=" abi_x86_64? ( ${ASM_DEPEND} )" PATCHES=( - "${FILESDIR}/arm-r1.patch" - "${FILESDIR}/neon.patch" - "${FILESDIR}/x265-3.3-ppc64.patch" + "${FILESDIR}/${PN}-9999-arm.patch" + #"${FILESDIR}/neon.patch" + "${FILESDIR}/${PN}-9999-ppc64.patch" "${FILESDIR}/tests.patch" "${FILESDIR}/test-ns.patch" ) |