[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: 1d5f3078732b4e7102719f3ab73628f1570deebf
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Mar 10 19:49:58 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Mar 10 19:51:18 2024 +
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 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? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/files/, media-gfx/exact-image/
commit: 61afa189c7cf95602c598d70521f54ac7a08c2fe
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Mar 9 17:39:46 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Mar 9 17:40:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61afa189
media-gfx/exact-image: add 1.2.1
Signed-off-by: Alfredo Tupone gentoo.org>
media-gfx/exact-image/Manifest | 1 +
media-gfx/exact-image/exact-image-1.2.1.ebuild | 95 ++
.../exact-image/files/exact-image-1.2.1-gcc6.patch | 32
3 files changed, 128 insertions(+)
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 484e6b6fdbc1..c022a9ed0e52 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1 +1,2 @@
DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B
67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9
SHA512
8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
+DIST exact-image-1.2.1.tar.bz2 320849 BLAKE2B
615884f2501b3e9ff00410d3569c8aa7d0131610f990591eb77a11cf6d7249342b4a2ece0f2dd62ea7a1cdd213ae1a98bf6da0817b74d8c8e78cbca5b8e67e33
SHA512
34af0575d8564dd5942f0e3ec5b6fe7fb234a96e621a737359406a2571ed8ac2c15ef2e7655a7d260b37b68138e071342583f47ad7ef0e3b3511e5ebc1a873a8
diff --git a/media-gfx/exact-image/exact-image-1.2.1.ebuild
b/media-gfx/exact-image/exact-image-1.2.1.ebuild
new file mode 100644
index ..ff25fe575bdc
--- /dev/null
+++ b/media-gfx/exact-image/exact-image-1.2.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2024 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="https://exactcode.com/opensource/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 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"
+
+RDEPEND="
+ x11-libs/agg[truetype]
+ sys-libs/zlib
+ expat? ( dev-libs/expat )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ lua? ( ${LUA_DEPS} )
+ openexr? ( media-libs/openexr:= )
+ perl? ( dev-lang/perl )
+ png? ( >=media-libs/libpng-1.2.43 )
+ 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}"/${PN}-1.0.2-g++.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
+}
+
+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 \
+ --without-ruby || die
+}
diff --git a/media-gfx/exact-image/files/exact-image-1.2.1-gcc6.patch
b/media-gfx/exact-image/files/exact-image-1.2.1-gcc6.patch
new file mode 100644
index ..6e9a5b124dbb
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-1.2.1-gcc6.patch
@@ -0,0 +1,32 @@
+Bug: https://bugs.gentoo.org/600380
+
+--- a/codecs/dcraw.h
b/codecs/dcraw.h
+@@ -4438,22 +4438,22 @@
+ -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: 1234ba43a9d0a357800bd523402e111225864c57
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Dec 11 13:48:21 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Dec 11 13:48:40 2023 +
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 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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: 4ebd27277b9958e49adf00bdf67f95c84ef57c80
Author: Sam James gentoo org>
AuthorDate: Sun Dec 18 07:57:49 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 18 07:57:49 2022 +
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 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..
--- 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
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: 9d7cf03c54a514fd53b91084d15fbd04500b2066
Author: Sam James gentoo org>
AuthorDate: Sun Dec 18 07:57:36 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 18 07:57:36 2022 +
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 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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: d02e633df94175577e7a7409589b8366a82756a3
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Mar 11 18:46:30 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Mar 11 18:46:30 2022 +
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 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"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: b9763e7a77ee2648fa17cce39b9cdf96a5357cee Author: Brian Evans gentoo org> AuthorDate: Thu Mar 10 21:13:32 2022 + Commit: Brian Evans gentoo org> CommitDate: Thu Mar 10 21:13:32 2022 + 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 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]
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: a7e870d68e3aba08ee6b366de054c122ae330f67
Author: Brian Evans gentoo org>
AuthorDate: Thu Mar 10 18:11:34 2022 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Mar 10 18:11:34 2022 +
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 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 ..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 \
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: d23aa06fb9ce58308d7ce59f2ceb6ea4bcf5a09c
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Mar 2 20:50:53 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Mar 2 20:50:53 2022 +
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 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/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) \
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: b9e6f1bb871be9e14c0ff2f935b649557ae602a0
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Sep 18 16:45:35 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Sep 18 16:51:18 2021 +
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 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/;
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: b79f19c7a164177e167982ebf8827e6cbb5a1ab9
Author: Bernd Waibel posteo net>
AuthorDate: Tue Jul 20 19:56:50 2021 +
Commit: Marek Szuba gentoo org>
CommitDate: Wed Jul 21 21:57:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79f19c7
media-gfx/exact-image: add slot operator for openexr
restrict to posteo.net>
Signed-off-by: Marek Szuba 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/libpng-1.2.43 )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/, media-gfx/exact-image/files/
commit: 3d8c5adfaa40d1bdebd43d3e432917f81e8394d6
Author: Conrad Kostecki gentoo org>
AuthorDate: Fri Mar 26 00:18:27 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Mar 26 00:21:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d8c5adf
media-gfx/exact-image: drop old version
Dropping all old versions, which do not support slotted lua.
Closes: https://bugs.gentoo.org/634050
Closes: https://bugs.gentoo.org/712618
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
media-gfx/exact-image/Manifest | 1 -
media-gfx/exact-image/exact-image-0.8.1-r3.ebuild | 95 --
media-gfx/exact-image/exact-image-1.0.2.ebuild | 97 --
.../files/exact-image-0.7.5-libpng14.patch | 69 --
.../exact-image/files/exact-image-0.8.1-gcc6.patch | 139 -
.../files/exact-image-0.8.1-libpng15.patch | 34 -
6 files changed, 435 deletions(-)
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 139b6188894..484e6b6fdbc 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1,2 +1 @@
-DIST exact-image-0.8.1.tar.bz2 283660 BLAKE2B
49aa68640b785da59fd0e04d0a0892ad06adbc286a98bf908e60e77cfd273263e83dce3c9eb75c30f422c2b6eef2178dd0585aada63f992291abf298b369f3aa
SHA512
0adc51c5a29415e236a963cfdaf8f5527e628e9a645e87d00c69a7185e60639cfcd9b1c2b4c3abe1826c5364f0c5d45a0ebb8923cfed53d041d1d36b2604b565
DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B
67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9
SHA512
8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
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
deleted file mode 100644
index 54e1fbe7f7f..000
--- a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils 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"
-
-RDEPEND="x11-libs/agg[truetype]
- sys-libs/zlib
- expat? ( dev-libs/expat )
- jpeg? ( virtual/jpeg )
- lua? ( dev-lang/lua:0= )
- 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}
- virtual/pkgconfig
- swig? ( dev-lang/swig )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.5-libpng14.patch
- "${FILESDIR}"/${P}-libpng15.patch
- "${FILESDIR}"/${P}-gcc6.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-libungif \
- --without-jasper \
- $(use_with openexr) \
- $(use_with expat) \
- --without-lcms \
- --without-bardecode \
- $(use_with lua) \
- $(use_with swig) \
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: 75282e006c40ea6ce4dc3c784c5c7a3e23285960
Author: Conrad Kostecki gentoo org>
AuthorDate: Fri Mar 26 00:17:16 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Mar 26 00:21:20 2021 +
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 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 000..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
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/files/, media-gfx/exact-image/
commit: 649287aaab870763cf8a436e4212b57a6fcf0c02
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Oct 6 06:34:59 2020 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Oct 6 06:34:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=649287aa
media-gfx/exact-image: fix to work with php7
Closes: https://bugs.gentoo.org/651072
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alfredo Tupone gentoo.org>
media-gfx/exact-image/exact-image-1.0.2.ebuild | 1 +
media-gfx/exact-image/files/exact-image-1.0.2-php.patch | 11 +++
2 files changed, 12 insertions(+)
diff --git a/media-gfx/exact-image/exact-image-1.0.2.ebuild
b/media-gfx/exact-image/exact-image-1.0.2.ebuild
index 2c2e93b4fff..62b39e9d7e4 100644
--- a/media-gfx/exact-image/exact-image-1.0.2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc6.patch
"${FILESDIR}"/${P}-g++.patch
"${FILESDIR}"/${P}-dcraw.patch
+ "${FILESDIR}"/${P}-php.patch
)
src_prepare() {
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-php.patch
b/media-gfx/exact-image/files/exact-image-1.0.2-php.patch
new file mode 100644
index 000..787d71335f3
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-1.0.2-php.patch
@@ -0,0 +1,11 @@
+--- a/api/php/Makefile 2020-10-06 08:28:04.511865454 +0200
b/api/php/Makefile 2020-10-06 08:28:18.109638538 +0200
+@@ -8,7 +8,7 @@
+
+ $($(X_MODULE)_OUTPUT)/api-php-wrap.cc: $(X_MODULE)/../api.hh
$(X_MODULE)/../api-swig.hh
+ $(Q)echo " SWIG $(dir $@)"
+- $(Q)swig -php5 -c++ -outdir $(dir $@) -o '$@' $(X_MODULE)/../api-swig.hh
++ $(Q)swig -php7 -c++ -outdir $(dir $@) -o '$@' $(X_MODULE)/../api-swig.hh
+
+ # we have an own install
+ _X_BUILD_IMPLICIT := $(_X_BUILD_IMPLICIT)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/files/, media-gfx/exact-image/
commit: 52fc47e8c7532de3562a64f8c76447d3f317b920
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Sep 10 07:04:25 2020 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Sep 10 07:04:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52fc47e8
media-gfx/exact-image: fix build with llvm
Closes: https://bugs.gentoo.org/739976
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Alfredo Tupone gentoo.org>
media-gfx/exact-image/exact-image-1.0.2.ebuild| 1 +
media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch | 11 +++
2 files changed, 12 insertions(+)
diff --git a/media-gfx/exact-image/exact-image-1.0.2.ebuild
b/media-gfx/exact-image/exact-image-1.0.2.ebuild
index 0cea0d26cf5..2c2e93b4fff 100644
--- a/media-gfx/exact-image/exact-image-1.0.2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-gcc6.patch
"${FILESDIR}"/${P}-g++.patch
+ "${FILESDIR}"/${P}-dcraw.patch
)
src_prepare() {
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch
b/media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch
new file mode 100644
index 000..ba609c294b1
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch
@@ -0,0 +1,11 @@
+--- a/codecs/dcraw.h 2020-09-10 08:42:19.905105346 +0200
b/codecs/dcraw.h 2020-09-10 08:47:50.826316874 +0200
+@@ -9956,7 +9956,7 @@
+ strncpy (th->desc, desc, 512);
+ strncpy (th->make, make, 64);
+ strncpy (th->model, model, 64);
+- strcpy (th->soft, "dcraw v"DCRAW_VERSION);
++ strcpy (th->soft, "dcraw v" DCRAW_VERSION);
+ t = localtime ();
+ sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
+ t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/, media-gfx/exact-image/files/
commit: 954ac8189027048023fb01e319d81ddf0533b7a9
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Jul 23 17:20:35 2020 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Jul 23 17:20:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=954ac818
media-gfx/exact-image: fix calling g++ directly
Closes: https://bugs.gentoo.org/730778
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Alfredo Tupone gentoo.org>
media-gfx/exact-image/exact-image-1.0.2.ebuild | 1 +
.../exact-image/files/exact-image-1.0.2-g++.patch | 22 ++
2 files changed, 23 insertions(+)
diff --git a/media-gfx/exact-image/exact-image-1.0.2.ebuild
b/media-gfx/exact-image/exact-image-1.0.2.ebuild
index 7e5d51787a4..0cea0d26cf5 100644
--- a/media-gfx/exact-image/exact-image-1.0.2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2.ebuild
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${P}-g++.patch
)
src_prepare() {
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-g++.patch
b/media-gfx/exact-image/files/exact-image-1.0.2-g++.patch
new file mode 100644
index 000..29370eaa9ab
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-1.0.2-g++.patch
@@ -0,0 +1,22 @@
+--- a/configure2020-07-23 19:16:47.199283125 +0200
b/configure2020-07-23 19:17:01.229075367 +0200
+@@ -19,19 +19,6 @@
+
+ parse_options $*
+
+-compile c++ available.c ||
+- status_error "A C++ compiler is not installed or does not work
correctly.
+-A C++ compiler is vital for exact-image - so you need to install it first."
+-
+-compile c++ stl.c template.c template-specialization.c \
+-partial-template-specialization.c function-template.c \
+-|| status_error \
+- "At least one of the advanced ANSI C++ tests failed. Since these
+-features are vital for exact-image you need to update to a more recent
compiler first."
+-
+-headercheck c++ iostream string iostream sstream fstream ||
+- status_error "Not all tested STL headers are present - please install
them."
+-
+ pkgcheck x11 compile X11 atleast 11.0
+ pkgcheck libagg pkg-config LIBAGG atleast 2.3 ||
+ status_error "Anti-Grain Geometry was not found, since it is vital
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/, media-gfx/exact-image/files/
commit: 0ccbe6cd4cbebaac19731d5e29885f6ac03e8abb
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Jul 4 19:46:18 2020 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Jul 4 19:46:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ccbe6cd
media-gfx/exact-image: Version bump to 1.0.2
Closes: https://bugs.gentoo.org/544102
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Alfredo Tupone gentoo.org>
media-gfx/exact-image/Manifest | 1 +
media-gfx/exact-image/exact-image-1.0.2.ebuild | 94 ++
.../exact-image/files/exact-image-1.0.2-gcc6.patch | 64 +++
3 files changed, 159 insertions(+)
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 242900902c3..139b6188894 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1 +1,2 @@
DIST exact-image-0.8.1.tar.bz2 283660 BLAKE2B
49aa68640b785da59fd0e04d0a0892ad06adbc286a98bf908e60e77cfd273263e83dce3c9eb75c30f422c2b6eef2178dd0585aada63f992291abf298b369f3aa
SHA512
0adc51c5a29415e236a963cfdaf8f5527e628e9a645e87d00c69a7185e60639cfcd9b1c2b4c3abe1826c5364f0c5d45a0ebb8923cfed53d041d1d36b2604b565
+DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B
67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9
SHA512
8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
diff --git a/media-gfx/exact-image/exact-image-1.0.2.ebuild
b/media-gfx/exact-image/exact-image-1.0.2.ebuild
new file mode 100644
index 000..7e5d51787a4
--- /dev/null
+++ b/media-gfx/exact-image/exact-image-1.0.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils 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"
+
+RDEPEND="x11-libs/agg[truetype]
+ sys-libs/zlib
+ expat? ( dev-libs/expat )
+ jpeg? ( virtual/jpeg )
+ lua? ( dev-lang/lua:= )
+ 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}
+ virtual/pkgconfig
+ swig? ( dev-lang/swig )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc6.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
+}
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-gcc6.patch
b/media-gfx/exact-image/files/exact-image-1.0.2-gcc6.patch
new file mode 100644
index 000..10fb38d6d65
--- /dev/null
+++
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: a778ed2ca9a78c6b8bde07cb629a4c51bc850987
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Jun 7 07:56:27 2020 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jun 7 07:56:27 2020 +
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 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 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
+
+ tup...@gentoo.org
+ Tupone Alfredo
+
Adds Swig support dev-lang/swig
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: f406116a7fd36db79e0724cf892f249d99f557e5
Author: David Seifert gentoo org>
AuthorDate: Wed Aug 28 08:18:49 2019 +
Commit: David Seifert gentoo org>
CommitDate: Wed Aug 28 08:18:49 2019 +
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 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 \
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/, media-gfx/exact-image/files/
commit: 97e7a2a7296a283bc7f0ad95604e6a83666bf036
Author: Peter Levine gmail com>
AuthorDate: Wed Aug 2 07:14:25 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Sep 2 18:45:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e7a2a7
media-gfx/exact-image: Fix building with GCC-6
Closes: https://bugs.gentoo.org/600380
Closes: https://github.com/gentoo/gentoo/pull/5275
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-gfx/exact-image/exact-image-0.8.1-r3.ebuild | 3 +-
.../exact-image/files/exact-image-0.8.1-gcc6.patch | 139 +
2 files changed, 141 insertions(+), 1 deletion(-)
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 7868e9f4c45..7aae44b9343 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
@@ -47,7 +47,8 @@ pkg_setup() {
src_prepare() {
eapply \
"${FILESDIR}"/${PN}-0.7.5-libpng14.patch \
- "${FILESDIR}"/${P}-libpng15.patch
+ "${FILESDIR}"/${P}-libpng15.patch \
+ "${FILESDIR}"/${P}-gcc6.patch
eapply_user
# fix python hardcoded path wrt bug #327171
diff --git a/media-gfx/exact-image/files/exact-image-0.8.1-gcc6.patch
b/media-gfx/exact-image/files/exact-image-0.8.1-gcc6.patch
new file mode 100644
index 000..4871c99205a
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-0.8.1-gcc6.patch
@@ -0,0 +1,139 @@
+Bug: https://bugs.gentoo.org/600380
+
+--- a/bardecode/code25i.hh
b/bardecode/code25i.hh
+@@ -20,6 +20,12 @@
+
+ #include "scanner_utils.hh"
+
++#if __cplusplus >= 201103L
++#define STATIC_CONST_DOUBLE static constexpr double
++#else
++#define STATIC_CONST_DOUBLE static const double
++#endif
++
+ namespace BarDecode
+ {
+ struct code25i_t
+@@ -37,11 +43,11 @@
+ #define w_hq 1.5
+ #define tol 0.2
+ #else
+-static const double n_lq = 15;
+-static const double n_hq = 5.3;
+-static const double w_lq = 5.2;
+-static const double w_hq = 1.5;
+-static const double tol = 0.2;
++STATIC_CONST_DOUBLE n_lq = 15;
++STATIC_CONST_DOUBLE n_hq = 5.3;
++STATIC_CONST_DOUBLE w_lq = 5.2;
++STATIC_CONST_DOUBLE w_hq = 1.5;
++STATIC_CONST_DOUBLE tol = 0.2;
+ #endif
+ static const usize_t min_quiet_usize = 5;
+ //static const usize_t min_quiet_usize = 10;
+--- a/codecs/bmp.cc
b/codecs/bmp.cc
+@@ -473,7 +473,7 @@
+ std::cerr << "scanline " << row << " Seek error: " << stream->tellg()
<< " vs " << offset << std::endl;
+ }
+
+- if (stream->read ((char*)row_data, file_stride) < 0) {
++ if (!static_cast(stream->read ((char*)row_data, file_stride))) {
+ std::cerr << "scanline " << row << ": Read error\n";
+ }
+
+--- a/codecs/dcraw.h
b/codecs/dcraw.h
+@@ -3958,22 +3958,22 @@
+ -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
+ -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
+ -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
+--1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
+--1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
++-1,-2,-1,+0,0,(signed char) 0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
++-1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,(signed char) 0x88, -1,-1,+1,-2,0,0x40,
+ -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
+ -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
+ -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
+ -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
+ -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
+ -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
+-+0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
+++0,-2,+0,+0,1,(signed char) 0x80, +0,-1,+0,+1,1,(signed char) 0x88,
+0,-1,+1,-2,0,0x40,
+ +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
+ +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
+ +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
+ +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
+ +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
+-+0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
+-+1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
+++0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,(signed char) 0x80,
+++1,-1,+1,+1,0,(signed char) 0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
+ +1,+0,+2,+1,0,0x10
+ }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
+ ushort (*brow[5])[4], *pix;
+@@ -6341,11 +6341,11 @@
+ { 10793,-3791,-1146,-7498,15177,2488,-1390,1577,7321 } },
+ { "OLYMPUS C80", 0, 0,
+ { 8606,-2509,-1014,-8238,15714,2703,-942,979,7760 } },
+-{
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/
commit: 9ab31643d2802e5237bd244b4803d7bbeb41d357
Author: David Seifert gentoo org>
AuthorDate: Sun Feb 19 10:41:17 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Feb 19 10:41:17 2017 +
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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/files/, media-gfx/exact-image/
commit: 2701cb64ee7cd76093474d7b9868341afc7ee0f6
Author: Michał Górny gentoo org>
AuthorDate: Sat Feb 18 18:51:48 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Feb 18 18:52:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2701cb64
media-gfx/exact-image: python-single-r1, EAPI=6
...-0.8.1-r1.ebuild => exact-image-0.8.1-r2.ebuild} | 21 ++---
.../files/exact-image-0.7.5-libpng14.patch | 4 ++--
.../files/exact-image-0.8.1-libpng15.patch | 4 ++--
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/media-gfx/exact-image/exact-image-0.8.1-r1.ebuild
b/media-gfx/exact-image/exact-image-0.8.1-r2.ebuild
similarity index 88%
rename from media-gfx/exact-image/exact-image-0.8.1-r1.ebuild
rename to media-gfx/exact-image/exact-image-0.8.1-r2.ebuild
index c12812e5a8..3b83d0e650 100644
--- a/media-gfx/exact-image/exact-image-0.8.1-r1.ebuild
+++ b/media-gfx/exact-image/exact-image-0.8.1-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
-PYTHON_DEPEND="python? 2:2.5"
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python toolchain-funcs
+inherit eutils multilib python-single-r1 toolchain-funcs
DESCRIPTION="A fast, modern and generic image processing library"
HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/;
@@ -26,6 +26,7 @@ RDEPEND="x11-libs/agg[truetype]
php? ( dev-lang/php )
perl? ( dev-lang/perl )
png? ( >=media-libs/libpng-1.2.43 )
+ python? ( ${PYTHON_DEPS} )
ruby? ( dev-lang/ruby )
tiff? ( media-libs/tiff )
truetype? ( >=media-libs/freetype-2 )
@@ -40,21 +41,19 @@ DEPEND="${RDEPEND}
swig? ( dev-lang/swig )"
pkg_setup() {
- if use python; then
- python_set_active_version 2
- fi
- python_pkg_setup
+ use python && python-single-r1_pkg_setup
}
src_prepare() {
- epatch \
+ eapply \
"${FILESDIR}"/${PN}-0.7.5-libpng14.patch \
"${FILESDIR}"/${P}-libpng15.patch
+ eapply_user
# fix python hardcoded path wrt bug #327171
- sed -i -e "s:python2.5:python$(python_get_version):" \
+ sed -i -e "s:python2.5:${EPYTHON}:" \
-e "s:\$(libdir):usr/$(get_libdir):" \
- "${S}"/api/python/Makefile
+ "${S}"/api/python/Makefile || die
# Respect user CFLAGS/CXXFLAGS.
sed -i \
diff --git a/media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch
b/media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch
index f25b9af02d..7c62a6cbd7 100644
--- a/media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch
+++ b/media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch
@@ -1,5 +1,5 @@
codecs/png.cc
-+++ codecs/png.cc
+--- a/codecs/png.cc
b/codecs/png.cc
@@ -71,7 +71,7 @@
/* Allocate/initialize the memory for image information. REQUIRED. */
info_ptr = png_create_info_struct(png_ptr);
diff --git a/media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch
b/media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch
index 44c94726e3..94c8906a87 100644
--- a/media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch
+++ b/media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch
@@ -1,5 +1,5 @@
codecs/png.cc
-+++ codecs/png.cc
+--- a/codecs/png.cc
b/codecs/png.cc
@@ -16,6 +16,7 @@
*/
