public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2017-02-19 10:55 David Seifert
  0 siblings, 0 replies; 14+ messages in thread
From: David Seifert @ 2017-02-19 10:55 UTC (permalink / raw
  To: gentoo-commits

commit:     9ab31643d2802e5237bd244b4803d7bbeb41d357
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 10:41:17 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 10:41:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab31643

media-gfx/exact-image: Add missing Python variables

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../{exact-image-0.8.1-r2.ebuild => exact-image-0.8.1-r3.ebuild}         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/exact-image/exact-image-0.8.1-r2.ebuild b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
similarity index 98%
rename from media-gfx/exact-image/exact-image-0.8.1-r2.ebuild
rename to media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
index 3b83d0e650..1a0cc8f636 100644
--- a/media-gfx/exact-image/exact-image-0.8.1-r2.ebuild
+++ b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="expat jpeg jpeg2k lua openexr php perl png python ruby swig tiff truetype X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="x11-libs/agg[truetype]
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2019-08-28  8:19 David Seifert
  0 siblings, 0 replies; 14+ messages in thread
From: David Seifert @ 2019-08-28  8:19 UTC (permalink / raw
  To: gentoo-commits

commit:     f406116a7fd36db79e0724cf892f249d99f557e5
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 08:18:49 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 08:18:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f406116a

media-gfx/exact-image: [QA] Remove media-libs/jasper dep

Bug: https://bugs.gentoo.org/689784
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-gfx/exact-image/exact-image-0.8.1-r3.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
index 7aae44b9343..5eaeb57c3e4 100644
--- a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
+++ b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,13 +13,12 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="expat jpeg jpeg2k lua openexr php perl png python ruby swig tiff truetype X"
+IUSE="expat jpeg lua openexr php perl png python ruby swig tiff truetype X"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="x11-libs/agg[truetype]
 	sys-libs/zlib
 	expat? ( dev-libs/expat )
-	jpeg2k? ( media-libs/jasper )
 	jpeg? ( virtual/jpeg )
 	lua? ( dev-lang/lua )
 	openexr? ( media-libs/openexr )
@@ -91,7 +90,7 @@ src_configure() {
 		$(use_with tiff libtiff) \
 		$(use_with png libpng) \
 		--without-libungif \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		$(use_with openexr) \
 		$(use_with expat) \
 		--without-lcms \


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2020-06-07  7:57 Alfredo Tupone
  0 siblings, 0 replies; 14+ messages in thread
From: Alfredo Tupone @ 2020-06-07  7:57 UTC (permalink / raw
  To: gentoo-commits

commit:     a778ed2ca9a78c6b8bde07cb629a4c51bc850987
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  7 07:56:27 2020 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jun  7 07:56:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a778ed2c

media-gfx/exact-image: remove python bindings

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 media-gfx/exact-image/exact-image-0.8.1-r3.ebuild | 39 +++++++++--------------
 media-gfx/exact-image/metadata.xml                |  5 ++-
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
index 5eaeb57c3e4..91c362a6c1e 100644
--- a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
+++ b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
-inherit eutils multilib python-single-r1 toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A fast, modern and generic image processing library"
 HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
@@ -13,20 +12,18 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="expat jpeg lua openexr php perl png python ruby swig tiff truetype X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
 
 RDEPEND="x11-libs/agg[truetype]
 	sys-libs/zlib
 	expat? ( dev-libs/expat )
 	jpeg? ( virtual/jpeg )
-	lua? ( dev-lang/lua )
+	lua? ( dev-lang/lua:= )
 	openexr? ( media-libs/openexr )
-	php? ( dev-lang/php )
+	php? ( dev-lang/php:* )
 	perl? ( dev-lang/perl )
 	png? ( >=media-libs/libpng-1.2.43 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby )
+	ruby? ( dev-lang/ruby:* )
 	tiff? ( media-libs/tiff )
 	truetype? ( >=media-libs/freetype-2 )
 	X? (
@@ -39,21 +36,14 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	swig? ( dev-lang/swig )"
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.5-libpng14.patch
+	"${FILESDIR}"/${P}-libpng15.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_prepare() {
-	eapply \
-		"${FILESDIR}"/${PN}-0.7.5-libpng14.patch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	eapply_user
-
-	# fix python hardcoded path wrt bug #327171
-	sed -i -e "s:python2.5:${EPYTHON}:" \
-		-e "s:\$(libdir):usr/$(get_libdir):" \
-		"${S}"/api/python/Makefile || die
+	default
 
 	# Respect user CFLAGS/CXXFLAGS.
 	sed -i \
@@ -79,6 +69,7 @@ src_configure() {
 	# evas -> enlightenment overlay
 	# bardecode -> protected by custom license
 	# libungif -> not supported anymore
+	# python -> allegedly not python3, but python2 only
 
 	./configure \
 		--prefix=/usr \
@@ -98,7 +89,7 @@ src_configure() {
 		$(use_with lua) \
 		$(use_with swig) \
 		$(use_with perl) \
-		$(use_with python) \
+		--without-python \
 		$(use_with php) \
 		$(use_with ruby) || die
 }

diff --git a/media-gfx/exact-image/metadata.xml b/media-gfx/exact-image/metadata.xml
index 3c2bdaeead9..b4fce831a06 100644
--- a/media-gfx/exact-image/metadata.xml
+++ b/media-gfx/exact-image/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
 <use>
 	<flag name="swig">Adds Swig support <pkg>dev-lang/swig</pkg></flag>
 </use>


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2021-03-26  0:21 Conrad Kostecki
  0 siblings, 0 replies; 14+ messages in thread
From: Conrad Kostecki @ 2021-03-26  0:21 UTC (permalink / raw
  To: gentoo-commits

commit:     75282e006c40ea6ce4dc3c784c5c7a3e23285960
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 00:17:16 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 00:21:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75282e00

media-gfx/exact-image: add support for slotted lua

Closes: https://bugs.gentoo.org/752741
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-gfx/exact-image/exact-image-1.0.2-r1.ebuild | 105 ++++++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild
new file mode 100644
index 00000000000..91b8519e19b
--- /dev/null
+++ b/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit eutils lua-single multilib toolchain-funcs
+
+DESCRIPTION="A fast, modern and generic image processing library"
+HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
+SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
+REQUIRED_USE="lua? ( swig )"
+
+RDEPEND="
+	x11-libs/agg[truetype]
+	sys-libs/zlib
+	expat? ( dev-libs/expat )
+	jpeg? ( virtual/jpeg )
+	lua? ( ${LUA_DEPS} )
+	openexr? ( media-libs/openexr )
+	php? ( dev-lang/php:* )
+	perl? ( dev-lang/perl )
+	png? ( >=media-libs/libpng-1.2.43 )
+	ruby? ( dev-lang/ruby:* )
+	tiff? ( media-libs/tiff )
+	truetype? ( >=media-libs/freetype-2 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+"
+DEPEND="
+	${RDEPEND}
+	swig? ( dev-lang/swig )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-g++.patch
+	"${FILESDIR}"/${P}-dcraw.patch
+	"${FILESDIR}"/${P}-php.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect user CFLAGS/CXXFLAGS.
+	sed -i \
+		-e '/C\(XX\)\?FLAGS =/s/-O2//' \
+		-e "\$aCFLAGS += ${CFLAGS}\nCXXFLAGS += ${CXXFLAGS}" \
+		Makefile || die
+
+	# Show commands.  Use qualified CC/CXX.
+	sed -i \
+		-e '/^Q =/d' \
+		-e '/^\t@echo /d' \
+		-e "\$aCC:=$(tc-getCC)\nCXX:=$(tc-getCXX)" \
+		build/bottom.make || die
+
+	# The copied string fits exactly.  Use memcpy to reflect that a null
+	# terminator is not needed.
+	sed -i \
+		-e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \
+		codecs/tga.cc || die
+}
+
+src_configure() {
+	# evas -> enlightenment overlay
+	# bardecode -> protected by custom license
+	# libungif -> not supported anymore
+	# python -> allegedly not python3, but python2 only
+
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		$(use_with X x11) \
+		$(use_with truetype freetype) \
+		--without-evas \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with png libpng) \
+		--without-libgif \
+		--without-jasper \
+		$(use_with openexr) \
+		$(use_with expat) \
+		--without-lcms \
+		--without-bardecode \
+		$(use_with lua) \
+		$(use_with swig) \
+		--without-python \
+		$(use_with perl) \
+		--without-python \
+		$(use_with php) \
+		$(use_with ruby) || die
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2021-07-21 21:57 Marek Szuba
  0 siblings, 0 replies; 14+ messages in thread
From: Marek Szuba @ 2021-07-21 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     b79f19c7a164177e167982ebf8827e6cbb5a1ab9
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Jul 20 19:56:50 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 21 21:57:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79f19c7

media-gfx/exact-image: add slot operator for openexr

restrict to <openexr-3

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../{exact-image-1.0.2-r1.ebuild => exact-image-1.0.2-r2.ebuild}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
similarity index 98%
rename from media-gfx/exact-image/exact-image-1.0.2-r1.ebuild
rename to media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
index 51f39a69c4e..d7c17e6ed53 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	expat? ( dev-libs/expat )
 	jpeg? ( virtual/jpeg )
 	lua? ( ${LUA_DEPS} )
-	openexr? ( media-libs/openexr )
+	openexr? ( <media-libs/openexr-3.0.0:0= )
 	php? ( dev-lang/php:* )
 	perl? ( dev-lang/perl )
 	png? ( >=media-libs/libpng-1.2.43 )


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2021-09-18 16:51 Alfredo Tupone
  0 siblings, 0 replies; 14+ messages in thread
From: Alfredo Tupone @ 2021-09-18 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     b9e6f1bb871be9e14c0ff2f935b649557ae602a0
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 16:45:35 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 16:51:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e6f1bb

media-gfx/exact-image: UnusedInherits

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 media-gfx/exact-image/exact-image-1.0.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
index d7c17e6ed53..32d67a26443 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit lua-single multilib toolchain-funcs
+inherit lua-single toolchain-funcs
 
 DESCRIPTION="A fast, modern and generic image processing library"
 HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2022-03-02 20:51 Alfredo Tupone
  0 siblings, 0 replies; 14+ messages in thread
From: Alfredo Tupone @ 2022-03-02 20:51 UTC (permalink / raw
  To: gentoo-commits

commit:     d23aa06fb9ce58308d7ce59f2ceb6ea4bcf5a09c
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  2 20:50:53 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 20:50:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d23aa06f

media-gfx/exact-image: compatible with openexr:3

Closes: https://bugs.gentoo.org/834328
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 ...-image-1.0.2-r2.ebuild => exact-image-1.0.2-r3.ebuild} | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r3.ebuild
similarity index 90%
rename from media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
rename to media-gfx/exact-image/exact-image-1.0.2-r3.ebuild
index 32d67a26443a..700070540cde 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
-REQUIRED_USE="lua? ( swig )"
+REQUIRED_USE="lua? ( swig ) perl? ( swig ) php? ( swig ) ruby? ( swig )"
 
 RDEPEND="
 	x11-libs/agg[truetype]
@@ -23,7 +23,7 @@ RDEPEND="
 	expat? ( dev-libs/expat )
 	jpeg? ( virtual/jpeg )
 	lua? ( ${LUA_DEPS} )
-	openexr? ( <media-libs/openexr-3.0.0:0= )
+	openexr? ( media-libs/openexr:= )
 	php? ( dev-lang/php:* )
 	perl? ( dev-lang/perl )
 	png? ( >=media-libs/libpng-1.2.43 )
@@ -35,8 +35,7 @@ RDEPEND="
 		x11-libs/libXt
 		x11-libs/libICE
 		x11-libs/libSM
-	)
-"
+	)"
 DEPEND="
 	${RDEPEND}
 	swig? ( dev-lang/swig )
@@ -72,6 +71,11 @@ src_prepare() {
 	sed -i \
 		-e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \
 		codecs/tga.cc || die
+
+	# openexr vers 3
+	sed -i \
+		-e 's:Int64:uint64_t:g' \
+		codecs/openexr.cc || die
 }
 
 src_configure() {
@@ -97,7 +101,6 @@ src_configure() {
 		--without-bardecode \
 		$(use_with lua) \
 		$(use_with swig) \
-		--without-python \
 		$(use_with perl) \
 		--without-python \
 		$(use_with php) \


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2022-03-10 18:13 Brian Evans
  0 siblings, 0 replies; 14+ messages in thread
From: Brian Evans @ 2022-03-10 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     a7e870d68e3aba08ee6b366de054c122ae330f67
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 18:11:34 2022 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 18:11:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e870d6

media-gfx/exact-image: Add PHP_TARGETS in revbump

Once swig is expanded to a newer version, PHP 8 targets can be added
The swig-4.0.2 release only works with PHP 7

Closes: https://bugs.gentoo.org/780864
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 media-gfx/exact-image/exact-image-1.0.2-r4.ebuild | 176 ++++++++++++++++++++++
 1 file changed, 176 insertions(+)

diff --git a/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
new file mode 100644
index 000000000000..f6fbfa550df3
--- /dev/null
+++ b/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="exactimage"
+USE_PHP="php7-4"
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_SKIP_PATCHES="yes"
+PHP_EXT_SKIP_PHPIZE="yes"
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit php-ext-source-r3 lua-single toolchain-funcs
+
+DESCRIPTION="A fast, modern and generic image processing library"
+HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
+SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
+REQUIRED_USE="lua? ( swig ) perl? ( swig ) php? ( swig ) ruby? ( swig )"
+
+RDEPEND="
+	x11-libs/agg[truetype]
+	sys-libs/zlib
+	expat? ( dev-libs/expat )
+	jpeg? ( virtual/jpeg )
+	lua? ( ${LUA_DEPS} )
+	openexr? ( media-libs/openexr:= )
+	perl? ( dev-lang/perl )
+	png? ( >=media-libs/libpng-1.2.43 )
+	ruby? ( dev-lang/ruby:* )
+	tiff? ( media-libs/tiff )
+	truetype? ( >=media-libs/freetype-2 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+DEPEND="
+	${RDEPEND}
+	swig? ( dev-lang/swig )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-g++.patch
+	"${FILESDIR}"/${P}-dcraw.patch
+	"${FILESDIR}"/${P}-php.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect user CFLAGS/CXXFLAGS.
+	sed -i \
+		-e '/C\(XX\)\?FLAGS =/s/-O2//' \
+		-e "\$aCFLAGS += ${CFLAGS}\nCXXFLAGS += ${CXXFLAGS}" \
+		Makefile || die
+
+	# Show commands.  Use qualified CC/CXX.
+	sed -i \
+		-e '/^Q =/d' \
+		-e '/^\t@echo /d' \
+		-e "\$aCC:=$(tc-getCC)\nCXX:=$(tc-getCXX)" \
+		build/bottom.make || die
+
+	# The copied string fits exactly.  Use memcpy to reflect that a null
+	# terminator is not needed.
+	sed -i \
+		-e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \
+		codecs/tga.cc || die
+
+	# openexr vers 3
+	sed -i \
+		-e 's:Int64:uint64_t:g' \
+		codecs/openexr.cc || die
+
+	# When using PHP, the php-config binary should be specified by slot
+	# Cannot be done in a patch as it is live
+	if use php ; then
+		php-ext-source-r3_src_prepare
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			sed -i "s~php-config~${PHPCONFIG}~" configure || die
+		done
+	fi
+}
+
+src_configure() {
+	# evas -> enlightenment overlay
+	# bardecode -> protected by custom license
+	# libungif -> not supported anymore
+	# python -> allegedly not python3, but python2 only
+
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		$(use_with X x11) \
+		$(use_with truetype freetype) \
+		--without-evas \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with png libpng) \
+		--without-libgif \
+		--without-jasper \
+		$(use_with openexr) \
+		$(use_with expat) \
+		--without-lcms \
+		--without-bardecode \
+		$(use_with lua) \
+		$(use_with swig) \
+		$(use_with perl) \
+		--without-python \
+		--without-php \
+		$(use_with ruby) || die
+	if use php; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			./configure \
+				--prefix=/usr \
+				--libdir=/usr/$(get_libdir) \
+				--without-x11 \
+				$(use_with truetype freetype) \
+				--without-evas \
+				$(use_with jpeg libjpeg) \
+				$(use_with tiff libtiff) \
+				$(use_with png libpng) \
+				--without-jasper \
+				--without-libgif \
+				$(use_with openexr) \
+				$(use_with expat) \
+				--without-lcms \
+				--without-bardecode \
+				--without-lua \
+				--with-swig \
+				--without-perl \
+				--without-python \
+				--with-php \
+				--without-ruby || die
+		done
+	fi
+}
+
+src_compile() {
+	default
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			# Copy built objects from default
+			cp -a "${S}/objdir" . || die
+			emake
+		done
+	fi
+}
+
+src_install() {
+	default
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			exeinto "${EXT_DIR#$EPREFIX}"
+			newexe objdir/api/php/ExactImage.so "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+	fi
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2022-03-10 21:14 Brian Evans
  0 siblings, 0 replies; 14+ messages in thread
From: Brian Evans @ 2022-03-10 21:14 UTC (permalink / raw
  To: gentoo-commits

commit:     b9763e7a77ee2648fa17cce39b9cdf96a5357cee
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 21:13:32 2022 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 21:13:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9763e7a

media-gfx/exact-image: Disable tests

They never ran before and are broken in the Makefile

Closes: https://bugs.gentoo.org/834936
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 media-gfx/exact-image/exact-image-1.0.2-r4.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
index f6fbfa550df3..d16a3856626e 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
@@ -21,6 +21,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
 REQUIRED_USE="lua? ( swig ) perl? ( swig ) php? ( swig ) ruby? ( swig )"
+# Tests are broken; 'make check' fails and referenced testsuite dir not found
+RESTRICT="test"
 
 RDEPEND="
 	x11-libs/agg[truetype]


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2022-03-11 18:46 Alfredo Tupone
  0 siblings, 0 replies; 14+ messages in thread
From: Alfredo Tupone @ 2022-03-11 18:46 UTC (permalink / raw
  To: gentoo-commits

commit:     d02e633df94175577e7a7409589b8366a82756a3
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 18:46:30 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 18:46:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02e633d

media-gfx/exact-image: fix HOMEPAGE

Closes: https://bugs.gentoo.org/834553
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 media-gfx/exact-image/exact-image-1.0.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
index d16a3856626e..f166ddcf3d83 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
@@ -13,7 +13,7 @@ LUA_COMPAT=( lua5-{1..4} luajit )
 inherit php-ext-source-r3 lua-single toolchain-funcs
 
 DESCRIPTION="A fast, modern and generic image processing library"
-HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
+HOMEPAGE="https://exactcode.com/opensource/exactimage/"
 SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2022-12-18  8:01 Sam James
  0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-12-18  8:01 UTC (permalink / raw
  To: gentoo-commits

commit:     4ebd27277b9958e49adf00bdf67f95c84ef57c80
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 07:57:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 07:57:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ebd2727

media-gfx/exact-image: drop 1.0.2-r6

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/exact-image/exact-image-1.0.2-r6.ebuild | 108 ----------------------
 1 file changed, 108 deletions(-)

diff --git a/media-gfx/exact-image/exact-image-1.0.2-r6.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r6.ebuild
deleted file mode 100644
index d796fcd8415b..000000000000
--- a/media-gfx/exact-image/exact-image-1.0.2-r6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua-single toolchain-funcs
-
-DESCRIPTION="A fast, modern and generic image processing library"
-HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
-SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
-REQUIRED_USE="lua? ( swig ) perl? ( swig ) php? ( swig ) ruby? ( swig )"
-
-RDEPEND="
-	x11-libs/agg[truetype]
-	sys-libs/zlib
-	expat? ( dev-libs/expat )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	lua? ( ${LUA_DEPS} )
-	openexr? ( media-libs/openexr:= )
-	php? ( dev-lang/php:* )
-	perl? ( dev-lang/perl )
-	png? ( >=media-libs/libpng-1.2.43 )
-	ruby? ( dev-lang/ruby:* )
-	tiff? ( media-libs/tiff:= )
-	truetype? ( >=media-libs/freetype-2 )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-	)"
-DEPEND="
-	${RDEPEND}
-	swig? ( dev-lang/swig )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc6.patch
-	"${FILESDIR}"/${P}-g++.patch
-	"${FILESDIR}"/${P}-dcraw.patch
-	"${FILESDIR}"/${P}-php.patch
-)
-
-src_prepare() {
-	default
-
-	# Respect user CFLAGS/CXXFLAGS.
-	sed -i \
-		-e '/C\(XX\)\?FLAGS =/s/-O2//' \
-		-e "\$aCFLAGS += ${CFLAGS}\nCXXFLAGS += ${CXXFLAGS}" \
-		Makefile || die
-
-	# Show commands.  Use qualified CC/CXX.
-	sed -i \
-		-e '/^Q =/d' \
-		-e '/^\t@echo /d' \
-		-e "\$aCC:=$(tc-getCC)\nCXX:=$(tc-getCXX)" \
-		build/bottom.make || die
-
-	# The copied string fits exactly.  Use memcpy to reflect that a null
-	# terminator is not needed.
-	sed -i \
-		-e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \
-		codecs/tga.cc || die
-
-	# openexr vers 3
-	sed -i \
-		-e 's:Int64:uint64_t:g' \
-		codecs/openexr.cc || die
-}
-
-src_configure() {
-	# evas -> enlightenment overlay
-	# bardecode -> protected by custom license
-	# libungif -> not supported anymore
-	# python -> allegedly not python3, but python2 only
-
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		$(use_with X x11) \
-		$(use_with truetype freetype) \
-		--without-evas \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_with png libpng) \
-		--without-libgif \
-		--without-jasper \
-		$(use_with openexr) \
-		$(use_with expat) \
-		--without-lcms \
-		--without-bardecode \
-		$(use_with lua) \
-		$(use_with swig) \
-		$(use_with perl) \
-		--without-python \
-		$(use_with php) \
-		$(use_with ruby) || die
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2022-12-18  8:01 Sam James
  0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-12-18  8:01 UTC (permalink / raw
  To: gentoo-commits

commit:     9d7cf03c54a514fd53b91084d15fbd04500b2066
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 07:57:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 07:57:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7cf03c

media-gfx/exact-image: fix revbump order

Sorry for the noise. The script didn't get ordering right
in all cases.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{exact-image-1.0.2-r4.ebuild => exact-image-1.0.2-r8.ebuild}          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild
similarity index 100%
rename from media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
rename to media-gfx/exact-image/exact-image-1.0.2-r8.ebuild


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2023-12-11 13:49 Alfredo Tupone
  0 siblings, 0 replies; 14+ messages in thread
From: Alfredo Tupone @ 2023-12-11 13:49 UTC (permalink / raw
  To: gentoo-commits

commit:     1234ba43a9d0a357800bd523402e111225864c57
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 13:48:21 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 13:48:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1234ba43

media-gfx/exact-image: stabilize 1.0.2-r8 for amd64

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 media-gfx/exact-image/exact-image-1.0.2-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild
index 11e8e28d2a8b..6a03a3b17d0b 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="expat jpeg lua openexr perl png ruby swig tiff truetype X"
 REQUIRED_USE="lua? ( swig ) perl? ( swig ) ruby? ( swig )"
 # Tests are broken; 'make check' fails and referenced testsuite dir not found


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
@ 2024-03-10 19:51 Alfredo Tupone
  0 siblings, 0 replies; 14+ messages in thread
From: Alfredo Tupone @ 2024-03-10 19:51 UTC (permalink / raw
  To: gentoo-commits

commit:     1d5f3078732b4e7102719f3ab73628f1570deebf
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 19:49:58 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 19:51:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5f3078

media-gfx/exact-image: add jpegxl use flag

Closes: https://bugs.gentoo.org/926688
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../{exact-image-1.2.1.ebuild => exact-image-1.2.1-r1.ebuild}         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-gfx/exact-image/exact-image-1.2.1.ebuild b/media-gfx/exact-image/exact-image-1.2.1-r1.ebuild
similarity index 93%
rename from media-gfx/exact-image/exact-image-1.2.1.ebuild
rename to media-gfx/exact-image/exact-image-1.2.1-r1.ebuild
index ff25fe575bdc..7480e98e5c79 100644
--- a/media-gfx/exact-image/exact-image-1.2.1.ebuild
+++ b/media-gfx/exact-image/exact-image-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="expat jpeg lua openexr perl png swig tiff truetype X"
+IUSE="expat jpeg jpegxl lua openexr perl png swig tiff truetype X"
 REQUIRED_USE="lua? ( swig ) perl? ( swig )"
 # Tests are broken; 'make check' fails and referenced testsuite dir not found
 RESTRICT="test"
@@ -24,6 +24,7 @@ RDEPEND="
 	sys-libs/zlib
 	expat? ( dev-libs/expat )
 	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpegxl? ( <media-libs/libjxl-0.9:= )
 	lua? ( ${LUA_DEPS} )
 	openexr? ( media-libs/openexr:= )
 	perl? ( dev-lang/perl )
@@ -78,6 +79,7 @@ src_configure() {
 		$(use_with truetype freetype) \
 		--without-evas \
 		$(use_with jpeg libjpeg) \
+		$(use_with jpegxl libjxl) \
 		$(use_with tiff libtiff) \
 		$(use_with png libpng) \
 		--without-libgif \


^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2024-03-10 19:51 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-21 21:57 [gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2024-03-10 19:51 Alfredo Tupone
2023-12-11 13:49 Alfredo Tupone
2022-12-18  8:01 Sam James
2022-12-18  8:01 Sam James
2022-03-11 18:46 Alfredo Tupone
2022-03-10 21:14 Brian Evans
2022-03-10 18:13 Brian Evans
2022-03-02 20:51 Alfredo Tupone
2021-09-18 16:51 Alfredo Tupone
2021-03-26  0:21 Conrad Kostecki
2020-06-07  7:57 Alfredo Tupone
2019-08-28  8:19 David Seifert
2017-02-19 10:55 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox