From: "Maciej Mrozowski" <reavertm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
Date: Sat, 9 Dec 2023 03:00:01 +0000 (UTC) [thread overview]
Message-ID: <1702090730.1610fe59e84df9b728930d2fe1083de1f4ee512e.reavertm@gentoo> (raw)
commit: 1610fe59e84df9b728930d2fe1083de1f4ee512e
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 02:57:53 2023 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> 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 <reavertm <AT> 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
next reply other threads:[~2023-12-09 3:00 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-09 3:00 Maciej Mrozowski [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-18 0:15 [gentoo-commits] repo/gentoo:master commit in: media-libs/simage/ Andreas Sturmlechner
2024-11-26 0:36 Sam James
2024-10-21 14:42 Andreas Sturmlechner
2024-09-14 11:23 Andreas Sturmlechner
2024-03-25 11:22 Sam James
2024-03-25 11:22 Sam James
2024-03-25 11:22 Sam James
2024-03-25 11:22 Sam James
2022-12-16 4:30 Sam James
2021-12-08 3:33 Sam James
2021-02-24 22:07 Sam James
2021-02-24 20:45 Sam James
2021-02-21 4:04 Sam James
2021-02-21 4:03 Sam James
2021-01-15 6:50 Miroslav Šulc
2020-12-25 9:38 Miroslav Šulc
2020-03-04 16:34 Miroslav Šulc
2020-03-04 16:17 Agostino Sarubbo
2020-03-04 13:03 Agostino Sarubbo
2020-03-04 8:08 Agostino Sarubbo
2020-03-03 16:21 Agostino Sarubbo
2020-01-31 0:39 Miroslav Šulc
2020-01-30 12:55 Agostino Sarubbo
2020-01-30 11:05 Agostino Sarubbo
2020-01-30 11:00 Agostino Sarubbo
2020-01-30 10:10 Agostino Sarubbo
2019-11-16 17:28 Miroslav Šulc
2019-08-28 8:19 David Seifert
2018-08-29 6:15 Sergei Trofimovich
2018-03-12 4:33 Matt Turner
2018-03-05 22:14 Andreas Sturmlechner
2018-03-04 22:30 Sergei Trofimovich
2018-01-17 5:11 Thomas Deutschmann
2017-07-20 20:57 Sergei Trofimovich
2017-04-20 8:26 Jeroen Roovers
2017-04-05 20:25 Michael Weber
2017-01-15 9:40 Justin Lecher
2015-08-24 14:23 Alexis Ballier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1702090730.1610fe59e84df9b728930d2fe1083de1f4ee512e.reavertm@gentoo \
--to=reavertm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox