diff options
author | Daniel Bermond | 2019-02-06 01:16:56 +0000 |
---|---|---|
committer | Daniel Bermond | 2019-02-06 01:16:56 +0000 |
commit | c762bf25df2c229782e90cfcaaa0027aefb91d2f (patch) | |
tree | 100348cfd913798b8fcdf3b3b213cc5444ccfb24 | |
parent | 6e17ea6f175cd85d87a1ae872baf72c7e57b1c07 (diff) | |
download | aur-c762bf25df2c229782e90cfcaaa0027aefb91d2f.tar.gz |
Match upstream changes: switch to cmake and add git submodules
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 87 |
2 files changed, 66 insertions, 32 deletions
@@ -1,21 +1,28 @@ pkgbase = libtorrent-rasterbar-git pkgdesc = A C++ BitTorrent library that aims to be a good alternative to all the other implementations around (git version) - pkgver = 1.2.RC2.r32.g3e582100d + pkgver = 1.2.0.r24.g30b8a06bd pkgrel = 1 url = https://www.rasterbar.com/products/libtorrent/ arch = i686 arch = x86_64 license = BSD makedepends = git + makedepends = cmake makedepends = boost makedepends = python2 + makedepends = python2-setuptools makedepends = python - depends = boost-libs + makedepends = python-setuptools + optdepends = boost-libs: for python bindings optdepends = python2: for python2 bindings optdepends = python: for python3 bindings provides = libtorrent-rasterbar conflicts = libtorrent-rasterbar source = libtorrent-rasterbar::git+https://github.com/arvidn/libtorrent.git + source = git+https://github.com/arvidn/libsimulator.git + source = git+https://github.com/arvidn/try_signal.git + sha256sums = SKIP + sha256sums = SKIP sha256sums = SKIP pkgname = libtorrent-rasterbar-git @@ -1,30 +1,35 @@ # Maintainer : Daniel Bermond < gmail-com: danielbermond > pkgname=libtorrent-rasterbar-git -pkgver=1.2.RC2.r32.g3e582100d +pkgver=1.2.0.r24.g30b8a06bd pkgrel=1 pkgdesc='A C++ BitTorrent library that aims to be a good alternative to all the other implementations around (git version)' url='https://www.rasterbar.com/products/libtorrent/' arch=('i686' 'x86_64') license=('BSD') -depends=('boost-libs') -makedepends=('git' 'boost' 'python2' 'python') -optdepends=('python2: for python2 bindings' +makedepends=('git' 'cmake' 'boost' 'python2' 'python2-setuptools' + 'python' 'python-setuptools') +optdepends=('boost-libs: for python bindings' + 'python2: for python2 bindings' 'python: for python3 bindings') provides=('libtorrent-rasterbar') conflicts=('libtorrent-rasterbar') -source=('libtorrent-rasterbar'::'git+https://github.com/arvidn/libtorrent.git') -sha256sums=('SKIP') +source=('libtorrent-rasterbar'::'git+https://github.com/arvidn/libtorrent.git' + 'git+https://github.com/arvidn/libsimulator.git' + 'git+https://github.com/arvidn/try_signal.git') +sha256sums=('SKIP' + 'SKIP' + 'SKIP') prepare() { cd libtorrent-rasterbar mkdir -p py2 py3 - # avoid depending on newer processors - sed -i 's/-msse4.2//' configure.ac - - ./autotool.sh + git submodule init + git config --local "submodule.simulation/libsimulator.url" "${srcdir}/libsimulator" + git config --local "submodule.deps/try_signal.url" "${srcdir}/try_signal" + git submodule update } pkgver() { @@ -35,34 +40,44 @@ pkgver() { } _build() { - cd "${srcdir}/libtorrent-rasterbar/py${1}" + local _pyver="$1" + local _pylibver="$1" + + [ "${_pyver%%.*}" -gt '2' ] && _pylibver+='m' - printf '%s\n' "Building for python${1}..." + cd "${srcdir}/libtorrent-rasterbar/py${_pyver%%.*}" - # FS#50745 - [ "$1" -eq '2' ] && local _boost='boost_python' - [ "$1" -eq '3' ] && local _boost='boost_python3' + printf '%s\n' "Building for python${_pyver%%.*}..." # force C++11 mode (needed by qBittorrent) # https://github.com/qbittorrent/qBittorrent/issues/5265#issuecomment-220007436 - export CXXFLAGS="${CXXFLAGS} -std=c++11" - export PYTHON="/usr/bin/python${1}" - - ../configure \ - --prefix='/usr' \ - --enable-python-binding \ - --enable-examples \ - --disable-static \ - --with-libiconv \ - --with-boost-python="${_boost}" + cmake \ + -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} -std=c++11 -DNDEBUG=1" \ + -DCMAKE_INSTALL_LIBDIR:PATH='lib' \ + -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ + -DCMAKE_SKIP_RPATH:BOOL='YES' \ + -Dbuild_examples:BOOL='ON' \ + -Dbuild_tools:BOOL='ON' \ + -Dpython-bindings:BOOL='ON' \ + -DPYTHON_EXECUTABLE:FILEPATH="/usr/bin/python${_pyver}" \ + -DPYTHON_INCLUDE_DIR:PATH="/usr/include/python${_pylibver}" \ + -DPYTHON_LIBRARY:FILEPATH="/usr/lib/libpython${_pylibver}.so" \ + -Wno-dev \ + .. make } build() { - _build 2 - _build 3 + local _py2ver + local _py3ver + + _py2ver="$(python2 -c 'import sys; print("%s.%s" %sys.version_info[0:2])')" + _py3ver="$(python -c 'import sys; print("%s.%s" %sys.version_info[0:2])')" + + _build "$_py2ver" + _build "$_py3ver" } package() { @@ -71,9 +86,21 @@ package() { make -C py2 DESTDIR="$pkgdir" install make -C py3 DESTDIR="$pkgdir" install + # binaries + local _binary + cd py3/examples + for _binary in client_test connection_tester dump_torrent make_torrent \ + simple_client stats_counters upnp_test + do + install -D -m755 "${_binary}" -t "${pkgdir}/usr/bin" + done + cd "${srcdir}/libtorrent-rasterbar/py3/tools" + for _binary in dht session_log_alerts + do + install -D -m755 "${_binary}" -t "${pkgdir}/usr/bin" + done + # license + cd "${srcdir}/libtorrent-rasterbar" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - # remove most example binaries - rm "$pkgdir"/usr/bin/{*_test,*_tester,simple_client,stats_counters} } |