From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A28B0158086 for ; Fri, 8 Oct 2021 01:07:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF184E0870; Fri, 8 Oct 2021 01:07:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A010CE0870 for ; Fri, 8 Oct 2021 01:07:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1DFB343119 for ; Fri, 8 Oct 2021 01:07:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 363E1138 for ; Fri, 8 Oct 2021 01:07:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1633655196.fbb77bdce07e7e84d3d958f00065fc98093794d2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/x265/files/arm-r1.patch X-VCS-Directories: media-libs/x265/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fbb77bdce07e7e84d3d958f00065fc98093794d2 X-VCS-Branch: master Date: Fri, 8 Oct 2021 01:07:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b44d0057-0a8d-4712-8618-3b18d949a0db X-Archives-Hash: 1a1d9a0c92ffae3645401ac7d5c27f43 commit: fbb77bdce07e7e84d3d958f00065fc98093794d2 Author: Sam James gentoo org> AuthorDate: Fri Oct 8 01:06:18 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 8 01:06:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb77bdc media-libs/x265: fix build for arm with main10 Closes: https://bugs.gentoo.org/816795 Thanks-to: Tee KOBAYASHI gmail.com> Signed-off-by: Sam James gentoo.org> media-libs/x265/files/arm-r1.patch | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/media-libs/x265/files/arm-r1.patch b/media-libs/x265/files/arm-r1.patch index 8a8102dd258..69aa3036eff 100644 --- a/media-libs/x265/files/arm-r1.patch +++ b/media-libs/x265/files/arm-r1.patch @@ -1,10 +1,8 @@ More aliases for ARM. Do not force CFLAGS for ARM. -Index: source/CMakeLists.txt -=================================================================== ---- source.orig/CMakeLists.txt -+++ source/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_ # System architecture detection string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) @@ -40,3 +38,31 @@ Index: source/CMakeLists.txt endif() endif() endif() +--- 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 -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() +