gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-libs/oyranos: Fix mesa build error, drop multilib remnant, use xdg

Browse Source 
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@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2019-12-27 00:42:26 +01:00
parent ea0d374d06
commit 26db062e7b
4 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch Normal file
View File

@@ -0,0 +1,24 @@
From ac7bdc35ea376f938ad223b0156a04a2af6d2eff Mon Sep 17 00:00:00 2001
From: Kai-Uwe Behrmann <ku.b@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>

16
media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch Normal file
View File

@@ -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} )

12
media-libs/oyranos/oyranos-0.9.6-r1.ebuild
View File

@@ -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

4
media-libs/oyranos/oyranos-9999.ebuild
View File

@@ -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