Date: Thu, 14 Nov 2019 00:43:28 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517543 - head/games/freeorion Message-ID: <201911140043.xAE0hSZv095110@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Nov 14 00:43:28 2019 New Revision: 517543 URL: https://svnweb.freebsd.org/changeset/ports/517543 Log: games/freeorion: unbreak with boost 1.72 GG/src/Texture.cpp:232:25: error: no template named 'vector4' in namespace 'boost::mpl' typedef boost::mpl::vector4< ~~~~~~~~~~~~^ In file included from GG/src/Texture.cpp:32: In file included from /usr/local/include/boost/gil/extension/dynamic_image/any_image.hpp:11: In file included from /usr/local/include/boost/gil/extension/dynamic_image/any_image_view.hpp:17: In file included from /usr/local/include/boost/variant.hpp:17: /usr/local/include/boost/variant/variant.hpp:2416:5: error: static_assert failed due to requirement '::boost::mpl::is_sequence<int>::value' "( ::boost::mpl::is_sequence<Types>::value )" BOOST_STATIC_ASSERT(( ::boost::mpl::is_sequence<Types>::value )); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/boost/static_assert.hpp:70:41: note: expanded from macro 'BOOST_STATIC_ASSERT' # define BOOST_STATIC_ASSERT( ... ) static_assert(__VA_ARGS__, #__VA_ARGS__) ^ ~~~~~~~~~~~ /usr/local/include/boost/gil/extension/dynamic_image/any_image.hpp:88:26: note: in instantiation of template class 'boost::make_variant_over<int>' requested here class any_image : public make_variant_over<Images>::type ^ GG/src/Texture.cpp:247:15: note: in instantiation of template class 'boost::gil::any_image<int>' requested here ImageType image; ^ In file included from GG/src/Texture.cpp:32: /usr/local/include/boost/gil/extension/dynamic_image/any_image.hpp:90:58: error: no type named 'type' in 'boost::make_variant_over<int>' using parent_t = typename make_variant_over<Images>::type; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ GG/src/Texture.cpp:247:15: note: in instantiation of template class 'boost::gil::any_image<int>' requested here ImageType image; ^ In file included from GG/src/Texture.cpp:32: In file included from /usr/local/include/boost/gil/extension/dynamic_image/any_image.hpp:11: In file included from /usr/local/include/boost/gil/extension/dynamic_image/any_image_view.hpp:12: In file included from /usr/local/include/boost/gil/image.hpp:11: In file included from /usr/local/include/boost/gil/algorithm.hpp:11: In file included from /usr/local/include/boost/gil/bit_aligned_pixel_iterator.hpp:11: In file included from /usr/local/include/boost/gil/bit_aligned_pixel_reference.hpp:12: In file included from /usr/local/include/boost/gil/pixel.hpp:12: In file included from /usr/local/include/boost/gil/channel.hpp:11: In file included from /usr/local/include/boost/gil/utilities.hpp:11: In file included from /usr/local/include/boost/gil/detail/mp11.hpp:12: In file included from /usr/local/include/boost/mp11.hpp:11: /usr/local/include/boost/mp11/list.hpp:45:19: error: no type named 'type' in 'boost::mp11::detail::mp_size_impl<int>' template<class L> using mp_size = typename detail::mp_size_impl<L>::type; ^~~~~ /usr/local/include/boost/mp11/algorithm.hpp:121:50: note: in instantiation of template type alias 'mp_size' requested here template<template<class...> class F, class... L> using mp_transform = typename mp_if<mp_same<mp_size<L>...>, detail::mp_transform_impl<F, L...>, detail::list_size_mismatch>::type; ^ /usr/local/include/boost/gil/extension/dynamic_image/any_image.hpp:33:1: note: in instantiation of template type alias 'mp_transform' requested here using images_get_views_t = mp11::mp_transform<get_view_t, Images>; ^ /usr/local/include/boost/gil/extension/dynamic_image/any_image.hpp:92:43: note: in instantiation of template type alias 'images_get_views_t' requested here using view_t = any_image_view<detail::images_get_views_t<Images>>; ^ GG/src/Texture.cpp:247:15: note: in instantiation of template class 'boost::gil::any_image<int>' requested here ImageType image; ^ In file included from GG/src/Texture.cpp:32: In file included from /usr/local/include/boost/gil/extension/dynamic_image/any_image.hpp:11: In file included from /usr/local/include/boost/gil/extension/dynamic_image/any_image_view.hpp:12: In file included from /usr/local/include/boost/gil/image.hpp:11: In file included from /usr/local/include/boost/gil/algorithm.hpp:11: In file included from /usr/local/include/boost/gil/bit_aligned_pixel_iterator.hpp:11: In file included from /usr/local/include/boost/gil/bit_aligned_pixel_reference.hpp:12: In file included from /usr/local/include/boost/gil/pixel.hpp:12: In file included from /usr/local/include/boost/gil/channel.hpp:11: In file included from /usr/local/include/boost/gil/utilities.hpp:11: In file included from /usr/local/include/boost/gil/detail/mp11.hpp:12: In file included from /usr/local/include/boost/mp11.hpp:11: /usr/local/include/boost/mp11/list.hpp:45:19: error: no type named 'type' in 'boost::mp11::detail::mp_size_impl<int>' template<class L> using mp_size = typename detail::mp_size_impl<L>::type; ^~~~~ /usr/local/include/boost/mp11/algorithm.hpp:121:50: note: in instantiation of template type alias 'mp_size' requested here template<template<class...> class F, class... L> using mp_transform = typename mp_if<mp_same<mp_size<L>...>, detail::mp_transform_impl<F, L...>, detail::list_size_mismatch>::type; ^ /usr/local/include/boost/gil/extension/dynamic_image/any_image.hpp:39:1: note: in instantiation of template type alias 'mp_transform' requested here using images_get_const_views_t = mp11::mp_transform<get_const_view_t, Images>; ^ /usr/local/include/boost/gil/extension/dynamic_image/any_image.hpp:93:49: note: in instantiation of template type alias 'images_get_const_views_t' requested here using const_view_t = any_image_view<detail::images_get_const_views_t<Images>>; ^ GG/src/Texture.cpp:247:15: note: in instantiation of template class 'boost::gil::any_image<int>' requested here ImageType image; ^ Obtained from: upstream Modified: head/games/freeorion/Makefile (contents, props changed) head/games/freeorion/distinfo (contents, props changed) Modified: head/games/freeorion/Makefile ============================================================================== --- head/games/freeorion/Makefile Thu Nov 14 00:43:21 2019 (r517542) +++ head/games/freeorion/Makefile Thu Nov 14 00:43:28 2019 (r517543) @@ -21,6 +21,7 @@ PATCHFILES+= 78b7a1994b8b.patch:-p1 PATCHFILES+= ff8c06a6685f.patch:-p1 PATCHFILES+= 4a7b8833cb8d.patch:-p1 # rebased from 7513ede6b03c PATCHFILES+= 17caf5a174d3.patch:-p1 +PATCHFILES+= 5ad3f175925d.patch:-p1 MAINTAINER= amdmi3@FreeBSD.org COMMENT= Turn-based space empire and galactic conquest game Modified: head/games/freeorion/distinfo ============================================================================== --- head/games/freeorion/distinfo Thu Nov 14 00:43:21 2019 (r517542) +++ head/games/freeorion/distinfo Thu Nov 14 00:43:28 2019 (r517543) @@ -27,3 +27,5 @@ SHA256 (4a7b8833cb8d.patch) = 5da2609567124e1f1f5e52f7 SIZE (4a7b8833cb8d.patch) = 1057 SHA256 (17caf5a174d3.patch) = 81f6070e5eb247df34a80857c828fb4a1efa7645a1718f3a44f547a3b04ef3c0 SIZE (17caf5a174d3.patch) = 1037 +SHA256 (5ad3f175925d.patch) = 5da61872d446e5e8d8d48abec1b1ab997d0227224c92b26450ce3dcc4122452e +SIZE (5ad3f175925d.patch) = 2396
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911140043.xAE0hSZv095110>