* [gentoo-commits] proj/gamerlay:master commit in: media-libs/freeimage/
@ 2011-03-09 16:12 Azamat H. Hackimov
0 siblings, 0 replies; 3+ messages in thread
From: Azamat H. Hackimov @ 2011-03-09 16:12 UTC (permalink / raw
To: gentoo-commits
commit: f1787d793a705f19d31a04e73832cb9c5d1b2560
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Mar 9 16:11:16 2011 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Wed Mar 9 16:11:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=f1787d79
[media-libs/freeimage] Using virtual/jpeg instead media-libs/jpeg
(OK, let's try)
(Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)
---
media-libs/freeimage/freeimage-3.15.0.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/media-libs/freeimage/freeimage-3.15.0.ebuild b/media-libs/freeimage/freeimage-3.15.0.ebuild
index cc6f8d9..4990095 100644
--- a/media-libs/freeimage/freeimage-3.15.0.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.0.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="cxx doc"
RDEPEND="
- media-libs/jpeg
+ virtual/jpeg
media-libs/libmng
media-libs/libpng
media-libs/tiff
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: media-libs/freeimage/
@ 2011-08-03 15:58 Azamat H. Hackimov
0 siblings, 0 replies; 3+ messages in thread
From: Azamat H. Hackimov @ 2011-08-03 15:58 UTC (permalink / raw
To: gentoo-commits
commit: c46c1c94b999eddd166db995bfcaee56507168d5
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Aug 3 15:57:21 2011 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Wed Aug 3 15:57:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=c46c1c94
[media-libs/freeimage] 3.15.1 for testing.
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
---
media-libs/freeimage/freeimage-3.15.1.ebuild | 71 ++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/media-libs/freeimage/freeimage-3.15.1.ebuild b/media-libs/freeimage/freeimage-3.15.1.ebuild
new file mode 100644
index 0000000..15f8fe2
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.15.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="http://freeimage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}${MY_PV}.zip
+ doc? ( mirror://sourceforge/${PN}/${MY_PN}${MY_PV}.pdf )
+ http://ftp.gentoo.ru/people/winterheart/distfiles/${MY_PN}-${MY_PV}-patches.tar.bz2"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cxx doc"
+
+RDEPEND="
+ virtual/jpeg
+ media-libs/libmng
+ >=media-libs/libpng-1.5.4
+ media-libs/tiff
+ sys-libs/zlib
+ media-libs/openjpeg
+ media-libs/openexr"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+ append-cflags -std=c99 -D_POSIX_SOURCE # silence warnings from gcc
+ EPATCH_SOURCE="${WORKDIR}/${MY_PN}-${MY_PV}-patches" EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" epatch
+}
+
+src_compile() {
+ emake -f Makefile.gnu || die "emake failed"
+ if use cxx ; then
+ emake -f Makefile.fip || die "emake fip failed"
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" INSTALLDIR="${D}/usr/$(get_libdir)" \
+ -f Makefile.gnu install || die
+ if use cxx ; then
+ emake DESTDIR="${D}" INSTALLDIR="${D}/usr/$(get_libdir)" \
+ -f Makefile.fip install
+ fi
+ dodoc README.linux Whatsnew.txt
+ use doc && dodoc "${DISTDIR}"/${MY_P}.pdf
+
+ ebegin "Installing ${PN}.pc file"
+ dodir /usr/$(get_libdir)/pkgconfig
+ sed \
+ -e "s:@LIBDIR@:$(get_libdir):" \
+ -e "s:@PACKAGENAME@:${MY_PN}:" \
+ -e "s:@DESCRIPTION@:${DESCRIPTION}:" \
+ -e "s:@REQUIRES@:OpenEXR libpng:" \
+ -e "s:@VERSION@:${PV}:" \
+ -e "s:@LIBS@:-lfreeimage -lfreeimageplus:" \
+ -e "s:@EXTLIBS@:-ljpeg -lmng -ltiff -lopenjpeg -lz:" \
+ "${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc" || die
+ eend $?
+ PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists ${PN} \
+ || die ".pc file failed to validate."
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: media-libs/freeimage/
@ 2012-03-02 18:18 Azamat H. Hackimov
0 siblings, 0 replies; 3+ messages in thread
From: Azamat H. Hackimov @ 2012-03-02 18:18 UTC (permalink / raw
To: gentoo-commits
commit: 43e7011f325d405e2b2ce609089e7b7207f5a63c
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri Mar 2 18:17:57 2012 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Fri Mar 2 18:17:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=43e7011f
[media-libs/freeimage] New version 3.15.2.
Rewrited patchlist.
FreeImage now uses TIFF4 and not require libmng.
Splitted pkg-config files for freeimage and freeimageplus.
Minor QA issue fix - symlink for freeimageplus lib.
(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)
---
media-libs/freeimage/freeimage-3.15.0.ebuild | 71 --------------------
...image-3.15.1.ebuild => freeimage-3.15.2.ebuild} | 32 ++++++---
2 files changed, 22 insertions(+), 81 deletions(-)
diff --git a/media-libs/freeimage/freeimage-3.15.0.ebuild b/media-libs/freeimage/freeimage-3.15.0.ebuild
deleted file mode 100644
index 4990095..0000000
--- a/media-libs/freeimage/freeimage-3.15.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="http://freeimage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}${MY_PV}.zip
- doc? ( mirror://sourceforge/${PN}/${MY_PN}${MY_PV}.pdf )
- http://ftp.gentoo.ru/people/winterheart/distfiles/${MY_PN}-${MY_PV}-patches.tar.bz2"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cxx doc"
-
-RDEPEND="
- virtual/jpeg
- media-libs/libmng
- media-libs/libpng
- media-libs/tiff
- sys-libs/zlib
- media-libs/openjpeg
- media-libs/openexr"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
- append-cflags -std=c99 -D_POSIX_SOURCE # silence warnings from gcc
- EPATCH_SOURCE="${WORKDIR}/${MY_PN}-${MY_PV}-patches" EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" epatch
-}
-
-src_compile() {
- emake -f Makefile.gnu || die "emake failed"
- if use cxx ; then
- emake -f Makefile.fip || die "emake fip failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" INSTALLDIR="${D}/usr/$(get_libdir)" \
- -f Makefile.gnu install || die
- if use cxx ; then
- emake DESTDIR="${D}" INSTALLDIR="${D}/usr/$(get_libdir)" \
- -f Makefile.fip install
- fi
- dodoc README.linux Whatsnew.txt
- use doc && dodoc "${DISTDIR}"/${MY_P}.pdf
-
- ebegin "Installing ${PN}.pc file"
- dodir /usr/$(get_libdir)/pkgconfig
- sed \
- -e "s:@LIBDIR@:$(get_libdir):" \
- -e "s:@PACKAGENAME@:${MY_PN}:" \
- -e "s:@DESCRIPTION@:${DESCRIPTION}:" \
- -e "s:@REQUIRES@:OpenEXR libpng:" \
- -e "s:@VERSION@:${PV}:" \
- -e "s:@LIBS@:-lfreeimage -lfreeimageplus:" \
- -e "s:@EXTLIBS@:-ljpeg -lmng -ltiff -lopenjpeg -lz:" \
- "${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc" || die
- eend $?
- PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists ${PN} \
- || die ".pc file failed to validate."
-}
diff --git a/media-libs/freeimage/freeimage-3.15.1.ebuild b/media-libs/freeimage/freeimage-3.15.2.ebuild
similarity index 63%
rename from media-libs/freeimage/freeimage-3.15.1.ebuild
rename to media-libs/freeimage/freeimage-3.15.2.ebuild
index 15f8fe2..6c152da 100644
--- a/media-libs/freeimage/freeimage-3.15.1.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.2.ebuild
@@ -11,18 +11,17 @@ DESCRIPTION="Image library supporting many formats"
HOMEPAGE="http://freeimage.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_PN}${MY_PV}.zip
doc? ( mirror://sourceforge/${PN}/${MY_PN}${MY_PV}.pdf )
- http://ftp.gentoo.ru/people/winterheart/distfiles/${MY_PN}-${MY_PV}-patches.tar.bz2"
+ http://ftp.gentoo.ru/people/winterheart/distfiles/${MY_PN}-${PV}-patches.tar.bz2"
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
+LICENSE="|| ( GPL-2 GPL-3 FIPL-1.0 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cxx doc"
RDEPEND="
virtual/jpeg
- media-libs/libmng
>=media-libs/libpng-1.5.4
- media-libs/tiff
+ >=media-libs/tiff-4
sys-libs/zlib
media-libs/openjpeg
media-libs/openexr"
@@ -33,7 +32,7 @@ S=${WORKDIR}/${MY_PN}
src_prepare() {
append-cflags -std=c99 -D_POSIX_SOURCE # silence warnings from gcc
- EPATCH_SOURCE="${WORKDIR}/${MY_PN}-${MY_PV}-patches" EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/${MY_PN}-${PV}-patches" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
}
@@ -54,7 +53,7 @@ src_install() {
dodoc README.linux Whatsnew.txt
use doc && dodoc "${DISTDIR}"/${MY_P}.pdf
- ebegin "Installing ${PN}.pc file"
+ ebegin "Installing pkg-config file"
dodir /usr/$(get_libdir)/pkgconfig
sed \
-e "s:@LIBDIR@:$(get_libdir):" \
@@ -62,10 +61,23 @@ src_install() {
-e "s:@DESCRIPTION@:${DESCRIPTION}:" \
-e "s:@REQUIRES@:OpenEXR libpng:" \
-e "s:@VERSION@:${PV}:" \
- -e "s:@LIBS@:-lfreeimage -lfreeimageplus:" \
- -e "s:@EXTLIBS@:-ljpeg -lmng -ltiff -lopenjpeg -lz:" \
+ -e "s:@LIBS@:-lfreeimage:" \
+ -e "s:@EXTLIBS@:-ljpeg -ltiff -lopenjpeg -lz:" \
"${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc" || die
- eend $?
PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists ${PN} \
- || die ".pc file failed to validate."
+ || die ".pc file failed to validate."
+ if use cxx ; then
+ sed \
+ -e "s:@LIBDIR@:$(get_libdir):" \
+ -e "s:@PACKAGENAME@:${MY_PN}:" \
+ -e "s:@DESCRIPTION@:${DESCRIPTION}:" \
+ -e "s:@REQUIRES@:OpenEXR libpng:" \
+ -e "s:@VERSION@:${PV}:" \
+ -e "s:@LIBS@:-lfreeimageplus:" \
+ -e "s:@EXTLIBS@:-ljpeg -ltiff -lopenjpeg -lz:" \
+ "${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}plus.pc" || die
+ fi
+ PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists ${PN}plus \
+ || die ".pc file failed to validate."
+ eend $?
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-02 18:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-03 15:58 [gentoo-commits] proj/gamerlay:master commit in: media-libs/freeimage/ Azamat H. Hackimov
-- strict thread matches above, loose matches on Subject: below --
2012-03-02 18:18 Azamat H. Hackimov
2011-03-09 16:12 Azamat H. Hackimov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox