Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update boost and python-cmake #49

Merged
merged 7 commits into from
Jun 30, 2019
Merged

Update boost and python-cmake #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7509ffe
Update python-cmake
o01eg May 12, 2019
5863d76
Update boost to 1.67
o01eg May 12, 2019
b5dbc07
Update ChangeLog
o01eg May 12, 2019
e08b8c1
Update to boost 1.68.0
o01eg May 18, 2019
172771f
Update changelog
o01eg May 18, 2019
c264752
Add fix for both Boost.Asio and Boost.Python build.
o01eg May 19, 2019
e678ec3
Update boost to 1.69
o01eg May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

Notable changes to the FreeOrionSDK project will be documented in this file.

## v11 - TBA

- Update boost version to 1.69
- Update python-cmake-buildsystem from c3b8d532242efed85fb3cd77b0e39e424b6db475
to 501869c2b124552dae669d5fd6b7e7101a7cc30c.
- Pin Docker image to a stable and more recent base image
(docker.io/ubuntu:bionic-20190307).

## v10 - 2018-05-26

Expand Down
8 changes: 4 additions & 4 deletions Sources.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ set(LIBPNG_VERSION 1.6.34)
set(LIBPNG_URL https://downloads.sourceforge.net/project/libpng/libpng16/${LIBPNG_VERSION}/libpng-${LIBPNG_VERSION}.tar.gz)
set(LIBPNG_MD5 03fbc5134830240104e96d3cda648e71)

set(PYTHON_CMAKE_URL https://github.com/python-cmake-buildsystem/python-cmake-buildsystem/archive/c3b8d532242efed85fb3cd77b0e39e424b6db475.zip)
set(PYTHON_CMAKE_MD5 a4e9ddf10d8917cd4340dea8f889e440)
set(PYTHON_CMAKE_URL https://github.com/python-cmake-buildsystem/python-cmake-buildsystem/archive/501869c2b124552dae669d5fd6b7e7101a7cc30c.zip)
set(PYTHON_CMAKE_MD5 06d2b8fe33eeb08be5e8a127ffa5fff8)

set(PYTHON_VERSION 2.7.14)
set(PYTHON_URL https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz)
Expand Down Expand Up @@ -54,7 +54,7 @@ set(GLEW_VERSION 2.1.0)
set(GLEW_URL http://downloads.sourceforge.net/project/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz)
set(GLEW_MD5 b2ab12331033ddfaa50dc39345343980)

set(BOOST_VERSION 1.66.0)
set(BOOST_VERSION 1.69.0)
string(REPLACE "." "_" BOOST_VERSION_ ${BOOST_VERSION})
set(BOOST_URL http://downloads.sourceforge.net/project/boost/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_}.tar.gz)
set(BOOST_MD5 d275cd85b00022313c171f602db59fc5)
set(BOOST_MD5 b50944c0c13f81ce2c006802a1186f5a)
26 changes: 0 additions & 26 deletions patches/boost/0001-7970.patch
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions patches/boost/0001-Fix-hidden-visibility-symbols-for-mac-clang.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions patches/boost/0003-7920.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,6 @@ index 8d45239..9b880fa 100644

template <>
struct unsigned_integral_max_value<uint8_t> : public mpl::integral_c<uint32_t,0xFF> {};
@@ -64,7 +64,9 @@ struct unsigned_integral_max_value<uint32_t> : public mpl::integral_c<uintmax_t,

template <int K>
struct unsigned_integral_max_value<packed_channel_value<K> >
- : public mpl::integral_c<typename packed_channel_value<K>::integer_t, (1<<K)-1> {};
+ : public mpl::integral_c<typename packed_channel_value<K>::integer_t, (uint64_t(1)<<K)-1> {};
+
+

//////////////////////////////////////
//// unsigned_integral_num_bits - given an unsigned integral channel type, returns the minimum number of bits needed to represent it
--
2.14.3