diff --git a/net-libs/tox/tox-0.2.10.recipe b/net-libs/tox/tox-0.2.12.recipe similarity index 61% rename from net-libs/tox/tox-0.2.10.recipe rename to net-libs/tox/tox-0.2.12.recipe index b6a86d305..e29223fd8 100644 --- a/net-libs/tox/tox-0.2.10.recipe +++ b/net-libs/tox/tox-0.2.12.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2013-2017 Tox Project" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/TokTok/c-toxcore/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="5ccc4ecd79b95c367efe8341b06bf2a81f853032e6fcd7cb2bc0ad0ef7419d40" +CHECKSUM_SHA256="30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0" SOURCE_DIR="c-toxcore-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -23,71 +23,71 @@ else commandBinDir=$prefix/bin fi +libVersion="2.12.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" tox$secondaryArchSuffix = $portVersion - cmd:ntox$commandSuffix = $portVersion - lib:libtoxcore$secondaryArchSuffix = 2.10.0 compat >= 2 - lib:libtoxencryptsave$secondaryArchSuffix = 2.10.0 compat >= 2 + cmd:DHT_bootstrap$commandSuffix = $portVersion + cmd:tox_bootstrapd$commandSuffix = $portVersion + lib:libtoxcore$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix - lib:libcheck$secondaryArchSuffix lib:libconfig$secondaryArchSuffix - lib:libncurses$secondaryArchSuffix - lib:libsodium$secondaryArchSuffix -# lib:libvpx$secondaryArchSuffix + lib:libgtest$secondaryArchSuffix lib:libopus$secondaryArchSuffix + lib:libsodium$secondaryArchSuffix + lib:libvpx$secondaryArchSuffix " PROVIDES_devel=" tox${secondaryArchSuffix}_devel = $portVersion - devel:libtoxcore$secondaryArchSuffix = 2.10.0 compat >= 2 - devel:libtoxencryptsave$secondaryArchSuffix = 2.10.0 compat >= 2 + devel:libtoxcore$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" tox$secondaryArchSuffix == $portVersion base + devel:libopus$secondaryArchSuffix + devel:libsodium$secondaryArchSuffix + devel:libvpx$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libcheck$secondaryArchSuffix devel:libconfig$secondaryArchSuffix - devel:libncurses$secondaryArchSuffix - devel:libsodium$secondaryArchSuffix -# devel:libvpx$secondaryArchSuffix + devel:libgtest$secondaryArchSuffix devel:libopus$secondaryArchSuffix + devel:libsodium$secondaryArchSuffix + devel:libvpx$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoreconf - cmd:gawk + cmd:cmake cmd:gcc$secondaryArchSuffix + cmd:git cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix " BUILD() { - ./autogen.sh - runConfigure ./configure \ - --bindir=$commandBinDir \ - --enable-ntox \ - --disable-rt - make all \ - LIBS="-lnetwork -lbsd" + mkdir -p build && cd build + cmake .. $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE="Release" \ + -DCMAKE_INSTALL_BINDIR=$commandBinDir \ + -DCMAKE_EXE_LINKER_FLAGS:STRING=-lnetwork \ + -DSOCKET_LIBRARIES=-lnetwork \ + -DUSE_IPV6=OFF + make $jobArgs } INSTALL() { + cd build make install - rm $libDir/libtox*.la - - prepareInstalledDevelLibs \ - libtoxcore \ - libtoxencryptsave + prepareInstalledDevelLib \ + libtoxcore fixPkgconfig packageEntries devel \ @@ -96,5 +96,6 @@ INSTALL() TEST() { - make check + cd build + make test }