diff options
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/oyranos/ChangeLog | 11 | ||||
| -rw-r--r-- | media-libs/oyranos/files/oyranos-9999-buildsystem.patch | 190 | ||||
| -rw-r--r-- | media-libs/oyranos/oyranos-0.9.5.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/oyranos/oyranos-9999.ebuild | 49 |
4 files changed, 146 insertions, 112 deletions
diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog index ec452a5fcae6..21c1ad2e1ff8 100644 --- a/media-libs/oyranos/ChangeLog +++ b/media-libs/oyranos/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/oyranos -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.25 2014/07/30 22:59:45 xmw Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.26 2015/05/10 21:02:57 xmw Exp $ + + 10 May 2015; Michael Weber <xmw@gentoo.org> + files/oyranos-0.9.5-buildsystem-r1.patch, + files/oyranos-9999-buildsystem.patch, oyranos-0.9.5.ebuild, + oyranos-9999.ebuild: + Fix port changes from 0.9.5 to live ebuild, update buildsystem patch. Thanks + DrSlony (bug 548572) *oyranos-0.9.5 (30 Jul 2014) diff --git a/media-libs/oyranos/files/oyranos-9999-buildsystem.patch b/media-libs/oyranos/files/oyranos-9999-buildsystem.patch index 88b367985df6..7e9d03e805b6 100644 --- a/media-libs/oyranos/files/oyranos-9999-buildsystem.patch +++ b/media-libs/oyranos/files/oyranos-9999-buildsystem.patch @@ -1,5 +1,92 @@ ---- oyranos-0.9.5/src/CMakeLists.txt -+++ oyranos-0.9.5/src/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,7 @@ + FIND_PROGRAM(CMAKE_AR_TMP NAMES ar) + + # detect top level projects +-FIND_PACKAGE( Yajl ) ++FIND_PACKAGE( Yajl REQUIRED ) + IF( HAVE_YAJL ) + INCLUDE_DIRECTORIES( ${YAJL_INCLUDE_DIRS} ) + LINK_DIRECTORIES( ${YAJL_LIBRARY_DIRS} ) +@@ -58,73 +58,16 @@ + 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 ) +- ADD_SUBDIRECTORY( yajl ) +- 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 + BuildRequires: elektra-devel" ) + INCLUDE_DIRECTORIES( ${ELEKTRA_INCLUDE_DIRS} ) + LINK_DIRECTORIES( ${ELEKTRA_LIBRARY_DIRS} ) + STRING(REPLACE ";" " " ELEKTRA_PC_LDFLAGS "${ELEKTRA_STATIC_LDFLAGS}") +-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 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -100,7 +100,9 @@ INCLUDE_DIRECTORIES( ${XCM_INCLUDE_DIRS} ) LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} ) @@ -74,88 +161,23 @@ IF(HAVE_EXIV2) INCLUDE_DIRECTORIES( ${EXIV2_INCLUDE_DIRS} ) LINK_DIRECTORIES( ${EXIV2_LIBRARY_DIRS} ) ---- oyranos-0.9.5/CMakeLists.txt -+++ oyranos-0.9.5/CMakeLists.txt -@@ -41,7 +41,7 @@ - +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -33,7 +33,9 @@ + INSTALL( FILES ${MAN1_PAGES} DESTINATION share/man/man1 ) + INSTALL( FILES ${MAN3_PAGES} DESTINATION share/man/man3 ) - # 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( Doxygen ) ++IF(WANT_HTML) ++ FIND_PACKAGE( Doxygen REQUIRED ) ++ENDIF(WANT_HTML) + IF( DOXYGEN_FOUND ) --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) + ADD_CUSTOM_COMMAND( OUTPUT html +@@ -43,5 +45,5 @@ + ADD_CUSTOM_TARGET( docu ALL + DEPENDS html ) - #now add all directories +- INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PACKAGE_NAME} ) ++ INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PACKAGE_NAME}-${OYRANOS_VERSION} ) + ENDIF() diff --git a/media-libs/oyranos/oyranos-0.9.5.ebuild b/media-libs/oyranos/oyranos-0.9.5.ebuild index c09cb6959dfc..bbd4710bf7d5 100644 --- a/media-libs/oyranos/oyranos-0.9.5.ebuild +++ b/media-libs/oyranos/oyranos-0.9.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild,v 1.1 2014/07/30 22:59:45 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild,v 1.2 2015/05/10 21:02:57 xmw Exp $ EAPI=5 @@ -9,8 +9,8 @@ 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/" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://www.${PN}.org/git/${PN}" - inherit git-2 + EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git" + inherit git-r3 KEYWORDS="" else SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.9/${P}.tar.bz2" diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild index a3ab23f3a82a..c28140edde0f 100644 --- a/media-libs/oyranos/oyranos-9999.ebuild +++ b/media-libs/oyranos/oyranos-9999.ebuild @@ -1,32 +1,41 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.5 2014/06/22 12:38:50 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.6 2015/05/10 21:02:57 xmw Exp $ EAPI=5 -inherit eutils flag-o-matic cmake-utils cmake-multilib git-r3 +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/" -EGIT_REPO_URI="git://www.${PN}.org/git/${PN}" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.9/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi LICENSE="BSD" SLOT="0" -KEYWORDS="" IUSE="X cairo cups doc exif fltk qt4 raw test" -RDEPEND="=app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}] - >=app-admin/elektra-0.7.1-r5:0[${MULTILIB_USEDEP}] +RDEPEND=" + || ( + =app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}] + >=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}] + ) >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] >=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}] media-libs/icc-profiles-basiccolor-printing2009 - media-libs/icc-profiles-basiccolor-printing2009 + media-libs/icc-profiles-openicc || ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] >=media-libs/lcms-1.19-r1:0[${MULTILIB_USEDEP}] ) >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] - >=media-libs/libXcm-0.5.2-r1[${MULTILIB_USEDEP}] + >=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}] cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] ) cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] ) exif? ( >=media-gfx/exiv2-0.23-r2[${MULTILIB_USEDEP}] ) @@ -38,9 +47,12 @@ RDEPEND="=app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}] >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - app-doc/doxygen - media-gfx/graphviz" + doc? ( + app-doc/doxygen + media-gfx/graphviz + )" +DOCS="AUTHORS.md ChangeLog.md README.md" RESTRICT="test" MULTILIB_CHOST_TOOLS=( @@ -50,13 +62,13 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/oyranos/oyranos_version.h ) -CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindCUPS" +CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS" src_prepare() { einfo remove bundled libs rm -rf elektra* yajl || die - epatch "${FILESDIR}/${PN}"-9999-buildsystem.patch + epatch "${FILESDIR}/${P}"-buildsystem.patch if use fltk ; then #src/examples does not include fltk flags @@ -72,11 +84,12 @@ multilib_src_configure() { local mycmakeargs=( -DLIB_SUFFIX=${libdir#lib} - $(usex X -DWANT_X11=1 "") $(usex cairo -DWANT_CAIRO=1 "") $(usex cups -DWANT_CUPS=1 "") + $(usex doc -DWANT_HTML=1 "") $(usex exif -DWANT_EXIV2=1 "") $(usex raw -DWANT_LIBRAW=1 "") + $(usex X -DWANT_X11=1 "") # only used in programs $(multilib_native_usex fltk -DWANT_FLTK=1 "") @@ -85,11 +98,3 @@ multilib_src_configure() { cmake-utils_src_configure } - -multilib_src_install_all() { - 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 -} |