From owner-svn-ports-head@freebsd.org Sun Feb 28 20:13:58 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5BC55548642; Sun, 28 Feb 2021 20:13:58 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DpZNQ28fKz4qQM; Sun, 28 Feb 2021 20:13:58 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3CB5916F91; Sun, 28 Feb 2021 20:13:58 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11SKDw05075657; Sun, 28 Feb 2021 20:13:58 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11SKDvKn075653; Sun, 28 Feb 2021 20:13:57 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202102282013.11SKDvKn075653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 28 Feb 2021 20:13:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566804 - in head/net-p2p/py-libtorrent-rasterbar: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/net-p2p/py-libtorrent-rasterbar: . files X-SVN-Commit-Revision: 566804 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2021 20:13:58 -0000 Author: yuri Date: Sun Feb 28 20:13:57 2021 New Revision: 566804 URL: https://svnweb.freebsd.org/changeset/ports/566804 Log: net-p2p/py-libtorrent-rasterbar: Update 1.2.10 -> 2.0.2 Added: head/net-p2p/py-libtorrent-rasterbar/files/ head/net-p2p/py-libtorrent-rasterbar/files/b2 (contents, props changed) head/net-p2p/py-libtorrent-rasterbar/files/patch-ca9a7f3b89095949e30f533e53080293f33f2f60 (contents, props changed) Modified: head/net-p2p/py-libtorrent-rasterbar/Makefile head/net-p2p/py-libtorrent-rasterbar/distinfo Modified: head/net-p2p/py-libtorrent-rasterbar/Makefile ============================================================================== --- head/net-p2p/py-libtorrent-rasterbar/Makefile Sun Feb 28 20:08:18 2021 (r566803) +++ head/net-p2p/py-libtorrent-rasterbar/Makefile Sun Feb 28 20:13:57 2021 (r566804) @@ -2,34 +2,40 @@ # $FreeBSD$ PORTNAME= libtorrent-rasterbar -DISTVERSIONPREFIX= libtorrent- -DISTVERSION= 1.2.10 +DISTVERSION= 2.0.2 CATEGORIES= net-p2p python +MASTER_SITES= https://github.com/arvidn/libtorrent/releases/download/v${DISTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PATCH_SITES= https://github.com/arvidn/libtorrent/commit/ +PATCHFILES= 2e9a8423c8e2d3eba49165bacbae2878e25991cb.patch:-p3 # https://github.com/arvidn/libtorrent/pull/6016/commits + MAINTAINER= yuri@FreeBSD.org COMMENT= Python bindings for libtorrent-rasterbar LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../../COPYING -LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \ - ${PY_BOOST} +BUILD_DEPENDS= b2:devel/boost_build +#LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \ +# ${PY_BOOST} +LIB_DEPENDS= ${PY_BOOST} # Python binding rebuilds whole libtorrent: https://github.com/arvidn/libtorrent/issues/6017 -USES= compiler:c11 iconv localbase python:3.6+ -USE_GITHUB= yes -GH_ACCOUNT= arvidn -GH_PROJECT= libtorrent +USES= compiler:c11 iconv localbase:ldflags python:3.6+ USE_PYTHON= distutils autoplist +BINARY_ALIAS= b2=${FILESDIR}/b2 + CFLAGS+= -DTORRENT_DISABLE_LOGGING # undefined symbol: https://github.com/arvidn/libtorrent/issues/3331 -LDFLAGS+= ${LOCALBASE}/lib/libboost_python${PYTHON_SUFFIX}.so ${LOCALBASE}/lib/libiconv.so # fails to link libs: https://github.com/arvidn/libtorrent/issues/3330 +CFLAGS+= -fPIC +#LDFLAGS+= ${LOCALBASE}/lib/libboost_python${PYTHON_SUFFIX}.so ${LOCALBASE}/lib/libiconv.so # fails to link libs: https://github.com/arvidn/libtorrent/issues/3330 WRKSRC_SUBDIR= bindings/python # ensure python paths are correctly identified CONFIGURE_ENV= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \ - PYTHON_VERSION="${PYTHON_VERSION}" + PYTHON_VERSION="${PYTHON_VERSION}" \ + BOOST_ROOT=${LOCALBASE} post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/libtorrent*.so Modified: head/net-p2p/py-libtorrent-rasterbar/distinfo ============================================================================== --- head/net-p2p/py-libtorrent-rasterbar/distinfo Sun Feb 28 20:08:18 2021 (r566803) +++ head/net-p2p/py-libtorrent-rasterbar/distinfo Sun Feb 28 20:13:57 2021 (r566804) @@ -1,3 +1,5 @@ -TIMESTAMP = 1599281590 -SHA256 (arvidn-libtorrent-libtorrent-1.2.10_GH0.tar.gz) = e0fedb583f1e7bdcc0eb80a9df064a1e6fb0b825d8423e64bdb0f7a35879a09e -SIZE (arvidn-libtorrent-libtorrent-1.2.10_GH0.tar.gz) = 3586008 +TIMESTAMP = 1614539774 +SHA256 (libtorrent-rasterbar-2.0.2.tar.gz) = 3af22ea1b60e04a7cf357a3d770470ea5df15e968501782bd1414634a2b42cb7 +SIZE (libtorrent-rasterbar-2.0.2.tar.gz) = 4269533 +SHA256 (2e9a8423c8e2d3eba49165bacbae2878e25991cb.patch) = 189088dc121b6c62915b1edb76681298ccf34e0a4f628c4bee67a95b4ffceba9 +SIZE (2e9a8423c8e2d3eba49165bacbae2878e25991cb.patch) = 1422 Added: head/net-p2p/py-libtorrent-rasterbar/files/b2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/py-libtorrent-rasterbar/files/b2 Sun Feb 28 20:13:57 2021 (r566804) @@ -0,0 +1,3 @@ +#!/bin/sh + +$PREFIX/bin/b2 toolset=clang "$@" Added: head/net-p2p/py-libtorrent-rasterbar/files/patch-ca9a7f3b89095949e30f533e53080293f33f2f60 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/py-libtorrent-rasterbar/files/patch-ca9a7f3b89095949e30f533e53080293f33f2f60 Sun Feb 28 20:13:57 2021 (r566804) @@ -0,0 +1,50 @@ +- patch from the upstream to fix build + +From ca9a7f3b89095949e30f533e53080293f33f2f60 Mon Sep 17 00:00:00 2001 +From: arvidn +Date: Mon, 11 Jan 2021 21:14:29 +0100 +Subject: [PATCH] Fix cxxflags and linkflags injection via environment + variables + +--- + ChangeLog | 2 ++ + Jamfile | 5 ++--- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git ../../ChangeLog ../..//ChangeLog +index 01301258c8..aaefc2bc76 100644 +--- ../..//ChangeLog ++++ ../..//ChangeLog +@@ -1,3 +1,5 @@ ++ * Fix cxxflags and linkflags injection via environment variables ++ + 1.2.12 released + + * fix loading of DHT node ID from previous session on startup +diff --git ../..//Jamfile ../../Jamfile +index 21d1fc423e..44a1199484 100644 +--- ../../Jamfile ++++ ../../Jamfile +@@ -745,8 +745,7 @@ local usage-requirements = + msvc:_SCL_SECURE_NO_DEPRECATE + msvc:_CRT_SECURE_NO_DEPRECATE + +- $(CXXFLAGS) +- $(LDFLAGS) ++ "$(CXXFLAGS:J= )" + ; + + project torrent ; +@@ -770,11 +769,11 @@ lib torrent + + @building + @warnings +- $(CXXFLAGS) + + @tag + + $(usage-requirements) ++ "$(LDFLAGS:J= )" + + : # default build + multi