diff --git a/net/toxcore/Makefile b/net/toxcore/Makefile index 691c013a844..1970e5b6f0c 100755 --- a/net/toxcore/Makefile +++ b/net/toxcore/Makefile @@ -1,16 +1,16 @@ -# $OpenBSD: Makefile,v 1.7 2019/11/24 23:05:10 cwen Exp $ +# $OpenBSD: Makefile,v 1.8 2021/01/03 19:35:02 sthen Exp $ COMMENT = Tox client library -V = 0.2.3 -REVISION = 3 +V = 0.2.12 DISTNAME = toxcore-$V GH_ACCOUNT = TokTok GH_PROJECT = c-toxcore GH_TAGNAME = v$V -SHARED_LIBS += toxcore 0.1 # 0.1 +SHARED_LIBS += toxcore 1.0 + CATEGORIES = net telephony HOMEPAGE = https://tox.chat/ @@ -21,12 +21,11 @@ PERMIT_PACKAGE = Yes WANTLIB = c config m opus pthread sodium vpx MODULES = devel/cmake +COMPILER = base-clang ports-gcc LIB_DEPENDS = audio/opus \ devel/libconfig \ multimedia/libvpx \ security/libsodium -NO_TEST = Yes - .include diff --git a/net/toxcore/distinfo b/net/toxcore/distinfo index 8233af36dde..520f790481c 100644 --- a/net/toxcore/distinfo +++ b/net/toxcore/distinfo @@ -1,2 +1,2 @@ -SHA256 (toxcore-0.2.3.tar.gz) = IsUvKGxG0/gC7baXi88qU/gwE2Pit0V4RhNCejO6OjQ= -SIZE (toxcore-0.2.3.tar.gz) = 471336 +SHA256 (toxcore-0.2.12.tar.gz) = MK4yY8m2jTvvBveZup16Z+P61EcDBiXw/6S7ImhCKLA= +SIZE (toxcore-0.2.12.tar.gz) = 504832 diff --git a/net/toxcore/patches/patch-CMakeLists_txt b/net/toxcore/patches/patch-CMakeLists_txt deleted file mode 100644 index 3672bbbc88a..00000000000 --- a/net/toxcore/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,59 +0,0 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.4 2019/11/24 23:05:10 cwen Exp $ - -* remove unknown option for base-gcc -* NO_TEST is set but tests are built, and they break the build with base-gcc - -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -171,7 +171,7 @@ if(NOT MSVC) - # Comma at end of enum is supported everywhere we run. - add_cxxflag("-Wno-c++98-compat-pedantic") - # TODO(iphydf): Stop using flexible array members. -- add_cxxflag("-Wno-c99-extensions") -+ #add_cxxflag("-Wno-c99-extensions") - # We're C-compatible, so use C style casts. - add_cxxflag("-Wno-old-style-cast") - -@@ -463,24 +463,11 @@ if(ANDROID_CPU_FEATURES) - endif() - - function(auto_test target) -- if(NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD")) -- add_executable(auto_${target}_test ${CPUFEATURES} -- auto_tests/${target}_test.c) -- target_link_modules(auto_${target}_test toxcore) -- if(NOT ARGV1 STREQUAL "DONT_RUN") -- add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test) -- set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}") -- set_property(TEST ${target} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${target}.profraw") -- endif() -- endif() -+ message (WARNING "Test ${target} not built because it breaks the build with base-gcc and NO_TEST is set") - endfunction() - - if(BUILD_TOXAV) - add_definitions(-D__STDC_LIMIT_MACROS=1) -- add_executable(auto_monolith_test ${CPUFEATURES} -- auto_tests/monolith_test.cc) -- target_link_libraries(auto_monolith_test ${toxcore_LINK_MODULES}) -- add_test(NAME monolith COMMAND ${CROSSCOMPILING_EMULATOR} auto_monolith_test) - endif() - - auto_test(TCP) -@@ -593,15 +580,3 @@ if(NOT WIN32 - set_source_files_properties(testing/av_test.c PROPERTIES LANGUAGE CXX) - endif() - endif() -- --add_executable(DHT_test ${CPUFEATURES} -- testing/DHT_test.c) --target_link_modules(DHT_test toxcore) -- --add_executable(Messenger_test ${CPUFEATURES} -- testing/Messenger_test.c) --target_link_modules(Messenger_test toxcore) -- --add_executable(random_testing ${CPUFEATURES} -- testing/random_testing.cc) --target_link_modules(random_testing toxcore) diff --git a/net/toxcore/pkg/PLIST b/net/toxcore/pkg/PLIST index 593c61c12ab..db55d402fd2 100644 --- a/net/toxcore/pkg/PLIST +++ b/net/toxcore/pkg/PLIST @@ -1,9 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/29 11:14:09 landry Exp $ +@comment $OpenBSD: PLIST,v 1.2 2021/01/03 19:35:02 sthen Exp $ +@bin bin/DHT_bootstrap @bin bin/tox-bootstrapd include/tox/ include/tox/tox.h include/tox/toxav.h include/tox/toxencryptsave.h -lib/libtoxcore.a +@static-lib lib/libtoxcore.a @lib lib/libtoxcore.so.${LIBtoxcore_VERSION} lib/pkgconfig/toxcore.pc