From bd08e96ca74478af5a6c2440d1d6732c0ba2f40d Mon Sep 17 00:00:00 2001 From: skmpz Date: Mon, 24 May 2021 14:13:09 +0400 Subject: [PATCH 1/2] New package: benchmark-1.5.3 --- common/shlibs | 2 ++ srcpkgs/benchmark-devel | 1 + srcpkgs/benchmark/template | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 120000 srcpkgs/benchmark-devel create mode 100644 srcpkgs/benchmark/template diff --git a/common/shlibs b/common/shlibs index 4e992b40b792..b99950854387 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1373,6 +1373,8 @@ libkgapi2.so.2 libkgapi-2.0.1_1 libqoauth.so.2 qoauth-qt5-2.0.0_1 libIrrlicht.so.1.8 irrlicht-1.8_1 libsnappy.so.1 snappy-1.1.0_1 +libbenchmark.so.0 benchmark-1.5.3_1 +libbenchmark_main.so.0 benchmark-1.5.3_1 libKF5Torrent.so.6 libktorrent-2.1_1 libvncserver.so.1 libvncserver-0.9.13_2 libvncclient.so.1 libvncserver-0.9.13_2 diff --git a/srcpkgs/benchmark-devel b/srcpkgs/benchmark-devel new file mode 120000 index 000000000000..b26bca2dd54d --- /dev/null +++ b/srcpkgs/benchmark-devel @@ -0,0 +1 @@ +benchmark \ No newline at end of file diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template new file mode 100644 index 000000000000..49ead0a476b9 --- /dev/null +++ b/srcpkgs/benchmark/template @@ -0,0 +1,24 @@ +# Template file for 'benchmark' +pkgname=benchmark +version=1.5.3 +revision=1 +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF + -DBENCHMARK_DOWNLOAD_DEPENDENCIES=OFF" +short_desc="Microbenchmark support library" +maintainer="skmpz " +license="Apache-2.0" +homepage="https://github.com/google/benchmark/" +distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz" +checksum=e4fbb85eec69e6668ad397ec71a3a3ab165903abe98a8327db920b94508f720e + +benchmark-devel_package() { + depends="${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From d66ce4d0bf4c7b7eba09f4acc30c12a28604a407 Mon Sep 17 00:00:00 2001 From: skmpz Date: Mon, 24 May 2021 14:16:20 +0400 Subject: [PATCH 2/2] snappy: update to 1.1.9. --- .../patches/cmakelists_no_3rdparty.patch | 28 +++++++++++++++++++ srcpkgs/snappy/patches/inline.patch | 5 ++++ srcpkgs/snappy/template | 8 +++--- 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch create mode 100644 srcpkgs/snappy/patches/inline.patch diff --git a/srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch b/srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch new file mode 100644 index 000000000000..ba3d91c35efd --- /dev/null +++ b/srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch @@ -0,0 +1,28 @@ +--- CMakeLists.txt 2021-05-05 02:53:34.000000000 +0400 ++++ CMakeLists.txt 2021-05-24 13:49:21.551706280 +0400 +@@ -287,17 +286,0 @@ if(SNAPPY_BUILD_TESTS) +- # Prevent overriding the parent project's compiler/linker settings on Windows. +- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +- set(install_gtest OFF) +- set(install_gmock OFF) +- set(build_gmock ON) +- +- # This project is tested using GoogleTest. +- add_subdirectory("third_party/googletest") +- +- # GoogleTest triggers a missing field initializers warning. +- if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- set_property(TARGET gtest +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- set_property(TARGET gmock +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- +@@ -309 +292 @@ if(SNAPPY_BUILD_TESTS) +- target_link_libraries(snappy_unittest snappy_test_support gmock_main gtest) ++ target_link_libraries(snappy_unittest snappy_test_support gtest_main gtest) +@@ -330 +313 @@ if(SNAPPY_BUILD_BENCHMARKS) +- target_link_libraries(snappy_benchmark snappy_test_support benchmark_main) ++ target_link_libraries(snappy_benchmark snappy_test_support benchmark_main benchmark) +@@ -335 +317,0 @@ if(SNAPPY_BUILD_BENCHMARKS) +- add_subdirectory("third_party/benchmark") diff --git a/srcpkgs/snappy/patches/inline.patch b/srcpkgs/snappy/patches/inline.patch new file mode 100644 index 000000000000..eb51b4710dcd --- /dev/null +++ b/srcpkgs/snappy/patches/inline.patch @@ -0,0 +1,5 @@ +--- snappy.cc 2021-05-05 02:53:34.000000000 +0400 ++++ snappy.cc 2021-05-24 01:24:59.124654893 +0400 +@@ -1017 +1017 @@ SNAPPY_ATTRIBUTE_ALWAYS_INLINE +-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { ++inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { diff --git a/srcpkgs/snappy/template b/srcpkgs/snappy/template index 7062cb7b0d4c..ea991d855ed2 100644 --- a/srcpkgs/snappy/template +++ b/srcpkgs/snappy/template @@ -1,16 +1,16 @@ # Template file for 'snappy' pkgname=snappy -version=1.1.8 +version=1.1.9 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=1" -makedepends="zlib-devel lzo-devel" +makedepends="zlib-devel lzo-devel gtest-devel benchmark-devel" short_desc="Fast compressor/decompressor library" -maintainer="Orphaned " +maintainer="skmpz " license="BSD-3-Clause" homepage="https://google.github.io/snappy" distfiles="https://github.com/google/snappy/archive/${version}.tar.gz" -checksum=16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f +checksum="75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7" post_install() { vlicense COPYING