1 |
commit: 26db062e7b8df1334a8deb33edb799cad97cff2b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 26 23:42:26 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 26 23:51:01 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26db062e |
7 |
|
8 |
media-libs/oyranos: Fix mesa build error, drop multilib remnant, use xdg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/671996 |
11 |
Closes: https://bugs.gentoo.org/672004 |
12 |
Closes: https://bugs.gentoo.org/672006 |
13 |
Closes: https://bugs.gentoo.org/680324 |
14 |
Closes: https://bugs.gentoo.org/689686 |
15 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
16 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
17 |
|
18 |
.../oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch | 24 ++++++++++++++++++++++ |
19 |
.../oyranos/files/oyranos-0.9.6-underlinking.patch | 16 +++++++++++++++ |
20 |
media-libs/oyranos/oyranos-0.9.6-r1.ebuild | 12 +++++++---- |
21 |
media-libs/oyranos/oyranos-9999.ebuild | 4 ++-- |
22 |
4 files changed, 50 insertions(+), 6 deletions(-) |
23 |
|
24 |
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 |
25 |
new file mode 100644 |
26 |
index 00000000000..83ed82a5629 |
27 |
--- /dev/null |
28 |
+++ b/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch |
29 |
@@ -0,0 +1,24 @@ |
30 |
+From ac7bdc35ea376f938ad223b0156a04a2af6d2eff Mon Sep 17 00:00:00 2001 |
31 |
+From: Kai-Uwe Behrmann <ku.b@×××.de> |
32 |
+Date: Fri, 28 Dec 2018 00:14:24 +0100 |
33 |
+Subject: [PATCH] * [exmpl]: update GLee.h to Mesa-18.3.1 |
34 |
+ |
35 |
+the include guards of system files changed |
36 |
+--- |
37 |
+ src/examples/image_display/GLee.h | 2 ++ |
38 |
+ 1 file changed, 2 insertions(+) |
39 |
+ |
40 |
+diff --git a/src/examples/image_display/GLee.h b/src/examples/image_display/GLee.h |
41 |
+index 2edca003..01b19c68 100644 |
42 |
+--- a/src/examples/image_display/GLee.h |
43 |
++++ b/src/examples/image_display/GLee.h |
44 |
+@@ -61,7 +61,9 @@ |
45 |
+ #include <OpenGL/gl.h> |
46 |
+ #else // GLX |
47 |
+ #define __glext_h_ /* prevent glext.h from being included */ |
48 |
++ #define __gl_glext_h_ |
49 |
+ #define __glxext_h_ /* prevent glxext.h from being included */ |
50 |
++ #define __glx_glxext_h_ |
51 |
+ #define GLX_GLXEXT_PROTOTYPES |
52 |
+ #include <GL/gl.h> |
53 |
+ #include <GL/glx.h> |
54 |
|
55 |
diff --git a/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch b/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch |
56 |
new file mode 100644 |
57 |
index 00000000000..b25a36cf79e |
58 |
--- /dev/null |
59 |
+++ b/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch |
60 |
@@ -0,0 +1,16 @@ |
61 |
+Index: oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt |
62 |
+=================================================================== |
63 |
+--- oyranos-0.9.6.orig/src/modules/color/modules/CMakeLists.txt |
64 |
++++ oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt |
65 |
+@@ -74,9 +74,9 @@ SET( OY_MODULE oydi ) |
66 |
+ SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} ) |
67 |
+ ADD_LIBRARY( ${OY_MODULE_LIB} |
68 |
+ SHARED ${PACKAGE_NAME}_cmm_${OY_MODULE}.c ) |
69 |
+-TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ) |
70 |
++TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} ) |
71 |
+ INSTALL (TARGETS ${OY_MODULE_LIB} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OY_CMMSUBPATH}) |
72 |
+-SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ) |
73 |
++SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} ) |
74 |
+ |
75 |
+ SET( OY_MODULE oyra ) |
76 |
+ SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} ) |
77 |
|
78 |
diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild |
79 |
index 05b026fa3e9..4eee55d10f7 100644 |
80 |
--- a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild |
81 |
+++ b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild |
82 |
@@ -1,4 +1,4 @@ |
83 |
-# Copyright 1999-2018 Gentoo Authors |
84 |
+# Copyright 1999-2019 Gentoo Authors |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
|
87 |
EAPI=6 |
88 |
@@ -12,7 +12,7 @@ else |
89 |
KEYWORDS="~amd64 ~x86" |
90 |
fi |
91 |
CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS" |
92 |
-inherit cmake-utils flag-o-matic |
93 |
+inherit cmake-utils flag-o-matic xdg |
94 |
|
95 |
DESCRIPTION="Colour management system allowing to share settings across apps and services" |
96 |
HOMEPAGE="https://www.oyranos.org/" |
97 |
@@ -69,7 +69,11 @@ DOCS=( {AUTHORS,ChangeLog,README}.md ) |
98 |
|
99 |
RESTRICT="test" |
100 |
|
101 |
-PATCHES=( "${WORKDIR}/patches" ) |
102 |
+PATCHES=( |
103 |
+ "${WORKDIR}/patches" |
104 |
+ "${FILESDIR}/${P}-mesa-18.3.1.patch" # bug 671996 |
105 |
+ "${FILESDIR}/${P}-underlinking.patch" |
106 |
+) |
107 |
|
108 |
src_prepare() { |
109 |
# remove bundled libs |
110 |
@@ -77,7 +81,7 @@ src_prepare() { |
111 |
cmake-utils_src_prepare |
112 |
} |
113 |
|
114 |
-multilib_src_configure() { |
115 |
+src_configure() { |
116 |
local mycmakeargs=( |
117 |
-DCMAKE_INSTALL_DOCDIR=share/doc/${PF} |
118 |
-DUSE_SYSTEM_ELEKTRA=ON |
119 |
|
120 |
diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild |
121 |
index a44af27aa9e..9d14bb4f921 100644 |
122 |
--- a/media-libs/oyranos/oyranos-9999.ebuild |
123 |
+++ b/media-libs/oyranos/oyranos-9999.ebuild |
124 |
@@ -11,7 +11,7 @@ else |
125 |
KEYWORDS="~amd64 ~x86" |
126 |
fi |
127 |
CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS" |
128 |
-inherit cmake-utils flag-o-matic |
129 |
+inherit cmake-utils flag-o-matic xdg |
130 |
|
131 |
DESCRIPTION="Colour management system allowing to share settings across apps and services" |
132 |
HOMEPAGE="https://www.oyranos.org/" |
133 |
@@ -74,7 +74,7 @@ src_prepare() { |
134 |
cmake-utils_src_prepare |
135 |
} |
136 |
|
137 |
-multilib_src_configure() { |
138 |
+src_configure() { |
139 |
local mycmakeargs=( |
140 |
-DCMAKE_INSTALL_DOCDIR=share/doc/${PF} |
141 |
-DUSE_SYSTEM_ELEKTRA=ON |