projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c1ef712)
Fix build with new versions of mesa, bug #533412.
authorMichał Górny <mgorny@gentoo.org>
Fri, 9 Jan 2015 19:17:29 +0000 (19:17 +0000)
committerMichał Górny <mgorny@gentoo.org>
Fri, 9 Jan 2015 19:17:29 +0000 (19:17 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

sci-libs/opencascade/ChangeLog patch | blob | history
sci-libs/opencascade/Manifest patch | blob | history
sci-libs/opencascade/files/opencascade-6.7.1-deprecated-glx-api.patch [new file with mode: 0644] patch | blob
sci-libs/opencascade/opencascade-6.7.0.ebuild patch | blob | history
sci-libs/opencascade/opencascade-6.7.1.ebuild patch | blob | history

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index 61e67061655adab4a4e9c77800933c67d07bfc7a..7fe10fb79d22f2352aec3d34cfa279bd448ff111 100644 (file)
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/opencascade
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.17 2015/01/01 21:45:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.18 2015/01/09 19:17:23 mgorny Exp $
+
+  09 Jan 2015; Michał Górny <mgorny@gentoo.org>
+  +files/opencascade-6.7.1-deprecated-glx-api.patch, opencascade-6.7.0.ebuild,
+  opencascade-6.7.1.ebuild:
+  Fix build with new versions of mesa, bug #533412.
 
   01 Jan 2015; Michael Weber <xmw@gentoo.org> opencascade-6.7.0.ebuild,
   opencascade-6.7.1.ebuild:
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 0efa7b19ea0cd5a85e42bd77548c7c6f35f5b6fa..c5cc301444668991362a60ce8a60c75f4eab806a 100644 (file)
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -10,6 +10,7 @@ AUX opencascade-6.5.4-fixed-tbb-VERSION.patch 236 SHA256 6b8a6057a374b86b6fa9b84
 AUX opencascade-6.5.4-tcl8.6.patch 1392 SHA256 92294c760fd127892929640c295c227f1c414828629dfc5b05bf19c14b30a1db SHA512 2c9652e7c4e44caad41bf9f4bee298ee3b3ced8ba417375d28b3832696d2fca0eb9a5420bbd82370ea60a1423ffb07da46593a4e5d49cc65b4c8a572b3ddb0e6 WHIRLPOOL ed56348c7109f9f7f70dea8dab6e04f2816465c8852ebfc157d59886221221cd0ede959bfe0434f1822583efc9bc788e949bf3111e36ce1aff1091a1e3f54ea7
 AUX opencascade-6.6.0-fixed-DESTDIR.patch 2210 SHA256 e619c64d0880b44e1c029f6ce30d9574b214d3c03d5fb04a4b58ac928d0c0452 SHA512 f29230e7fc199c8923c7ab164e93d0bfe9cc53336628eaacdd9c8095aa73ec9d10fe396f911ab369522d002bcbdd58ee764feb91303bd1472825a939ffb391c6 WHIRLPOOL e02e1ee23e3d3a75fbf6393f0593a1484c196dbb43829c5b3ab00eb7d11d2e8483f21df61924833e6e98a010e87883cb8b0356077c8b2ef9b9b7a1d884672b25
 AUX opencascade-6.7.0-fixed-DESTDIR.patch 2597 SHA256 bfe4b8321efe9a6142b2a2aefaa9232f7a72a3f7dc5704a033ccd944cf800138 SHA512 715f73573e988a8ec2632a3d9beeccaa5d5f65d52bf54599485537615ec9c936ef1f90d9d22c673d7c741a177e642561cb7ce793311a4faef07168fdd54426d2 WHIRLPOOL 52153514e33267b971ae097498d7f325fc50cb846b2ff38072445f11343220313070295ff83bf146b51dcc7838fc407d758133fe8e7944d2670168fd66be12fe
+AUX opencascade-6.7.1-deprecated-glx-api.patch 3001 SHA256 36d03f5d40989c4f0f0c177e5acdb1ef1de2c179e9e3c97eb31e598908e01665 SHA512 f96788a08ae967d4b1b7cb635022afb9dd970a11f5149bc11dddc4f129254bb205a2c1dda57b4abe7cdf9b9a08bb514a51801f3d7fd8675cd334daf058368532 WHIRLPOOL 8967d9da5d2cc97659aec2c3dcc8a6c9b9c46a29d8265cb02c065c5b5a4d961c61425403849f97215b689331b1508d429d3353d7767018397fc7cfd256cac4fd
 DIST OpenCASCADE650.tar.gz 214819922 SHA256 fb95d8a542bbfc26af6186495f752a683b40137b34d6afd8f9bb02730c2436c6 SHA512 ea2c3703e3338584d84fb8e06664e79f5f113a117e94a4eefcf39bac3bcc28d81ace2340c83399ecbe5774c348faa3713e90623f8329562e10700ad7e2048be7 WHIRLPOOL 78e092b9ea892d7686578696bcba67f649b65b8d520f358cf2aac9a2c49baf75ff3717899865d7f752a5577b123f8d0eadce06173e5b1bad3dcf0c31052b09d6
 DIST OpenCASCADE655.tgz 146901035 SHA256 f5c6ab58aeb5c514428ae1b802e2820ca9267d19eecd64776f06baa60098d1b6 SHA512 848057a8a9fd41f1d13c4634c5e3366d37f3b4c81b7b194be9d4e48f5608f0bdfbc8cedd2a466e1724649a04ee87bfd0d1a445be47d832cc12fba5647689ceb2 WHIRLPOOL 18413460491c8a2fd10e97c22dd4b9b4772d97f19d27f59f33faa6618a1aac348877abc3ab9526878b38aba22328986a5c656ac91930cad460d33e93653bb463
 DIST OpenCASCADE660.tgz 119153607 SHA256 e39fa4b2255b9bd9bf97aa122043f4608d97b6b79d922375da53275e42b25d60 SHA512 8ee232f96ad650e55ac1f5fb1fe684b9d8198279dee4d7fd80a569c35562fffa643dd362fed7c5aff79541dbc463acc38b1364d8396c2c92c2d73f4955893866 WHIRLPOOL 29f0eaee2c64e4fb3fbb958e7cd043a2738a9d62414f332b81c65a009a100f39f56c38b20ffad4e76754522bfcbdc915470c84f9c218109650f9fd23d7bb3813
@@ -18,16 +19,26 @@ DIST opencascade-6.7.1.tgz 194568487 SHA256 c918cb554c0c22d322dc1d2f3a31069e1d5d
 EBUILD opencascade-6.5.5.ebuild 5441 SHA256 df01e8d1d867a650958f1f081a5dabf9e52640ea80f192deeacee0cea56b7255 SHA512 3da956c57ee6523ebc71d25e88fc4a83928fc17efe2bde4d8a19d96b583bbb1f122481b3ef4baff85d1db425ba7996cfa76c841fcc134bbb7a7f12f5ae8553e0 WHIRLPOOL 271e41f8a1d1efbcf36e04da0eab6f841aaffc3efd281088244215aad209960489b230f6a26283335ccc2d0a14f4eb310997b98026b04604cd33eb0f95e0cce4
 EBUILD opencascade-6.5.ebuild 5436 SHA256 1ec89a54b1db7bb9a4b00b6fc8175daeaba38b810e7673934f0b7cd686fa2484 SHA512 2d2f824c45c78402de53241b1ea3ce7245bb06edfc059132cf3eec1a5b3c055bbfc32248d7c45dfea5908c469867d6349d47a2546881ae0a8f5e616b54b567fc WHIRLPOOL fcd050bd96baef3c014203d1558338552c3b0d26cd0e130e825abb847dedd80fae9ce9b933f9782cf5fc41136209f6ff86535fb0bb0125adfeb322b53d719021
 EBUILD opencascade-6.6.0.ebuild 5415 SHA256 70b3113dc987e68bdd0ace30daa80bb7e3a1ab37b867d796e440d266b996d3cd SHA512 47e1b295762d5e9e1e58b02542b1aeedb29f4fe229888d288b64142423dacafab66ff8062dba0add38ec244d9860fa3ced479b2c24815f97bbb975bc711d232a WHIRLPOOL ccbca362e28b20ee2c2c89c1061e4f6daf60e1cb364c2a6ab3f57539f66a2cfd0d09b86bd0c347791759411abccd1e8e98237189a9919ee20fed150a6dc27ba7
-EBUILD opencascade-6.7.0.ebuild 5326 SHA256 5cb1daaf468c98bb63732c950afc974a622a31027ab78004a3549ec1f3480d0b SHA512 13bb52e80e8d496cf8ab98aacd3ae06323694b011d267da5343da13255153b7226924ced3d9a34591fd82a8fe477ab4e039e93417a648ebe2f6679d59a2e41b0 WHIRLPOOL 7d7a2d85d126ac176d31a0b2d6285966192306df6e9cdf62d8668afcdf125b5ae36c0550106e400f727423df744e98dc6a51bffc51609cf815cec75f19b822c6
-EBUILD opencascade-6.7.1.ebuild 5326 SHA256 26c37f980692cf1f015be4c066099f6bcbb92452535ff98537e68ea608f5e04d SHA512 6b0fc6e2bea1b10e726ffb25e49ab0c09fafcd251278ae2a1cc69ccbf167797b5f5c23e769799390d4b84313cbd6b6dde2d3ff0d4afa4a9184ba59c59a32a7f4 WHIRLPOOL 674cef6ecdc70fe72487be0013b92913762821a05a2fe90ba3ae02b661d5ccd51de152229a01222507ddd8965c1a518630665ae079c43cb1c6e0308c21b28aea
-MISC ChangeLog 3802 SHA256 75bba68ca6ae2cde9a63578492dd6153d4f7906d1a8ba1a1f6ee4e9a6ccc5c20 SHA512 d67d4a87e3139120fa661380ff3b62ac92abf04688ab0a7b7112e85adc620aa39cf134b292b236ea39bcea0fe1dd8b5a3534e41514817b2561dd3b2d27b4567a WHIRLPOOL 2ab0c8a23bccca7d97fc190ab49f5cf5edc8978664b10891f51a63edae5a7ce640e43bde7ddc59caf670a8cfb408d75cc59cce55f1dfd61384b44da8da79af06
+EBUILD opencascade-6.7.0.ebuild 5384 SHA256 0caa4916bdabd88863bc16016cc02526536947adddca53af926d78fffee00670 SHA512 7be1fe902364f06005c7478d2b123433933afdb5f2e27fd98ff5358269aba7e5f77732162933953c14da0b93c3077c36588b49b58ede8388d3e019fe4d4fd6e9 WHIRLPOOL 30ed45a79bb50ae10d94a41a1a9c107b970652d1662e79ef9ff73801afaad40bcf7cea930c7e2871ca6302d3fdf92754b6c3f566af2f612a36eda7453d7573f6
+EBUILD opencascade-6.7.1.ebuild 5384 SHA256 6e86c28c44dfee27bef74e91bea9a6bf85ec959900a43e378a417756a9374c4a SHA512 f2da17fa35a9b4b5a4c3033090d65ab675943b3ffe0984bfac5815e6b7765496973435e82faae6b80215718f385ea8946ed5d22aa9b7f2d7ebca924ca82511fb WHIRLPOOL ceb4d8976195faa803d45e7231abeae842069d07d0853c2523ed1da0ed2d99a47c91a3f1753b7a06278e2271837947f22ac013c5cc7887cf1d7a04524e35f6e0
+MISC ChangeLog 4015 SHA256 f4917f791cfbdf04c0e518168dacbf8d9ce14f9e0123a36104edbc54e60a9356 SHA512 02db4c7db5cbfae4936ffc119158c56ac1938c491b84fad0ce113fee171fb4aa355dc8c7a3f676bf83227c61fa50ad581fc9500d9b46d83941d9cc28521a6e1d WHIRLPOOL c40c4de75735299d5e28d698c7d73c10457eaa3c8226dbad527c7ae89dcadd4d29983dd1523231bd59f3c6c8e9d57d562e1413a436915a0fd7fffd4e4751d6f1
 MISC metadata.xml 506 SHA256 fae19891e8b9f1570d1518684e1339704e369a93a72107034089a0391d94b973 SHA512 500798c528f2a099baec8fe93527b185937d5da048b0c2d95eca04d42c3c51717bd0801157eb562d42851ef8a17ddba86964689c40a2d70cfaf117cef2e31c45 WHIRLPOOL 1ecd2b2bcd731d10210c97ec3cafbcb3c6f9bcd9202265d5df2c270966dd5386929ef71fa0236460a8903844ca5b164366ff53c0628ce4011c13840f2983ed37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlSlv/FfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDYpgD/YlZoSF8EX5xlomh+2jFeoxhj
-6cYn3RFu3/HYyVwDNFgBAJCkfS1scOaXFfRmL7FxYMAnQKXcP/IuZI5JEIO/k3Vt
-=XkzP
+iQJ8BAEBCABmBQJUsClIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOPc0P/RkieLsb7HZw1t4e0RTr00o3
+X0yyxafTAAAphA+tYdxqaa3uH9QxG306t+pq/vM7FiqpDGOwy72WCT8welo8r5mC
+RVn0UL4JY5iqqV5uI41WTviXavfPzjA+ykyGH7xUb/RQP8mNcWuRLxUPjfyGodaQ
+OR/waPem3x7SEc4N3MItaIrLpXf4GPtB3vUk2ma1FW9JuJ+l8cuw34NyGKk0vID9
+bFnLa8LivEqNLaAtK+valQkX6YejIDHCqpggPLwz/arTzv7OS8fouBdhNrUP/+zT
+LxvhWu2Ixg0/usDeDO+P0j17yYLCuVZjUiKsi7iEX0p26ZhbTm3VJG+KkS8V5JZm
+VMRdNS+Tr4spIkWQw0uKBQqTuhISZE+a7xwTD4OoWeICxX2uyKvzBufCgpOxs9tR
+MVUV0oX9jbqa/bKL3C3PI741ufABHHD6VZZ1Wo9zjaS+ZHfDRp5Xo6zVs3avkp2I
+QWd21pb6MoSkkXHe0RuCK/solzY37ysJgycWnSIJ7wG+eXUpOtdmhdtpVQws2HpQ
+yGl0jxuox/W9mslR1T8WcuVu/p1A86ww0piEvQOdAQHzP+hXH3+YBvFp3CxfZJas
+uGeTl/dEpf89mR7yHzwR7rpnIvKw52aaigr2+9/cmoep6HeRy679uPOYPij/gfXD
+KNDSH1qCPMlq3QKmbwgQ
+=qItw
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/opencascade/files/opencascade-6.7.1-deprecated-glx-api.patch b/sci-libs/opencascade/files/opencascade-6.7.1-deprecated-glx-api.patch
new file mode 100644 (file)
index 0000000..b3c3629
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.7.1-deprecated-glx-api.patch
@@ -0,0 +1,89 @@
+From ba7e14489e14f08aae3e0f48b419b2149290b163 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@kyomu.43-1.org>
+Date: Tue, 23 Dec 2014 21:15:59 +0100
+Subject: [PATCH] Define GLX_GLXEXT_LEGACY prior to inclusion of GL/glx.h
+
+---
+ inc/InterfaceGraphic_X11.hxx                  | 1 +
+ samples/qt/Common/src/View.cxx                | 1 +
+ src/InterfaceGraphic/InterfaceGraphic_X11.hxx | 1 +
+ src/OpenGl/OpenGl_Context.cxx                 | 1 +
+ src/OpenGl/OpenGl_Workspace_Raytrace.cxx      | 1 +
+ src/Xw/Xw_Window.cxx                          | 1 +
+ 6 files changed, 6 insertions(+)
+
+diff --git a/inc/InterfaceGraphic_X11.hxx b/inc/InterfaceGraphic_X11.hxx
+index 280bb9b..98d7415 100755
+--- a/inc/InterfaceGraphic_X11.hxx
++++ b/inc/InterfaceGraphic_X11.hxx
+@@ -21,6 +21,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
++#define GLX_GLXEXT_LEGACY
+ #include <GL/glx.h>
+ 
+ #if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX)
+diff --git a/samples/qt/Common/src/View.cxx b/samples/qt/Common/src/View.cxx
+index 77f51b8..9b3f4e2 100755
+--- a/samples/qt/Common/src/View.cxx
++++ b/samples/qt/Common/src/View.cxx
+@@ -28,6 +28,7 @@
+ #include <Cocoa_Window.hxx>
+ #else
+ #include <QX11Info>
++#define GLX_GLXEXT_LEGACY
+ #include <GL/glx.h>
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+diff --git a/src/InterfaceGraphic/InterfaceGraphic_X11.hxx b/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
+index 280bb9b..98d7415 100755
+--- a/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
++++ b/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
+@@ -21,6 +21,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
++#define GLX_GLXEXT_LEGACY
+ #include <GL/glx.h>
+ 
+ #if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX)
+diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx
+index 9e2f074..1ddf6a4 100755
+--- a/src/OpenGl/OpenGl_Context.cxx
++++ b/src/OpenGl/OpenGl_Context.cxx
+@@ -39,6 +39,7 @@
+ #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
+   #include <dlfcn.h>
+ #else
++  #define GLX_GLXEXT_LEGACY
+   #include <GL/glx.h> // glXGetProcAddress()
+ #endif
+ 
+diff --git a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx b/src/OpenGl/OpenGl_Workspace_Raytrace.cxx
+index f1b5afe..870eb7d 100755
+--- a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx
++++ b/src/OpenGl/OpenGl_Workspace_Raytrace.cxx
+@@ -32,6 +32,7 @@
+ #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
+   #include <OpenGL/CGLCurrent.h>
+ #else
++  #define GLX_GLXEXT_LEGACY
+   #include <GL/glx.h>
+ #endif
+ 
+diff --git a/src/Xw/Xw_Window.cxx b/src/Xw/Xw_Window.cxx
+index 5442365..0e80444 100755
+--- a/src/Xw/Xw_Window.cxx
++++ b/src/Xw/Xw_Window.cxx
+@@ -20,6 +20,7 @@
+ #include <Aspect_Convert.hxx>
+ #include <Aspect_WindowDefinitionError.hxx>
+ 
++#define GLX_GLXEXT_LEGACY
+ #include <GL/glx.h>
+ 
+ namespace
+-- 
+2.0.5
+
diff --git a/sci-libs/opencascade/opencascade-6.7.0.ebuild b/sci-libs/opencascade/opencascade-6.7.0.ebuild
index 19359a9d3dd75ff5fe6a2f4c0c2ae91cb24f82ae..30e057ee1325769bd6b040afaa75b54f91720e33 100644 (file)
--- a/sci-libs/opencascade/opencascade-6.7.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.7.0.ebuild,v 1.2 2015/01/01 21:45:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.7.0.ebuild,v 1.3 2015/01/09 19:17:23 mgorny Exp $
 
 EAPI=5
 
@@ -47,6 +47,7 @@ src_prepare() {
        java-pkg-opt-2_src_prepare
 
        epatch \
+               "${FILESDIR}"/${PN}-6.7.1-deprecated-glx-api.patch \
                "${FILESDIR}"/${PN}-6.7.0-fixed-DESTDIR.patch \
                "${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.patch
 
diff --git a/sci-libs/opencascade/opencascade-6.7.1.ebuild b/sci-libs/opencascade/opencascade-6.7.1.ebuild
index 285a669fb67df558ca513c834ddc402cc715e750..a8cb62b6a4e17a1822cf2d2e3f25b75b77ef6a10 100644 (file)
--- a/sci-libs/opencascade/opencascade-6.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.7.1.ebuild,v 1.2 2015/01/01 21:45:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.7.1.ebuild,v 1.3 2015/01/09 19:17:23 mgorny Exp $
 
 EAPI=5
 
@@ -47,6 +47,7 @@ src_prepare() {
        java-pkg-opt-2_src_prepare
 
        epatch \
+               "${FILESDIR}"/${PN}-6.7.1-deprecated-glx-api.patch \
                "${FILESDIR}"/${PN}-6.7.0-fixed-DESTDIR.patch \
                "${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.patch
 
Unnamed repository; edit this file 'description' to name the repository.