1 |
commit: 8310cc0d0cccb8144cf499bbb6ada5633e02ec7f |
2 |
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> |
3 |
AuthorDate: Thu Jul 22 20:11:32 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 31 00:59:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8310cc0d |
7 |
|
8 |
dev-games/openscenegraph: cleanup asio patch |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
11 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
12 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
13 |
|
14 |
.../openscenegraph-3.6.5-use_boost_asio.patch | 55 +++++++++------------- |
15 |
1 file changed, 22 insertions(+), 33 deletions(-) |
16 |
|
17 |
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch b/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch |
18 |
index 4dfeedcaf19..f9a32c0dc60 100644 |
19 |
--- a/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch |
20 |
+++ b/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch |
21 |
@@ -1,6 +1,5 @@ |
22 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt osg-my/CMakeLists.txt |
23 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt 2020-01-31 12:03:07.000000000 +0100 |
24 |
-+++ osg-my/CMakeLists.txt 2020-09-26 18:45:41.191099844 +0200 |
25 |
+--- a/CMakeLists.txt |
26 |
++++ b/CMakeLists.txt |
27 |
@@ -764,7 +764,7 @@ |
28 |
FIND_PACKAGE(DirectInput) |
29 |
FIND_PACKAGE(NVTT) |
30 |
@@ -10,9 +9,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt osg-my/CMakeLists.t |
31 |
ENDIF() |
32 |
FIND_PACKAGE(ZeroConf) |
33 |
|
34 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindAsio.cmake osg-my/CMakeModules/FindAsio.cmake |
35 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindAsio.cmake 2020-01-31 12:03:07.000000000 +0100 |
36 |
-+++ osg-my/CMakeModules/FindAsio.cmake 1970-01-01 01:00:00.000000000 +0100 |
37 |
+--- a/CMakeModules/FindAsio.cmake |
38 |
++++ b/CMakeModules/FindAsio.cmake |
39 |
@@ -1,22 +0,0 @@ |
40 |
-# Locate ASIO-headers (http://think-async.com/Asio) |
41 |
-# This module defines |
42 |
@@ -36,9 +34,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindAsio.cmake osg-my |
43 |
- SET(ASIO_FOUND "YES") |
44 |
- ENDIF() |
45 |
-ENDIF() |
46 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/CMakeLists.txt osg-my/src/osgPlugins/CMakeLists.txt |
47 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/CMakeLists.txt 2020-01-31 12:03:07.000000000 +0100 |
48 |
-+++ osg-my/src/osgPlugins/CMakeLists.txt 2020-09-26 20:04:59.345449848 +0200 |
49 |
+--- a/src/osgPlugins/CMakeLists.txt |
50 |
++++ b/src/osgPlugins/CMakeLists.txt |
51 |
@@ -299,13 +299,13 @@ |
52 |
# |
53 |
# Device integration plugins |
54 |
@@ -57,9 +54,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/CMakeLists.txt osg- |
55 |
|
56 |
|
57 |
IF(ZEROCONF_FOUND) |
58 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/CMakeLists.txt osg-my/src/osgPlugins/RestHttpDevice/CMakeLists.txt |
59 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/CMakeLists.txt 2020-01-31 12:03:07.000000000 +0100 |
60 |
-+++ osg-my/src/osgPlugins/RestHttpDevice/CMakeLists.txt 2020-09-26 18:46:57.096859301 +0200 |
61 |
+--- a/src/osgPlugins/RestHttpDevice/CMakeLists.txt |
62 |
++++ b/src/osgPlugins/RestHttpDevice/CMakeLists.txt |
63 |
@@ -1,6 +1,5 @@ |
64 |
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) |
65 |
-INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR}) |
66 |
@@ -77,9 +73,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/CMak |
67 |
|
68 |
#### end var setup ### |
69 |
SETUP_PLUGIN(resthttp) |
70 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.cpp osg-my/src/osgPlugins/RestHttpDevice/connection.cpp |
71 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.cpp 2020-01-31 12:03:07.000000000 +0100 |
72 |
-+++ osg-my/src/osgPlugins/RestHttpDevice/connection.cpp 2020-09-26 18:32:19.690576603 +0200 |
73 |
+--- a/src/osgPlugins/RestHttpDevice/connection.cpp |
74 |
++++ b/src/osgPlugins/RestHttpDevice/connection.cpp |
75 |
@@ -37,14 +37,14 @@ |
76 |
void connection::start() |
77 |
{ |
78 |
@@ -112,9 +107,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/conn |
79 |
socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec); |
80 |
} |
81 |
|
82 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.hpp osg-my/src/osgPlugins/RestHttpDevice/connection.hpp |
83 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.hpp 2020-01-31 12:03:07.000000000 +0100 |
84 |
-+++ osg-my/src/osgPlugins/RestHttpDevice/connection.hpp 2020-09-26 19:56:49.410701890 +0200 |
85 |
+--- a/src/osgPlugins/RestHttpDevice/connection.hpp |
86 |
++++ b/src/osgPlugins/RestHttpDevice/connection.hpp |
87 |
@@ -11,7 +11,7 @@ |
88 |
#ifndef HTTP_SERVER_CONNECTION_HPP |
89 |
#define HTTP_SERVER_CONNECTION_HPP |
90 |
@@ -147,9 +141,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/conn |
91 |
|
92 |
/// Socket for the connection. |
93 |
asio::ip::tcp::socket socket_; |
94 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.cpp osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.cpp |
95 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.cpp 2020-01-31 12:03:07.000000000 +0100 |
96 |
-+++ osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.cpp 2020-09-26 19:56:12.353279737 +0200 |
97 |
+--- a/src/osgPlugins/RestHttpDevice/io_service_pool.cpp |
98 |
++++ b/src/osgPlugins/RestHttpDevice/io_service_pool.cpp |
99 |
@@ -11,7 +11,7 @@ |
100 |
#include "server.hpp" |
101 |
#include <stdexcept> |
102 |
@@ -181,9 +174,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_s |
103 |
} |
104 |
|
105 |
void io_service_pool::stop() |
106 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.hpp osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.hpp |
107 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.hpp 2020-01-31 12:03:07.000000000 +0100 |
108 |
-+++ osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.hpp 2020-09-26 18:37:02.119722575 +0200 |
109 |
+--- a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp |
110 |
++++ b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp |
111 |
@@ -11,11 +11,13 @@ |
112 |
#ifndef HTTP_SERVER_IO_SERVICE_POOL_HPP |
113 |
#define HTTP_SERVER_IO_SERVICE_POOL_HPP |
114 |
@@ -199,9 +191,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_s |
115 |
namespace http { |
116 |
namespace server { |
117 |
|
118 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/reply.hpp osg-my/src/osgPlugins/RestHttpDevice/reply.hpp |
119 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/reply.hpp 2020-01-31 12:03:07.000000000 +0100 |
120 |
-+++ osg-my/src/osgPlugins/RestHttpDevice/reply.hpp 2020-09-26 18:28:42.741206569 +0200 |
121 |
+--- a/src/osgPlugins/RestHttpDevice/reply.hpp |
122 |
++++ b/src/osgPlugins/RestHttpDevice/reply.hpp |
123 |
@@ -13,9 +13,11 @@ |
124 |
|
125 |
#include <string> |
126 |
@@ -215,9 +206,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/repl |
127 |
namespace http { |
128 |
namespace server { |
129 |
|
130 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.cpp osg-my/src/osgPlugins/RestHttpDevice/server.cpp |
131 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.cpp 2020-01-31 12:03:07.000000000 +0100 |
132 |
-+++ osg-my/src/osgPlugins/RestHttpDevice/server.cpp 2020-09-26 19:53:17.692061347 +0200 |
133 |
+--- a/src/osgPlugins/RestHttpDevice/server.cpp |
134 |
++++ b/src/osgPlugins/RestHttpDevice/server.cpp |
135 |
@@ -23,7 +23,7 @@ |
136 |
request_handler_(doc_root) |
137 |
{ |
138 |
@@ -236,9 +226,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/serv |
139 |
{ |
140 |
if (!e) |
141 |
{ |
142 |
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.hpp osg-my/src/osgPlugins/RestHttpDevice/server.hpp |
143 |
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.hpp 2020-01-31 12:03:07.000000000 +0100 |
144 |
-+++ osg-my/src/osgPlugins/RestHttpDevice/server.hpp 2020-09-26 18:29:38.894046375 +0200 |
145 |
+--- a/src/osgPlugins/RestHttpDevice/server.hpp |
146 |
++++ b/src/osgPlugins/RestHttpDevice/server.hpp |
147 |
@@ -11,7 +11,7 @@ |
148 |
#ifndef HTTP_SERVER_SERVER_HPP |
149 |
#define HTTP_SERVER_SERVER_HPP |