public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2015-12-18 10:13 Michael Sterrett
  0 siblings, 0 replies; 33+ messages in thread
From: Michael Sterrett @ 2015-12-18 10:13 UTC (permalink / raw
  To: gentoo-commits

commit:     e68f595bf7b131eee82624a66a173e2ebead994e
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 09:59:30 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 09:59:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e68f595b

EAPI=5

Package-Manager: portage-2.2.24

 media-libs/freeimage/freeimage-3.15.4.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-libs/freeimage/freeimage-3.15.4.ebuild b/media-libs/freeimage/freeimage-3.15.4.ebuild
index f622782..d85ae33 100644
--- a/media-libs/freeimage/freeimage-3.15.4.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.4.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
-
+EAPI=5
 inherit toolchain-funcs eutils multilib
 
 MY_PN=FreeImage


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2015-12-18 10:13 Michael Sterrett
  0 siblings, 0 replies; 33+ messages in thread
From: Michael Sterrett @ 2015-12-18 10:13 UTC (permalink / raw
  To: gentoo-commits

commit:     949277af841f41ba4a1ac72737ae3c903c5dbde8
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 10:10:00 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 10:10:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949277af

add some slot deps

Package-Manager: portage-2.2.24

 media-libs/freeimage/freeimage-3.15.4.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/freeimage/freeimage-3.15.4.ebuild b/media-libs/freeimage/freeimage-3.15.4.ebuild
index d85ae33..3ec8469 100644
--- a/media-libs/freeimage/freeimage-3.15.4.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.4.ebuild
@@ -23,15 +23,15 @@ IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff"
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
 # uses code from it to handle 16bit<->float conversions.
 RDEPEND="sys-libs/zlib
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
 	mng? ( media-libs/libmng )
 	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0 )
 	raw? ( media-libs/libraw )
 	tiff? (
 		media-libs/ilmbase
-		media-libs/tiff
+		media-libs/tiff:0
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2017-01-22 14:53 Agostino Sarubbo
  0 siblings, 0 replies; 33+ messages in thread
From: Agostino Sarubbo @ 2017-01-22 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     20f270a5e195de5e79122ba409e6a8f38b1bbca9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 14:53:26 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 14:53:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20f270a5

media-libs/freeimage: amd64 stable wrt bug #596350

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.15.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
index 2b58afe..265e20d 100644
--- a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2017-01-22 15:01 Agostino Sarubbo
  0 siblings, 0 replies; 33+ messages in thread
From: Agostino Sarubbo @ 2017-01-22 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1a6b94cd6bddfd518a296ed40f20535ab66605a1
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 15:01:01 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 15:01:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a6b94cd

media-libs/freeimage: x86 stable wrt bug #596350

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.15.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
index 265e20d..76ee702 100644
--- a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2017-01-22 15:38 David Seifert
  0 siblings, 0 replies; 33+ messages in thread
From: David Seifert @ 2017-01-22 15:38 UTC (permalink / raw
  To: gentoo-commits

commit:     fd7524a9b5584c1fa2d8fa0ed209c217bc0dffc7
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 15:38:32 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 15:38:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7524a9

media-libs/freeimage: Remove old

Gentoo-bug: 559006, 596350

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/freeimage/Manifest                |   1 -
 media-libs/freeimage/freeimage-3.15.4.ebuild | 104 ---------------------------
 2 files changed, 105 deletions(-)

diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index f29f982..4ca56fd 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -1,3 +1,2 @@
 DIST FreeImage3154.pdf 1007480 SHA256 455b0ba7cf571f3fc3027681a70abf3c2321d0a4fd7956c5ba58bd7ccb7b5373 SHA512 cebde5e2609c9a0c06b4e07e1c595d7d6714895095cd9935f59c8b2ff9b34116248f5453b41f469f6242d87cae79be82d59f6a9ec0f75b1ea3df61ac1f651b28 WHIRLPOOL a1e8b575d198b61e74db9eb31e9472460158e86989ed822c156cae3f625f6ea0d156e4b7ddffc8b7a1d16a601be39b4cf0e20558d36bb4dd73195fea4faa43e7
 DIST FreeImage3154.zip 5513923 SHA256 eb6361519d33131690a0e726b085a05825e5adf9fb72c752d8d39100e48dc829 SHA512 0db9eb7d0ed8e08e10ff4fa274c4484541ca119c3d437a85fdc3b2d9232bf14a7877c79b1e62c8c99278d7020a9f623c161f2342475f3ee526233404138112cc WHIRLPOOL 2747bb7a35d8de24a1a876616626a9e840495f06da836ce15135aafaa21bc1d8d9cece17f7512424b66edfcc521ed096ea85da5ea5b5b90b4c032bf080356b4d
-DIST freeimage-3.15.4-libjpeg-turbo.patch.gz 5386 SHA256 e33374db55d1de1f12357138c1a2dac750957c36da9ed6052c1a6084312737a6 SHA512 8b1be0d1b63c5e0dc4f6c841f569929d7a91738c29d86bb3c3f15dd7a5a198bdc5fc6612668ac6ed263674caae1e07520eae003a5adf7395e0539f2820d888f6 WHIRLPOOL 75b8f3486ae9ebf34e7467068b0d93d1a9cc4539e27c6cbb29b617d41459333b0dc263f4003a8d81628922c1fb562452dfa39829eef721898809d40ede9498a9

diff --git a/media-libs/freeimage/freeimage-3.15.4.ebuild b/media-libs/freeimage/freeimage-3.15.4.ebuild
deleted file mode 100644
index 3ec8469..00000000
--- a/media-libs/freeimage/freeimage-3.15.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs eutils multilib
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-MY_P=${MY_PN}${MY_PV}
-
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="http://freeimage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf
-	https://dev.gentoo.org/~gienah/2big4tree/media-libs/freeimage/${PN}-3.15.4-libjpeg-turbo.patch.gz"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff"
-
-# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	mng? ( media-libs/libmng )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng:0 )
-	raw? ( media-libs/libraw )
-	tiff? (
-		media-libs/ilmbase
-		media-libs/tiff:0
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	cd Source
-	if has_version ">=media-libs/libjpeg-turbo-1.2.1"; then
-		# Patch from Christian Heimes's fork (thanks) https://bitbucket.org/tiran/freeimageturbo
-		epatch "${DISTDIR}"/${PN}-3.15.4-libjpeg-turbo.patch.gz
-		cp LibJPEG/{jpegcomp.h,jpegint.h} . || die
-	fi
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG || die
-	cd ..
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	sed -i \
-		-e "s:/./:/:g" \
-		-e "s: ./: :g" \
-		-e 's: Source: \\\n\tSource:g' \
-		-e 's: Wrapper: \\\n\tWrapper:g' \
-		-e 's: Examples: \\\n\tExamples:g' \
-		-e 's: TestAPI: \\\n\tTestAPI:g' \
-		-e 's: -ISource: \\\n\t-ISource:g' \
-		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-		Makefile.srcs fipMakefile.srcs || die
-	sed -i \
-		-e "/LibJPEG/d" \
-		-e "/LibPNG/d" \
-		-e "/LibTIFF/d" \
-		-e "/Source\/ZLib/d" \
-		-e "/LibOpenJPEG/d" \
-		-e "/OpenEXR/d" \
-		-e "/LibRawLite/d" \
-		-e "/LibMNG/d" \
-		Makefile.srcs fipMakefile.srcs || die
-	epatch "${FILESDIR}"/${PN}-3.15.4-{unbundling,raw}.patch
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
-	dodoc Whatsnew.txt "${DISTDIR}"/${MY_P}.pdf
-}


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2018-09-12  9:11 Andreas Sturmlechner
  0 siblings, 0 replies; 33+ messages in thread
From: Andreas Sturmlechner @ 2018-09-12  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     23bd5bb2436d9d785eee8b64a80023ab4a8fc31e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 19:25:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 09:10:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23bd5bb2

media-libs/freeimage: Drop unused eutils

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-libs/freeimage/freeimage-3.15.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
index d40deb29685..bd41031de0c 100644
--- a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 MY_PN=FreeImage
 MY_PV=${PV//.}


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2018-09-12 15:54 Andreas Sturmlechner
  0 siblings, 0 replies; 33+ messages in thread
From: Andreas Sturmlechner @ 2018-09-12 15:54 UTC (permalink / raw
  To: gentoo-commits

commit:     84ad431abf46c3733d03e35889f0062cdf38d753
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 15:54:18 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 15:54:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84ad431a

media-libs/freeimage: Put back eutils

Even though no function is used, at least one patch fails without.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/freeimage/freeimage-3.15.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
index bd41031de0c..f79cd6ac5c1 100644
--- a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 MY_PN=FreeImage
 MY_PV=${PV//.}


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2019-04-14 12:44 James Le Cuirot
  0 siblings, 0 replies; 33+ messages in thread
From: James Le Cuirot @ 2019-04-14 12:44 UTC (permalink / raw
  To: gentoo-commits

commit:     305ef0378cb54e6d152b532d0a2082ba0757dd63
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 12:38:21 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 12:44:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=305ef037

media-libs/freeimage: EAPI 7 for 3.18.0

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0.ebuild b/media-libs/freeimage/freeimage-3.18.0.ebuild
index bde23753bf0..35dd66ffd42 100644
--- a/media-libs/freeimage/freeimage-3.18.0.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils toolchain-funcs
 
@@ -34,9 +34,10 @@ RDEPEND="
 		media-libs/tiff:0
 	)
 	webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_PN}
 


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2019-11-26 10:18 Thomas Deutschmann
  0 siblings, 0 replies; 33+ messages in thread
From: Thomas Deutschmann @ 2019-11-26 10:18 UTC (permalink / raw
  To: gentoo-commits

commit:     31092f64982be2e19bd459cf097267f5fa441fab
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 10:13:52 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 10:13:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31092f64

media-libs/freeimage: x86 stable (bug #701174)

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
index fa58c6fc2f7..19897ac6da3 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2019-11-26 12:27 Agostino Sarubbo
  0 siblings, 0 replies; 33+ messages in thread
From: Agostino Sarubbo @ 2019-11-26 12:27 UTC (permalink / raw
  To: gentoo-commits

commit:     a436cec6ff96660aa9c8621f83307711a108ff96
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 12:25:42 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 12:25:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a436cec6

media-libs/freeimage: amd64 stable wrt bug #701174

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
index 19897ac6da3..60e82af7394 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2020-06-14 20:42 James Le Cuirot
  0 siblings, 0 replies; 33+ messages in thread
From: James Le Cuirot @ 2020-06-14 20:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ab0acf2ef2270903efdd78cdb3d5749acad8bb7b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jun 14 14:33:02 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 20:41:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0acf2e

media-libs/freeimage: use HTTPS

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
index 144c53bbacb..e904c560e53 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
@@ -10,7 +10,7 @@ MY_PV=${PV//.}
 MY_P=${MY_PN}${MY_PV}
 
 DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="http://freeimage.sourceforge.net/"
+HOMEPAGE="https://freeimage.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 	mirror://sourceforge/${PN}/${MY_P}.pdf"
 


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2021-02-19  1:17 Thomas Deutschmann
  0 siblings, 0 replies; 33+ messages in thread
From: Thomas Deutschmann @ 2021-02-19  1:17 UTC (permalink / raw
  To: gentoo-commits

commit:     3216adeda4acfe190b6568632d0def17c8070c3c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 01:15:16 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 01:17:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3216aded

media-libs/freeimage: x86 stable (bug #701850)

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
index d15d09ce9bc..08a2730cec5 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2021-02-22 18:57 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2021-02-22 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     9301a0c8c6254149480248d2c35f4134c1a136d1
Author:     Roy Bamford <neddyseagoon <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 14:50:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 18:55:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9301a0c8

media-libs/freeimage: added ~arm64

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Roy Bamford <neddyseagoon <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
index 08a2730cec5..0e7405e5ae6 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2021-03-01 15:55 Thomas Deutschmann
  0 siblings, 0 replies; 33+ messages in thread
From: Thomas Deutschmann @ 2021-03-01 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     08383fc2049c6f212649483f3be40eb38c11543a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  1 15:55:10 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 15:55:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08383fc2

media-libs/freeimage: restore x86 keyword

Fixes: 9301a0c8c ("media-libs/freeimage: added ~arm64")
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
index 0e7405e5ae6..17929a69f04 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2021-07-03 15:39 John Helmert III
  0 siblings, 0 replies; 33+ messages in thread
From: John Helmert III @ 2021-07-03 15:39 UTC (permalink / raw
  To: gentoo-commits

commit:     7dae6201ab92598af08e695826fe123bf9e6027f
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  3 15:38:36 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat Jul  3 15:38:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dae6201

media-libs/freeimage: drop 3.18.0-r1

Bug: https://bugs.gentoo.org/701850
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r1.ebuild | 119 ------------------------
 1 file changed, 119 deletions(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
deleted file mode 100644
index 0193edd9160..00000000000
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edos2unix toolchain-funcs
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-MY_P=${MY_PN}${MY_PV}
-
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="https://freeimage.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf
-	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
-
-# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:0= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		media-libs/ilmbase:=
-		media-libs/tiff:0
-	)
-	webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}
-
-DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
-PATCHES=(
-	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
-	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
-	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
-	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
-	"${FILESDIR}"/${PN}-3.18.0-raw.patch
-	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
-)
-
-src_prepare() {
-	pushd Source >/dev/null || die
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
-	popd >/dev/null || die
-
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	sed -i \
-		-e "s:/./:/:g" \
-		-e "s: ./: :g" \
-		-e 's: Source: \\\n\tSource:g' \
-		-e 's: Wrapper: \\\n\tWrapper:g' \
-		-e 's: Examples: \\\n\tExamples:g' \
-		-e 's: TestAPI: \\\n\tTestAPI:g' \
-		-e 's: -ISource: \\\n\t-ISource:g' \
-		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-		-e 's:INCLS:\nINCLS:g' \
-		Makefile.srcs fipMakefile.srcs || die
-	sed -i \
-		-e "/LibJPEG/d" \
-		-e "/LibJXR/d" \
-		-e "/LibPNG/d" \
-		-e "/LibTIFF/d" \
-		-e "/Source\/ZLib/d" \
-		-e "/LibOpenJPEG/d" \
-		-e "/OpenEXR/d" \
-		-e "/LibRawLite/d" \
-		-e "/LibMNG/d" \
-		-e "/LibWebP/d" \
-		-e "/LibJXR/d" \
-		Makefile.srcs fipMakefile.srcs || die
-
-	default
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			USE_WEBP=$(usex webp) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2021-11-02 10:04 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2021-11-02 10:04 UTC (permalink / raw
  To: gentoo-commits

commit:     39428fadcfe3ebc4b90bc471af27aba690fe2cc7
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Nov  2 05:13:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  2 10:04:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39428fad

media-libs/freeimage: restrict dependency on openexr

Package does not yet support OpenEXR-3, so restrict to :0

Closes: https://bugs.gentoo.org/788349
Closes: https://bugs.gentoo.org/820671
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22793
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r3.ebuild | 121 ++++++++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
new file mode 100644
index 00000000000..f172fa6a221
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix toolchain-funcs
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="https://freeimage.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	mirror://sourceforge/${PN}/${MY_P}.pdf
+	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
+
+# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( media-libs/openexr:0= )
+	png? ( media-libs/libpng:0= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		media-libs/ilmbase:=
+		media-libs/tiff:0
+	)
+	webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+PATCHES=(
+	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
+	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
+	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+	"${FILESDIR}"/${PN}-3.18.0-raw.patch
+	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
+	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
+)
+
+src_prepare() {
+	pushd Source >/dev/null || die
+	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+	popd >/dev/null || die
+
+	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+	sed -i \
+		-e "s:/./:/:g" \
+		-e "s: ./: :g" \
+		-e 's: Source: \\\n\tSource:g' \
+		-e 's: Wrapper: \\\n\tWrapper:g' \
+		-e 's: Examples: \\\n\tExamples:g' \
+		-e 's: TestAPI: \\\n\tTestAPI:g' \
+		-e 's: -ISource: \\\n\t-ISource:g' \
+		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
+		-e 's:INCLS:\nINCLS:g' \
+		Makefile.srcs fipMakefile.srcs || die
+	sed -i \
+		-e "/LibJPEG/d" \
+		-e "/LibJXR/d" \
+		-e "/LibPNG/d" \
+		-e "/LibTIFF/d" \
+		-e "/Source\/ZLib/d" \
+		-e "/LibOpenJPEG/d" \
+		-e "/OpenEXR/d" \
+		-e "/LibRawLite/d" \
+		-e "/LibMNG/d" \
+		-e "/LibWebP/d" \
+		-e "/LibJXR/d" \
+		Makefile.srcs fipMakefile.srcs || die
+
+	default
+}
+
+foreach_make() {
+	local m
+	for m in Makefile.{gnu,fip} ; do
+		emake -f ${m} \
+			USE_EXR=$(usex openexr) \
+			USE_JPEG=$(usex jpeg) \
+			USE_JPEG2K=$(usex jpeg2k) \
+			USE_MNG=$(usex mng) \
+			USE_PNG=$(usex png) \
+			USE_TIFF=$(usex tiff) \
+			USE_RAW=$(usex raw) \
+			USE_WEBP=$(usex webp) \
+			$(usex static-libs '' STATICLIB=) \
+			"$@"
+	done
+}
+
+src_compile() {
+	tc-export AR PKG_CONFIG
+	foreach_make \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN}
+}
+
+src_install() {
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2021-11-07 12:26 Jakov Smolić
  0 siblings, 0 replies; 33+ messages in thread
From: Jakov Smolić @ 2021-11-07 12:26 UTC (permalink / raw
  To: gentoo-commits

commit:     400192215e293282989545bb8b330b6538aa752a
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  7 12:26:17 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 12:26:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40019221

media-libs/freeimage: Stabilize 3.18.0-r3 amd64, #820671

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
index f172fa6a221..14443fdb4ea 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2021-11-08  6:22 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2021-11-08  6:22 UTC (permalink / raw
  To: gentoo-commits

commit:     96b53dbab112e83f8290608ffda8dc95f592737f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  8 06:22:29 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov  8 06:22:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b53dba

media-libs/freeimage: Stabilize 3.18.0-r3 x86, #820671

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

 media-libs/freeimage/freeimage-3.18.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
index 14443fdb4ea..c313772f8d8 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2021-12-02  2:50 Yixun Lan
  0 siblings, 0 replies; 33+ messages in thread
From: Yixun Lan @ 2021-12-02  2:50 UTC (permalink / raw
  To: gentoo-commits

commit:     2db9725a559d8a142ab9330f1d9394a499d64bed
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 07:54:17 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Dec  2 02:43:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db9725a

media-libs/freeimage: keyword ~riscv

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
index c313772f8d8e..e0aea4f7eb1b 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2021-12-28 17:10 Ionen Wolkens
  0 siblings, 0 replies; 33+ messages in thread
From: Ionen Wolkens @ 2021-12-28 17:10 UTC (permalink / raw
  To: gentoo-commits

commit:     e4206eecd6d7f28fae7da773b3f98672a91aa852
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 15:26:42 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 17:00:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4206eec

media-libs/freeimage: drop 3.18.0-r2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r2.ebuild | 121 ------------------------
 1 file changed, 121 deletions(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
deleted file mode 100644
index 3240d3021ec0..000000000000
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edos2unix toolchain-funcs
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-MY_P=${MY_PN}${MY_PV}
-
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="https://freeimage.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf
-	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
-
-# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:0= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		media-libs/ilmbase:=
-		media-libs/tiff:0
-	)
-	webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}
-
-DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
-PATCHES=(
-	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
-	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
-	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
-	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
-	"${FILESDIR}"/${PN}-3.18.0-raw.patch
-	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
-	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
-	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
-)
-
-src_prepare() {
-	pushd Source >/dev/null || die
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
-	popd >/dev/null || die
-
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	sed -i \
-		-e "s:/./:/:g" \
-		-e "s: ./: :g" \
-		-e 's: Source: \\\n\tSource:g' \
-		-e 's: Wrapper: \\\n\tWrapper:g' \
-		-e 's: Examples: \\\n\tExamples:g' \
-		-e 's: TestAPI: \\\n\tTestAPI:g' \
-		-e 's: -ISource: \\\n\t-ISource:g' \
-		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-		-e 's:INCLS:\nINCLS:g' \
-		Makefile.srcs fipMakefile.srcs || die
-	sed -i \
-		-e "/LibJPEG/d" \
-		-e "/LibJXR/d" \
-		-e "/LibPNG/d" \
-		-e "/LibTIFF/d" \
-		-e "/Source\/ZLib/d" \
-		-e "/LibOpenJPEG/d" \
-		-e "/OpenEXR/d" \
-		-e "/LibRawLite/d" \
-		-e "/LibMNG/d" \
-		-e "/LibWebP/d" \
-		-e "/LibJXR/d" \
-		Makefile.srcs fipMakefile.srcs || die
-
-	default
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			USE_WEBP=$(usex webp) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2022-02-18  2:32 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2022-02-18  2:32 UTC (permalink / raw
  To: gentoo-commits

commit:     f86c9215e901e8a610e621d2b65795f2cbcad070
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 02:32:12 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 02:32:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f86c9215

media-libs/freeimage: TIFF needs OpenEXR too

But put off simplifying the depenencies for now (dropping USE=openexr, maybe?)
to avoid even more churn than necessary.

Closes: https://bugs.gentoo.org/833494
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{freeimage-3.18.0-r4.ebuild => freeimage-3.18.0-r5.ebuild}     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r4.ebuild b/media-libs/freeimage/freeimage-3.18.0-r5.ebuild
similarity index 95%
rename from media-libs/freeimage/freeimage-3.18.0-r4.ebuild
rename to media-libs/freeimage/freeimage-3.18.0-r5.ebuild
index 5d9ec9c1f57c..c13a691d0db8 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r4.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r5.ebuild
@@ -20,18 +20,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
-# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
+# The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
 # uses code from it to handle 16bit<->float conversions.
 RDEPEND="
 	sys-libs/zlib
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	mng? ( media-libs/libmng:= )
-	openexr? ( media-libs/openexr:0= )
+	openexr? ( media-libs/openexr:= )
 	png? ( media-libs/libpng:0= )
 	raw? ( media-libs/libraw:= )
 	tiff? (
-		dev-libs/imath:=
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:=
 		media-libs/tiff:0
 	)
 	webp? ( media-libs/libwebp:= )"


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2022-02-19 19:47 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2022-02-19 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     63d3a1ddaccd8cff51d507c6ebd3b8e5ba5a1ae1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 19:45:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 19:45:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d3a1dd

media-libs/freeimage: simplify OpenEXR 3 dependency

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

 .../{freeimage-3.18.0-r5.ebuild => freeimage-3.18.0-r6.ebuild}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r5.ebuild b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
similarity index 99%
rename from media-libs/freeimage/freeimage-3.18.0-r5.ebuild
rename to media-libs/freeimage/freeimage-3.18.0-r6.ebuild
index c13a691d0db8..bca21a612902 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r5.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	raw? ( media-libs/libraw:= )
 	tiff? (
 		>=dev-libs/imath-3.1.4-r2:=
-		>=media-libs/openexr-3:=
+		>=media-libs/openexr-3:0=
 		media-libs/tiff:0
 	)
 	webp? ( media-libs/libwebp:= )"


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2022-02-19 23:48 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2022-02-19 23:48 UTC (permalink / raw
  To: gentoo-commits

commit:     e162de72d7c304757c5997e0ee97036c87edbee3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 23:46:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 23:47:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e162de72

media-libs/freeimage: restore dropped libraw patch

Bug: https://bugs.gentoo.org/833158
Reported-by: Robin Couto <dbtx+gn2 <AT> ozono.us>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r6.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
index bca21a612902..ecb5222045b5 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
 	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
 	"${FILESDIR}"/${PN}-3.18.0-openexr-3-imath.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2022-02-28  5:21 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2022-02-28  5:21 UTC (permalink / raw
  To: gentoo-commits

commit:     086633ff13d974b0a361b78fcf57bc8bf460f0d2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 05:20:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 05:20:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086633ff

media-libs/freeimage: Stabilize 3.18.0-r6 amd64, #833158

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

 media-libs/freeimage/freeimage-3.18.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
index ecb5222045b5..0fd79d7b13d5 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2022-02-28 23:58 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2022-02-28 23:58 UTC (permalink / raw
  To: gentoo-commits

commit:     b0ef8e8228ca84b38a1f9be5f57e97709fb797ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 23:57:17 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 23:57:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ef8e82

media-libs/freeimage: Stabilize 3.18.0-r6 x86, #833158

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

 media-libs/freeimage/freeimage-3.18.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
index 0fd79d7b13d5..fc7744569906 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2022-05-30 20:27 Ionen Wolkens
  0 siblings, 0 replies; 33+ messages in thread
From: Ionen Wolkens @ 2022-05-30 20:27 UTC (permalink / raw
  To: gentoo-commits

commit:     2955cb2f8d9901aa2efde212fa80a7d100be75e5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 19:53:38 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 30 20:25:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2955cb2f

media-libs/freeimage: limit to <tiff-4.4.0 in stable

This relies on a tiff internal function that was replaced in
4.4.0 by a public function, but a simple swap means needing
to depend on >=4.4.0 which is not yet stable. Force dependency
to prevent mishaps.

Also update deprecated jpeg dep while revbumping.

Bug: https://bugs.gentoo.org/848531
Bug: https://bugs.gentoo.org/848534
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../{freeimage-3.18.0-r6.ebuild => freeimage-3.18.0-r7.ebuild}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild b/media-libs/freeimage/freeimage-3.18.0-r7.ebuild
similarity index 98%
rename from media-libs/freeimage/freeimage-3.18.0-r6.ebuild
rename to media-libs/freeimage/freeimage-3.18.0-r7.ebuild
index fc7744569906..7f916489e378 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r7.ebuild
@@ -24,7 +24,7 @@ IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 # uses code from it to handle 16bit<->float conversions.
 RDEPEND="
 	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	mng? ( media-libs/libmng:= )
 	openexr? ( media-libs/openexr:= )
@@ -33,7 +33,7 @@ RDEPEND="
 	tiff? (
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
-		media-libs/tiff:0
+		<media-libs/tiff-4.4.0
 	)
 	webp? ( media-libs/libwebp:= )"
 DEPEND="${RDEPEND}"


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2022-06-29  7:52 Agostino Sarubbo
  0 siblings, 0 replies; 33+ messages in thread
From: Agostino Sarubbo @ 2022-06-29  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     261b5e0fb2ab069edbe3afa8d1f62c5924167946
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 07:52:17 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 07:52:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=261b5e0f

media-libs/freeimage: amd64 stable wrt bug #854828

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r8.ebuild b/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
index 826ed42b593c..a262dc8058d9 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2022-06-30  7:03 Agostino Sarubbo
  0 siblings, 0 replies; 33+ messages in thread
From: Agostino Sarubbo @ 2022-06-30  7:03 UTC (permalink / raw
  To: gentoo-commits

commit:     7ba08e005d793b47add0c6646a6d84d3c98c13fe
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 07:03:40 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 07:03:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba08e00

media-libs/freeimage: x86 stable wrt bug #854828

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r8.ebuild b/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
index a262dc8058d9..2616dbf53ee7 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2022-07-03  5:33 Ionen Wolkens
  0 siblings, 0 replies; 33+ messages in thread
From: Ionen Wolkens @ 2022-07-03  5:33 UTC (permalink / raw
  To: gentoo-commits

commit:     b9a80a6b3bd48789b4edde44a8fc98009cdb6acd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 05:09:31 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 05:09:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9a80a6b

media-libs/freeimage: drop 3.18.0-r3, 3.18.0-r7

Cleanup now not to block upcoming <tiff-4.0.0 security cleanup.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r3.ebuild | 121 -----------------------
 media-libs/freeimage/freeimage-3.18.0-r7.ebuild | 124 ------------------------
 2 files changed, 245 deletions(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
deleted file mode 100644
index e0aea4f7eb1b..000000000000
--- a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix toolchain-funcs
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-MY_P=${MY_PN}${MY_PV}
-
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="https://freeimage.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf
-	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
-
-# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( media-libs/openexr:0= )
-	png? ( media-libs/libpng:0= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		media-libs/ilmbase:=
-		media-libs/tiff:0
-	)
-	webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}
-
-DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
-PATCHES=(
-	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
-	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
-	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
-	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
-	"${FILESDIR}"/${PN}-3.18.0-raw.patch
-	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
-	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
-	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
-)
-
-src_prepare() {
-	pushd Source >/dev/null || die
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
-	popd >/dev/null || die
-
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	sed -i \
-		-e "s:/./:/:g" \
-		-e "s: ./: :g" \
-		-e 's: Source: \\\n\tSource:g' \
-		-e 's: Wrapper: \\\n\tWrapper:g' \
-		-e 's: Examples: \\\n\tExamples:g' \
-		-e 's: TestAPI: \\\n\tTestAPI:g' \
-		-e 's: -ISource: \\\n\t-ISource:g' \
-		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-		-e 's:INCLS:\nINCLS:g' \
-		Makefile.srcs fipMakefile.srcs || die
-	sed -i \
-		-e "/LibJPEG/d" \
-		-e "/LibJXR/d" \
-		-e "/LibPNG/d" \
-		-e "/LibTIFF/d" \
-		-e "/Source\/ZLib/d" \
-		-e "/LibOpenJPEG/d" \
-		-e "/OpenEXR/d" \
-		-e "/LibRawLite/d" \
-		-e "/LibMNG/d" \
-		-e "/LibWebP/d" \
-		-e "/LibJXR/d" \
-		Makefile.srcs fipMakefile.srcs || die
-
-	default
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			USE_WEBP=$(usex webp) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
-	einstalldocs
-}

diff --git a/media-libs/freeimage/freeimage-3.18.0-r7.ebuild b/media-libs/freeimage/freeimage-3.18.0-r7.ebuild
deleted file mode 100644
index 7f916489e378..000000000000
--- a/media-libs/freeimage/freeimage-3.18.0-r7.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix toolchain-funcs
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-MY_P=${MY_PN}${MY_PV}
-
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="https://freeimage.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf
-	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
-
-# The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="
-	sys-libs/zlib
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:0= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		>=dev-libs/imath-3.1.4-r2:=
-		>=media-libs/openexr-3:0=
-		<media-libs/tiff-4.4.0
-	)
-	webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}
-
-DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
-
-PATCHES=(
-	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
-	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
-	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
-	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
-	"${FILESDIR}"/${PN}-3.18.0-raw.patch
-	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
-	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
-	"${FILESDIR}"/${PN}-3.18.0-openexr-3-imath.patch
-	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
-)
-
-src_prepare() {
-	pushd Source >/dev/null || die
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
-	popd >/dev/null || die
-
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	sed -i \
-		-e "s:/./:/:g" \
-		-e "s: ./: :g" \
-		-e 's: Source: \\\n\tSource:g' \
-		-e 's: Wrapper: \\\n\tWrapper:g' \
-		-e 's: Examples: \\\n\tExamples:g' \
-		-e 's: TestAPI: \\\n\tTestAPI:g' \
-		-e 's: -ISource: \\\n\t-ISource:g' \
-		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-		-e 's:INCLS:\nINCLS:g' \
-		Makefile.srcs fipMakefile.srcs || die
-	sed -i \
-		-e "/LibJPEG/d" \
-		-e "/LibJXR/d" \
-		-e "/LibPNG/d" \
-		-e "/LibTIFF/d" \
-		-e "/Source\/ZLib/d" \
-		-e "/LibOpenJPEG/d" \
-		-e "/OpenEXR/d" \
-		-e "/LibRawLite/d" \
-		-e "/LibMNG/d" \
-		-e "/LibWebP/d" \
-		-e "/LibJXR/d" \
-		Makefile.srcs fipMakefile.srcs || die
-
-	default
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			USE_WEBP=$(usex webp) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2023-07-26  6:32 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2023-07-26  6:32 UTC (permalink / raw
  To: gentoo-commits

commit:     59f980b406cdff3e27cf9c718aa89d7c43b9ed97
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Thu Jul 13 18:13:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 06:32:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f980b4

media-libs/freeimage: Add -std=c++14 in CXXFLAGS for clang-16 compatibility

Closes: https://bugs.gentoo.org/909421
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/31867
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r11.ebuild | 131 +++++++++++++++++++++++
 1 file changed, 131 insertions(+)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
new file mode 100644
index 000000000000..1a10247f8be9
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix toolchain-funcs flag-o-matic
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="https://freeimage.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	mirror://sourceforge/${PN}/${MY_P}.pdf
+	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
+
+# The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+	sys-libs/zlib
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+		>=media-libs/tiff-4.4.0:=
+	)
+	webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+
+PATCHES=(
+	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
+	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
+	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+	"${FILESDIR}"/${PN}-3.18.0-raw.patch
+	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
+	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
+	"${FILESDIR}"/${PN}-3.18.0-openexr-3-imath.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
+	"${FILESDIR}"/${PN}-3.18.0-tiff-4.4.0.patch
+	"${FILESDIR}"/${PN}-3.18.0-null-to-false.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.21.0.patch
+)
+
+src_prepare() {
+	pushd Source >/dev/null || die
+	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+	popd >/dev/null || die
+
+	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+	sed -i \
+		-e "s:/./:/:g" \
+		-e "s: ./: :g" \
+		-e 's: Source: \\\n\tSource:g' \
+		-e 's: Wrapper: \\\n\tWrapper:g' \
+		-e 's: Examples: \\\n\tExamples:g' \
+		-e 's: TestAPI: \\\n\tTestAPI:g' \
+		-e 's: -ISource: \\\n\t-ISource:g' \
+		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
+		-e 's:INCLS:\nINCLS:g' \
+		Makefile.srcs fipMakefile.srcs || die
+	sed -i \
+		-e "/LibJPEG/d" \
+		-e "/LibJXR/d" \
+		-e "/LibPNG/d" \
+		-e "/LibTIFF/d" \
+		-e "/Source\/ZLib/d" \
+		-e "/LibOpenJPEG/d" \
+		-e "/OpenEXR/d" \
+		-e "/LibRawLite/d" \
+		-e "/LibMNG/d" \
+		-e "/LibWebP/d" \
+		-e "/LibJXR/d" \
+		Makefile.srcs fipMakefile.srcs || die
+
+	default
+}
+
+foreach_make() {
+	local m
+	for m in Makefile.{gnu,fip} ; do
+		emake -f ${m} \
+			USE_EXR=$(usex openexr) \
+			USE_JPEG=$(usex jpeg) \
+			USE_JPEG2K=$(usex jpeg2k) \
+			USE_MNG=$(usex mng) \
+			USE_PNG=$(usex png) \
+			USE_TIFF=$(usex tiff) \
+			USE_RAW=$(usex raw) \
+			USE_WEBP=$(usex webp) \
+			$(usex static-libs '' STATICLIB=) \
+			"$@"
+	done
+}
+
+src_compile() {
+	tc-export AR PKG_CONFIG
+
+	# Uses std::auto_ptr (deprecated in c++11, removed in c++17)
+	append-cxxflags '-std=c++14'
+
+	foreach_make \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN}
+}
+
+src_install() {
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2023-09-27  6:05 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2023-09-27  6:05 UTC (permalink / raw
  To: gentoo-commits

commit:     5ff209ffef9f9301c6e32b99902a16795798671b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 06:03:41 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 06:03:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff209ff

media-libs/freeimage: Stabilize 3.18.0-r11 amd64, #914808

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

 media-libs/freeimage/freeimage-3.18.0-r11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
index 1a10247f8be9..906feb3435c8 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2023-09-28  0:21 Sam James
  0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2023-09-28  0:21 UTC (permalink / raw
  To: gentoo-commits

commit:     8b166df94cd8512a816fb72551776f28c32e9b28
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 00:20:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 00:20:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b166df9

media-libs/freeimage: Stabilize 3.18.0-r11 x86, #914808

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

 media-libs/freeimage/freeimage-3.18.0-r11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
index 906feb3435c8..727d83891786 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/
@ 2024-03-13 15:03 Arthur Zamarin
  0 siblings, 0 replies; 33+ messages in thread
From: Arthur Zamarin @ 2024-03-13 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     3676696a7edc59f6b4da1c77e696b3105b5dce53
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 14:56:42 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 15:03:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3676696a

media-libs/freeimage: Stabilize 3.18.0-r11 arm64, #926894

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-libs/freeimage/freeimage-3.18.0-r11.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
index 727d83891786..c07115b6c4f9 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and


^ permalink raw reply related	[flat|nested] 33+ messages in thread
end of thread, other threads:[~2024-03-13 15:03 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-30 20:27 [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/ Ionen Wolkens
  -- strict thread matches above, loose matches on Subject: below --
2024-03-13 15:03 Arthur Zamarin
2023-09-28  0:21 Sam James
2023-09-27  6:05 Sam James
2023-07-26  6:32 Sam James
2022-07-03  5:33 Ionen Wolkens
2022-06-30  7:03 Agostino Sarubbo
2022-06-29  7:52 Agostino Sarubbo
2022-02-28 23:58 Sam James
2022-02-28  5:21 Sam James
2022-02-19 23:48 Sam James
2022-02-19 19:47 Sam James
2022-02-18  2:32 Sam James
2021-12-28 17:10 Ionen Wolkens
2021-12-02  2:50 Yixun Lan
2021-11-08  6:22 Sam James
2021-11-07 12:26 Jakov Smolić
2021-11-02 10:04 Sam James
2021-07-03 15:39 John Helmert III
2021-03-01 15:55 Thomas Deutschmann
2021-02-22 18:57 Sam James
2021-02-19  1:17 Thomas Deutschmann
2020-06-14 20:42 James Le Cuirot
2019-11-26 12:27 Agostino Sarubbo
2019-11-26 10:18 Thomas Deutschmann
2019-04-14 12:44 James Le Cuirot
2018-09-12 15:54 Andreas Sturmlechner
2018-09-12  9:11 Andreas Sturmlechner
2017-01-22 15:38 David Seifert
2017-01-22 15:01 Agostino Sarubbo
2017-01-22 14:53 Agostino Sarubbo
2015-12-18 10:13 Michael Sterrett
2015-12-18 10:13 Michael Sterrett

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