Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-libs/oyranos/ChangeLog11
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-buildsystem.patch162
-rw-r--r--media-libs/oyranos/oyranos-0.9.0.ebuild85
-rw-r--r--media-libs/oyranos/oyranos-0.9.1.ebuild83
-rw-r--r--media-libs/oyranos/oyranos-0.9.4.ebuild79
5 files changed, 251 insertions, 169 deletions
diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
index 904d189ec652..b621bf798cc1 100644
--- a/media-libs/oyranos/ChangeLog
+++ b/media-libs/oyranos/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for media-libs/oyranos
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.9 2013/02/11 07:46:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.10 2013/03/23 18:17:07 xmw Exp $
+
+*oyranos-0.9.4 (23 Mar 2013)
+
+ 23 Mar 2013; Michael Weber <xmw@gentoo.org> -oyranos-0.9.0.ebuild,
+ -oyranos-0.9.1.ebuild, +oyranos-0.9.4.ebuild,
+ +files/oyranos-0.9.4-buildsystem.patch:
+ Version bump (bug 450494, thanks Chris Reffett and Andreas Sturmlechner for
+ their contribution), ebuild rewritten from scratch (cudos upstream for
+ nothing), drop old.
*oyranos-0.9.1-r1 (11 Feb 2013)
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-buildsystem.patch b/media-libs/oyranos/files/oyranos-0.9.4-buildsystem.patch
new file mode 100644
index 000000000000..ed864eac1612
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.4-buildsystem.patch
@@ -0,0 +1,162 @@
+--- oyranos-0.9.4/src/CMakeLists.txt
++++ oyranos-0.9.4/src/CMakeLists.txt
+@@ -100,7 +100,9 @@
+ INCLUDE_DIRECTORIES( ${XCM_INCLUDE_DIRS} )
+ LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} )
+
+-FIND_PACKAGE( X11 )
++IF(X11_WANT)
++FIND_PACKAGE( X11 REQUIRED )
++ENDIF(X11_WANT)
+ IF(X11_FOUND)
+ INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIRS} )
+ LINK_DIRECTORIES( ${X11_LIBRARY_DIRS} )
+@@ -123,27 +125,35 @@
+ LINK_DIRECTORIES( ${XXF86VM_LIBRARY_DIRS} )
+ ENDIF(X11_FOUND)
+
+-FIND_PACKAGE( CUPS )
++IF(WANT_CUPS)
++FIND_PACKAGE( Cups REQUIRED )
++SET( HAVE_CUPS 1 )
++ENDIF(WANT_CUPS)
+ IF(HAVE_CUPS)
+- INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIRS} )
+- LINK_DIRECTORIES( ${CUPS_LIBRARY_DIRS} )
++ INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIR} )
+ ENDIF(HAVE_CUPS)
+
+-FIND_PACKAGE( Cairo )
++IF(WANT_CAIRO)
++FIND_PACKAGE( Cairo REQUIRED)
++ENDIF(WANT_CAIRO)
+ IF(HAVE_CAIRO)
+ INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR}/cairo )
+ INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR} )
+ LINK_DIRECTORIES( ${CAIRO_LIBRARY_DIRS} )
+ ENDIF(HAVE_CAIRO)
+
+-FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui)
++IF(WANT_QT4)
++FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
++ENDIF(WANT_QT4)
+ IF(QT_FOUND)
+ SET( HAVE_QT 1 )
+ INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} )
+ LINK_DIRECTORIES( ${QT_LIBRARY_DIRS} )
+ ENDIF(QT_FOUND)
+
+-FIND_PACKAGE( Fltk )
++IF(WANT_FLTK)
++FIND_PACKAGE( FLTK REQUIRED)
++ENDIF(WANT_FLTK)
+ IF(FLTK_FOUND)
+ SET( HAVE_FLTK 1 )
+ INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} )
+@@ -159,7 +169,9 @@
+ SET( LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} PARENT_SCOPE)
+ ENDIF(LIBXML2_FOUND)
+
+-FIND_PACKAGE( LibRaw )
++IF(WANT_LIBRAW)
++FIND_PACKAGE( LibRaw REQUIRED )
++ENDIF(WANT_LIBRAW)
+ IF( HAVE_LIBRAW )
+ # TRY_COMPILE(
+ # HAVE_LIBRAW_REALLY
+@@ -182,7 +194,9 @@
+ MESSAGE( "HAVE_LIBRAW_PLUGIN: ${HAVE_LIBRAW_PLUGIN}" )
+ ENDIF()
+
+-FIND_PACKAGE( Exif2 )
++IF(WANT_EXIV2)
++FIND_PACKAGE( Exif2 REQUIRED )
++ENDIF(WANT_EXIV2)
+ IF(HAVE_EXIV2)
+ INCLUDE_DIRECTORIES( ${EXIV2_INCLUDE_DIRS} )
+ LINK_DIRECTORIES( ${EXIV2_LIBRARY_DIRS} )
+--- oyranos-0.9.4/CMakeLists.txt
++++ oyranos-0.9.4/CMakeLists.txt
+@@ -41,7 +41,7 @@
+
+
+ # detect top level projects
+-FIND_PACKAGE( Yajl )
++FIND_PACKAGE( Yajl REQUIRED )
+ IF( HAVE_YAJL )
+ INCLUDE_DIRECTORIES( ${YAJL_INCLUDE_DIRS} )
+ LINK_DIRECTORIES( ${YAJL_LIBRARY_DIRS} )
+@@ -51,71 +51,15 @@
+ IF( NOT HAVE_YAJL_VERSION_H )
+ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/yajl/ )
+ ENDIF( NOT HAVE_YAJL_VERSION_H )
+-ELSE( HAVE_YAJL )
+- IF(CMAKE_VERSION VERSION_GREATER 2.8.0)
+- include(ExternalProject)
+- ExternalProject_Add( yajl
+- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yajl
+- CONFIGURE_COMMAND cmake ${CMAKE_CURRENT_SOURCE_DIR}/yajl
+- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/yajl
+- BUILD_COMMAND ${MAKE}
+- # skip installation
+- INSTALL_COMMAND echo )
+- INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/yajl )
+- LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/yajl )
+- SET( YAJL_LIBRARIES yajl-static )
+- ENDIF()
+-
+ ENDIF( HAVE_YAJL )
+
+-FIND_PACKAGE( Elektra )
++FIND_PACKAGE( Elektra REQUIRED )
++SET( HAVE_ELEKTRA 1 )
+ IF(HAVE_ELEKTRA)
+ SET( ELEKTRA_SPEC "Requires: elektra 0.7
+ BuildRequires: elektra-devel" )
+ INCLUDE_DIRECTORIES( ${ELEKTRA_INCLUDE_DIRS} )
+ LINK_DIRECTORIES( ${ELEKTRA_LIBRARY_DIRS} )
+-ELSE(HAVE_ELEKTRA)
+- SET( ELEKTRA_VERSION elektra-0.7.1 )
+- MESSAGE( "-- Using internal Elektra: ${ELEKTRA_VERSION}" )
+- INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/${ELEKTRA_VERSION}/src/include
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/include )
+- SET( ELEKTRA_LIBRARIES_STATIC
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdb.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhandle.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-key.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyset.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-trie.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhighlevel.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbcapability.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyhelpers.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keymeta.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyname.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keytest.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyvalue.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-serialize.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-split.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-exported_symbols.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libloader/libloader_static_a-kdbLibLoader.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-internal.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-helper.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/backends/filesys/libelektra_filesys_a-filesys.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-kdbtools.o
+- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-stream.o
+- )
+- SET( ELEKTRA_LIBRARIES
+- ${LIBXML2_LIBRARIES}
+- )
+- IF(CMAKE_VERSION VERSION_GREATER 2.8.0)
+- include(ExternalProject)
+- ExternalProject_Add( ${ELEKTRA_VERSION}
+- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}
+- # GCC flags (-fPIC) will fail on Windows, without we get relocation R_X86_64_32 errors
+- CONFIGURE_COMMAND CFLAGS=-fPIC ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}/configure --enable-static --enable-shared=false
+- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${ELEKTRA_VERSION}
+- BUILD_COMMAND ${MAKE}
+- # skip installation
+- INSTALL_COMMAND echo )
+- ENDIF()
+ ENDIF(HAVE_ELEKTRA)
+
+ #now add all directories
diff --git a/media-libs/oyranos/oyranos-0.9.0.ebuild b/media-libs/oyranos/oyranos-0.9.0.ebuild
deleted file mode 100644
index 4ed347a1c5ba..000000000000
--- a/media-libs/oyranos/oyranos-0.9.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild,v 1.3 2012/11/23 21:55:30 xmw Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="colour management system allowing to share various settings across applications and services"
-HOMEPAGE="http://www.oyranos.org/"
-SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc static-libs test xinerama"
-
-RDEPEND="app-admin/elektra
- dev-libs/libxml2
- dev-libs/yajl
- media-gfx/exiv2
- media-libs/lcms:0
- media-libs/libpng:0
- media-libs/libraw
- >=media-libs/libXcm-0.5.1
- X? ( x11-libs/fltk:1
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXxf86vm
- xinerama? ( x11-libs/libXinerama ) )"
-DEPEND="${RDEPEND}
- app-doc/doxygen
- media-gfx/graphviz
- test? ( media-libs/icc-profiles-basiccolor-printing2009
- media-libs/icc-profiles-openicc )"
-
-RESTRICT="test"
-
-src_prepare() {
- einfo remove bundled elektra yajl
- rm -rf elektra* yajl || die
- #keep bundled libXNVCtrl
-
- epatch "${FILESDIR}"/${P}-buildsystem.patch
- epatch "${FILESDIR}"/${P}-png.patch
- epatch "${FILESDIR}"/${P}-array.patch
-
- if ! use X ; then
- sed -e '/FLTK_GUI =/s:=.*:=:' \
- -i makefile.in || die
- fi
-
- if has_version "<app-admin/elektra-0.8.3" ; then
- sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \
- -i test.c test2.cpp oyranos_elektra.c || die
- fi
-}
-
-src_configure() {
- tc-export CC CXX
- econf --prefix=/usr \
- --enable-verbose \
- $(use_with X x) \
- $(use_enable X libX11) \
- $(use_enable X libXext) \
- $(use_enable X libXrandr) \
- $(use_enable X libXxf86vm) \
- $(use_enable X fltk) \
- $(use_enable static-libs static) \
- $(use_enable xinerama libXinerama)
-}
-
-src_compile() {
- emake all
- use X && emake oforms
- emake docu
-}
-
-src_install() {
- emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${P} install-main
-
- if ! use doc ; then
- rm -rf "${ED}/usr/share/doc/${P}/html" || die
- fi
-}
diff --git a/media-libs/oyranos/oyranos-0.9.1.ebuild b/media-libs/oyranos/oyranos-0.9.1.ebuild
deleted file mode 100644
index 9304ea0c72c3..000000000000
--- a/media-libs/oyranos/oyranos-0.9.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.1.ebuild,v 1.2 2012/11/23 21:55:30 xmw Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="colour management system allowing to share various settings across applications and services"
-HOMEPAGE="http://www.oyranos.org/"
-SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc static-libs test xinerama"
-
-RDEPEND="app-admin/elektra
- dev-libs/libxml2
- dev-libs/yajl
- media-gfx/exiv2
- media-libs/lcms:0
- media-libs/libpng:0
- media-libs/libraw
- >=media-libs/libXcm-0.5.1
- X? ( x11-libs/fltk:1
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXxf86vm
- xinerama? ( x11-libs/libXinerama ) )"
-DEPEND="${RDEPEND}
- app-doc/doxygen
- media-gfx/graphviz
- test? ( media-libs/icc-profiles-basiccolor-printing2009
- media-libs/icc-profiles-openicc )"
-
-RESTRICT="test"
-
-src_prepare() {
- einfo remove bundled elektra yajl
- rm -rf elektra* yajl || die
- #keep bundled libXNVCtrl
-
- epatch "${FILESDIR}"/${PN}-0.9.0-buildsystem.patch
-
- if ! use X ; then
- sed -e '/FLTK_GUI =/s:=.*:=:' \
- -i makefile.in || die
- fi
-
- if has_version "<app-admin/elektra-0.8.3" ; then
- sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \
- -i test.c test2.cpp oyranos_elektra.c || die
- fi
-}
-
-src_configure() {
- tc-export CC CXX
- econf --prefix=/usr \
- --enable-verbose \
- $(use_with X x) \
- $(use_enable X libX11) \
- $(use_enable X libXext) \
- $(use_enable X libXrandr) \
- $(use_enable X libXxf86vm) \
- $(use_enable X fltk) \
- $(use_enable static-libs static) \
- $(use_enable xinerama libXinerama)
-}
-
-src_compile() {
- emake all
- use X && emake oforms
- emake docu
-}
-
-src_install() {
- emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${P} install-main
-
- if ! use doc ; then
- rm -rf "${ED}/usr/share/doc/${P}/html" || die
- fi
-}
diff --git a/media-libs/oyranos/oyranos-0.9.4.ebuild b/media-libs/oyranos/oyranos-0.9.4.ebuild
new file mode 100644
index 000000000000..cfcfc6b91149
--- /dev/null
+++ b/media-libs/oyranos/oyranos-0.9.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.4.ebuild,v 1.1 2013/03/23 18:17:07 xmw Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic cmake-utils cmake-multilib
+
+DESCRIPTION="colour management system allowing to share various settings across applications and services"
+HOMEPAGE="http://www.oyranos.org/"
+SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X cairo cups doc exif fltk qt4 raw test"
+
+RDEPEND=">=app-admin/elektra-0.8.3-r1
+ dev-libs/libxml2
+ dev-libs/yajl
+ media-gfx/exiv2
+ || ( media-libs/lcms:0 media-libs/lcms:2 )
+ media-libs/libpng:0
+ media-libs/libraw
+ >=media-libs/libXcm-0.5.1
+ fltk? ( x11-libs/fltk:1 )
+ X? ( x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXxf86vm
+ x11-libs/libXinerama )
+ cairo? ( x11-libs/cairo )
+ cups? ( net-print/cups )
+ exif? ( media-gfx/exiv2 )
+ qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+ raw? ( media-libs/libraw )"
+DEPEND="${RDEPEND}
+ app-doc/doxygen
+ media-gfx/graphviz
+ test? ( media-libs/icc-profiles-basiccolor-printing2009
+ media-libs/icc-profiles-openicc )"
+
+#RESTRICT="test"
+
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindElektra FindXcm FindCUPS"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}"-buildsystem.patch
+
+ if use fltk ; then
+ #src/examples does not include fltk flags
+ append-cflags $(fltk-config --cflags)
+ append-cxxflags $(fltk-confiag --cxxflags)
+ fi
+
+ cmake-utils_src_prepare
+
+ einfo remove bundled libs
+ rm -rf elektra* yajl || die
+
+ mycmakeargs=(
+ $(usex X -DWANT_X11=1 "")
+ $(usex cairo -DWANT_CAIRO=1 "")
+ $(usex cups -DWANT_CUPS=1 "")
+ $(usex exif -DWANT_EXIV2=1 "")
+ $(usex fltk -DWANT_FLTK=1 "")
+ $(usex qt4 -DWANT_QT4=1 "")
+ $(usex raw -DWANT_LIBRAW=1 "")
+ )
+}
+
+src_install() {
+ cmake-multilib_src_install
+
+ dodoc AUTHORS ChangeLog README
+ if use doc ; then
+ mv "${ED}/usr/share/doc/${PN}/*" "${ED}/usr/share/doc/${P}" || die
+ fi
+ rm -rf "${ED}/usr/share/doc/${PN}" || die
+}