commit: 26db062e7b8df1334a8deb33edb799cad97cff2b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 26 23:42:26 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Dec 26 23:51:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26db062e
media-libs/oyranos: Fix mesa build error, drop multilib remnant, use xdg Closes: https://bugs.gentoo.org/671996 Closes: https://bugs.gentoo.org/672004 Closes: https://bugs.gentoo.org/672006 Closes: https://bugs.gentoo.org/680324 Closes: https://bugs.gentoo.org/689686 Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch | 24 ++++++++++++++++++++++ .../oyranos/files/oyranos-0.9.6-underlinking.patch | 16 +++++++++++++++ media-libs/oyranos/oyranos-0.9.6-r1.ebuild | 12 +++++++---- media-libs/oyranos/oyranos-9999.ebuild | 4 ++-- 4 files changed, 50 insertions(+), 6 deletions(-) diff --git a/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch b/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch new file mode 100644 index 00000000000..83ed82a5629 --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch @@ -0,0 +1,24 @@ +From ac7bdc35ea376f938ad223b0156a04a2af6d2eff Mon Sep 17 00:00:00 2001 +From: Kai-Uwe Behrmann <k...@gmx.de> +Date: Fri, 28 Dec 2018 00:14:24 +0100 +Subject: [PATCH] * [exmpl]: update GLee.h to Mesa-18.3.1 + +the include guards of system files changed +--- + src/examples/image_display/GLee.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/examples/image_display/GLee.h b/src/examples/image_display/GLee.h +index 2edca003..01b19c68 100644 +--- a/src/examples/image_display/GLee.h ++++ b/src/examples/image_display/GLee.h +@@ -61,7 +61,9 @@ + #include <OpenGL/gl.h> + #else // GLX + #define __glext_h_ /* prevent glext.h from being included */ ++ #define __gl_glext_h_ + #define __glxext_h_ /* prevent glxext.h from being included */ ++ #define __glx_glxext_h_ + #define GLX_GLXEXT_PROTOTYPES + #include <GL/gl.h> + #include <GL/glx.h> diff --git a/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch b/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch new file mode 100644 index 00000000000..b25a36cf79e --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch @@ -0,0 +1,16 @@ +Index: oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt +=================================================================== +--- oyranos-0.9.6.orig/src/modules/color/modules/CMakeLists.txt ++++ oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt +@@ -74,9 +74,9 @@ SET( OY_MODULE oydi ) + SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} ) + ADD_LIBRARY( ${OY_MODULE_LIB} + SHARED ${PACKAGE_NAME}_cmm_${OY_MODULE}.c ) +-TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ) ++TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} ) + INSTALL (TARGETS ${OY_MODULE_LIB} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OY_CMMSUBPATH}) +-SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ) ++SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} ) + + SET( OY_MODULE oyra ) + SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} ) diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild index 05b026fa3e9..4eee55d10f7 100644 --- a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild +++ b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ else KEYWORDS="~amd64 ~x86" fi CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS" -inherit cmake-utils flag-o-matic +inherit cmake-utils flag-o-matic xdg DESCRIPTION="Colour management system allowing to share settings across apps and services" HOMEPAGE="https://www.oyranos.org/"; @@ -69,7 +69,11 @@ DOCS=( {AUTHORS,ChangeLog,README}.md ) RESTRICT="test" -PATCHES=( "${WORKDIR}/patches" ) +PATCHES=( + "${WORKDIR}/patches" + "${FILESDIR}/${P}-mesa-18.3.1.patch" # bug 671996 + "${FILESDIR}/${P}-underlinking.patch" +) src_prepare() { # remove bundled libs @@ -77,7 +81,7 @@ src_prepare() { cmake-utils_src_prepare } -multilib_src_configure() { +src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} -DUSE_SYSTEM_ELEKTRA=ON diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild index a44af27aa9e..9d14bb4f921 100644 --- a/media-libs/oyranos/oyranos-9999.ebuild +++ b/media-libs/oyranos/oyranos-9999.ebuild @@ -11,7 +11,7 @@ else KEYWORDS="~amd64 ~x86" fi CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS" -inherit cmake-utils flag-o-matic +inherit cmake-utils flag-o-matic xdg DESCRIPTION="Colour management system allowing to share settings across apps and services" HOMEPAGE="https://www.oyranos.org/"; @@ -74,7 +74,7 @@ src_prepare() { cmake-utils_src_prepare } -multilib_src_configure() { +src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} -DUSE_SYSTEM_ELEKTRA=ON
