* [gentoo-commits] repo/gentoo:master commit in: media-gfx/photivo/
@ 2015-09-21 4:59 Ian Delaney
0 siblings, 0 replies; 2+ messages in thread
From: Ian Delaney @ 2015-09-21 4:59 UTC (permalink / raw
To: gentoo-commits
commit: 0e0af4b996ea2af1667d48a7c800c10081731f54
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 04:58:31 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 04:59:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0af4b9
media-gfx/photivo: fix location of header file in live ebuild
patch by wraeth submitted via, and closes, bug #560120
Package-Manager: portage-2.2.20.1
media-gfx/photivo/photivo-9999.ebuild | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/media-gfx/photivo/photivo-9999.ebuild b/media-gfx/photivo/photivo-9999.ebuild
index 9f921e5..b6626ed 100644
--- a/media-gfx/photivo/photivo-9999.ebuild
+++ b/media-gfx/photivo/photivo-9999.ebuild
@@ -8,7 +8,7 @@ inherit qt4-r2 mercurial
DESCRIPTION="Photo processor for RAW and Bitmap images"
HOMEPAGE="http://www.photivo.org"
-EHG_REPO_URI="https://photivo.googlecode.com/hg/"
+EHG_REPO_URI="https://bitbucket.org/Photivo/photivo"
LICENSE="GPL-3"
SLOT="0"
@@ -33,10 +33,18 @@ src_prepare() {
local File
for File in $(find "${S}" -type f); do
if grep -sq ccache ${File}; then
- sed -e 's/ccache//' -i "${File}"
+ sed -e 's/ccache//' -i "${File}" || die
fi
done
+ # bug 560120 - fix includes for lensfun.h
+ sed -s -e 's:lensfun.h:lensfun\/lensfun.h:' \
+ -i ReferenceMaterial/LensFunSample.c \
+ -i Sources/ptConstants.h \
+ -i Sources/ptImage.h \
+ -i Sources/ptImage_Lensfun.cpp \
+ -i Sources/ptLensfun.h || die
+
# useless check (no pkgconfig file is provided)
sed -e "/PKGCONFIG += CImg/d" \
-i photivoProject/photivoProject.pro || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/photivo/
@ 2018-02-27 23:13 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-02-27 23:13 UTC (permalink / raw
To: gentoo-commits
commit: d971396d40b903449c1b7304cfc131a7ad179691
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 23:11:25 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 23:12:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d971396d
media-gfx/photivo: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-gfx/photivo/Manifest | 2 -
media-gfx/photivo/photivo-0_pre20121006.ebuild | 68 --------------------------
media-gfx/photivo/photivo-0_pre20121212.ebuild | 68 --------------------------
3 files changed, 138 deletions(-)
diff --git a/media-gfx/photivo/Manifest b/media-gfx/photivo/Manifest
index 5914c4433cb..bc561190273 100644
--- a/media-gfx/photivo/Manifest
+++ b/media-gfx/photivo/Manifest
@@ -1,3 +1 @@
-DIST photivo-0_pre20121006.tar.gz 2515621 BLAKE2B 116316aaee5d56373eb1b421795e014b98b174d74fac10dbf86fd75e8ff2d1bbdb80ae45ef77fea55b4703e3af6b3f0b3a1217ecf8673d5c49914948bd8ef99f SHA512 fa9763929acd1ea5afcc9ae6a68034f7cc571ea41569eae987ce0d99101b2d17cfa3a71fece4484478c207712e49112824dd496ccb6be80aebe20b5bbf8f2be5
-DIST photivo-0_pre20121212.tar.gz 2606004 BLAKE2B 4e23feeac5bc43d1ee153df246036cb6445a79fefc9f031e7bdaad1a2643ff7b11de39176b9e74aa4218f5e5141ce8a0132bce23586108e4d70b1f1cb67e2dbc SHA512 000ffe58f2b676c2796aff4e445a0968441dd850b397f3b3292dcd3bc2abfdb49a781799c3f85eefff09ce74dede6a1eb846ed4a760ee0ec033043a12f03f967
DIST photivo-0_pre20131115.tar.gz 3145008 BLAKE2B 61051c1f1c49eb3e7ae3c350b27cc4336256a2a299bc84d621f290e4fca6f82c7008dc9f32d0472b2a6ac58c088cfcfa861d06d6a80b5435eeb107fe8f8043e9 SHA512 b98d2dced306325b5ab116c4ba170404a6956d081128095b5315f3b061797290b5a305da73ede9f496659b2b1cc8090cd2f300cfbd311c69db59c8425bd2e047
diff --git a/media-gfx/photivo/photivo-0_pre20121006.ebuild b/media-gfx/photivo/photivo-0_pre20121006.ebuild
deleted file mode 100644
index 7a56b69562e..00000000000
--- a/media-gfx/photivo/photivo-0_pre20121006.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2
-
-DESCRIPTION="Photo processor for RAW and Bitmap images"
-HOMEPAGE="http://www.photivo.org"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gimp"
-
-RDEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- virtual/jpeg
- media-libs/tiff
- media-libs/libpng
- media-gfx/exiv2
- media-libs/lcms:2
- media-libs/lensfun
- sci-libs/fftw:3.0
- media-libs/liblqr
- media-gfx/graphicsmagick[q16,-lcms]
- media-gfx/greycstoration[lapack]
- virtual/lapack
- media-libs/cimg
- gimp? ( media-gfx/gimp )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-${PV/0_pre/}
-
-src_prepare() {
- # remove ccache dependency
- local File
- for File in $(find "${S}" -type f); do
- if grep -sq ccache ${File}; then
- sed -e 's/ccache//' -i "${File}"
- fi
- done
-
- # useless check (no pkgconfig file is provided)
- sed -e "/PKGCONFIG += CImg/d" \
- -i photivoProject/photivoProject.pro || die
- qt4-r2_src_prepare
-}
-
-src_configure() {
- local config="WithSystemCImg"
- if ! use gimp ; then
- config+=" WithoutGimp"
- fi
-
- eqmake4 "CONFIG+=${config}"
-}
-
-src_install() {
- qt4-r2_src_install
-
- if use gimp; then
- exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
- doexe ptGimp
- doexe "mm extern photivo.py"
- fi
-}
diff --git a/media-gfx/photivo/photivo-0_pre20121212.ebuild b/media-gfx/photivo/photivo-0_pre20121212.ebuild
deleted file mode 100644
index a9c304d07f8..00000000000
--- a/media-gfx/photivo/photivo-0_pre20121212.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2
-
-DESCRIPTION="Photo processor for RAW and Bitmap images"
-HOMEPAGE="http://www.photivo.org"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gimp"
-
-RDEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- virtual/jpeg
- media-libs/tiff
- media-libs/libpng
- media-gfx/exiv2
- media-libs/lcms:2
- media-libs/lensfun
- sci-libs/fftw:3.0
- media-libs/liblqr
- media-gfx/graphicsmagick[q16,-lcms]
- media-gfx/greycstoration[lapack]
- virtual/lapack
- media-libs/cimg
- gimp? ( media-gfx/gimp )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-${PV/0_pre/}
-
-src_prepare() {
- # remove ccache dependency
- local File
- for File in $(find "${S}" -type f); do
- if grep -sq ccache ${File}; then
- sed -e 's/ccache//' -i "${File}"
- fi
- done
-
- # useless check (no pkgconfig file is provided)
- sed -e "/PKGCONFIG += CImg/d" \
- -i photivoProject/photivoProject.pro || die
- qt4-r2_src_prepare
-}
-
-src_configure() {
- local config="WithSystemCImg"
- if use gimp ; then
- config+=" WithGimp"
- fi
-
- eqmake4 "CONFIG+=${config}"
-}
-
-src_install() {
- qt4-r2_src_install
-
- if use gimp; then
- exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
- doexe ptGimp
- doexe "mm extern photivo.py"
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-02-27 23:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-21 4:59 [gentoo-commits] repo/gentoo:master commit in: media-gfx/photivo/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2018-02-27 23:13 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox