[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/, media-gfx/hugin/files/
commit: 868cd36143314836dce0e40be7e3f2bb25eb0a3c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Mar 14 09:06:58 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 24 21:02:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868cd361
media-gfx/hugin: drop 2022.0.0, 2022.0.0-r2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/hugin/Manifest | 1 -
.../hugin/files/hugin-2022.0.0-exiv2-0.28.patch| 99
media-gfx/hugin/hugin-2022.0.0-r2.ebuild | 102 -
media-gfx/hugin/hugin-2022.0.0.ebuild | 99
4 files changed, 301 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 9cbac297857f..cdb38af8edc9 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1 @@
-DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B
ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be
SHA512
752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B
5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89
SHA512
f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8
diff --git a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch
b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch
deleted file mode 100644
index dff74132b48f..
--- a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Patch originally taken from ArchLinux, modified to be backwards compatible.
-
-diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp
a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 24 19:13:20 2023 +0200
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp Mon Jun 05 00:31:19 2023 +0200
-@@ -40,7 +40,11 @@
- Exiv2::ExifData::iterator itr =
exifData.findKey(Exiv2::ExifKey(keyName));
- if (itr != exifData.end() && itr->count())
- {
-+#if EXIV2_TEST_VERSION(0,28,0)
-+value = itr->toUint32();
-+#else
- value = itr->toLong();
-+#endif
- return true;
- }
- else
-@@ -165,7 +169,11 @@
- {
- if(it!=exifData.end() && it->count())
- {
-+#if EXIV2_TEST_VERSION(0,28,0)
-+return it->toUint32();
-+#else
- return it->toLong();
-+#endif
- }
- return 0;
- };
-@@ -600,4 +608,4 @@
- };
-
- }; //namespace Exiv2Helper
--}; //namespace HuginBase
-\ No newline at end of file
-+}; //namespace HuginBase
-diff -r 79cd11a7a66f src/hugin_base/panodata/SrcPanoImage.cpp
a/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 24 19:13:20 2023 +0200
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp Mon Jun 05 00:31:19 2023 +0200
-@@ -384,7 +384,11 @@
- pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
- if (pos != xmpData.end())
- {
-+#if EXIV2_TEST_VERSION(0,28,0)
-+croppedWidth = pos->toUint32();
-+#else
- croppedWidth = pos->toLong();
-+#endif
- }
- else
- {
-@@ -394,7 +398,11 @@
- pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
- if (pos != xmpData.end())
- {
-+#if EXIV2_TEST_VERSION(0,28,0)
-+croppedHeight = pos->toUint32();
-+#else
- croppedHeight = pos->toLong();
-+#endif
- }
- else
- {
-@@ -408,7 +416,11 @@
- double hfov = 0;
- if (pos != xmpData.end())
- {
-+#if EXIV2_TEST_VERSION(0,28,0)
-+hfov = 360 * croppedWidth /
(double)pos->toUint32();
-+#else
- hfov = 360 * croppedWidth / (double)pos->toLong();
-+#endif
- }
- else
- {
-@@ -419,7 +431,11 @@
- pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
- if (pos != xmpData.end())
- {
-+#if EXIV2_TEST_VERSION(0,28,0)
-+fullHeight = pos->toUint32();
-+#else
- fullHeight = pos->toLong();
-+#endif
- }
- else
- {
-@@ -430,7 +446,11 @@
- pos =
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 2f873155767680e37b942ab41f3b309640ff9a03
Author: Sam James gentoo org>
AuthorDate: Wed Mar 13 00:53:21 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Mar 13 00:53:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f873155
media-gfx/hugin: Stabilize 2023.0.0-r1 arm64, #926338
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/hugin-2023.0.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
index 40d1a080ad48..093270613d29 100644
--- a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 30a0c2286381cbd6bdd91db0e9b1ed393ba9b2ab
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Mar 12 14:37:57 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Mar 12 14:37:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30a0c228
media-gfx/hugin: Stabilize 2023.0.0-r1 amd64, #926338
Signed-off-by: Arthur Zamarin gentoo.org>
media-gfx/hugin/hugin-2023.0.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
index d5b856010292..40d1a080ad48 100644
--- a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: a7796141b51a1c4f2eb0da0221fab1e128e7f667
Author: Sam James gentoo org>
AuthorDate: Tue Mar 12 00:35:37 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 12 00:39:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7796141
media-gfx/hugin: drop stale zthread dependency
Dropped upstream in
https://sourceforge.net/p/hugin/hugin/ci/7811fb3dab6c7d5cfd1133df40e1f0845a173d62/
from 2014.
Someone posted about this on /r/gentoo a few weeks ago and I found it curious
but didn't dig into it more. After coming across bug #924925 for zthread, I
thought
I'd take a deeper look.
hugin still has the CMake module for zthread but it's not called anywhere, and
the bundled copy in foreign/ it references is long-gone too.
Note that hugin also, since 2014, supports OpenMP as a replacement, but handling
that in a separate commit as can't do that in stable like we are here.
Bug: https://bugs.gentoo.org/924925
Bug: https://bugs.gentoo.org/926788
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/{hugin-2022.0.0-r1.ebuild => hugin-2022.0.0-r2.ebuild} | 3 +--
media-gfx/hugin/{hugin-2023.0.0.ebuild => hugin-2023.0.0-r1.ebuild}| 3 +--
media-gfx/hugin/hugin-.ebuild | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/media-gfx/hugin/hugin-2022.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2022.0.0-r2.ebuild
similarity index 97%
rename from media-gfx/hugin/hugin-2022.0.0-r1.ebuild
rename to media-gfx/hugin/hugin-2022.0.0-r2.ebuild
index 8fe47c8a270b..1902077f9eda 100644
--- a/media-gfx/hugin/hugin-2022.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2022.0.0-r2.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=7
@@ -22,7 +22,6 @@ IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\
l10n_})"
CDEPEND="
dev-db/sqlite:3
dev-libs/boost:=
- dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2:=
media-libs/freeglut
diff --git a/media-gfx/hugin/hugin-2023.0.0.ebuild
b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
similarity index 97%
rename from media-gfx/hugin/hugin-2023.0.0.ebuild
rename to media-gfx/hugin/hugin-2023.0.0-r1.ebuild
index 934bab607e9c..d5b856010292 100644
--- a/media-gfx/hugin/hugin-2023.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2023.0.0-r1.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=7
@@ -22,7 +22,6 @@ IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\
l10n_})"
CDEPEND="
dev-db/sqlite:3
dev-libs/boost:=
- dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2:=
media-libs/freeglut
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 06c2a45cde7f..aec868af9672 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.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=7
@@ -24,7 +24,6 @@ IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\
l10n_})"
CDEPEND="
dev-db/sqlite:3
dev-libs/boost:=
- dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2:=
media-libs/freeglut
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: c90c94e0fedbd69314d87830e3b75905f5d030f8
Author: Markus Meier gentoo org>
AuthorDate: Thu Dec 21 18:29:53 2023 +
Commit: Markus Meier gentoo org>
CommitDate: Thu Dec 21 18:29:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90c94e0
media-gfx/hugin: version bump and wxGTK 3.2 update for bug #917630
Signed-off-by: Markus Meier gentoo.org>
media-gfx/hugin/Manifest | 1 +
.../{hugin-.ebuild => hugin-2023.0.0.ebuild} | 20 +---
media-gfx/hugin/hugin-.ebuild| 4 ++--
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index f845f64e758e..9cbac297857f 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B
ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be
SHA512
752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
+DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B
5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89
SHA512
f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-2023.0.0.ebuild
similarity index 82%
copy from media-gfx/hugin/hugin-.ebuild
copy to media-gfx/hugin/hugin-2023.0.0.ebuild
index f73101d06bae..934bab607e9c 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-2023.0.0.ebuild
@@ -3,20 +3,18 @@
EAPI=7
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{9..11} )
+WX_GTK_VER="3.2-gtk3"
+PYTHON_COMPAT=( python3_{9..12} )
-inherit mercurial python-single-r1 wxwidgets cmake xdg
+inherit python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
-SRC_URI=""
-EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin;
-EHG_PROJECT="${PN}-${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
@@ -65,6 +63,10 @@ pkg_setup() {
}
src_prepare() {
+ sed -i \
+ -e "/COMMAND.*GZIP/d" \
+ -e "s/\.gz//g" \
+ "${S}"/doc/CMakeLists.txt || die
cmake_src_prepare
}
@@ -72,10 +74,6 @@ src_configure() {
local mycmakeargs=(
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
- # Temporary workaround for bug #833443. Can be dropped when
- # we switch to wxgtk-3.2, but complications for that remain
- # w/ egl+wayland.
- -DUSE_GDKBACKEND_X11=on
)
cmake_src_configure
}
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index f73101d06bae..06c2a45cde7f 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{9..11} )
+WX_GTK_VER="3.2-gtk3"
+PYTHON_COMPAT=( python3_{9..12} )
inherit mercurial python-single-r1 wxwidgets cmake xdg
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 92729a9da9d9a66f3b6984b2df12e9d93eea6c7b
Author: Sam James gentoo org>
AuthorDate: Sat Sep 23 20:06:48 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Sep 23 20:06:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92729a9d
media-gfx/hugin: disable Wayland backend
As noted in the bug, this is broken w/ wxgtk-3.0. Just go for the X backend
for now until we can move to wxgtk-3.2, but we can't quite do that yet because
of issues w/ egl+wayland.
Closes: https://bugs.gentoo.org/833443
Signed-off-by: Sam James gentoo.org>
.../{hugin-.ebuild => hugin-2022.0.0-r1.ebuild}| 18 +-
media-gfx/hugin/hugin-.ebuild | 4
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-2022.0.0-r1.ebuild
similarity index 80%
copy from media-gfx/hugin/hugin-.ebuild
copy to media-gfx/hugin/hugin-2022.0.0-r1.ebuild
index 9411d0ca3b31..8fe47c8a270b 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-2022.0.0-r1.ebuild
@@ -6,17 +6,15 @@ EAPI=7
WX_GTK_VER="3.0-gtk3"
PYTHON_COMPAT=( python3_{9..11} )
-inherit mercurial python-single-r1 wxwidgets cmake xdg
+inherit python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
-SRC_URI=""
-EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin;
-EHG_PROJECT="${PN}-${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
@@ -59,12 +57,18 @@ DOCS=( authors.txt README TODO )
S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906468
+
pkg_setup() {
use python && python-single-r1_pkg_setup
setup-wxwidgets
}
src_prepare() {
+ sed -i \
+ -e "/COMMAND.*GZIP/d" \
+ -e "s/\.gz//g" \
+ "${S}"/doc/CMakeLists.txt || die
cmake_src_prepare
}
@@ -72,6 +76,10 @@ src_configure() {
local mycmakeargs=(
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
+ # Temporary workaround for bug #833443. Can be dropped when
+ # we switch to wxgtk-3.2, but complications for that remain
+ # w/ egl+wayland.
+ -DUSE_GDKBACKEND_X11=on
)
cmake_src_configure
}
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 9411d0ca3b31..f73101d06bae 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -72,6 +72,10 @@ src_configure() {
local mycmakeargs=(
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
+ # Temporary workaround for bug #833443. Can be dropped when
+ # we switch to wxgtk-3.2, but complications for that remain
+ # w/ egl+wayland.
+ -DUSE_GDKBACKEND_X11=on
)
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/files/
commit: 3505c88418253cf329b0ca92a4c25ed1c98d4c3d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 8 19:50:56 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 8 19:51:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3505c884
media-gfx/hugin: Drop mistakenly added file
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/hugin-2022.0.0-exiv2-0.28.patch.orig | 76 --
1 file changed, 76 deletions(-)
diff --git a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch.orig
b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch.orig
deleted file mode 100644
index b1653a312cab..
--- a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch.orig
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp
a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 24 19:13:20 2023 +0200
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp Mon Jun 05 00:31:19 2023 +0200
-@@ -40,7 +40,7 @@
- Exiv2::ExifData::iterator itr =
exifData.findKey(Exiv2::ExifKey(keyName));
- if (itr != exifData.end() && itr->count())
- {
--value = itr->toLong();
-+value = itr->toUint32();
- return true;
- }
- else
-@@ -165,7 +165,7 @@
- {
- if(it!=exifData.end() && it->count())
- {
--return it->toLong();
-+return it->toUint32();
- }
- return 0;
- };
-@@ -600,4 +600,4 @@
- };
-
- }; //namespace Exiv2Helper
--}; //namespace HuginBase
-\ No newline at end of file
-+}; //namespace HuginBase
-diff -r 79cd11a7a66f src/hugin_base/panodata/SrcPanoImage.cpp
a/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 24 19:13:20 2023 +0200
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp Mon Jun 05 00:31:19 2023 +0200
-@@ -384,7 +384,7 @@
- pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
- if (pos != xmpData.end())
- {
--croppedWidth = pos->toLong();
-+croppedWidth = pos->toUint32();
- }
- else
- {
-@@ -394,7 +394,7 @@
- pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
- if (pos != xmpData.end())
- {
--croppedHeight = pos->toLong();
-+croppedHeight = pos->toUint32();
- }
- else
- {
-@@ -408,7 +408,7 @@
- double hfov = 0;
- if (pos != xmpData.end())
- {
--hfov = 360 * croppedWidth / (double)pos->toLong();
-+hfov = 360 * croppedWidth /
(double)pos->toUint32();
- }
- else
- {
-@@ -419,7 +419,7 @@
- pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
- if (pos != xmpData.end())
- {
--fullHeight = pos->toLong();
-+fullHeight = pos->toUint32();
- }
- else
- {
-@@ -430,7 +430,7 @@
- pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
- if (pos != xmpData.end())
- {
--cropTop = pos->toLong();
-+cropTop = pos->toUint32();
- }
- else
- {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/, media-gfx/hugin/files/
commit: d18335caa756f5e5c1478d5fe3ba17f011a78c80
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 8 19:22:39 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 8 19:38:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18335ca
media-gfx/hugin: Fix build with >=exiv2-0.28
Closes: https://bugs.gentoo.org/906468
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../hugin/files/hugin-2022.0.0-exiv2-0.28.patch| 99 ++
.../files/hugin-2022.0.0-exiv2-0.28.patch.orig | 76 +
media-gfx/hugin/hugin-2022.0.0.ebuild | 2 +
3 files changed, 177 insertions(+)
diff --git a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch
b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch
new file mode 100644
index ..dff74132b48f
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch
@@ -0,0 +1,99 @@
+Patch originally taken from ArchLinux, modified to be backwards compatible.
+
+diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp
+--- a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 24 19:13:20 2023 +0200
b/src/hugin_base/panodata/Exiv2Helper.cpp Mon Jun 05 00:31:19 2023 +0200
+@@ -40,7 +40,11 @@
+ Exiv2::ExifData::iterator itr =
exifData.findKey(Exiv2::ExifKey(keyName));
+ if (itr != exifData.end() && itr->count())
+ {
++#if EXIV2_TEST_VERSION(0,28,0)
++value = itr->toUint32();
++#else
+ value = itr->toLong();
++#endif
+ return true;
+ }
+ else
+@@ -165,7 +169,11 @@
+ {
+ if(it!=exifData.end() && it->count())
+ {
++#if EXIV2_TEST_VERSION(0,28,0)
++return it->toUint32();
++#else
+ return it->toLong();
++#endif
+ }
+ return 0;
+ };
+@@ -600,4 +608,4 @@
+ };
+
+ }; //namespace Exiv2Helper
+-}; //namespace HuginBase
+\ No newline at end of file
++}; //namespace HuginBase
+diff -r 79cd11a7a66f src/hugin_base/panodata/SrcPanoImage.cpp
+--- a/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 24 19:13:20 2023 +0200
b/src/hugin_base/panodata/SrcPanoImage.cpp Mon Jun 05 00:31:19 2023 +0200
+@@ -384,7 +384,11 @@
+ pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
+ if (pos != xmpData.end())
+ {
++#if EXIV2_TEST_VERSION(0,28,0)
++croppedWidth = pos->toUint32();
++#else
+ croppedWidth = pos->toLong();
++#endif
+ }
+ else
+ {
+@@ -394,7 +398,11 @@
+ pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
+ if (pos != xmpData.end())
+ {
++#if EXIV2_TEST_VERSION(0,28,0)
++croppedHeight = pos->toUint32();
++#else
+ croppedHeight = pos->toLong();
++#endif
+ }
+ else
+ {
+@@ -408,7 +416,11 @@
+ double hfov = 0;
+ if (pos != xmpData.end())
+ {
++#if EXIV2_TEST_VERSION(0,28,0)
++hfov = 360 * croppedWidth /
(double)pos->toUint32();
++#else
+ hfov = 360 * croppedWidth / (double)pos->toLong();
++#endif
+ }
+ else
+ {
+@@ -419,7 +431,11 @@
+ pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
+ if (pos != xmpData.end())
+ {
++#if EXIV2_TEST_VERSION(0,28,0)
++fullHeight = pos->toUint32();
++#else
+ fullHeight = pos->toLong();
++#endif
+ }
+ else
+ {
+@@ -430,7 +446,11 @@
+ pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
+ if (pos != xmpData.end())
+ {
++#if EXIV2_TEST_VERSION(0,28,0)
++cropTop = pos->toUint32();
++#else
+ cropTop = pos->toLong();
++#endif
+ }
+ else
+ {
diff --git a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch.orig
b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch.orig
new file mode 100644
index ..b1653a312cab
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch.orig
@@ -0,0 +1,76 @@
+diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp
+--- a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 24 19:13:20 2023 +0200
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: d8bf86c8f1fe7536afeba68a260e51cedde83e70
Author: Jérôme Carretero zougloub eu>
AuthorDate: Thu Feb 16 16:25:45 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Feb 16 17:12:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8bf86c8
media-gfx/hugin: Copy py3.11 to -
Signed-off-by: Michał Górny gentoo.org>
media-gfx/hugin/hugin-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 26a7d4a3d6bf..9411d0ca3b31 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit mercurial python-single-r1 wxwidgets cmake xdg
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: ef1fd49434b3944b7d197e159733b1debf4cf4fa
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 28 18:24:20 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Feb 1 19:26:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1fd494
media-gfx/hugin: drop 2021.0.0-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/hugin/Manifest | 1 -
media-gfx/hugin/hugin-2021.0.0-r1.ebuild | 98
2 files changed, 99 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index e30767d33cc1..f845f64e758e 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1 @@
-DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B
4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038
SHA512
fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853
DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B
ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be
SHA512
752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
diff --git a/media-gfx/hugin/hugin-2021.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2021.0.0-r1.ebuild
deleted file mode 100644
index 71ada31d1b34..
--- a/media-gfx/hugin/hugin-2021.0.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit python-single-r1 wxwidgets cmake xdg
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
-IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
- !!dev-util/cocom
- dev-db/sqlite:3
- dev-libs/boost:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- >=media-libs/libpano13-2.9.19_beta1:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/openexr:=
- media-libs/tiff:=
- >=media-libs/vigra-1.11.1-r5[openexr]
- sci-libs/fftw:3.0=
- sci-libs/flann
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
- lapack? ( virtual/blas virtual/lapack )
- python? ( ${PYTHON_DEPS} )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool
- raw? ( media-gfx/dcraw )"
-DEPEND="${CDEPEND}
- dev-cpp/tclap
- sys-devel/gettext
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- setup-wxwidgets
-}
-
-src_prepare() {
- sed -i \
- -e "/COMMAND.*GZIP/d" \
- -e "s/\.gz//g" \
- "${S}"/doc/CMakeLists.txt || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_HSI=$(usex python)
- -DENABLE_LAPACK=$(usex lapack)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- use python && python_optimize
-
- local lang
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- ca-valencia) dir=ca_ES@valencia;;
- cs) dir=cs_CZ;;
- *) dir=${lang/-/_};;
- esac
- if ! use l10n_${lang} ; then
- rm -r "${ED}"/usr/share/locale/${dir} || die
- fi
- done
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 61e180811234fa166ad42a356c7f266291e28a7f
Author: Markus Meier gentoo org>
AuthorDate: Mon Dec 19 19:23:08 2022 +
Commit: Markus Meier gentoo org>
CommitDate: Mon Dec 19 19:23:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e18081
media-gfx/hugin: version bump
Signed-off-by: Markus Meier gentoo.org>
media-gfx/hugin/Manifest| 1 +
.../hugin/{hugin-.ebuild => hugin-2022.0.0.ebuild} | 17 +
media-gfx/hugin/hugin-.ebuild | 3 +--
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 15ba9e83bbf6..e30767d33cc1 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B
4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038
SHA512
fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853
+DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B
ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be
SHA512
752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-2022.0.0.ebuild
similarity index 88%
copy from media-gfx/hugin/hugin-.ebuild
copy to media-gfx/hugin/hugin-2022.0.0.ebuild
index 2d80dcb4c7c8..76bca342c75e 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-2022.0.0.ebuild
@@ -4,25 +4,22 @@
EAPI=7
WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
-inherit mercurial python-single-r1 wxwidgets cmake xdg
+inherit python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
-SRC_URI=""
-EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin;
-EHG_PROJECT="${PN}-${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="amd64 arm64 x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
- !!dev-util/cocom
dev-db/sqlite:3
dev-libs/boost:=
dev-libs/zthread
@@ -30,8 +27,8 @@ CDEPEND="
media-gfx/exiv2:=
media-libs/freeglut
media-libs/glew:=
- >=media-libs/libpano13-2.9.19_beta1:=
media-libs/libjpeg-turbo:=
+ >=media-libs/libpano13-2.9.19_beta1:=
media-libs/libpng:=
media-libs/openexr:=
media-libs/tiff:=
@@ -66,6 +63,10 @@ pkg_setup() {
}
src_prepare() {
+ sed -i \
+ -e "/COMMAND.*GZIP/d" \
+ -e "s/\.gz//g" \
+ "${S}"/doc/CMakeLists.txt || die
cmake_src_prepare
}
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 2d80dcb4c7c8..7d99806d9fa0 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -22,7 +22,6 @@ LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl
pl pt-BR ro ru sk
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
- !!dev-util/cocom
dev-db/sqlite:3
dev-libs/boost:=
dev-libs/zthread
@@ -30,8 +29,8 @@ CDEPEND="
media-gfx/exiv2:=
media-libs/freeglut
media-libs/glew:=
- >=media-libs/libpano13-2.9.19_beta1:=
media-libs/libjpeg-turbo:=
+ >=media-libs/libpano13-2.9.19_beta1:=
media-libs/libpng:=
media-libs/openexr:=
media-libs/tiff:=
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 07228657c30b7e55691f503ed96a3981d5f622fa
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 04:25:32 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 04:29:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07228657
media-gfx/hugin: unrevbump
Unintentional, was defect in script for libtiff revbumps (fixed already for next
time.)
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/{hugin--r1.ebuild => hugin-.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-gfx/hugin/hugin--r1.ebuild
b/media-gfx/hugin/hugin-.ebuild
similarity index 100%
rename from media-gfx/hugin/hugin--r1.ebuild
rename to media-gfx/hugin/hugin-.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 45ceacce3b7c21eecaa831c96bd38f3a13db2d76
Author: Sam James gentoo org>
AuthorDate: Mon Jul 11 02:48:00 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 11 02:48:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ceacce
media-gfx/hugin: sync live (PYTHON_COMPAT)
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/hugin-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 6762e901caa5..b581777198f5 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit mercurial python-single-r1 wxwidgets cmake xdg
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 6b6f5b4ce8e273d7d113fb43546e308b80d1229c
Author: Markus Meier gentoo org>
AuthorDate: Thu May 19 19:46:41 2022 +
Commit: Markus Meier gentoo org>
CommitDate: Thu May 19 19:46:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6f5b4c
media-gfx/hugin: remove old for bug #846002
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Markus Meier gentoo.org>
media-gfx/hugin/Manifest | 1 -
media-gfx/hugin/hugin-2020.0.0-r1.ebuild | 98
2 files changed, 99 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index a9d64fb575cd..15ba9e83bbf6 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1 @@
-DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B
f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d
SHA512
4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B
4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038
SHA512
fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
deleted file mode 100644
index e52816245c81..
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-single-r1 wxwidgets cmake xdg
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
-IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
- !!dev-util/cocom
- dev-db/sqlite:3
- dev-libs/boost:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- >=media-libs/libpano13-2.9.19_beta1:0=
- media-libs/libpng:0=
- media-libs/openexr:0=
- media-libs/tiff:0
- >=media-libs/vigra-1.11.0[openexr]
- sci-libs/fftw:3.0=
- sci-libs/flann
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
- lapack? ( virtual/blas virtual/lapack )
- python? ( ${PYTHON_DEPS} )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool
- raw? ( media-gfx/dcraw )"
-DEPEND="${CDEPEND}
- dev-cpp/tclap
- sys-devel/gettext
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- setup-wxwidgets
-}
-
-src_prepare() {
- sed -i \
- -e "/COMMAND.*GZIP/d" \
- -e "s/\.gz//g" \
- "${S}"/doc/CMakeLists.txt || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_HSI=$(usex python)
- -DENABLE_LAPACK=$(usex lapack)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- use python && python_optimize
-
- local lang
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- ca-valencia) dir=ca_ES@valencia;;
- cs) dir=cs_CZ;;
- *) dir=${lang/-/_};;
- esac
- if ! use l10n_${lang} ; then
- rm -r "${ED}"/usr/share/locale/${dir} || die
- fi
- done
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: a39a6cc092da43d9129b0517feb6ea8ecbc5dea6
Author: Sam James gentoo org>
AuthorDate: Tue Mar 1 00:01:59 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 1 00:01:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a39a6cc0
media-gfx/hugin: Stabilize 2021.0.0 arm64, #833158
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/hugin-2021.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2021.0.0.ebuild
b/media-gfx/hugin/hugin-2021.0.0.ebuild
index 8b619035f13e..742e8a51342c 100644
--- a/media-gfx/hugin/hugin-2021.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2021.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 0b8f2e7175735c3387dc9182fd2750825826541d
Author: Sam James gentoo org>
AuthorDate: Mon Feb 28 23:57:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 28 23:57:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b8f2e71
media-gfx/hugin: Stabilize 2021.0.0 x86, #833158
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/hugin-2021.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2021.0.0.ebuild
b/media-gfx/hugin/hugin-2021.0.0.ebuild
index 697b27778327..8b619035f13e 100644
--- a/media-gfx/hugin/hugin-2021.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2021.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 98f5e504236e294119f14fb528495e9d4c192722
Author: Sam James gentoo org>
AuthorDate: Mon Feb 28 05:20:30 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 28 05:20:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f5e504
media-gfx/hugin: Stabilize 2021.0.0 amd64, #833158
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/hugin-2021.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2021.0.0.ebuild
b/media-gfx/hugin/hugin-2021.0.0.ebuild
index ae3b138ce660..697b27778327 100644
--- a/media-gfx/hugin/hugin-2021.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2021.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 1c76f8e03f7ddf764ade3be696265628b2361978 Author: Sam James gentoo org> AuthorDate: Fri Feb 18 18:12:11 2022 + Commit: Sam James gentoo org> CommitDate: Fri Feb 18 18:14:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c76f8e0 media-gfx/hugin: depend on newer Vigra To ensure Vigra is working correctly w/ unslotted OpenEXR. Signed-off-by: Sam James gentoo.org> media-gfx/hugin/hugin-2021.0.0.ebuild | 2 +- media-gfx/hugin/hugin-.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media-gfx/hugin/hugin-2021.0.0.ebuild b/media-gfx/hugin/hugin-2021.0.0.ebuild index 94cb614e8887..ae3b138ce660 100644 --- a/media-gfx/hugin/hugin-2021.0.0.ebuild +++ b/media-gfx/hugin/hugin-2021.0.0.ebuild @@ -32,7 +32,7 @@ CDEPEND=" media-libs/libpng:0= media-libs/openexr:0= media-libs/tiff:0 - >=media-libs/vigra-1.11.0[openexr] + >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib diff --git a/media-gfx/hugin/hugin-.ebuild b/media-gfx/hugin/hugin-.ebuild index 4ec32d7007d0..6762e901caa5 100644 --- a/media-gfx/hugin/hugin-.ebuild +++ b/media-gfx/hugin/hugin-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ CDEPEND=" media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 - >=media-libs/vigra-1.11.0[openexr] + >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: cbb5e0b6f306726fe926273e3664d1c9cc9fc9d4
Author: Markus Meier gentoo org>
AuthorDate: Sat Jan 1 17:07:30 2022 +
Commit: Markus Meier gentoo org>
CommitDate: Sat Jan 1 17:07:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb5e0b6
media-gfx/hugin: version bump
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Markus Meier gentoo.org>
media-gfx/hugin/Manifest | 2 +-
media-gfx/hugin/{hugin-2021.0_rc1.ebuild => hugin-2021.0.0.ebuild} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 90d1547caf8f..a9d64fb575cd 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1,2 @@
DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B
f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d
SHA512
4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
-DIST hugin-2021.0_rc1.tar.bz2 10333665 BLAKE2B
f9453a8478b700a964eaae4c8e15109717b6af7361b0596e17b8a1ba4377ff9f932ed8ab9d154981d4aa46908a365ac6b05fa12f63ec743e939c8318525abb58
SHA512
076ce4260d325ed703e61e26771bae6f478475d3d2863036ae9dc3bb0465eff037ca6a2f04c0c9fe02b42b984bc7025fb7dc84e521d49baa2bb78749931f63de
+DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B
4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038
SHA512
fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853
diff --git a/media-gfx/hugin/hugin-2021.0_rc1.ebuild
b/media-gfx/hugin/hugin-2021.0.0.ebuild
similarity index 96%
rename from media-gfx/hugin/hugin-2021.0_rc1.ebuild
rename to media-gfx/hugin/hugin-2021.0.0.ebuild
index 3e91a000b936..94cb614e8887 100644
--- a/media-gfx/hugin/hugin-2021.0_rc1.ebuild
+++ b/media-gfx/hugin/hugin-2021.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-single-r1 wxwidgets cmake xdg
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 126162d5f2f37820cb8eb3af79c5e91da9bdcb09
Author: Markus Meier gentoo org>
AuthorDate: Sat Dec 25 10:49:03 2021 +
Commit: Markus Meier gentoo org>
CommitDate: Sat Dec 25 10:49:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=126162d5
media-gfx/hugin: version bump
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Markus Meier gentoo.org>
media-gfx/hugin/Manifest| 1 +
media-gfx/hugin/hugin-2021.0_rc1.ebuild | 98 +
2 files changed, 99 insertions(+)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index d7d176549e20..90d1547caf8f 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B
f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d
SHA512
4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
+DIST hugin-2021.0_rc1.tar.bz2 10333665 BLAKE2B
f9453a8478b700a964eaae4c8e15109717b6af7361b0596e17b8a1ba4377ff9f932ed8ab9d154981d4aa46908a365ac6b05fa12f63ec743e939c8318525abb58
SHA512
076ce4260d325ed703e61e26771bae6f478475d3d2863036ae9dc3bb0465eff037ca6a2f04c0c9fe02b42b984bc7025fb7dc84e521d49baa2bb78749931f63de
diff --git a/media-gfx/hugin/hugin-2021.0_rc1.ebuild
b/media-gfx/hugin/hugin-2021.0_rc1.ebuild
new file mode 100644
index ..3e91a000b936
--- /dev/null
+++ b/media-gfx/hugin/hugin-2021.0_rc1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-single-r1 wxwidgets cmake xdg
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ dev-db/sqlite:3
+ dev-libs/boost:=
+ dev-libs/zthread
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2:=
+ media-libs/freeglut
+ media-libs/glew:=
+ >=media-libs/libpano13-2.9.19_beta1:0=
+ media-libs/libpng:0=
+ media-libs/openexr:0=
+ media-libs/tiff:0
+ >=media-libs/vigra-1.11.0[openexr]
+ sci-libs/fftw:3.0=
+ sci-libs/flann
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
+ lapack? ( virtual/blas virtual/lapack )
+ python? ( ${PYTHON_DEPS} )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool
+ raw? ( media-gfx/dcraw )"
+DEPEND="${CDEPEND}
+ dev-cpp/tclap
+ sys-devel/gettext
+ virtual/pkgconfig
+ python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ setup-wxwidgets
+}
+
+src_prepare() {
+ sed -i \
+ -e "/COMMAND.*GZIP/d" \
+ -e "s/\.gz//g" \
+ "${S}"/doc/CMakeLists.txt || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HSI=$(usex python)
+ -DENABLE_LAPACK=$(usex lapack)
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ use python && python_optimize
+
+ local lang
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ ca-valencia) dir=ca_ES@valencia;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang/-/_};;
+ esac
+ if ! use l10n_${lang} ; then
+ rm -r "${ED}"/usr/share/locale/${dir} || die
+ fi
+ done
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: bd2914dd1396124d746c58ce24f0175f78bca156 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Oct 16 21:51:55 2021 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Oct 16 23:15:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2914dd media-gfx/hugin: Depend on openexr:0 Closes: https://bugs.gentoo.org/816021 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas K. Hüttel gentoo.org> media-gfx/hugin/hugin-2020.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild index 7c550810e7c..e52816245c8 100644 --- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild +++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild @@ -30,7 +30,7 @@ CDEPEND=" media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= - media-libs/openexr:= + media-libs/openexr:0= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0=
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: c4118c52a9e9410b70cfb8d56cbe36b79928b0f1
Author: Michał Górny gentoo org>
AuthorDate: Tue Apr 20 07:32:40 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Apr 20 07:32:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4118c52
media-gfx/hugin: Enable py3.9
Signed-off-by: Michał Górny gentoo.org>
media-gfx/hugin/hugin-2020.0.0-r1.ebuild | 2 +-
media-gfx/hugin/hugin-.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 8a8381d740e..7c550810e7c 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit python-single-r1 wxwidgets cmake xdg
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index b55ba425e71..4ec32d7007d 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit mercurial python-single-r1 wxwidgets cmake xdg
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 64c7ec26fadea4b496a92c24830efe4b4f96415b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Feb 26 19:10:00 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 28 12:26:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c7ec26
media-gfx/hugin: Drop 2019.2.0
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/hugin/Manifest | 1 -
media-gfx/hugin/hugin-2019.2.0.ebuild | 105 --
2 files changed, 106 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index d5129750459..d7d176549e2 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1 @@
-DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B
4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70
SHA512
2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B
f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d
SHA512
4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild
b/media-gfx/hugin/hugin-2019.2.0.ebuild
deleted file mode 100644
index af53b07ac8a..000
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
-IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
- !!dev-util/cocom
- dev-db/sqlite:3
- dev-libs/boost:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- >=media-libs/libpano13-2.9.19_beta1:0=
- media-libs/libpng:0=
- media-libs/openexr:=
- media-libs/tiff:0
- >=media-libs/vigra-1.11.0[openexr]
- sci-libs/fftw:3.0=
- sci-libs/flann
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
- lapack? ( virtual/blas virtual/lapack )
- python? ( ${PYTHON_DEPS} )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool
- raw? ( media-gfx/dcraw )"
-DEPEND="${CDEPEND}
- dev-cpp/tclap
- sys-devel/gettext
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- setup-wxwidgets
-}
-
-src_prepare() {
- sed -i \
- -e "/COMMAND.*GZIP/d" \
- -e "s/\.gz//g" \
- "${S}"/doc/CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_HSI=$(usex python)
- -DENABLE_LAPACK=$(usex lapack)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- use python && python_optimize
-
- mkdir -p "${ED}"/usr/share/metainfo || die
- mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
- rmdir "${ED}"/usr/share/appdata || die
-
- local lang
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- ca-valencia) dir=ca_ES@valencia;;
- cs) dir=cs_CZ;;
- *) dir=${lang/-/_};;
- esac
- if ! use l10n_${lang} ; then
- rm -r "${ED%/}"/usr/share/locale/${dir} || die
- fi
- done
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 016e6a5de13e6c1b39706504bc717a1ceffdcb3b
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Feb 19 19:30:07 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Feb 19 19:32:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016e6a5d
media-gfx/hugin: x86 stable (bug #769611)
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
media-gfx/hugin/hugin-2020.0.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 0624774a644..8a8381d740e 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 0ab9fd1b6983f34d57c01fd624ca2f98f00edd11
Author: Sam James gentoo org>
AuthorDate: Thu Feb 18 08:40:19 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 18 08:40:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab9fd1b
media-gfx/hugin: Stabilize 2020.0.0-r1 amd64, #769611
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/hugin-2020.0.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index e90610cc03a..0624774a644 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: b9eb747f4edc60926b54e0f649d7473e8ba1c170
Author: Sam James gentoo org>
AuthorDate: Wed Feb 17 00:10:35 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 17 00:10:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9eb747f
media-gfx/hugin: Stabilize 2020.0.0-r1 arm64, #769611
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/hugin-2020.0.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 511fe35e84f..e90610cc03a 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: b7e0856a002184db6a912f00836d828f9fa17ec5
Author: Sam James gentoo org>
AuthorDate: Thu Jan 28 17:41:52 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 28 17:42:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e0856a
media-gfx/hugin: fix UnnecessarySlashStrip
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/hugin-2019.2.0.ebuild | 2 +-
media-gfx/hugin/hugin-.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild
b/media-gfx/hugin/hugin-2019.2.0.ebuild
index 17dcd99f555..551c513f4c0 100644
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.2.0.ebuild
@@ -99,7 +99,7 @@ src_install() {
*) dir=${lang/-/_};;
esac
if ! use l10n_${lang} ; then
- rm -r "${ED}"/usr/share/locale/${dir} || die
+ rm -r "${ED%/}"/usr/share/locale/${dir} || die
fi
done
}
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 0c9e3ac20a0..ee7505448f4 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -90,7 +90,7 @@ src_install() {
*) dir=${lang/-/_};;
esac
if ! use l10n_${lang} ; then
- rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ rm -r "${ED}"/usr/share/locale/${dir} || die
fi
done
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 1daafbbefc10f2234b18b79d55b6fdafcbabedf7
Author: Sam James gentoo org>
AuthorDate: Wed Jan 27 03:21:56 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jan 27 03:21:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1daafbbe
media-gfx/hugin: fix UnnecessarySlashStrip
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
media-gfx/hugin/hugin-2019.2.0.ebuild| 4 ++--
media-gfx/hugin/hugin-2020.0.0-r1.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild
b/media-gfx/hugin/hugin-2019.2.0.ebuild
index 0981ba7e2ee..17dcd99f555 100644
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -99,7 +99,7 @@ src_install() {
*) dir=${lang/-/_};;
esac
if ! use l10n_${lang} ; then
- rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ rm -r "${ED}"/usr/share/locale/${dir} || die
fi
done
}
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 60bec67bbd9..564aa6501c6 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -92,7 +92,7 @@ src_install() {
*) dir=${lang/-/_};;
esac
if ! use l10n_${lang} ; then
- rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ rm -r "${ED}"/usr/share/locale/${dir} || die
fi
done
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 38451c38409c18f28b17e83043f1e396b6c4643d
Author: Markus Meier gentoo org>
AuthorDate: Sun Dec 20 09:14:27 2020 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Dec 20 09:14:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38451c38
media-gfx/hugin: bump EAPI and fix repoman warnings
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Markus Meier gentoo.org>
...gin-2020.0.0.ebuild => hugin-2020.0.0-r1.ebuild} | 14 +++---
media-gfx/hugin/hugin-.ebuild | 21 +++--
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/media-gfx/hugin/hugin-2020.0.0.ebuild
b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
similarity index 90%
rename from media-gfx/hugin/hugin-2020.0.0.ebuild
rename to media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 7c7d2c57f26..60bec67bbd9 100644
--- a/media-gfx/hugin/hugin-2020.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
@@ -39,7 +39,7 @@ CDEPEND="
virtual/glu
virtual/jpeg:0
virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
lapack? ( virtual/blas virtual/lapack )
python? ( ${PYTHON_DEPS} )
sift? ( media-gfx/autopano-sift-C )"
@@ -68,7 +68,7 @@ src_prepare() {
-e "/COMMAND.*GZIP/d" \
-e "s/\.gz//g" \
"${S}"/doc/CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -76,11 +76,11 @@ src_configure() {
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
use python && python_optimize
local lang
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 3eb92a7c66c..0c9e3ac20a0 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{6,7,8} )
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit mercurial python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
@@ -19,7 +19,7 @@ SLOT="0"
KEYWORDS=""
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
!!dev-util/cocom
@@ -41,12 +41,13 @@ CDEPEND="
virtual/glu
virtual/jpeg:0
virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
lapack? ( virtual/blas virtual/lapack )
python? ( ${PYTHON_DEPS} )
sift? ( media-gfx/autopano-sift-C )"
RDEPEND="${CDEPEND}
- media-libs/exiftool"
+ media-libs/exiftool
+ raw? ( media-gfx/dcraw )"
DEPEND="${CDEPEND}
dev-cpp/tclap
sys-devel/gettext
@@ -65,7 +66,7 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -73,11 +74,11 @@ src_configure() {
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
use python && python_optimize
local lang
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: a836e732e8d245ff46ff1b06c162f2e4496959e9
Author: Markus Meier gentoo org>
AuthorDate: Thu Dec 17 19:48:13 2020 +
Commit: Markus Meier gentoo org>
CommitDate: Thu Dec 17 19:48:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a836e732
media-gfx/hugin: version bump
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Markus Meier gentoo.org>
media-gfx/hugin/Manifest | 1 +
media-gfx/hugin/hugin-2020.0.0.ebuild | 98 +++
2 files changed, 99 insertions(+)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 424227ceba5..d5129750459 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B
4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70
SHA512
2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
+DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B
f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d
SHA512
4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
diff --git a/media-gfx/hugin/hugin-2020.0.0.ebuild
b/media-gfx/hugin/hugin-2020.0.0.ebuild
new file mode 100644
index 000..7c7d2c57f26
--- /dev/null
+++ b/media-gfx/hugin/hugin-2020.0.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ dev-db/sqlite:3
+ dev-libs/boost:=
+ dev-libs/zthread
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2:=
+ media-libs/freeglut
+ media-libs/glew:=
+ >=media-libs/libpano13-2.9.19_beta1:0=
+ media-libs/libpng:0=
+ media-libs/openexr:=
+ media-libs/tiff:0
+ >=media-libs/vigra-1.11.0[openexr]
+ sci-libs/fftw:3.0=
+ sci-libs/flann
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/wxGTK:3.0=[X,opengl]
+ lapack? ( virtual/blas virtual/lapack )
+ python? ( ${PYTHON_DEPS} )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool
+ raw? ( media-gfx/dcraw )"
+DEPEND="${CDEPEND}
+ dev-cpp/tclap
+ sys-devel/gettext
+ virtual/pkgconfig
+ python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ setup-wxwidgets
+}
+
+src_prepare() {
+ sed -i \
+ -e "/COMMAND.*GZIP/d" \
+ -e "s/\.gz//g" \
+ "${S}"/doc/CMakeLists.txt || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HSI=$(usex python)
+ -DENABLE_LAPACK=$(usex lapack)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use python && python_optimize
+
+ local lang
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ ca-valencia) dir=ca_ES@valencia;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang/-/_};;
+ esac
+ if ! use l10n_${lang} ; then
+ rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ fi
+ done
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 7b02e0ed7405f96684b5f7d65335ac806c4fa322
Author: Miroslav Šulc gentoo org>
AuthorDate: Sat Dec 5 07:19:18 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Dec 5 07:19:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b02e0ed
media-gfx/hugin: fixed installation of live
they already use /usr/share/metadata
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Miroslav Šulc gentoo.org>
media-gfx/hugin/hugin-.ebuild | 4
1 file changed, 4 deletions(-)
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 34db3dfeb05..3eb92a7c66c 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -80,10 +80,6 @@ src_install() {
cmake-utils_src_install
use python && python_optimize
- mkdir -p "${ED}"/usr/share/metainfo || die
- mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
- rmdir "${ED}"/usr/share/appdata || die
-
local lang
for lang in ${LANGS} ; do
case ${lang} in
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: d6783965230b5d67ea233783c7a5c5fa22bdc04d
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Oct 25 19:01:03 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Oct 25 19:01:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6783965
media-gfx/hugin: Move metainfo to right place
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Closes: https://bugs.gentoo.org/722420
Signed-off-by: Andreas K. Hüttel gentoo.org>
media-gfx/hugin/hugin-2019.2.0.ebuild | 4
media-gfx/hugin/hugin-.ebuild | 4
2 files changed, 8 insertions(+)
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild
b/media-gfx/hugin/hugin-2019.2.0.ebuild
index 7cc3209c4c5..0981ba7e2ee 100644
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.2.0.ebuild
@@ -86,6 +86,10 @@ src_install() {
cmake-utils_src_install
use python && python_optimize
+ mkdir -p "${ED}"/usr/share/metainfo || die
+ mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+ rmdir "${ED}"/usr/share/appdata || die
+
local lang
for lang in ${LANGS} ; do
case ${lang} in
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 3eb92a7c66c..34db3dfeb05 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -80,6 +80,10 @@ src_install() {
cmake-utils_src_install
use python && python_optimize
+ mkdir -p "${ED}"/usr/share/metainfo || die
+ mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+ rmdir "${ED}"/usr/share/appdata || die
+
local lang
for lang in ${LANGS} ; do
case ${lang} in
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 27c26e13fbcdb151c0e8980b6e083bfbde352d9e Author: Markus Meier gentoo org> AuthorDate: Thu Jun 18 17:51:25 2020 + Commit: Markus Meier gentoo org> CommitDate: Thu Jun 18 17:51:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c26e13 media-gfx/hugin: add myself as maintainer Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Markus Meier gentoo.org> media-gfx/hugin/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml index ffcd4b4177d..4b6e44910c0 100644 --- a/media-gfx/hugin/metadata.xml +++ b/media-gfx/hugin/metadata.xml @@ -5,6 +5,10 @@ dilfri...@gentoo.org Andreas K. Huettel + + mae...@gentoo.org + Markus Meier + automatically align images with media-gfx/autopano-sift-C
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 069a521d4a21ecba0f1e19c44295e48162b38938 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Jun 6 23:12:57 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Jun 6 23:12:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=069a521d media-gfx/hugin: Take package Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas K. Hüttel gentoo.org> media-gfx/hugin/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml index 26ff81965fd..ffcd4b4177d 100644 --- a/media-gfx/hugin/metadata.xml +++ b/media-gfx/hugin/metadata.xml @@ -1,7 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + + dilfri...@gentoo.org + Andreas K. Huettel + automatically align images with media-gfx/autopano-sift-C
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/, media-gfx/hugin/files/
commit: f4841815cb707b2aad2db97001a0a38eab577c34
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat May 23 09:51:14 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat May 23 10:52:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4841815
media-gfx/hugin: Drop 2019.0.0
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/hugin/Manifest | 1 -
.../hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch | 29 --
media-gfx/hugin/hugin-2019.0.0.ebuild | 100 -
3 files changed, 130 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index ed9c292193e..424227ceba5 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1 @@
-DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B
59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5
SHA512
49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B
4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70
SHA512
2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
diff --git a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
deleted file mode 100644
index e22023f3998..000
--- a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix build against exiv2-0.27.1 by using upstream recommended catchall header.
-
a/src/hugin_base/panodata/SrcPanoImage.cpp 2019-02-16 09:18:55.0
+0100
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp 2019-05-21 14:26:23.470193305
+0200
-@@ -40,9 +40,7 @@
- #include
- #include
- #include
--#include
--#include
--#include
-+#include
- #include
- #include "Exiv2Helper.h"
-
a/src/hugin1/hugin/RawImport.cpp 2019-02-02 11:11:01.0 +0100
-+++ b/src/hugin1/hugin/RawImport.cpp 2019-05-21 14:33:00.522541182 +0200
-@@ -35,10 +35,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include
--#include
--#include
--#include
-+#include
- #ifdef __WXMSW__
- #include
- #endif
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild
b/media-gfx/hugin/hugin-2019.0.0.ebuild
deleted file mode 100644
index 1217aa9474d..000
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
-IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
- !!dev-util/cocom
- dev-db/sqlite:3
- dev-libs/boost:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- >=media-libs/libpano13-2.9.19_beta1:0=
- media-libs/libpng:0=
- media-libs/openexr:=
- media-libs/tiff:0
- >=media-libs/vigra-1.11.0[openexr]
- sci-libs/fftw:3.0=
- sci-libs/flann
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
- lapack? ( virtual/blas virtual/lapack )
- python? ( ${PYTHON_DEPS} )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool
- raw? ( media-gfx/dcraw )"
-DEPEND="${CDEPEND}
- dev-cpp/tclap
- sys-devel/gettext
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- setup-wxwidgets
-}
-
-src_prepare() {
- sed -i \
- -e "/COMMAND.*GZIP/d" \
- -e "s/\.gz//g" \
- "${S}"/doc/CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_HSI=$(usex python)
- -DENABLE_LAPACK=$(usex lapack)
- )
- cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 9e7cf6458811396c73413ddb69314ca5fca6deff
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 11 09:26:10 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 11 09:26:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7cf645
media-gfx/hugin: amd64 stable wrt bug #721678
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/hugin/hugin-2019.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild
b/media-gfx/hugin/hugin-2019.2.0.ebuild
index 4daff2ed430..27836f8e7f3 100644
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 0bd77bd3748f358cf1397f4f2893fa91b61a1f76
Author: Sam James (sam_c) cmpct info>
AuthorDate: Sat May 9 06:48:07 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun May 10 17:38:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd77bd3
media-gfx/hugin: arm64 stable (bug #721678)
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) cmpct.info>
Signed-off-by: Mart Raudsepp gentoo.org>
media-gfx/hugin/hugin-2019.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild
b/media-gfx/hugin/hugin-2019.2.0.ebuild
index d78bbbd573a..4daff2ed430 100644
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 89a7a27ee5757d890abcf8d061c230d3a3a79f0e
Author: Michał Górny gentoo org>
AuthorDate: Mon Feb 10 11:49:15 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Feb 10 11:54:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89a7a27e
media-gfx/hugin: Remove py2
Signed-off-by: Michał Górny gentoo.org>
media-gfx/hugin/hugin-2019.0.0.ebuild | 2 +-
media-gfx/hugin/hugin-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild
b/media-gfx/hugin/hugin-2019.0.0.ebuild
index f5dd754fb2f..1217aa9474d 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 448faaebbc2..3eb92a7c66c 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -4,7 +4,7 @@
EAPI=6
WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 81c2f0a1ea5bb94b51bd7e21635e10cd0eb2f934 Author: Tim Harder gentoo org> AuthorDate: Sun Feb 2 18:34:51 2020 + Commit: Tim Harder gentoo org> CommitDate: Sun Feb 2 18:35:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c2f0a1 media-gfx/hugin: drop redundant longdescription from metadata Signed-off-by: Tim Harder gentoo.org> media-gfx/hugin/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml index df762b45d7c..637ee9b9288 100644 --- a/media-gfx/hugin/metadata.xml +++ b/media-gfx/hugin/metadata.xml @@ -5,7 +5,6 @@ graph...@gentoo.org Gentoo Graphics Project - hugin is a panorama stitching program automatically align images with media-gfx/autopano-sift-C
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 63d200ff4c0985956a4b598e152d6f73ff70f537
Author: Markus Meier gentoo org>
AuthorDate: Mon Dec 30 13:13:35 2019 +
Commit: Markus Meier gentoo org>
CommitDate: Mon Dec 30 13:13:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d200ff
media-gfx/hugin: version bump
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Markus Meier gentoo.org>
media-gfx/hugin/Manifest | 2 +-
media-gfx/hugin/{hugin-2019.2.0_rc3.ebuild => hugin-2019.2.0.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index dfaa338e84d..ed9c292193e 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1,2 @@
DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B
59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5
SHA512
49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
-DIST hugin-2019.2.0-rc3.tar.bz2 10335030 BLAKE2B
4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70
SHA512
2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
+DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B
4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70
SHA512
2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
diff --git a/media-gfx/hugin/hugin-2019.2.0_rc3.ebuild
b/media-gfx/hugin/hugin-2019.2.0.ebuild
similarity index 100%
rename from media-gfx/hugin/hugin-2019.2.0_rc3.ebuild
rename to media-gfx/hugin/hugin-2019.2.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: b9b9614e290c810c41b1440a3cd66f59678428bb
Author: Markus Meier gentoo org>
AuthorDate: Wed Dec 25 13:28:44 2019 +
Commit: Markus Meier gentoo org>
CommitDate: Wed Dec 25 13:28:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9b9614e
media-gfx/hugin: version bump
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Markus Meier gentoo.org>
media-gfx/hugin/Manifest | 1 +
media-gfx/hugin/hugin-2019.2.0_rc3.ebuild | 101 ++
2 files changed, 102 insertions(+)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 2b21a77fe5b..dfaa338e84d 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B
59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5
SHA512
49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
+DIST hugin-2019.2.0-rc3.tar.bz2 10335030 BLAKE2B
4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70
SHA512
2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
diff --git a/media-gfx/hugin/hugin-2019.2.0_rc3.ebuild
b/media-gfx/hugin/hugin-2019.2.0_rc3.ebuild
new file mode 100644
index 000..41ad9fae2f7
--- /dev/null
+++ b/media-gfx/hugin/hugin-2019.2.0_rc3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ dev-db/sqlite:3
+ dev-libs/boost:=
+ dev-libs/zthread
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2:=
+ media-libs/freeglut
+ media-libs/glew:=
+ >=media-libs/libpano13-2.9.19_beta1:0=
+ media-libs/libpng:0=
+ media-libs/openexr:=
+ media-libs/tiff:0
+ >=media-libs/vigra-1.11.0[openexr]
+ sci-libs/fftw:3.0=
+ sci-libs/flann
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/wxGTK:3.0=[X,opengl]
+ lapack? ( virtual/blas virtual/lapack )
+ python? ( ${PYTHON_DEPS} )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool
+ raw? ( media-gfx/dcraw )"
+DEPEND="${CDEPEND}
+ dev-cpp/tclap
+ sys-devel/gettext
+ virtual/pkgconfig
+ python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ setup-wxwidgets
+}
+
+src_prepare() {
+ sed -i \
+ -e "/COMMAND.*GZIP/d" \
+ -e "s/\.gz//g" \
+ "${S}"/doc/CMakeLists.txt || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HSI=$(usex python)
+ -DENABLE_LAPACK=$(usex lapack)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use python && python_optimize
+
+ local lang
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ ca-valencia) dir=ca_ES@valencia;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang/-/_};;
+ esac
+ if ! use l10n_${lang} ; then
+ rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ fi
+ done
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: d4f048ed3dd0b6306398a4efca36cbcd4cfdb5f3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 30 14:38:02 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Wed Dec 4 16:36:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f048ed
media-gfx/hugin: python3_7, python3_8
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner gentoo.org>
Signed-off-by: Aaron Bauman gentoo.org>
media-gfx/hugin/hugin-2019.0.0.ebuild | 2 +-
media-gfx/hugin/hugin-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild
b/media-gfx/hugin/hugin-2019.0.0.ebuild
index 65ee4e79249..a07dfba592b 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 5ec24c68ade..50b288d329c 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -4,7 +4,7 @@
EAPI=6
WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 5a53c0332f0aff736a371c3716dc1987e8f6f195
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue May 21 13:00:28 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 21 13:00:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a53c033
media-gfx/hugin: Fix QA warnings, using xdg.eclass
Closes: https://bugs.gentoo.org/646730
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/hugin/hugin-2019.0.0.ebuild | 2 +-
media-gfx/hugin/hugin-.ebuild | 6 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild
b/media-gfx/hugin/hugin-2019.0.0.ebuild
index 89e66a9dc80..65ee4e79249 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
WX_GTK_VER="3.0"
PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 0783740a35d..5ec24c68ade 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -6,7 +6,7 @@ EAPI=6
WX_GTK_VER="3.0"
PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver
+inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
@@ -64,6 +64,10 @@ pkg_setup() {
setup-wxwidgets
}
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
-DBUILD_HSI=$(usex python)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
commit: daef89acb5955fe9bb48930cadf883626b2fa7e2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue May 21 12:32:40 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 21 12:37:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daef89ac
media-gfx/hugin: Drop 2018.0.0
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/hugin/Manifest | 1 -
.../hugin/files/hugin-2018.0.0-exiv2-0.27.patch| 28 ---
media-gfx/hugin/hugin-2018.0.0.ebuild | 91 --
3 files changed, 120 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 84f352f2ed7..2b21a77fe5b 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1 @@
-DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B
dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a
SHA512
30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B
59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5
SHA512
49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
diff --git a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
deleted file mode 100644
index 23dd5428921..000
--- a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,28 +0,0 @@
a/src/hugin_base/panodata/Exiv2Helper.cpp
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp
-@@ -29,6 +29,7 @@
- #include "hugin_math/hugin_math.h"
- #include "hugin_utils/utils.h"
- #include "exiv2/easyaccess.hpp"
-+#include "exiv2/version.hpp"
-
- namespace HuginBase
- {
-@@ -232,7 +233,7 @@
- return false;
- };
- };
--#if EXIV2_TEST_VERSION(0,23,0)
-+#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0)
- if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) &&
- _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2))
- {
-@@ -563,7 +564,7 @@
- std::string lensName;
- // first we are reading LensModel in Exif section, this is only
available
- // with EXIF >= 2.3
--#if EXIV2_TEST_VERSION(0,22,0)
-+#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0)
- //the string "Exif.Photo.LensModel" is only defined in exiv2
0.22.0 and above
- if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName))
- #else
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild
b/media-gfx/hugin/hugin-2018.0.0.ebuild
deleted file mode 100644
index 5c87262440f..000
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net;
-SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
- !!dev-util/cocom
- dev-db/sqlite:3
- dev-libs/boost:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- >=media-libs/libpano13-2.9.19_beta1:0=
- media-libs/libpng:0=
- media-libs/openexr:=
- media-libs/tiff:0
- >=media-libs/vigra-1.11.0[openexr]
- sci-libs/fftw:3.0=
- sci-libs/flann
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
- lapack? ( virtual/blas virtual/lapack )
- python? ( ${PYTHON_DEPS} )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-cpp/tclap
- sys-devel/gettext
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- setup-wxwidgets
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_HSI=$(usex
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/, media-gfx/hugin/files/
commit: 3212eb8d7b02addbad078efdc07839c163547363
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue May 21 12:31:49 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 21 12:37:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3212eb8d
media-gfx/hugin: Fix build against exiv2-0.27.1
Closes: https://bugs.gentoo.org/686366
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch | 29 ++
media-gfx/hugin/hugin-2019.0.0.ebuild | 2 ++
2 files changed, 31 insertions(+)
diff --git a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
new file mode 100644
index 000..e22023f3998
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
@@ -0,0 +1,29 @@
+Fix build against exiv2-0.27.1 by using upstream recommended catchall header.
+
+--- a/src/hugin_base/panodata/SrcPanoImage.cpp 2019-02-16 09:18:55.0
+0100
b/src/hugin_base/panodata/SrcPanoImage.cpp 2019-05-21 14:26:23.470193305
+0200
+@@ -40,9 +40,7 @@
+ #include
+ #include
+ #include
+-#include
+-#include
+-#include
++#include
+ #include
+ #include "Exiv2Helper.h"
+
+--- a/src/hugin1/hugin/RawImport.cpp 2019-02-02 11:11:01.0 +0100
b/src/hugin1/hugin/RawImport.cpp 2019-05-21 14:33:00.522541182 +0200
+@@ -35,10 +35,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include
+-#include
+-#include
+-#include
++#include
+ #ifdef __WXMSW__
+ #include
+ #endif
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild
b/media-gfx/hugin/hugin-2019.0.0.ebuild
index 543908d5bca..89e66a9dc80 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -56,6 +56,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DOCS=( authors.txt README TODO )
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366
+
S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: f19acc061cd0c65a95ccc8a23a8c2d70cc3c75f6
Author: Aaron Bauman gentoo org>
AuthorDate: Mon May 20 17:07:33 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon May 20 17:22:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f19acc06
media-gfx/hugin: arm64 stable
Signed-off-by: Aaron Bauman gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"
media-gfx/hugin/hugin-2019.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild
b/media-gfx/hugin/hugin-2019.0.0.ebuild
index b5b073811a5..543908d5bca 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 arm64 x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: d1b2fb35e90dab9fa27b33b02eb49c72f1d273b7
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun May 19 20:58:54 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun May 19 20:58:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b2fb35
media-gfx/hugin: amd64 stable wrt bug #684990
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
media-gfx/hugin/hugin-2019.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild
b/media-gfx/hugin/hugin-2019.0.0.ebuild
index 5120cc5b689..b5b073811a5 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 0dae28f85e27340908ef131b7344c21b919c8ca4
Author: Ulrich Müller gentoo org>
AuthorDate: Wed Apr 24 21:13:49 2019 +
Commit: Ulrich Müller gentoo org>
CommitDate: Wed Apr 24 21:19:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dae28f8
media-gfx/hugin: Fix LICENSE.
Closes: https://bugs.gentoo.org/684152
Acked-by: Tim Harder gentoo.org>
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Ulrich Müller gentoo.org>
media-gfx/hugin/hugin-2018.0.0.ebuild | 2 +-
media-gfx/hugin/hugin-2019.0.0.ebuild | 2 +-
media-gfx/hugin/hugin-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild
b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 76350c33b19..5c87262440f 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GUI for the creation & processing of panoramic
images"
HOMEPAGE="http://hugin.sf.net;
SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
-LICENSE="GPL-2 SIFT"
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
KEYWORDS="amd64 x86"
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild
b/media-gfx/hugin/hugin-2019.0.0.ebuild
index 1ef08a891cd..931b74efeb7 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GUI for the creation & processing of panoramic
images"
HOMEPAGE="http://hugin.sf.net;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 65bdb0aad59..0783740a35d 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin;
EHG_PROJECT="${PN}-${PN}"
-LICENSE="GPL-2 SIFT"
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
KEYWORDS=""
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 6e3964d38abff52a2e736e5d0b0b88be50d0cdd8
Author: Markus Meier gentoo org>
AuthorDate: Sat Apr 6 12:14:16 2019 +
Commit: Markus Meier gentoo org>
CommitDate: Sat Apr 6 12:14:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3964d3
media-gfx/hugin: version bump
Signed-off-by: Markus Meier gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
media-gfx/hugin/Manifest | 2 +-
media-gfx/hugin/{hugin-2019.0.0_rc1.ebuild => hugin-2019.0.0.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 08a32a754b7..84f352f2ed7 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1,2 @@
DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B
dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a
SHA512
30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
-DIST hugin-2019.0.0_rc1.tar.bz2 10297887 BLAKE2B
59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5
SHA512
49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
+DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B
59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5
SHA512
49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
diff --git a/media-gfx/hugin/hugin-2019.0.0_rc1.ebuild
b/media-gfx/hugin/hugin-2019.0.0.ebuild
similarity index 100%
rename from media-gfx/hugin/hugin-2019.0.0_rc1.ebuild
rename to media-gfx/hugin/hugin-2019.0.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 87e1394d075d024648c08351032a79422be8970b
Author: Markus Meier gentoo org>
AuthorDate: Sun Mar 24 19:06:47 2019 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Mar 24 19:06:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e1394d
media-gfx/hugin: version bump
Signed-off-by: Markus Meier gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
media-gfx/hugin/Manifest | 1 +
media-gfx/hugin/hugin-2019.0.0_rc1.ebuild | 98 +++
2 files changed, 99 insertions(+)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index e5a0e43564d..08a32a754b7 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B
dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a
SHA512
30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
+DIST hugin-2019.0.0_rc1.tar.bz2 10297887 BLAKE2B
59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5
SHA512
49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
diff --git a/media-gfx/hugin/hugin-2019.0.0_rc1.ebuild
b/media-gfx/hugin/hugin-2019.0.0_rc1.ebuild
new file mode 100644
index 000..fc7b4544dcb
--- /dev/null
+++ b/media-gfx/hugin/hugin-2019.0.0_rc1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ dev-db/sqlite:3
+ dev-libs/boost:=
+ dev-libs/zthread
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2:=
+ media-libs/freeglut
+ media-libs/glew:=
+ >=media-libs/libpano13-2.9.19_beta1:0=
+ media-libs/libpng:0=
+ media-libs/openexr:=
+ media-libs/tiff:0
+ >=media-libs/vigra-1.11.0[openexr]
+ sci-libs/fftw:3.0=
+ sci-libs/flann
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/wxGTK:3.0=[X,opengl]
+ lapack? ( virtual/blas virtual/lapack )
+ python? ( ${PYTHON_DEPS} )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool
+ raw? ( media-gfx/dcraw )"
+DEPEND="${CDEPEND}
+ dev-cpp/tclap
+ sys-devel/gettext
+ virtual/pkgconfig
+ python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ setup-wxwidgets
+}
+
+src_prepare() {
+ sed -i \
+ -e "/COMMAND.*GZIP/d" \
+ -e "s/\.gz//g" \
+ "${S}"/doc/CMakeLists.txt || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HSI=$(usex python)
+ -DENABLE_LAPACK=$(usex lapack)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use python && python_optimize
+
+ local lang
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ ca-valencia) dir=ca_ES@valencia;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang/-/_};;
+ esac
+ if ! use l10n_${lang} ; then
+ rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ fi
+ done
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: c262fcc5e8d0561d0b1acefb57180f7c917e7e6b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 17 12:57:31 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 17 12:58:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c262fcc5
media-gfx/hugin: Drop 2016.2.0, 2017.0
Broken by exiv2.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/hugin/Manifest | 2 -
media-gfx/hugin/hugin-2016.2.0.ebuild | 88 ---
media-gfx/hugin/hugin-2017.0.ebuild | 88 ---
3 files changed, 178 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 332225632fe..e5a0e43564d 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,3 +1 @@
-DIST hugin-2016.2.0.tar.bz2 10386216 BLAKE2B
8437a360880903fac33be7dc12fcdff7fbd16b15153de32e127bdc2b5fe5a47e9ebefe8bc4fb088ba2b818743b8bee9348560aaeb53781bfd0eeb57ec1adbe0b
SHA512
9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
-DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B
fa7475347f6b1b561132d5370172fee410afd4f8b15c2c5d7d356023716d15cdcc5ecb8a13d743ce13f3c15ebb7f4b42f0e9653b9f94e752d5e6dea3ecef05b7
SHA512
bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B
dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a
SHA512
30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild
b/media-gfx/hugin/hugin-2016.2.0.ebuild
deleted file mode 100644
index 6d66c2d7419..000
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net;
-SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
- !!dev-util/cocom
- dev-db/sqlite:3
- dev-libs/boost:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- >=media-libs/libpano13-2.9.19_beta1:0=
- media-libs/libpng:0=
- media-libs/openexr:=
- media-libs/tiff:0
- >=media-libs/vigra-1.9.0[openexr]
- sci-libs/fftw:3.0=
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
- lapack? ( virtual/blas virtual/lapack )
- python? ( ${PYTHON_DEPS} )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-cpp/tclap
- sys-devel/gettext
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- setup-wxwidgets
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_HSI=$(usex python)
- -DENABLE_LAPACK=$(usex lapack)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- use python && python_optimize
-
- local lang
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- ca-valencia) dir=ca_ES@valencia;;
- cs) dir=cs_CZ;;
- *) dir=${lang/-/_};;
- esac
- if ! use l10n_${lang} ; then
- rm -r "${ED%/}"/usr/share/locale/${dir} || die
- fi
- done
-}
diff --git a/media-gfx/hugin/hugin-2017.0.ebuild
b/media-gfx/hugin/hugin-2017.0.ebuild
deleted file mode 100644
index 649cba97977..000
--- a/media-gfx/hugin/hugin-2017.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
commit: 450cbf95fae0141740b2c9f74265220651ee8863
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 29 13:30:34 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 29 13:31:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=450cbf95
media-gfx/hugin: Fix build with exiv2-0.27
Switch to eapi7-ver
Sync deps with 2018.0.0
Closes: https://bugs.gentoo.org/673730
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../hugin/files/hugin-2018.0.0-exiv2-0.27.patch| 28 ++
media-gfx/hugin/hugin-2018.0.0.ebuild | 8 ---
media-gfx/hugin/hugin-.ebuild | 7 +++---
3 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
new file mode 100644
index 000..23dd5428921
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
@@ -0,0 +1,28 @@
+--- a/src/hugin_base/panodata/Exiv2Helper.cpp
b/src/hugin_base/panodata/Exiv2Helper.cpp
+@@ -29,6 +29,7 @@
+ #include "hugin_math/hugin_math.h"
+ #include "hugin_utils/utils.h"
+ #include "exiv2/easyaccess.hpp"
++#include "exiv2/version.hpp"
+
+ namespace HuginBase
+ {
+@@ -232,7 +233,7 @@
+ return false;
+ };
+ };
+-#if EXIV2_TEST_VERSION(0,23,0)
++#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0)
+ if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) &&
+ _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2))
+ {
+@@ -563,7 +564,7 @@
+ std::string lensName;
+ // first we are reading LensModel in Exif section, this is only
available
+ // with EXIF >= 2.3
+-#if EXIV2_TEST_VERSION(0,22,0)
++#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0)
+ //the string "Exif.Photo.LensModel" is only defined in exiv2
0.22.0 and above
+ if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName))
+ #else
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild
b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 3b5e82f438d..cb72199b0eb 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
WX_GTK_VER="3.0"
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit python-single-r1 wxwidgets versionator cmake-utils
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
@@ -55,7 +55,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DOCS=( authors.txt README TODO )
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2).0
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
pkg_setup() {
use python && python-single-r1_pkg_setup
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 8615f1c5a0b..c46a552195e 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
WX_GTK_VER="3.0"
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
+inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
@@ -36,6 +36,7 @@ CDEPEND="
media-libs/tiff:0
>=media-libs/vigra-1.11.0[openexr]
sci-libs/fftw:3.0=
+ sci-libs/flann
sys-libs/zlib
virtual/glu
virtual/jpeg:0
@@ -56,7 +57,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DOCS=( authors.txt README TODO )
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
pkg_setup() {
use python && python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: e474c57de73a8f3e3e01c2f901b593abf05ac98e
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Jul 9 01:26:53 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Jul 9 01:29:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e474c57d
media-gfx/hugin: x86 stable (bug #652616)
Package-Manager: Portage-2.3.41, Repoman-2.3.9
media-gfx/hugin/hugin-2018.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild
b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 3a3bee02ade..3b5e82f438d 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: ad2b12bd1d0ad4b6311f1553b601310ddb66fba4
Author: Jason Zaman gentoo org>
AuthorDate: Sun Jun 24 13:47:32 2018 +
Commit: Jason Zaman gentoo org>
CommitDate: Sun Jun 24 13:49:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2b12bd
media-gfx/hugin: amd64 stable
Gentoo-bug: 652616
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-gfx/hugin/hugin-2018.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild
b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 6e80515ca14..3a3bee02ade 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: bd11aa5ac0f2e004da145ad52e49ef82c765f879
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Jun 22 19:25:48 2018 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Fri Jun 22 19:29:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd11aa5a
media-gfx/hugin: Add python-3.6 to allowed list
Closes: https://bugs.gentoo.org/656948
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-gfx/hugin/hugin-2018.0.0.ebuild | 2 +-
media-gfx/hugin/hugin-.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild
b/media-gfx/hugin/hugin-2018.0.0.ebuild
index c3812f206d1..6e80515ca14 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit python-single-r1 wxwidgets versionator cmake-utils
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 32e41078241..8615f1c5a0b 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 49fe0dc515747dfea4a7c20846866a5f7a87797b
Author: Matt Turner gentoo org>
AuthorDate: Thu Apr 26 04:56:19 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 26 05:02:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49fe0dc5
media-gfx/hugin: Dropped ppc keywords
media-gfx/hugin/hugin-2016.2.0.ebuild | 2 +-
media-gfx/hugin/hugin-2017.0.ebuild | 2 +-
media-gfx/hugin/hugin-2018.0.0.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild
b/media-gfx/hugin/hugin-2016.2.0.ebuild
index a679e5c2f83..6d66c2d7419 100644
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/hugin/hugin-2017.0.ebuild
b/media-gfx/hugin/hugin-2017.0.ebuild
index 36ab6ab525a..649cba97977 100644
--- a/media-gfx/hugin/hugin-2017.0.ebuild
+++ b/media-gfx/hugin/hugin-2017.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild
b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 33d44b9ffac..c3812f206d1 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: f672630753e845b9e9b2bc3f02d3a1ad35c4
Author: Markus Meier gentoo org>
AuthorDate: Sun Feb 4 17:11:50 2018 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Feb 4 17:11:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6726307
media-gfx/hugin: fix version number
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-gfx/hugin/Manifest | 2 +-
media-gfx/hugin/{hugin-2018.0.ebuild => hugin-2018.0.0.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index f5eda8ab528..332225632fe 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,3 +1,3 @@
DIST hugin-2016.2.0.tar.bz2 10386216 BLAKE2B
8437a360880903fac33be7dc12fcdff7fbd16b15153de32e127bdc2b5fe5a47e9ebefe8bc4fb088ba2b818743b8bee9348560aaeb53781bfd0eeb57ec1adbe0b
SHA512
9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B
fa7475347f6b1b561132d5370172fee410afd4f8b15c2c5d7d356023716d15cdcc5ecb8a13d743ce13f3c15ebb7f4b42f0e9653b9f94e752d5e6dea3ecef05b7
SHA512
bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
-DIST hugin-2018.0.tar.bz2 9838518 BLAKE2B
dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a
SHA512
30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
+DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B
dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a
SHA512
30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
diff --git a/media-gfx/hugin/hugin-2018.0.ebuild
b/media-gfx/hugin/hugin-2018.0.0.ebuild
similarity index 100%
rename from media-gfx/hugin/hugin-2018.0.ebuild
rename to media-gfx/hugin/hugin-2018.0.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 8d86e2f6409d26fae41838b81c2dc6f7b575e8e0
Author: Markus Meier gentoo org>
AuthorDate: Sat Feb 3 17:01:00 2018 +
Commit: Markus Meier gentoo org>
CommitDate: Sat Feb 3 17:01:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d86e2f6
media-gfx/hugin: version bump
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-gfx/hugin/Manifest | 2 +-
media-gfx/hugin/{hugin-2018.0_rc2.ebuild => hugin-2018.0.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index f25e50664a5..f5eda8ab528 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,3 +1,3 @@
DIST hugin-2016.2.0.tar.bz2 10386216 BLAKE2B
8437a360880903fac33be7dc12fcdff7fbd16b15153de32e127bdc2b5fe5a47e9ebefe8bc4fb088ba2b818743b8bee9348560aaeb53781bfd0eeb57ec1adbe0b
SHA512
9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B
fa7475347f6b1b561132d5370172fee410afd4f8b15c2c5d7d356023716d15cdcc5ecb8a13d743ce13f3c15ebb7f4b42f0e9653b9f94e752d5e6dea3ecef05b7
SHA512
bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
-DIST hugin-2018.0rc2.tar.bz2 9838518 BLAKE2B
dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a
SHA512
30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
+DIST hugin-2018.0.tar.bz2 9838518 BLAKE2B
dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a
SHA512
30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
diff --git a/media-gfx/hugin/hugin-2018.0_rc2.ebuild
b/media-gfx/hugin/hugin-2018.0.ebuild
similarity index 100%
rename from media-gfx/hugin/hugin-2018.0_rc2.ebuild
rename to media-gfx/hugin/hugin-2018.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: b0618cdaff22d351db5c387976ac1f7a46d6ef5e
Author: Markus Meier gentoo org>
AuthorDate: Sun Jan 28 20:28:21 2018 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Jan 28 20:38:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0618cda
media-gfx/hugin: version bump
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-gfx/hugin/Manifest| 1 +
media-gfx/hugin/hugin-2018.0_rc2.ebuild | 89 +
2 files changed, 90 insertions(+)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index a0fa04ab92b..f25e50664a5 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1,3 @@
DIST hugin-2016.2.0.tar.bz2 10386216 BLAKE2B
8437a360880903fac33be7dc12fcdff7fbd16b15153de32e127bdc2b5fe5a47e9ebefe8bc4fb088ba2b818743b8bee9348560aaeb53781bfd0eeb57ec1adbe0b
SHA512
9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B
fa7475347f6b1b561132d5370172fee410afd4f8b15c2c5d7d356023716d15cdcc5ecb8a13d743ce13f3c15ebb7f4b42f0e9653b9f94e752d5e6dea3ecef05b7
SHA512
bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
+DIST hugin-2018.0rc2.tar.bz2 9838518 BLAKE2B
dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a
SHA512
30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
diff --git a/media-gfx/hugin/hugin-2018.0_rc2.ebuild
b/media-gfx/hugin/hugin-2018.0_rc2.ebuild
new file mode 100644
index 000..33d44b9ffac
--- /dev/null
+++ b/media-gfx/hugin/hugin-2018.0_rc2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit python-single-r1 wxwidgets versionator cmake-utils
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net;
+SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
+
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
+IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ dev-db/sqlite:3
+ dev-libs/boost:=
+ dev-libs/zthread
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2:=
+ media-libs/freeglut
+ media-libs/glew:=
+ >=media-libs/libpano13-2.9.19_beta1:0=
+ media-libs/libpng:0=
+ media-libs/openexr:=
+ media-libs/tiff:0
+ >=media-libs/vigra-1.11.0[openexr]
+ sci-libs/fftw:3.0=
+ sci-libs/flann
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/wxGTK:3.0=[X,opengl]
+ lapack? ( virtual/blas virtual/lapack )
+ python? ( ${PYTHON_DEPS} )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool"
+DEPEND="${CDEPEND}
+ dev-cpp/tclap
+ sys-devel/gettext
+ virtual/pkgconfig
+ python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-2).0
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ setup-wxwidgets
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HSI=$(usex python)
+ -DENABLE_LAPACK=$(usex lapack)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use python && python_optimize
+
+ local lang
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ ca-valencia) dir=ca_ES@valencia;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang/-/_};;
+ esac
+ if ! use l10n_${lang} ; then
+ rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ fi
+ done
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 258d506d6c01820656b575ed5feb8613daf74c7f
Author: Markus Meier gentoo org>
AuthorDate: Fri Dec 29 12:14:30 2017 +
Commit: Markus Meier gentoo org>
CommitDate: Fri Dec 29 12:15:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=258d506d
media-gfx/hugin: add missing setup-wxwidgets call, bug #642598
Package-Manager: Portage-2.3.13, Repoman-2.3.3
media-gfx/hugin/hugin-2016.2.0.ebuild | 1 +
media-gfx/hugin/hugin-2017.0.ebuild | 1 +
media-gfx/hugin/hugin-.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild
b/media-gfx/hugin/hugin-2016.2.0.ebuild
index d20586db462..a679e5c2f83 100644
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0.ebuild
@@ -58,6 +58,7 @@ S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
pkg_setup() {
use python && python-single-r1_pkg_setup
+ setup-wxwidgets
}
src_configure() {
diff --git a/media-gfx/hugin/hugin-2017.0.ebuild
b/media-gfx/hugin/hugin-2017.0.ebuild
index 5f4eb71761c..36ab6ab525a 100644
--- a/media-gfx/hugin/hugin-2017.0.ebuild
+++ b/media-gfx/hugin/hugin-2017.0.ebuild
@@ -58,6 +58,7 @@ S=${WORKDIR}/${PN}-2017.0.0
pkg_setup() {
use python && python-single-r1_pkg_setup
+ setup-wxwidgets
}
src_configure() {
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index ff6380b66e3..32e41078241 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -60,6 +60,7 @@ S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
pkg_setup() {
use python && python-single-r1_pkg_setup
+ setup-wxwidgets
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: f79621aeabb6379cf2a995185684db7452bbccdf Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Dec 9 23:30:38 2017 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Dec 9 23:31:01 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f79621ae media-gfx/hugin: Building with gcc-7 requires vigra-1.11.0, bug 639558 Closes: https://bugs.gentoo.org/639558 Package-Manager: Portage-2.3.17, Repoman-2.3.6 media-gfx/hugin/Manifest| 4 ++-- media-gfx/hugin/hugin-2017.0.ebuild | 2 +- media-gfx/hugin/hugin-.ebuild | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index ea1c32f07bc..a0fa04ab92b 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,2 +1,2 @@ -DIST hugin-2016.2.0.tar.bz2 10386216 SHA256 54ab1bc8dd94d83c02bfd4082c4454b3b33f0fa56bc17b45cf3e89be87691f15 SHA512 9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510 WHIRLPOOL 4a61d4aa9d9362b03a04cdff192247c3d71b1e10bac5495165b870e47de2d66890c5895e94a56059df21be8c072600f7c6b18f66584979d40b755fcc1d8a9a64 -DIST hugin-2017.0.tar.bz2 9803272 SHA256 86646ea27f32b959d38e7d36270703214b1ae961e379dd64b14d027139cd4609 SHA512 bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969 WHIRLPOOL 72978ca95f4f0aa17dda68beec925521969e39d000da9d00b014923a53387280b74571b4874f1dc506abceb2019dca7a2f2aba3e9128bdd9490f962f452296f8 +DIST hugin-2016.2.0.tar.bz2 10386216 BLAKE2B 8437a360880903fac33be7dc12fcdff7fbd16b15153de32e127bdc2b5fe5a47e9ebefe8bc4fb088ba2b818743b8bee9348560aaeb53781bfd0eeb57ec1adbe0b SHA512 9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510 +DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B fa7475347f6b1b561132d5370172fee410afd4f8b15c2c5d7d356023716d15cdcc5ecb8a13d743ce13f3c15ebb7f4b42f0e9653b9f94e752d5e6dea3ecef05b7 SHA512 bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969 diff --git a/media-gfx/hugin/hugin-2017.0.ebuild b/media-gfx/hugin/hugin-2017.0.ebuild index ec84702f585..5f4eb71761c 100644 --- a/media-gfx/hugin/hugin-2017.0.ebuild +++ b/media-gfx/hugin/hugin-2017.0.ebuild @@ -32,7 +32,7 @@ CDEPEND=" media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 - >=media-libs/vigra-1.9.0[openexr] + >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sys-libs/zlib virtual/glu diff --git a/media-gfx/hugin/hugin-.ebuild b/media-gfx/hugin/hugin-.ebuild index c71b0cdc559..ff6380b66e3 100644 --- a/media-gfx/hugin/hugin-.ebuild +++ b/media-gfx/hugin/hugin-.ebuild @@ -34,7 +34,7 @@ CDEPEND=" media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 - >=media-libs/vigra-1.9.0[openexr] + >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sys-libs/zlib virtual/glu
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 41f5439d4e97b100c888b29065be9ddf6c0903c9
Author: Markus Meier gentoo org>
AuthorDate: Mon Jul 3 18:41:21 2017 +
Commit: Markus Meier gentoo org>
CommitDate: Mon Jul 3 18:41:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f5439d
media-gfx/darktable: version bump
Package-Manager: Portage-2.3.6, Repoman-2.3.1
media-gfx/hugin/Manifest | 2 +-
media-gfx/hugin/{hugin-2017.0_rc2.ebuild => hugin-2017.0.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 7a445b9acf5..ea1c32f07bc 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1,2 @@
DIST hugin-2016.2.0.tar.bz2 10386216 SHA256
54ab1bc8dd94d83c02bfd4082c4454b3b33f0fa56bc17b45cf3e89be87691f15 SHA512
9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
WHIRLPOOL
4a61d4aa9d9362b03a04cdff192247c3d71b1e10bac5495165b870e47de2d66890c5895e94a56059df21be8c072600f7c6b18f66584979d40b755fcc1d8a9a64
-DIST hugin-2017.0rc2.tar.bz2 9803272 SHA256
86646ea27f32b959d38e7d36270703214b1ae961e379dd64b14d027139cd4609 SHA512
bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
WHIRLPOOL
72978ca95f4f0aa17dda68beec925521969e39d000da9d00b014923a53387280b74571b4874f1dc506abceb2019dca7a2f2aba3e9128bdd9490f962f452296f8
+DIST hugin-2017.0.tar.bz2 9803272 SHA256
86646ea27f32b959d38e7d36270703214b1ae961e379dd64b14d027139cd4609 SHA512
bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
WHIRLPOOL
72978ca95f4f0aa17dda68beec925521969e39d000da9d00b014923a53387280b74571b4874f1dc506abceb2019dca7a2f2aba3e9128bdd9490f962f452296f8
diff --git a/media-gfx/hugin/hugin-2017.0_rc2.ebuild
b/media-gfx/hugin/hugin-2017.0.ebuild
similarity index 100%
rename from media-gfx/hugin/hugin-2017.0_rc2.ebuild
rename to media-gfx/hugin/hugin-2017.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 0cc8fc96cf7c4be49ff86ab8370cc33ec68015aa
Author: Markus Meier gentoo org>
AuthorDate: Sun Jun 18 09:03:53 2017 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Jun 18 09:03:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc8fc96
media-gfx/hugin: version bump
Package-Manager: Portage-2.3.5, Repoman-2.3.1
media-gfx/hugin/Manifest | 2 +-
media-gfx/hugin/{hugin-2017.0_rc1.ebuild => hugin-2017.0_rc2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index d4c9c6c562b..7a445b9acf5 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1,2 @@
DIST hugin-2016.2.0.tar.bz2 10386216 SHA256
54ab1bc8dd94d83c02bfd4082c4454b3b33f0fa56bc17b45cf3e89be87691f15 SHA512
9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
WHIRLPOOL
4a61d4aa9d9362b03a04cdff192247c3d71b1e10bac5495165b870e47de2d66890c5895e94a56059df21be8c072600f7c6b18f66584979d40b755fcc1d8a9a64
-DIST hugin-2017.0rc1.tar.bz2 9803219 SHA256
6fd0039943dad654157bf720fe844bd1ad163cfa9078822faa14fc5651690f18 SHA512
f9bfdf8298b834988cb0f7957b261fdce07e82093609046961f4bc301d7a8dabb394e7895bda90e01334a18148486e245669a32e594bfdc49a4cd0b503b90738
WHIRLPOOL
4e8e938a28d15686864b900f0aac909652d62d7d64172378d87518d736654bf629634c7c5387c8cb110a49d318623f68d54c8866161898bcece55f5ecf3a5092
+DIST hugin-2017.0rc2.tar.bz2 9803272 SHA256
86646ea27f32b959d38e7d36270703214b1ae961e379dd64b14d027139cd4609 SHA512
bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
WHIRLPOOL
72978ca95f4f0aa17dda68beec925521969e39d000da9d00b014923a53387280b74571b4874f1dc506abceb2019dca7a2f2aba3e9128bdd9490f962f452296f8
diff --git a/media-gfx/hugin/hugin-2017.0_rc1.ebuild
b/media-gfx/hugin/hugin-2017.0_rc2.ebuild
similarity index 100%
rename from media-gfx/hugin/hugin-2017.0_rc1.ebuild
rename to media-gfx/hugin/hugin-2017.0_rc2.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 4ba21d4dfe3a8bcb4ec9be91cdaec452509b6f1e
Author: Markus Meier gentoo org>
AuthorDate: Sun Jun 4 07:18:41 2017 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Jun 4 07:18:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba21d4d
media-gfx/hugin: version bump
Package-Manager: Portage-2.3.5, Repoman-2.3.1
media-gfx/hugin/Manifest| 1 +
media-gfx/hugin/hugin-2017.0_rc1.ebuild | 87 +
2 files changed, 88 insertions(+)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index ea5223efbc3..d4c9c6c562b 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
DIST hugin-2016.2.0.tar.bz2 10386216 SHA256
54ab1bc8dd94d83c02bfd4082c4454b3b33f0fa56bc17b45cf3e89be87691f15 SHA512
9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
WHIRLPOOL
4a61d4aa9d9362b03a04cdff192247c3d71b1e10bac5495165b870e47de2d66890c5895e94a56059df21be8c072600f7c6b18f66584979d40b755fcc1d8a9a64
+DIST hugin-2017.0rc1.tar.bz2 9803219 SHA256
6fd0039943dad654157bf720fe844bd1ad163cfa9078822faa14fc5651690f18 SHA512
f9bfdf8298b834988cb0f7957b261fdce07e82093609046961f4bc301d7a8dabb394e7895bda90e01334a18148486e245669a32e594bfdc49a4cd0b503b90738
WHIRLPOOL
4e8e938a28d15686864b900f0aac909652d62d7d64172378d87518d736654bf629634c7c5387c8cb110a49d318623f68d54c8866161898bcece55f5ecf3a5092
diff --git a/media-gfx/hugin/hugin-2017.0_rc1.ebuild
b/media-gfx/hugin/hugin-2017.0_rc1.ebuild
new file mode 100644
index 000..ec84702f585
--- /dev/null
+++ b/media-gfx/hugin/hugin-2017.0_rc1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit python-single-r1 wxwidgets versionator cmake-utils
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net;
+SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
+
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
+IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ dev-db/sqlite:3
+ dev-libs/boost:=
+ dev-libs/zthread
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2:=
+ media-libs/freeglut
+ media-libs/glew:=
+ >=media-libs/libpano13-2.9.19_beta1:0=
+ media-libs/libpng:0=
+ media-libs/openexr:=
+ media-libs/tiff:0
+ >=media-libs/vigra-1.9.0[openexr]
+ sci-libs/fftw:3.0=
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/wxGTK:3.0=[X,opengl]
+ lapack? ( virtual/blas virtual/lapack )
+ python? ( ${PYTHON_DEPS} )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool"
+DEPEND="${CDEPEND}
+ dev-cpp/tclap
+ sys-devel/gettext
+ virtual/pkgconfig
+ python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+S=${WORKDIR}/${PN}-2017.0.0
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HSI=$(usex python)
+ -DENABLE_LAPACK=$(usex lapack)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use python && python_optimize
+
+ local lang
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ ca-valencia) dir=ca_ES@valencia;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang/-/_};;
+ esac
+ if ! use l10n_${lang} ; then
+ rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ fi
+ done
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: c940f26b464ce9487e9a8184bd98be3f29d5f580
Author: Markus Meier gentoo org>
AuthorDate: Sun May 7 08:29:38 2017 +
Commit: Markus Meier gentoo org>
CommitDate: Sun May 7 08:29:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c940f26b
media-gfx/hugin: remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.1
media-gfx/hugin/Manifest | 2 -
media-gfx/hugin/hugin-2015.0.0-r1.ebuild | 86
media-gfx/hugin/hugin-2016.0.0.ebuild| 86
3 files changed, 174 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index d1db1a808b9..ea5223efbc3 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,3 +1 @@
-DIST hugin-2015.0.0.tar.bz2 10611519 SHA256
2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512
bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
WHIRLPOOL
f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
-DIST hugin-2016.0.0.tar.bz2 10508576 SHA256
b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6 SHA512
029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1
WHIRLPOOL
2c21670944ba7fecb969499b21b279abb8bc77c5f9f5c5eab1576601b1d496576c0b53bc1e24d29e974d44f38e95da1ca32eeed198fa53f3f382fc4e3b8ddaa4
DIST hugin-2016.2.0.tar.bz2 10386216 SHA256
54ab1bc8dd94d83c02bfd4082c4454b3b33f0fa56bc17b45cf3e89be87691f15 SHA512
9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
WHIRLPOOL
4a61d4aa9d9362b03a04cdff192247c3d71b1e10bac5495165b870e47de2d66890c5895e94a56059df21be8c072600f7c6b18f66584979d40b755fcc1d8a9a64
diff --git a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
deleted file mode 100644
index 3f8b634cf8c..000
--- a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR
ro ru sk sv zh_CN zh_TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- dev-db/sqlite:3
- >=dev-libs/boost-1.49.0-r1:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- >=media-libs/libpano13-2.9.19_beta1:0=
- media-libs/libpng:0=
- media-libs/openexr:=
- media-libs/tiff:0
- >=media-libs/vigra-1.9.0[openexr]
- sci-libs/fftw:=
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
- lapack? ( virtual/blas virtual/lapack )
- python? ( ${PYTHON_DEPS} )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-cpp/tclap
- sys-devel/gettext
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- sed \
- -e 's:-O3::g' \
- -i src/celeste/CMakeLists.txt || die
- rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
- cmake-utils_src_prepare
-}
-
-src_install() {
- cmake-utils_src_install
- use python && python_optimize
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca@valencia) dir=ca_ES@valencia;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2016.0.0.ebuild
b/media-gfx/hugin/hugin-2016.0.0.ebuild
deleted file mode 100644
index 01a27b1e9e1..000
--- a/media-gfx/hugin/hugin-2016.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 2dfd9fd3c1a3bf8318d34ee450fac942e85d8773
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat May 6 17:20:10 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat May 6 17:20:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dfd9fd3
media-gfx/hugin: x86 stable wrt bug #617646
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/hugin/hugin-2016.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild
b/media-gfx/hugin/hugin-2016.2.0.ebuild
index 350c53e0528..d20586db462 100644
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 32c4deeb6886cb728a7ce56f1e31c5c013784a9e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat May 6 16:48:07 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat May 6 16:48:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c4deeb
media-gfx/hugin: amd64 stable wrt bug #617646
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/hugin/hugin-2016.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild
b/media-gfx/hugin/hugin-2016.2.0.ebuild
index c3a52fff95c..350c53e0528 100644
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 8fd1c4d3a52cbc602ecb521ec9c0895f1e2a0d37
Author: David Seifert gentoo org>
AuthorDate: Mon Nov 7 19:16:46 2016 +
Commit: David Seifert gentoo org>
CommitDate: Mon Nov 7 19:17:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd1c4d3
media-gfx/hugin: Let eclass delete superfluous modules
Gentoo-bug: 599108
Package-Manager: portage-2.3.2
media-gfx/hugin/hugin-.ebuild | 5 -
1 file changed, 5 deletions(-)
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index d40c3e7..43f9679 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -62,11 +62,6 @@ pkg_setup() {
use python && python-single-r1_pkg_setup
}
-src_prepare() {
- cmake-utils_src_prepare
- rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-}
-
src_configure() {
local mycmakeargs=(
-DBUILD_HSI=$(usex python)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: ce7666adf1d23589fb395761f8778a01ea29750c
Author: David Seifert gentoo org>
AuthorDate: Mon Nov 7 18:03:41 2016 +
Commit: David Seifert gentoo org>
CommitDate: Mon Nov 7 18:04:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7666ad
media-gfx/hugin: Let eclass delete superfluous modules
Gentoo-bug: 599108
Package-Manager: portage-2.3.2
media-gfx/hugin/hugin-2016.2.0.ebuild | 5 -
1 file changed, 5 deletions(-)
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild
b/media-gfx/hugin/hugin-2016.2.0.ebuild
index 8a366e2..4936c90 100644
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0.ebuild
@@ -60,11 +60,6 @@ pkg_setup() {
use python && python-single-r1_pkg_setup
}
-src_prepare() {
- cmake-utils_src_prepare
- rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-}
-
src_configure() {
local mycmakeargs=(
-DBUILD_HSI=$(usex python)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: fd38427c4c5a3fb50e6110a9a1b4eed3141505ca
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sun Sep 18 10:02:41 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sun Nov 6 18:11:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd38427c
media-gfx/hugin: Switch to EAPI 6, python3_5
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2354
Signed-off-by: David Seifert gentoo.org>
media-gfx/hugin/hugin-2016.2.0.ebuild | 29 ++---
media-gfx/hugin/hugin-.ebuild | 29 ++---
2 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild
b/media-gfx/hugin/hugin-2016.2.0.ebuild
index 5345e17..8a366e2 100644
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit python-single-r1 wxwidgets versionator cmake-utils
@@ -23,7 +23,7 @@ IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
!!dev-util/cocom
dev-db/sqlite:3
- >=dev-libs/boost-1.49.0-r1:0=
+ dev-libs/boost:=
dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2:=
@@ -34,7 +34,7 @@ CDEPEND="
media-libs/openexr:=
media-libs/tiff:0
>=media-libs/vigra-1.9.0[openexr]
- sci-libs/fftw:=
+ sci-libs/fftw:3.0=
sys-libs/zlib
virtual/glu
virtual/jpeg:0
@@ -52,27 +52,32 @@ DEPEND="${CDEPEND}
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DOCS=( authors.txt README TODO )
+
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- -DBUILD_HSI=$(usex python ON OFF)
- -DENABLE_LAPACK=$(usex lapack ON OFF)
- )
use python && python-single-r1_pkg_setup
}
src_prepare() {
+ cmake-utils_src_prepare
rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
+}
- cmake-utils_src_prepare
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HSI=$(usex python)
+ -DENABLE_LAPACK=$(usex lapack)
+ )
+ cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
use python && python_optimize
+ local lang
for lang in ${LANGS} ; do
case ${lang} in
ca) dir=ca_ES;;
@@ -80,6 +85,8 @@ src_install() {
cs) dir=cs_CZ;;
*) dir=${lang/-/_};;
esac
- use l10n_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ if ! use l10n_${lang} ; then
+ rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ fi
done
}
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index b739963..d40c3e7 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
@@ -25,7 +25,7 @@ IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
!!dev-util/cocom
dev-db/sqlite:3
- >=dev-libs/boost-1.49.0-r1:0=
+ dev-libs/boost:=
dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2:=
@@ -36,7 +36,7 @@ CDEPEND="
media-libs/openexr:=
media-libs/tiff:0
>=media-libs/vigra-1.9.0[openexr]
- sci-libs/fftw:=
+ sci-libs/fftw:3.0=
sys-libs/zlib
virtual/glu
virtual/jpeg:0
@@ -54,27 +54,32 @@ DEPEND="${CDEPEND}
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DOCS=( authors.txt README TODO )
+
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- -DBUILD_HSI=$(usex python ON OFF)
- -DENABLE_LAPACK=$(usex lapack ON OFF)
- )
use python && python-single-r1_pkg_setup
}
src_prepare() {
+ cmake-utils_src_prepare
rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
+}
- cmake-utils_src_prepare
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HSI=$(usex python)
+ -DENABLE_LAPACK=$(usex lapack)
+ )
+ cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
use python && python_optimize
+ local lang
for lang in ${LANGS} ; do
case ${lang} in
ca)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 934d2b32961cbeac581e659d1a8ee40f52b70412
Author: Markus Meier gentoo org>
AuthorDate: Fri Sep 23 05:03:32 2016 +
Commit: Markus Meier gentoo org>
CommitDate: Fri Sep 23 05:03:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=934d2b32
media-gfx/hugin: version bump
Package-Manager: portage-2.3.0
media-gfx/hugin/Manifest | 2 +-
media-gfx/hugin/{hugin-2016.2.0_rc1.ebuild => hugin-2016.2.0.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 5e6e4f9..d1db1a8 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,3 +1,3 @@
DIST hugin-2015.0.0.tar.bz2 10611519 SHA256
2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512
bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
WHIRLPOOL
f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
DIST hugin-2016.0.0.tar.bz2 10508576 SHA256
b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6 SHA512
029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1
WHIRLPOOL
2c21670944ba7fecb969499b21b279abb8bc77c5f9f5c5eab1576601b1d496576c0b53bc1e24d29e974d44f38e95da1ca32eeed198fa53f3f382fc4e3b8ddaa4
-DIST hugin-2016.2.0-rc1.tar.bz2 10396049 SHA256
b1a68b7890b4d463e18408993ea7ef57aefe9c4b3a5a9724e9bbacf9d0d371a3 SHA512
d1f75772db6ab70af0fdbdad32c3c7770fb6660886646ea164f8c7ccf668a1cd2d14af1d61d45f9f9b28f49e78a19fb8678d4d7706e1ddd8989f9c44abe159b7
WHIRLPOOL
6c30aa339d8a0bef7c714b93dddc362eb67b5a333f0e22361eaba6c0f79e486fef0136c5b7296d0425040dd98d514ea364e1afba470489e356954d55fd266288
+DIST hugin-2016.2.0.tar.bz2 10386216 SHA256
54ab1bc8dd94d83c02bfd4082c4454b3b33f0fa56bc17b45cf3e89be87691f15 SHA512
9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
WHIRLPOOL
4a61d4aa9d9362b03a04cdff192247c3d71b1e10bac5495165b870e47de2d66890c5895e94a56059df21be8c072600f7c6b18f66584979d40b755fcc1d8a9a64
diff --git a/media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
b/media-gfx/hugin/hugin-2016.2.0.ebuild
similarity index 100%
rename from media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
rename to media-gfx/hugin/hugin-2016.2.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 9b1f18ac9baa3a1d35a3575bb798d4d03b5b8f65
Author: Markus Meier gentoo org>
AuthorDate: Sun Jul 10 09:13:29 2016 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Jul 10 09:13:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b1f18ac
media-gfx/hugin: version bump, migrate to I10N
Package-Manager: portage-2.3.0
media-gfx/hugin/Manifest | 1 +
...hugin-.ebuild => hugin-2016.2.0_rc1.ebuild} | 23 ++
media-gfx/hugin/hugin-.ebuild | 15 +++---
3 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 38839a5..5e6e4f9 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1,3 @@
DIST hugin-2015.0.0.tar.bz2 10611519 SHA256
2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512
bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
WHIRLPOOL
f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
DIST hugin-2016.0.0.tar.bz2 10508576 SHA256
b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6 SHA512
029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1
WHIRLPOOL
2c21670944ba7fecb969499b21b279abb8bc77c5f9f5c5eab1576601b1d496576c0b53bc1e24d29e974d44f38e95da1ca32eeed198fa53f3f382fc4e3b8ddaa4
+DIST hugin-2016.2.0-rc1.tar.bz2 10396049 SHA256
b1a68b7890b4d463e18408993ea7ef57aefe9c4b3a5a9724e9bbacf9d0d371a3 SHA512
d1f75772db6ab70af0fdbdad32c3c7770fb6660886646ea164f8c7ccf668a1cd2d14af1d61d45f9f9b28f49e78a19fb8678d4d7706e1ddd8989f9c44abe159b7
WHIRLPOOL
6c30aa339d8a0bef7c714b93dddc362eb67b5a333f0e22361eaba6c0f79e486fef0136c5b7296d0425040dd98d514ea364e1afba470489e356954d55fd266288
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
similarity index 74%
copy from media-gfx/hugin/hugin-.ebuild
copy to media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
index 50ecf8a..4b80209 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
@@ -7,20 +7,18 @@ EAPI=5
WX_GTK_VER="3.0"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
+inherit python-single-r1 wxwidgets versionator cmake-utils
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
-SRC_URI=""
-EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin;
-EHG_PROJECT="${PN}-${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86"
-LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR
ro ru sk sv zh_CN zh_TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
+IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
!!dev-util/cocom
@@ -66,9 +64,6 @@ pkg_setup() {
}
src_prepare() {
- sed \
- -e 's:-O3::g' \
- -i src/celeste/CMakeLists.txt || die
rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
cmake-utils_src_prepare
@@ -80,9 +75,11 @@ src_install() {
for lang in ${LANGS} ; do
case ${lang} in
- ca@valencia) dir=ca_ES@valencia;;
- *) dir=${lang};;
+ ca) dir=ca_ES;;
+ ca-valencia) dir=ca_ES@valencia;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang/-/_};;
esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ use l10n_${lang} || rm -r "${D}"/usr/share/locale/${dir}
done
}
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 50ecf8a..6fbb401 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -19,8 +19,8 @@ LICENSE="GPL-2 SIFT"
SLOT="0"
KEYWORDS=""
-LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR
ro ru sk sv zh_CN zh_TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru
sk sv zh-CN zh-TW"
+IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
!!dev-util/cocom
@@ -66,9 +66,6 @@ pkg_setup() {
}
src_prepare() {
- sed \
- -e 's:-O3::g' \
- -i src/celeste/CMakeLists.txt || die
rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
cmake-utils_src_prepare
@@ -80,9 +77,11 @@ src_install() {
for lang in ${LANGS} ; do
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 23ce9e354275378713cb2f250696095bd6b937b3 Author: Ian Stakenvicius gentoo org> AuthorDate: Wed Apr 20 15:13:24 2016 + Commit: Ian Stakenvicius gentoo org> CommitDate: Wed Apr 20 15:13:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ce9e35 media-gfx/hugin: fix references in metadata.xml Package-Manager: portage-2.2.26 media-gfx/hugin/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml index a614d6f..48424f5 100644 --- a/media-gfx/hugin/metadata.xml +++ b/media-gfx/hugin/metadata.xml @@ -8,7 +8,6 @@ hugin is a panorama stitching program automatically align images with - media-gfx/autopano-sift or media-gfx/autopano-sift-C
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 64e3c8d4c55892da6ae1430804636da60ded6e2f
Author: Markus Meier gentoo org>
AuthorDate: Sun Mar 20 10:38:18 2016 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Mar 20 10:38:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e3c8d4
media-gfx/hugin: version bump
Package-Manager: portage-2.2.28
media-gfx/hugin/Manifest | 2 +-
media-gfx/hugin/{hugin-2016.0.0_rc2.ebuild => hugin-2016.0.0.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index b97552b..38839a5 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1,2 @@
DIST hugin-2015.0.0.tar.bz2 10611519 SHA256
2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512
bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
WHIRLPOOL
f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
-DIST hugin-2016.0.0_rc2.tar.bz2 10508576 SHA256
b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6 SHA512
029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1
WHIRLPOOL
2c21670944ba7fecb969499b21b279abb8bc77c5f9f5c5eab1576601b1d496576c0b53bc1e24d29e974d44f38e95da1ca32eeed198fa53f3f382fc4e3b8ddaa4
+DIST hugin-2016.0.0.tar.bz2 10508576 SHA256
b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6 SHA512
029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1
WHIRLPOOL
2c21670944ba7fecb969499b21b279abb8bc77c5f9f5c5eab1576601b1d496576c0b53bc1e24d29e974d44f38e95da1ca32eeed198fa53f3f382fc4e3b8ddaa4
diff --git a/media-gfx/hugin/hugin-2016.0.0_rc2.ebuild
b/media-gfx/hugin/hugin-2016.0.0.ebuild
similarity index 100%
rename from media-gfx/hugin/hugin-2016.0.0_rc2.ebuild
rename to media-gfx/hugin/hugin-2016.0.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 99c00fa7bb363b0c792af6f786fe9d760892ef6b
Author: Markus Meier gentoo org>
AuthorDate: Sat Mar 12 12:36:55 2016 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Mar 13 12:27:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c00fa7
media-gfx/hugin: version bump
Package-Manager: portage-2.2.27
media-gfx/hugin/Manifest| 2 +-
.../hugin/{hugin-2016.0.0_rc1.ebuild => hugin-2016.0.0_rc2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index ac2a267..b97552b 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1,2 @@
DIST hugin-2015.0.0.tar.bz2 10611519 SHA256
2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512
bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
WHIRLPOOL
f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
-DIST hugin-2016.0.0_rc1.tar.bz2 10507908 SHA256
1be18902e70d541a8b2d2855cff7ccd8ce5bdc3836a6185a5d94262392b4f533 SHA512
cb3326513153a7ae3471286baba52ff37d10cd75c52c9c7852c097a3760f8c0aeb3643a039f60f13b3aae4b31d782f8f3d17380328fdfee4c6b94953d488
WHIRLPOOL
096f2dda5a6af476052079d9fff398cddf6bda630f921612e086190482d077dd997b195a0f340cf652179c6e340e48141055b2a87ad329b5d06badaef97c5f49
+DIST hugin-2016.0.0_rc2.tar.bz2 10508576 SHA256
b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6 SHA512
029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1
WHIRLPOOL
2c21670944ba7fecb969499b21b279abb8bc77c5f9f5c5eab1576601b1d496576c0b53bc1e24d29e974d44f38e95da1ca32eeed198fa53f3f382fc4e3b8ddaa4
diff --git a/media-gfx/hugin/hugin-2016.0.0_rc1.ebuild
b/media-gfx/hugin/hugin-2016.0.0_rc2.ebuild
similarity index 100%
rename from media-gfx/hugin/hugin-2016.0.0_rc1.ebuild
rename to media-gfx/hugin/hugin-2016.0.0_rc2.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 88320cc0d863e84fc017a522e7f8e676407ef2ac
Author: Markus Meier gentoo org>
AuthorDate: Thu Mar 10 18:04:58 2016 +
Commit: Markus Meier gentoo org>
CommitDate: Thu Mar 10 18:05:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88320cc0
media-gfx/hugin: version bump
Package-Manager: portage-2.2.27
media-gfx/hugin/Manifest | 1 +
.../{hugin-.ebuild => hugin-2016.0.0_rc1.ebuild} | 18 --
media-gfx/hugin/hugin-.ebuild | 10 +-
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 34addc4..ac2a267 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
DIST hugin-2015.0.0.tar.bz2 10611519 SHA256
2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512
bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
WHIRLPOOL
f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
+DIST hugin-2016.0.0_rc1.tar.bz2 10507908 SHA256
1be18902e70d541a8b2d2855cff7ccd8ce5bdc3836a6185a5d94262392b4f533 SHA512
cb3326513153a7ae3471286baba52ff37d10cd75c52c9c7852c097a3760f8c0aeb3643a039f60f13b3aae4b31d782f8f3d17380328fdfee4c6b94953d488
WHIRLPOOL
096f2dda5a6af476052079d9fff398cddf6bda630f921612e086190482d077dd997b195a0f340cf652179c6e340e48141055b2a87ad329b5d06badaef97c5f49
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-2016.0.0_rc1.ebuild
similarity index 83%
copy from media-gfx/hugin/hugin-.ebuild
copy to media-gfx/hugin/hugin-2016.0.0_rc1.ebuild
index 061cae1..5d675f1 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-2016.0.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,17 +7,15 @@ EAPI=5
WX_GTK_VER="3.0"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
+inherit python-single-r1 wxwidgets versionator cmake-utils
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
-SRC_URI=""
-EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin;
-EHG_PROJECT="${PN}-${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86"
LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR
ro ru sk sv zh_CN zh_TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
@@ -25,7 +23,7 @@ IUSE="debug lapack python sift $(echo ${LANGS//\ /\
linguas_})"
CDEPEND="
!!dev-util/cocom
dev-db/sqlite:3
- >=dev-libs/boost-1.49.0-r1:=
+ >=dev-libs/boost-1.49.0-r1:0=
dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2:=
@@ -38,7 +36,7 @@ CDEPEND="
>=media-libs/vigra-1.9.0[openexr]
sci-libs/fftw:=
sys-libs/zlib
- virtual/opengl
+ virtual/glu
virtual/jpeg:0
virtual/opengl
x11-libs/wxGTK:3.0=[X,opengl]
@@ -59,8 +57,8 @@ S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
pkg_setup() {
DOCS="authors.txt README TODO"
mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
+ -DBUILD_HSI=$(usex python ON OFF)
+ -DENABLE_LAPACK=$(usex lapack ON OFF)
)
use python && python-single-r1_pkg_setup
}
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index 061cae1..50ecf8a 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -25,7 +25,7 @@ IUSE="debug lapack python sift $(echo ${LANGS//\ /\
linguas_})"
CDEPEND="
!!dev-util/cocom
dev-db/sqlite:3
- >=dev-libs/boost-1.49.0-r1:=
+ >=dev-libs/boost-1.49.0-r1:0=
dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2:=
@@ -38,7 +38,7 @@ CDEPEND="
>=media-libs/vigra-1.9.0[openexr]
sci-libs/fftw:=
sys-libs/zlib
- virtual/opengl
+ virtual/glu
virtual/jpeg:0
virtual/opengl
x11-libs/wxGTK:3.0=[X,opengl]
@@ -59,8 +59,8 @@ S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
pkg_setup() {
DOCS="authors.txt README TODO"
mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
+ -DBUILD_HSI=$(usex python ON OFF)
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 1f171d178801b1d538c2e1df87aa11f3dac9be4d
Author: Markus Meier gentoo org>
AuthorDate: Sat Nov 7 07:49:53 2015 +
Commit: Markus Meier gentoo org>
CommitDate: Sat Nov 7 07:49:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f171d17
media-gfx/hugin: remove unused base eclass
Package-Manager: portage-2.2.23
media-gfx/hugin/hugin-2015.0.0-r1.ebuild | 2 +-
media-gfx/hugin/hugin-.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
index 3306723..e44a64b 100644
--- a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
WX_GTK_VER="3.0"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit base python-single-r1 wxwidgets versionator cmake-utils
+inherit python-single-r1 wxwidgets versionator cmake-utils
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
diff --git a/media-gfx/hugin/hugin-.ebuild
b/media-gfx/hugin/hugin-.ebuild
index ae044a4..061cae1 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -7,7 +7,7 @@ EAPI=5
WX_GTK_VER="3.0"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit base mercurial python-single-r1 wxwidgets versionator cmake-utils
+inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net;
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
commit: c3397c5cceda6c6e02e92cf9b9e64ca5854ade18
Author: Markus Meier gentoo org>
AuthorDate: Tue Nov 3 19:10:42 2015 +
Commit: Markus Meier gentoo org>
CommitDate: Tue Nov 3 19:10:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3397c5c
remove old
Package-Manager: portage-2.2.23
media-gfx/hugin/Manifest | 1 -
.../hugin/files/hugin-2014.0.0-ParseExp.patch | 527 -
.../hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch | 15 -
media-gfx/hugin/hugin-2014.0.0-r1.ebuild | 89
media-gfx/hugin/hugin-2014.0.0.ebuild | 89
media-gfx/hugin/hugin-2015.0.0.ebuild | 86
6 files changed, 807 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 84eaf33..34addc4 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1 @@
-DIST hugin-2014.0.0.tar.bz2 10974274 SHA256
f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512
f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5
WHIRLPOOL
e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d
DIST hugin-2015.0.0.tar.bz2 10611519 SHA256
2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512
bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
WHIRLPOOL
f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
diff --git a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch
b/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch
deleted file mode 100644
index 3ee0dee..000
--- a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch
+++ /dev/null
@@ -1,527 +0,0 @@
-Contains revisions 6407:917d117ba6b0 6597:5b768c308932 6688:dde84e96b755
6689:e237d6d1d873 of ParseExp.cpp/h
-
-diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.cpp
a/src/tools/ParseExp.cpp Sun Dec 15 18:20:14 2013 +0100
-+++ b/src/tools/ParseExp.cpp Sat Sep 13 11:22:39 2014 +0200
-@@ -1,262 +1,246 @@
--// -*- c-basic-offset: 4 -*-
--
--/** @file ParseExp.cpp
-- *
-- * @brief functions to parse expressions from strings
-- *
-- * @author T. Modes
-- *
-- */
--
--/* This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This software is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public
-- * License along with this software; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- */
--
--// implementation is based on blog at
--//
http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html
--// modified to Hugins need
--// added if statement
--
--#include "ParseExp.h"
--
--#include
--#include
--
--#include
--#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010
--#error "At least Spirit version 2.1 required"
--#endif
--#include
--#include
--#include
--
--namespace Parser
--{
--
--// helper classes to implement operators
--
--//power function
--struct lazy_pow_
--{
--template
--struct result { typedef X type; };
--
--template
--X operator()(X x, Y y) const
--{
--return std::pow(x, y);
--}
--};
--
--// modulus for double values
--struct lazy_mod_
--{
--template
--struct result { typedef X type; };
--
--template
--X operator()(X x, Y y) const
--{
--return std::fmod(x,y);
--}
--};
--
--// if statement
--struct lazy_if_
--{
--template
--struct result { typedef Y type; };
--
--template
--X operator()(X x, Y y, Z z) const
--{
--return x ? y : z;
--}
--};
--
--// wrapper for unary function
--struct lazy_ufunc_
--{
--template
--struct result { typedef A1 type; };
--
--template
--A1 operator()(F f, A1 a1) const
--{
--return f(a1);
--}
--};
--
--// convert rad into deg
--double deg(const double d)
--{
--return d*180.0/boost::math::constants::pi();
--};
--
--// convert deg into rad
--double rad(const double d)
--{
--return d*boost::math::constants::pi()/180;
--};
--
--// the main grammar class
--struct grammar:boost::spirit::qi::grammar
--{
--
--// symbol table for constants like "pi", e.g. image
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 6e4f7a2cb350016dfefb7fe39d36aba10d48189c
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Nov 3 16:17:16 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Nov 3 16:17:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4f7a2c
media-gfx/hugin: x86 stable wrt bug #563944
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
media-gfx/hugin/hugin-2015.0.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
index d00380e..3306723 100644
--- a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR
ro ru sk sv zh_CN zh_TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
commit: 3f345cc40a3a9e664dab22e6587fdb6dff17cb95
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Oct 27 12:17:36 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Oct 27 12:17:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f345cc4
media-gfx/hugin: amd64 stable wrt bug #563944
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
media-gfx/hugin/hugin-2015.0.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
index b42262b..d00380e 100644
--- a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR
ro ru sk sv zh_CN zh_TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
