<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b68fccda9687656372346ed56f19667abd8d50ac">https://github.com/macports/macports-ports/commit/b68fccda9687656372346ed56f19667abd8d50ac</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b68fccda968 libtorrent-rasterbar: update to 2.0.3 & change to cmake & more (#10414)
</span>b68fccda968 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b68fccda9687656372346ed56f19667abd8d50ac
</span>Author: Zhenfu Shi <szf1234@me.com>
AuthorDate: Mon Apr 5 22:18:34 2021 +0800
<span style='display:block; white-space:pre;color:#404040;'> libtorrent-rasterbar: update to 2.0.3 & change to cmake & more (#10414)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Drop python27 variant & add myself as comaintainer
</span>---
net/libtorrent-rasterbar/Portfile | 76 ++++++++--------------
.../files/patch-python-use-the-right-compiler.diff | 20 +++---
2 files changed, 39 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libtorrent-rasterbar/Portfile b/net/libtorrent-rasterbar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b796cc3b18..c3df7f1dfd0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/libtorrent-rasterbar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/libtorrent-rasterbar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,34 +5,32 @@ PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup conflicts_build 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup arvidn libtorrent 1.2.11 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup arvidn libtorrent 2.0.3 v
</span> name libtorrent-rasterbar
license BSD
categories net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {devans @dbevans} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {devans @dbevans} {i0ntempest @i0ntempest} openmaintainer
</span> platforms darwin
homepage https://libtorrent.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname libtorrent-rasterbar-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description A C++ bittorrent library (not the same as port libtorrent)
long_description A C++ bittorrent library designed to run on anything from embedded systems to large scale \
seed servers. It comes with python bindings and detailed documentation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 14019d6611ac3104280631c0123423ee67eaea62 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 714ca990209e1eda2b9b95fca627cbb7959ad5ec6c24e316eeb92eb150d53915 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3591817
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b47ce089cb9f7452ac7e9a8265c58cf18cc298b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 59bfc7654bccaa2735353fb21e503ed6f66f1964150b70799150ed3f2403bcc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4294340
</span>
depends_lib port:boost \
path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python-use-the-right-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-python-use-the-right-compiler.diff
</span>
# Apple clang less than 900.0.39.2 fails to build
# build using C++14 for binary compatibility with C++14 dependents
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,64 +40,46 @@ compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 900.0.39.2}
</span> # ensure that compiler is using C++14 mode
configure.cxxflags-append -std=c++14
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-python-binding \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-boost-libdir="${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autotool.sh && ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DBoost_LIBRARY_DIR_RELEASE="${prefix}/lib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dencryption=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_TYPE=Release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_CXX_STANDARD=14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlogging=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpython-bindings=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpython-install-system-dir=ON
</span>
universal_variant no
conflicts_build ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python37 python38 description {Build bindings for Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants boost python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-boost-python="boost_python27-mt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_INSTALL_PARAMS=--prefix=${destroot}${frameworks_dir}/Python.framework/Versions/2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_EXTRA_LIBS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python38 python39 description {Build bindings for Python 3.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python38 python39 description {Build bindings for Python 3.7} {
</span> require_active_variants boost python37
depends_lib-append port:python37
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-boost-python="boost_python37-mt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_INSTALL_PARAMS=--prefix=${destroot}${frameworks_dir}/Python.framework/Versions/3.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_EXTRA_LIBS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPython3_EXECUTABLE=${prefix}/bin/python3.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBoost_PYTHON37_LIBRARY_RELEASE=${prefix}/lib/libboost_python37-mt.dylib
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python27 python37 python39 description {Build bindings for Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python37 python39 description {Build bindings for Python 3.8} {
</span> require_active_variants boost python38
depends_lib-append port:python38
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-boost-python="boost_python38-mt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_INSTALL_PARAMS=--prefix=${destroot}${frameworks_dir}/Python.framework/Versions/3.8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_EXTRA_LIBS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPython3_EXECUTABLE=${prefix}/bin/python3.8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBoost_PYTHON38_LIBRARY_RELEASE=${prefix}/lib/libboost_python38-mt.dylib
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python27 python37 python38 description {Build bindings for Python 3.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python37 python38 description {Build bindings for Python 3.9} {
</span> require_active_variants boost python39
depends_lib-append port:python39
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-boost-python="boost_python39-mt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_INSTALL_PARAMS=--prefix=${destroot}${frameworks_dir}/Python.framework/Versions/3.9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_EXTRA_LIBS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPython3_EXECUTABLE=${prefix}/bin/python3.9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBoost_PYTHON39_LIBRARY_RELEASE=${prefix}/lib/libboost_python39-mt.dylib
</span> }
variant error_logging description {Enable logging of errors to disk} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-logging=errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dlogging=OFF -Dlogging=ON
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python37] && ![variant_isset python38] && ![variant_isset python39]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python37] && ![variant_isset python38] && ![variant_isset python39]} {
</span> default_variants +python38
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libtorrent-rasterbar/files/patch-python-use-the-right-compiler.diff b/net/libtorrent-rasterbar/files/patch-python-use-the-right-compiler.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5fec9fb3f52..21c5c36fb5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/libtorrent-rasterbar/files/patch-python-use-the-right-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/libtorrent-rasterbar/files/patch-python-use-the-right-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bindings/python/Makefile.am.orig 2020-04-02 18:25:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bindings/python/Makefile.am 2020-04-02 18:28:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ENABLE_PYTHON_BINDING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bindings/python/CMakeLists.txt.old 2021-01-08 06:53:40.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bindings/python/CMakeLists.txt 2021-03-26 13:08:16.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,8 +114,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file(${SETUP_PY_IN} ${SETUP_PY} @ONLY)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- all-local:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(PYTHON) $(srcdir)/setup.py build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CC=$(CC) $(PYTHON) $(srcdir)/setup.py build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(OUTPUT ${OUTPUT}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} build -b "${CMAKE_CURRENT_SOURCE_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} egg_info -b "${CMAKE_CURRENT_SOURCE_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${Python3_EXECUTABLE} ${SETUP_PY} build -b "${CMAKE_CURRENT_SOURCE_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${Python3_EXECUTABLE} ${SETUP_PY} egg_info -b "${CMAKE_CURRENT_SOURCE_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDS ${DEPS})
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- install-exec-local:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(PYTHON) $(srcdir)/setup.py install @PYTHON_INSTALL_PARAMS@
</span></pre><pre style='margin:0'>
</pre>