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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB29B158013 for ; Sat, 9 Dec 2023 03:00:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 124082BC019; Sat, 9 Dec 2023 03:00:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E57F62BC019 for ; Sat, 9 Dec 2023 03:00:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01B9C33BDC5 for ; Sat, 9 Dec 2023 03:00:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E1BC144F for ; Sat, 9 Dec 2023 03:00:01 +0000 (UTC) From: "Maciej Mrozowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Mrozowski" Message-ID: <1702090730.1610fe59e84df9b728930d2fe1083de1f4ee512e.reavertm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/simage/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/simage/Manifest media-libs/simage/simage-1.8.1-r3.ebuild media-libs/simage/simage-1.8.3.ebuild media-libs/simage/simage-9999.ebuild X-VCS-Directories: media-libs/simage/ X-VCS-Committer: reavertm X-VCS-Committer-Name: Maciej Mrozowski X-VCS-Revision: 1610fe59e84df9b728930d2fe1083de1f4ee512e X-VCS-Branch: master Date: Sat, 9 Dec 2023 03:00:01 +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: de0cfd1d-8dc4-42ef-88e5-5f9ff15a264c X-Archives-Hash: 14b6a4a7637c205a0d1609193780ab4f commit: 1610fe59e84df9b728930d2fe1083de1f4ee512e Author: Maciej Mrozowski gentoo org> AuthorDate: Sat Dec 9 02:57:53 2023 +0000 Commit: Maciej Mrozowski gentoo org> CommitDate: Sat Dec 9 02:58:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1610fe59 media-libs/simage: add 1.8.3 with optional qt6 support Signed-off-by: Maciej Mrozowski gentoo.org> media-libs/simage/Manifest | 1 + media-libs/simage/simage-1.8.1-r3.ebuild | 4 ++-- .../{simage-9999.ebuild => simage-1.8.3.ebuild} | 23 ++++++++++++++++------ media-libs/simage/simage-9999.ebuild | 23 ++++++++++++++++------ 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index f01f4b90a2a4..e8f2c117a07c 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1 +1,2 @@ DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe +DIST simage-1.8.3.tar.gz 829994 BLAKE2B 794ee3a1c71727af7e92839542470a4732584715b01cbfd5be7b34d8ea8295ca65f5634e10027e0e7e4eb36a024d31704ad31d9aa0a6ad6b66c08612879a1603 SHA512 193137bd00a322fe6c170d3ff318ac81e4cc685bdfa40a0415c5bb95802b6290174fea630eb79956f362b4e79fa0b60916976c63ef26d6a65a6a51d5d9f7de03 diff --git a/media-libs/simage/simage-1.8.1-r3.ebuild b/media-libs/simage/simage-1.8.1-r3.ebuild index bc61f6c45c3a..0c2755db7da4 100644 --- a/media-libs/simage/simage-1.8.1-r3.ebuild +++ b/media-libs/simage/simage-1.8.1-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Image and video texturing library" HOMEPAGE="https://github.com/coin3d/simage/" diff --git a/media-libs/simage/simage-9999.ebuild b/media-libs/simage/simage-1.8.3.ebuild similarity index 83% copy from media-libs/simage/simage-9999.ebuild copy to media-libs/simage/simage-1.8.3.ebuild index ae5ce0a704a3..fcec6add0f0c 100644 --- a/media-libs/simage/simage-9999.ebuild +++ b/media-libs/simage/simage-1.8.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Image and video texturing library" HOMEPAGE="https://github.com/coin3d/simage/" @@ -13,13 +13,14 @@ if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git" else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" S="${WORKDIR}/${PN}" fi LICENSE="BSD-1" SLOT="0" -IUSE="gif jpeg png qt5 sndfile test tiff vorbis zlib" +IUSE="gif jpeg png qt5 qt6 sndfile test tiff vorbis zlib" +REQUIRED_USE="qt5? ( !qt6 )" RESTRICT="!test? ( test )" RDEPEND=" @@ -30,6 +31,9 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 ) + qt6? ( + dev-qt/qtbase:6[gui] + ) sndfile? ( media-libs/libsndfile media-libs/flac:= @@ -56,6 +60,12 @@ PATCHES=( DOCS=(AUTHORS ChangeLog NEWS README) src_configure() { + local use_qt + if use qt5 || use qt6 ; then + use_qt=ON + else + use_qt=OFF + fi local mycmakeargs=( -DSIMAGE_BUILD_SHARED_LIBS=ON -DSIMAGE_BUILD_EXAMPLES=OFF @@ -65,8 +75,9 @@ src_configure() { -DSIMAGE_USE_GDIPLUS=OFF # Windows -DSIMAGE_USE_CGIMAGE=OFF # OS X only -DSIMAGE_USE_QUICKTIME=OFF # OS X only - -DSIMAGE_USE_QIMAGE=$(usex qt5) + -DSIMAGE_USE_QIMAGE=${use_qt} -DSIMAGE_USE_QT5=$(usex qt5) + -DSIMAGE_USE_QT6=$(usex qt6) -DSIMAGE_USE_CPACK=OFF -DSIMAGE_USE_STATIC_LIBS=OFF -DSIMAGE_LIBJASPER_SUPPORT=OFF diff --git a/media-libs/simage/simage-9999.ebuild b/media-libs/simage/simage-9999.ebuild index ae5ce0a704a3..fcec6add0f0c 100644 --- a/media-libs/simage/simage-9999.ebuild +++ b/media-libs/simage/simage-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Image and video texturing library" HOMEPAGE="https://github.com/coin3d/simage/" @@ -13,13 +13,14 @@ if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git" else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" S="${WORKDIR}/${PN}" fi LICENSE="BSD-1" SLOT="0" -IUSE="gif jpeg png qt5 sndfile test tiff vorbis zlib" +IUSE="gif jpeg png qt5 qt6 sndfile test tiff vorbis zlib" +REQUIRED_USE="qt5? ( !qt6 )" RESTRICT="!test? ( test )" RDEPEND=" @@ -30,6 +31,9 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 ) + qt6? ( + dev-qt/qtbase:6[gui] + ) sndfile? ( media-libs/libsndfile media-libs/flac:= @@ -56,6 +60,12 @@ PATCHES=( DOCS=(AUTHORS ChangeLog NEWS README) src_configure() { + local use_qt + if use qt5 || use qt6 ; then + use_qt=ON + else + use_qt=OFF + fi local mycmakeargs=( -DSIMAGE_BUILD_SHARED_LIBS=ON -DSIMAGE_BUILD_EXAMPLES=OFF @@ -65,8 +75,9 @@ src_configure() { -DSIMAGE_USE_GDIPLUS=OFF # Windows -DSIMAGE_USE_CGIMAGE=OFF # OS X only -DSIMAGE_USE_QUICKTIME=OFF # OS X only - -DSIMAGE_USE_QIMAGE=$(usex qt5) + -DSIMAGE_USE_QIMAGE=${use_qt} -DSIMAGE_USE_QT5=$(usex qt5) + -DSIMAGE_USE_QT6=$(usex qt6) -DSIMAGE_USE_CPACK=OFF -DSIMAGE_USE_STATIC_LIBS=OFF -DSIMAGE_LIBJASPER_SUPPORT=OFF