summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-10-14 19:29:44 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-10-14 20:52:55 +0200
commit5e9542668be4e8c216de62295c2975c8cc1310ea (patch)
tree986b238fa9455029adeb3a8a20a820944e577d7c
parentdev-util/cmake: stable 3.8.2 for hppa, bug #634088 (thanks to Rolf Eike Beer) (diff)
downloadgentoo-5e954266.tar.gz
gentoo-5e954266.tar.bz2
gentoo-5e954266.zip
media-gfx/icc_examin: Add 0.56_p20171007 snapshot
- EAPI 6 - Switch to cmake - Add missing DEPENDs - Fix HOMEPAGE, DESCRIPTION Gentoo-bug: 536646 Package-Manager: Portage-2.3.11, Repoman-2.3.3
-rw-r--r--media-gfx/icc_examin/Manifest1
-rw-r--r--media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch27
-rw-r--r--media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild55
-rw-r--r--media-gfx/icc_examin/icc_examin-9999.ebuild49
4 files changed, 112 insertions, 20 deletions
diff --git a/media-gfx/icc_examin/Manifest b/media-gfx/icc_examin/Manifest
index ce9479918d51..d02d1acc4d1a 100644
--- a/media-gfx/icc_examin/Manifest
+++ b/media-gfx/icc_examin/Manifest
@@ -1 +1,2 @@
+DIST icc-examin-0.56_p20171007.tar.gz 724698 SHA256 1a7acd84a9891284d84f025baa37b97823fa6708e4b5b26be5f58d52381d12aa SHA512 79d4e42c0ae389128ee6514892d0019b0cec17466e8d8e47efbc0a5114c0d365732e26a9abb442a3bca3c2e83ede4dca407cad3bf250492a36832f8bdebeb2b6 WHIRLPOOL ef06562d25b172ee9aaef143422e0403a89dd0731a9d33a56fd6a60ac560e6f3e66b1bba14c9980feb6a288b4cff1dc2daf9458ca1034ab1c63140bf24b5ea80
DIST icc_examin-0.55.tar.gz 692711 SHA256 6a6036e4724845368c2ade86c3d29e9cf0e09801f704d02f45ed2b2481924bab SHA512 503d932890c747b9111167df360e9deedd985a4cd434610a6c0de42d4d36ff22907c1441485731349661ddab85d39268fcfc69c035601c1066ec9b63566f491a WHIRLPOOL b6014338eb79e3ac2bdbbb7e4f817a49cca0d34e6dc3b10fe74f6bc4cc1c85d57d7b76d53574aebdcb7dff599a1f0ade1f809006ada01977361d59a64ca8d413
diff --git a/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch b/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch
new file mode 100644
index 000000000000..5e4645a8b0ef
--- /dev/null
+++ b/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch
@@ -0,0 +1,27 @@
+From 172889b358d0801da8d2c15196129cd911e3afc1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 14 Oct 2017 18:59:20 +0200
+Subject: [PATCH] Fix FLTK include and libs
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 60ee08a..41f7c61 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -103,8 +103,8 @@ IF(FLTK_FOUND)
+ SET( FLTK_ADD_LIBS "fltk_jpeg" )
+ ENDIF( NOT JPEG_FOUND )
+ ENDIF(FLTK_FOUND)
+-INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} )
+-LINK_DIRECTORIES( ${FLTK_LIBRARY_DIRS} )
++INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIR} )
++LINK_DIRECTORIES( ${FLTK_LIBRARIES} )
+
+ FIND_PACKAGE( OpenGL )
+ IF(OPENGL_FOUND)
+--
+2.14.2
+
diff --git a/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild b/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild
new file mode 100644
index 000000000000..fd9e3b7ee0e5
--- /dev/null
+++ b/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=ee9e8cd013766b0df2c5e3b4416f985322b22966
+inherit cmake-utils flag-o-matic vcs-snapshot xdg-utils
+
+DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables"
+HOMEPAGE="http://www.oyranos.org/icc-examin/"
+SRC_URI="https://github.com/oyranos-cms/${PN/_/-}/tarball/${COMMIT} -> ${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ app-admin/elektra
+ media-libs/freetype
+ media-libs/ftgl
+ media-libs/libXcm[X]
+ media-libs/oyranos
+ media-libs/tiff:0
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/fltk[opengl]
+ x11-libs/libX11
+ x11-libs/libXinerama
+ x11-libs/libXpm
+ x11-libs/libXrandr
+ x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/libintl
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN/_/-}-0.56-fltk.patch" )
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+ append-cxxflags -fpermissive
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/media-gfx/icc_examin/icc_examin-9999.ebuild b/media-gfx/icc_examin/icc_examin-9999.ebuild
index 045fa7a82065..ceb2821c90c8 100644
--- a/media-gfx/icc_examin/icc_examin-9999.ebuild
+++ b/media-gfx/icc_examin/icc_examin-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils toolchain-funcs git-r3
+inherit cmake-utils flag-o-matic git-r3 xdg-utils
-DESCRIPTION="Viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and GPU gamma tables"
-HOMEPAGE="http://www.oyranos.org/wiki/index.php?title=ICC_Examin"
+DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables"
+HOMEPAGE="http://www.oyranos.org/icc-examin/"
EGIT_REPO_URI="https://github.com/oyranos-cms/${PN/_/-}.git"
LICENSE="GPL-2"
@@ -14,30 +14,39 @@ SLOT="0"
KEYWORDS=""
IUSE=""
-RDEPEND="app-admin/elektra
+RDEPEND="
+ app-admin/elektra
+ media-libs/freetype
media-libs/ftgl
- media-libs/libXcm
- =media-libs/oyranos-9999
+ media-libs/libXcm[X]
+ media-libs/oyranos
media-libs/tiff:0
- x11-libs/fltk
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/fltk[opengl]
x11-libs/libX11
x11-libs/libXinerama
x11-libs/libXpm
x11-libs/libXrandr
- x11-libs/libXxf86vm"
-
+ x11-libs/libXxf86vm
+"
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ sys-devel/gettext
+ virtual/libintl
+ virtual/pkgconfig
+"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.55-fix-xrandr-test.patch
+PATCHES=( "${FILESDIR}/${PN/_/-}-0.56-fltk.patch" )
- sed -e '/xdg-icon-resource\|xdg-desktop-menu/d' \
- -i makefile.in
+src_configure() {
+ append-cxxflags -fpermissive
+ cmake-utils_src_configure
}
-src_configure() {
- tc-export CC CXX
- econf --enable-verbose \
- --disable-static
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
}