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 DE73F1382C5 for ; Sat, 27 Feb 2021 17:51:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9572AE0959; Sat, 27 Feb 2021 17:51:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61F17E0959 for ; Sat, 27 Feb 2021 17:51:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5C5234113B for ; Sat, 27 Feb 2021 17:51:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29199530 for ; Sat, 27 Feb 2021 17:50:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1614447894.cb12e0cf8b9d460522cfd9c6f8369a3da4253ea0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/uchardet/, app-i18n/uchardet/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/uchardet/Manifest app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch app-i18n/uchardet/uchardet-0.0.6-r2.ebuild X-VCS-Directories: app-i18n/uchardet/ app-i18n/uchardet/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cb12e0cf8b9d460522cfd9c6f8369a3da4253ea0 X-VCS-Branch: master Date: Sat, 27 Feb 2021 17:50:59 +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: 9f2be1d9-fda2-4116-8864-4320ad6dec56 X-Archives-Hash: 022ec2c90e6b57da90f42db6234ccf1b commit: cb12e0cf8b9d460522cfd9c6f8369a3da4253ea0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 27 17:44:54 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 27 17:44:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb12e0cf app-i18n/uchardet: Drop 0.0.6-r2 Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> app-i18n/uchardet/Manifest | 1 - ...det-0.0.6-enforce-IEEE-float-precision-r1.patch | 59 ---------------------- app-i18n/uchardet/uchardet-0.0.6-r2.ebuild | 32 ------------ 3 files changed, 92 deletions(-) diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest index 6d0131253a3..1b6998d1aad 100644 --- a/app-i18n/uchardet/Manifest +++ b/app-i18n/uchardet/Manifest @@ -1,2 +1 @@ -DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f diff --git a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch deleted file mode 100644 index 2bc4977a5f0..00000000000 --- a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch +++ /dev/null @@ -1,59 +0,0 @@ -Add configuration option to enable SSE2. -Add -ffloat-store flag on x86 without SSE2. - -Gentoo bug: https://bugs.gentoo.org/631852 -Gentoo bug: https://bugs.gentoo.org/641716 -Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=101033 - -This patch is an aggregation of the following upstream commits: -5996bbd995aed5045cc22e4d1fab08c989377983 -77bf71ea365a19ac55c59cf10399b566a02d82c1 -939482ab2b5a6585bdd2e5251f3f2f113d64686f -cd617d181de03a7a13c2020e6c73cd14585e24b6 -f136d434f0809e064ac195b5bc4e0b50484a474c - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e9a699e..d140a24 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,6 @@ - ######## Project settings - cmake_minimum_required(VERSION 2.8.5) -+include(CheckCCompilerFlag) - set (PACKAGE_NAME uchardet) - project (${PACKAGE_NAME} CXX C) - enable_testing() -@@ -33,13 +34,31 @@ include(GNUInstallDirs) - - ######## Configuration - --option(BUILD_BINARY "Build executable" ON) --option(BUILD_SHARED_LIBS "Build shared library and link executable to it" ON) -+option(BUILD_BINARY "Build the CLI tool." ON) -+option(BUILD_SHARED_LIBS "Build shared library and link executable to it." ON) -+option(CHECK_SSE2 "Check and enable SSE2 extensions if supported. Disabling SSE on platforms which support it may decrease performances." ON) -+set(TARGET_ARCHITECTURE "" CACHE STRING "Target CPU architecture. It is autodetected if not specified.") - - if (BUILD_SHARED_LIBS) - option(BUILD_STATIC "Build static library" ON) - endif (BUILD_SHARED_LIBS) - -+if (TARGET_ARCHITECTURE STREQUAL "") -+ string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} TARGET_ARCHITECTURE) -+endif (TARGET_ARCHITECTURE STREQUAL "") -+ -+if (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*") -+ CHECK_C_COMPILER_FLAG(-msse2 SUPPORTS_CFLAG_SSE2) -+ CHECK_C_COMPILER_FLAG(-mfpmath=sse SUPPORTS_CFLAG_SSE_MATH) -+ if (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse") -+ else (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffloat-store") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store") -+ endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH) -+endif (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*") -+ - configure_file( - uchardet.pc.in - uchardet.pc diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild deleted file mode 100644 index da7d6a5567b..00000000000 --- a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="An encoding detector library" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/" -SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz" - -LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="cpu_flags_x86_sse2 static-libs test" -RESTRICT="!test? ( test )" - -PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision-r1.patch" ) - -src_prepare() { - cmake-utils_src_prepare - use test || cmake_comment_add_subdirectory test -} - -src_configure() { - local mycmakeargs=( - -DTARGET_ARCHITECTURE="${ARCH}" - -DBUILD_STATIC=$(usex static-libs) - -DCHECK_SSE2=$(usex cpu_flags_x86_sse2) - ) - cmake-utils_src_configure -}