Hello community, here is the log from the commit of package volk for openSUSE:Factory checked in at 2020-12-18 19:59:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/volk (Old) and /work/SRC/openSUSE:Factory/.volk.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "volk" Fri Dec 18 19:59:50 2020 rev:6 rq:856820 version:2.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/volk/volk.changes 2020-12-01 14:23:33.761643692 +0100 +++ /work/SRC/openSUSE:Factory/.volk.new.5145/volk.changes 2020-12-18 20:00:15.086117820 +0100 @@ -1,0 +2,14 @@ +Thu Dec 17 21:06:38 UTC 2020 - Martin Hauke <[email protected]> + +- Update to version 2.4.1 + Build + * cpu_features CMake option + * Add cpu_features to static library build. + * Use static liborc-0.4 library for static library build. + * cmake: Detect if cpu_features submodule is present. + Install + * Check for lib64 versus lib and set LIB_SUFFIX accordingly. +- Switch back to the release github tarballs +- Verify source signature + +------------------------------------------------------------------- Old: ---- _service volk-2.4.0.tar.xz New: ---- volk-2.4.1.tar.xz volk-2.4.1.tar.xz.sig volk.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ volk.spec ++++++ --- /var/tmp/diff_new_pack.9SV1xL/_old 2020-12-18 20:00:15.858118645 +0100 +++ /var/tmp/diff_new_pack.9SV1xL/_new 2020-12-18 20:00:15.862118650 +0100 @@ -19,13 +19,15 @@ %global sonum 2 %global soname 2_4 Name: volk -Version: 2.4.0 +Version: 2.4.1 Release: 0 Summary: Vector-Optimized Library of Kernels License: GPL-3.0-only Group: Development/Libraries/C and C++ URL: https://libvolk.org/ -Source: %{name}-%{version}.tar.xz +Source: https://github.com/gnuradio/volk/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source98: https://github.com/gnuradio/volk/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc#/%{name}-%{version}.tar.xz.sig +Source99: https://github.com/gnuradio/volk/releases/download/v%{version}/gpg_volk_release_key.asc#/volk.keyring Patch0: volk-fix-cpu_features-compilation-error.patch BuildRequires: cmake BuildRequires: fdupes ++++++ volk-2.4.0.tar.xz -> volk-2.4.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/.github/workflows/run-tests.yml new/volk-2.4.1/.github/workflows/run-tests.yml --- old/volk-2.4.0/.github/workflows/run-tests.yml 2020-11-22 17:33:01.000000000 +0100 +++ new/volk-2.4.1/.github/workflows/run-tests.yml 2020-12-17 16:49:06.000000000 +0100 @@ -22,6 +22,25 @@ - name: test run: cd build && ctest -V + build-ubuntu-static: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: dependencies + run: sudo apt install python3-mako liborc-dev + - name: Checkout submodules + uses: srt32/[email protected] + with: + args: git submodule update --init --recursive + - name: configure + run: mkdir build && cd build && cmake -DENABLE_STATIC_LIBS=True .. + - name: build + run: cmake --build build + - name: test + run: cd build && ctest -V + build-windows: runs-on: windows-latest @@ -55,4 +74,4 @@ - name: build run: cmake --build build --config Debug - name: test - run: cd build && ctest -V \ No newline at end of file + run: cd build && ctest -V diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/.gitignore new/volk-2.4.1/.gitignore --- old/volk-2.4.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/volk-2.4.1/.gitignore 2020-12-17 16:49:06.000000000 +0100 @@ -0,0 +1,5 @@ +*~ +*.pyc +*.pyo +*build*/ +archives/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/.lastrelease new/volk-2.4.1/.lastrelease --- old/volk-2.4.0/.lastrelease 2020-11-22 17:33:01.000000000 +0100 +++ new/volk-2.4.1/.lastrelease 2020-12-17 16:49:06.000000000 +0100 @@ -1 +1 @@ -v2.4.0 +v2.4.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/CHANGELOG.md new/volk-2.4.1/CHANGELOG.md --- old/volk-2.4.0/CHANGELOG.md 2020-11-22 17:33:01.000000000 +0100 +++ new/volk-2.4.1/CHANGELOG.md 2020-12-17 16:49:06.000000000 +0100 @@ -402,3 +402,44 @@ - volk_32fc_x2_dot_prod_32fc: disable slow & broken SSE4.1 kernel - fix: Adjust min/max for 32f_s32f_convert_8i kernel - fix: Use INT8_* instead of CHAR_* + + +## [2.4.1] - 2020-12-17 + +Hi everyone! + +We have a new VOLK bugfix release! We are happy to announce VOLK v2.4.1! We want to thank all contributors. This release wouldn't have been possible without them. + +Our v2.4.0 release introduced quite a lot of changes under the hood. With this bugfix release, we want to make sure that everything works as expected again. + + +### Contributors + +* A. Maitland Bottoms <[email protected]> +* Johannes Demel <[email protected]> +* Michael Dickens <[email protected]> +* Philip Balister <[email protected]> +* Ron Economos <[email protected]> +* Ryan Volz <[email protected]> + + +### Changes + +* Build + - cpu_features CMake option + - Add cpu_features to static library build. + - Use static liborc-0.4 library for static library build. + - cmake: Detect if cpu_features submodule is present. + +* Install + - Check for lib64 versus lib and set LIB_SUFFIX accordingly. + +* CI + - Add CI test for static library build. + +* Releases + - project: Include git submodules (i.e. cpu_features) in release tarball. + - scripts: Add GPG signature to release script + +* Other + - readme: Update TravisCI status badge diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/CMakeLists.txt new/volk-2.4.1/CMakeLists.txt --- old/volk-2.4.0/CMakeLists.txt 2020-11-22 17:33:01.000000000 +0100 +++ new/volk-2.4.1/CMakeLists.txt 2020-12-17 16:49:06.000000000 +0100 @@ -67,7 +67,7 @@ set(VERSION_INFO_MAJOR_VERSION 2) set(VERSION_INFO_MINOR_VERSION 4) -set(VERSION_INFO_MAINT_VERSION 0) +set(VERSION_INFO_MAINT_VERSION 1) include(VolkVersion) #setup version info macro(set_version_str VAR) @@ -114,14 +114,28 @@ # Dependencies setup ######################################################################## -# cpu_features -set(BUILD_PIC ON CACHE BOOL +# cpu_features - sensible defaults, user settable option +if(CMAKE_SYSTEM_PROCESSOR MATCHES + "(^mips)|(^arm)|(^aarch64)|(x86_64)|(AMD64|amd64)|(^i.86$)|(^powerpc)|(^ppc)") + option(VOLK_CPU_FEATURES "Volk uses cpu_features" ON) +else() + option(VOLK_CPU_FEATURES "Volk uses cpu_features" OFF) +endif() +if (VOLK_CPU_FEATURES) + if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cpu_features/CMakeLists.txt" ) + message(FATAL_ERROR "cpu_features/CMakeLists.txt not found. Did you forget to git clone recursively?\nFix with: git submodule update --init") + endif() + message(STATUS "Building Volk with cpu_features") + set(BUILD_PIC ON CACHE BOOL "Build cpu_features with Position Independent Code (PIC)." FORCE) -set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}") -set(BUILD_SHARED_LIBS OFF) -add_subdirectory(cpu_features) -set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}") + set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}") + set(BUILD_SHARED_LIBS OFF) + add_subdirectory(cpu_features) + set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}") +else() + message(STATUS "Building Volk without cpu_features") +endif() # Python include(VolkPython) #sets PYTHON_EXECUTABLE and PYTHON_DASH_B @@ -209,6 +223,13 @@ endif(DOXYGEN_FOUND) ######################################################################## +# Detect /lib versus /lib64 +######################################################################## +if (${CMAKE_INSTALL_LIBDIR} MATCHES lib64) + set(LIB_SUFFIX 64) +endif() + +######################################################################## # Setup the package config file ######################################################################## #set variables found in the pc.in file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/README.md new/volk-2.4.1/README.md --- old/volk-2.4.0/README.md 2020-11-22 17:33:01.000000000 +0100 +++ new/volk-2.4.1/README.md 2020-12-17 16:49:06.000000000 +0100 @@ -1,4 +1,4 @@ -[](https://travis-ci.org/gnuradio/volk) [](https://ci.appveyor.com/project/gnuradio/volk/branch/master) +[](https://travis-ci.com/gnuradio/volk) [](https://ci.appveyor.com/project/gnuradio/volk/branch/master)   diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/cmake/Modules/FindORC.cmake new/volk-2.4.1/cmake/Modules/FindORC.cmake --- old/volk-2.4.0/cmake/Modules/FindORC.cmake 2020-11-22 17:33:01.000000000 +0100 +++ new/volk-2.4.1/cmake/Modules/FindORC.cmake 2020-12-17 16:49:06.000000000 +0100 @@ -22,6 +22,10 @@ HINTS ${PC_ORC_LIBRARY_DIRS} PATHS ${ORC_ROOT}/lib${LIB_SUFFIX} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) +FIND_LIBRARY(ORC_LIBRARY_STATIC liborc-0.4.a + HINTS ${PC_ORC_LIBRARY_DIRS} + PATHS ${ORC_ROOT}/lib${LIB_SUFFIX} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) + LIST(APPEND ORC_LIBRARY ${ORC_LIB} ) @@ -30,6 +34,7 @@ SET(ORC_INCLUDE_DIRS ${ORC_INCLUDE_DIR}) SET(ORC_LIBRARIES ${ORC_LIBRARY}) SET(ORC_LIBRARY_DIRS ${ORC_LIBRARY_DIR}) +SET(ORC_LIBRARIES_STATIC ${ORC_LIBRARY_STATIC}) INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ORC "orc files" ORC_LIBRARY ORC_INCLUDE_DIR ORCC_EXECUTABLE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/cpu_features/.gitignore new/volk-2.4.1/cpu_features/.gitignore --- old/volk-2.4.0/cpu_features/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/volk-2.4.1/cpu_features/.gitignore 2020-10-15 11:09:51.000000000 +0200 @@ -0,0 +1,4 @@ +cmake_build/ +build/ + +*.swp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/lib/CMakeLists.txt new/volk-2.4.1/lib/CMakeLists.txt --- old/volk-2.4.0/lib/CMakeLists.txt 2020-11-22 17:33:01.000000000 +0100 +++ new/volk-2.4.1/lib/CMakeLists.txt 2020-12-17 16:49:06.000000000 +0100 @@ -511,10 +511,15 @@ PRIVATE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/kernels> - PRIVATE $<TARGET_PROPERTY:cpu_features,INTERFACE_INCLUDE_DIRECTORIES> PRIVATE ${CMAKE_CURRENT_BINARY_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ) +if(VOLK_CPU_FEATURES) + set_source_files_properties(volk_cpu.c PROPERTIES COMPILE_DEFINITIONS "VOLK_CPU_FEATURES=1") + target_include_directories(volk_obj + PRIVATE $<TARGET_PROPERTY:cpu_features,INTERFACE_INCLUDE_DIRECTORIES> +) +endif() #Configure object target properties if(NOT MSVC) @@ -530,7 +535,10 @@ #include directories is taken as provided; it -might- matter, but #probably doesn't. add_library(volk SHARED $<TARGET_OBJECTS:volk_obj>) -target_link_libraries(volk PUBLIC ${volk_libraries} PRIVATE cpu_features) +target_link_libraries(volk PUBLIC ${volk_libraries}) +if(VOLK_CPU_FEATURES) + target_link_libraries(volk PRIVATE cpu_features) +endif() target_include_directories(volk PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> @@ -569,10 +577,14 @@ #probably doesn't. if(ENABLE_STATIC_LIBS) add_library(volk_static STATIC $<TARGET_OBJECTS:volk_obj>) - target_link_libraries(volk_static PUBLIC ${volk_libraries} pthread) + target_link_libraries(volk_static PUBLIC ${volk_libraries}) + if(VOLK_CPU_FEATURES) + target_link_libraries(volk_static PRIVATE cpu_features) + endif() if(ORC_FOUND) - target_link_libraries(volk_static PUBLIC ${ORC_LIBRARIES}) + target_link_libraries(volk_static PUBLIC ${ORC_LIBRARIES_STATIC}) endif() + target_link_libraries(volk_static PRIVATE pthread) if(NOT MSVC) target_link_libraries(volk_static PUBLIC m) endif() @@ -600,11 +612,19 @@ make_directory(${CMAKE_CURRENT_BINARY_DIR}/.unittest) include(VolkAddTest) - VOLK_GEN_TEST(volk_test_all - SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc - ${CMAKE_CURRENT_SOURCE_DIR}/qa_utils.cc - TARGET_DEPS volk - ) + if(ENABLE_STATIC_LIBS) + VOLK_GEN_TEST(volk_test_all + SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc + ${CMAKE_CURRENT_SOURCE_DIR}/qa_utils.cc + TARGET_DEPS volk_static + ) + else() + VOLK_GEN_TEST(volk_test_all + SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc + ${CMAKE_CURRENT_SOURCE_DIR}/qa_utils.cc + TARGET_DEPS volk + ) + endif() foreach(kernel ${h_files}) get_filename_component(kernel ${kernel} NAME) string(REPLACE ".h" "" kernel ${kernel}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/scripts/tools/release.sh new/volk-2.4.1/scripts/tools/release.sh --- old/volk-2.4.0/scripts/tools/release.sh 2020-11-22 17:33:01.000000000 +0100 +++ new/volk-2.4.1/scripts/tools/release.sh 2020-12-17 16:49:06.000000000 +0100 @@ -52,7 +52,7 @@ " echo "${shortlog}" -#echo "${shortlog}" > ${deltafile} +echo "${shortlog}" > ${deltafile} ${EDITOR} ${deltafile} @@ -67,6 +67,7 @@ # Append the HEAD commit hash to the annotation echo "git-describes-hash: $(git rev-parse --verify HEAD)" >> "${annotationfile}" +echo "Signing git tag..." if type 'signify-openbsd' > /dev/null; then signaturefile="${tempdir}/annotationfile.sig" signify-openbsd -S -x "${signaturefile}" -s "${seckey}" -m "${annotationfile}" @@ -83,6 +84,12 @@ tarprefix="${project}-${version}" outfile="${tempdir}/${tarprefix}.tar" git archive "--output=${outfile}" "--prefix=${tarprefix}/" HEAD +# Append submodule archives +git submodule foreach --recursive "git archive --output ${tempdir}/${tarprefix}-sub-\${sha1}.tar --prefix=${tarprefix}/\${sm_path}/ HEAD" +if [[ $(ls ${tempdir}/${tarprefix}-sub*.tar | wc -l) != 0 ]]; then + # combine all archives into one tar + tar --concatenate --file ${outfile} ${tempdir}/${tarprefix}-sub*.tar +fi echo "Created tape archive '${outfile}' of size $(du -h ${outfile})." # 6. compress @@ -97,6 +104,8 @@ echo "…compressed." # 7. sign + +# 7.1 with openbsd-signify echo "signing file list…" filelist="${tempdir}/${version}.sha256" pushd "${tempdir}" @@ -107,14 +116,24 @@ popd echo "checked." +# 7.2 with GPG +echo "signing tarballs with GPG ..." +gpg --armor --detach-sign "${outfile}".gz +gpg --armor --detach-sign "${outfile}".xz + #8. bundle archives mkdir -p archives cp "${tempdir}"/*.tar.* "${filelist}.sig" "${pubkey}" archives/ echo "Results can be found under $(pwd)/archives" #9. Push to origin -read -q "push?Do you want to push to origin? (y/n)" || echo "not pushing" -if [ "${push}" = "y" ]; then - git push "${remote}" HEAD - git push "${remote}" "v${releaseprefix}${version}" -fi +echo "Finished release!" +echo "Remember to push release commit AND release tag!" +echo "Release commit: 'git push ${remote} HEAD'" +echo "Release tag: 'git push ${remote} v${releaseprefix}${version}'" +#read -q "push?Do you want to push to origin? (y/n)" || echo "not pushing" +#if [ "${push}" = "y" ]; then +# git push "${remote}" HEAD +# git push "${remote}" "v${releaseprefix}${version}" +#fi + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/volk-2.4.0/tmpl/volk_cpu.tmpl.c new/volk-2.4.1/tmpl/volk_cpu.tmpl.c --- old/volk-2.4.0/tmpl/volk_cpu.tmpl.c 2020-11-22 17:33:01.000000000 +0100 +++ new/volk-2.4.1/tmpl/volk_cpu.tmpl.c 2020-12-17 16:49:06.000000000 +0100 @@ -25,6 +25,7 @@ #include <string.h> +#if defined(VOLK_CPU_FEATURES) #include "cpu_features_macros.h" #if defined(CPU_FEATURES_ARCH_X86) #include "cpuinfo_x86.h" @@ -42,6 +43,7 @@ #if defined(__cplusplus) using namespace cpu_features; #endif +#endif struct VOLK_CPU volk_cpu; _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
