[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/files/, media-gfx/exact-image/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/files/, media-gfx/exact-image/

[Michał Górny]

commit:     2701cb64ee7cd76093474d7b9868341afc7ee0f6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 18:51:48 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 18:52:21 2017 +0000
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 @@
   */
  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/exact-image/files/, media-gfx/exact-image/

[Alfredo Tupone]

commit:     52fc47e8c7532de3562a64f8c76447d3f317b920
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 07:04:25 2020 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 07:04:25 2020 +0000
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 <tupone <AT> 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 00000000000..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 (&timestamp);
+   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/files/, media-gfx/exact-image/

[Alfredo Tupone]

commit:     649287aaab870763cf8a436e4212b57a6fcf0c02
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 06:34:59 2020 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 06:34:59 2020 +0000
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 <tupone <AT> 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 00000000000..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/

[Alfredo Tupone]

commit:     61afa189c7cf95602c598d70521f54ac7a08c2fe
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  9 17:39:46 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Mar  9 17:40:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61afa189

media-gfx/exact-image: add 1.2.1

Signed-off-by: Alfredo Tupone <tupone <AT> 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 000000000000..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 000000000000..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,
+     -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;