Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jasper for openSUSE:Factory checked in at 2022-02-14 22:36:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jasper (Old) and /work/SRC/openSUSE:Factory/.jasper.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jasper" Mon Feb 14 22:36:27 2022 rev:15 rq:954338 version:3.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/jasper/jasper.changes 2022-02-13 00:16:19.324273696 +0100 +++ /work/SRC/openSUSE:Factory/.jasper.new.1956/jasper.changes 2022-02-14 22:37:36.445638258 +0100 @@ -1,0 +2,7 @@ +Mon Feb 14 15:12:38 UTC 2022 - Michael Vetter <[email protected]> + +- Update to 3.0.2: + * Fix a build issue that occurs when a cross-compiler is + used (e.g., #319). + +------------------------------------------------------------------- Old: ---- version-3.0.1.tar.gz New: ---- version-3.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jasper.spec ++++++ --- /var/tmp/diff_new_pack.T9vA1S/_old 2022-02-14 22:37:36.941639550 +0100 +++ /var/tmp/diff_new_pack.T9vA1S/_new 2022-02-14 22:37:36.945639561 +0100 @@ -20,7 +20,7 @@ %global __builddir obs_build Name: jasper -Version: 3.0.1 +Version: 3.0.2 Release: 0 Summary: An Implementation of the JPEG-2000 Standard, Part 1 License: JasPer-2.0 ++++++ version-3.0.1.tar.gz -> version-3.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-3.0.1/.github/workflows/deploy_manual.yml new/jasper-version-3.0.2/.github/workflows/deploy_manual.yml --- old/jasper-version-3.0.1/.github/workflows/deploy_manual.yml 2022-02-12 21:49:32.000000000 +0100 +++ new/jasper-version-3.0.2/.github/workflows/deploy_manual.yml 2022-02-14 15:54:28.000000000 +0100 @@ -1,7 +1,7 @@ name: Deploy Manual on: - create: + push: tags: - version-[0-9]+.[0-9]+.[0-9]+-unstable[0-9]+ - 'manual-version-*' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-3.0.1/.github/workflows/release.yml new/jasper-version-3.0.2/.github/workflows/release.yml --- old/jasper-version-3.0.1/.github/workflows/release.yml 2022-02-12 21:49:32.000000000 +0100 +++ new/jasper-version-3.0.2/.github/workflows/release.yml 2022-02-14 15:54:28.000000000 +0100 @@ -1,7 +1,7 @@ name: release on: - create: + push: tags: - version-[0-9]+.[0-9]+.[0-9]+ - version-[0-9]+.[0-9]+.[0-9]+-rc[0-9]+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-3.0.1/CMakeLists.txt new/jasper-version-3.0.2/CMakeLists.txt --- old/jasper-version-3.0.1/CMakeLists.txt 2022-02-12 21:49:32.000000000 +0100 +++ new/jasper-version-3.0.2/CMakeLists.txt 2022-02-14 15:54:28.000000000 +0100 @@ -10,7 +10,7 @@ # The major, minor, and micro version numbers of the project. set(JAS_VERSION_MAJOR 3) set(JAS_VERSION_MINOR 0) -set(JAS_VERSION_PATCH 1) +set(JAS_VERSION_PATCH 2) # The shared library versioning information. # Guidelines on how to change this information can be found below. @@ -94,6 +94,9 @@ # Define options. ################################################################################ +# Note: The variable JAS_CROSSCOMPILING can be defined on the command line +# in order to override the value of CMAKE_CROSSCOMPILING (if necessary). + if(DEFINED BUILD_SHARED_LIBS) option(JAS_ENABLE_SHARED "Enable building of shared library" ${BUILD_SHARED_LIBS}) @@ -392,9 +395,30 @@ #set(JAS_CMAKE_REQUIRED_DEFINITIONS ${JAS_CMAKE_REQUIRED_DEFINITIONS}) # Get the value of the __STDC_VERSION__ preprocessor define. -jas_get_stdc_version(status JAS_STDC_VERSION) -if(NOT status) - message(FATAL_ERROR "Cannot determine the value of __STDC_VERSION__.") +if((DEFINED JAS_CROSSCOMPILING AND JAS_CROSSCOMPILING) OR + (NOT DEFINED JAS_CROSSCOMPILING AND CMAKE_CROSSCOMPILING)) + message("A cross-compiling environment has been detected.") + # Note: The variable JAS_STDC_VERSION should be set to the value of the + # preprocessor symbol __STDC_VERSION__ on the target platform. + # Since CMake is unable to run a cross-compiled program, the value of + # __STDC_VERSION__ cannot be automatically determined when + # cross-compiling. If cross-compiling, the value of JAS_STDC_VERSION + # will need to be set manually from the command line + # (e.g., using -DJAS_STDC_VERSION=YYYYMML) or by changing the line below. + set(JAS_STDC_VERSION "0L" CACHE INTERNAL "The value of __STDC_VERSION__.") + if (JAS_STDC_VERSION STREQUAL "0L") + message(FATAL_ERROR + "The value of __STDC_VERSION__ cannot be automatically determined " + "when cross-compiling. Please set JAS_STDC_VERSION to the value " + "of __STDC_VERSION__ when invoking CMake (e.g., by using the " + "option -DJAS_STDC_VERSION=...) or modify the CMakeLists.txt " + "appropriately.") + endif() +else() + jas_get_stdc_version(status JAS_STDC_VERSION) + if(NOT status) + message(FATAL_ERROR "Cannot determine the value of __STDC_VERSION__.") + endif() endif() message("__STDC_VERSION__: ${JAS_STDC_VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-3.0.1/NEWS.txt new/jasper-version-3.0.2/NEWS.txt --- old/jasper-version-3.0.1/NEWS.txt 2022-02-12 21:49:32.000000000 +0100 +++ new/jasper-version-3.0.2/NEWS.txt 2022-02-14 15:54:28.000000000 +0100 @@ -1,3 +1,8 @@ +3.0.2 (2022-02-14) +================== + +* Fix a build issue that occurs when a cross-compiler is used (e.g., #319). + 3.0.1 (2022-02-12) ================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-3.0.1/build/build_all new/jasper-version-3.0.2/build/build_all --- old/jasper-version-3.0.1/build/build_all 2022-02-12 21:49:32.000000000 +0100 +++ new/jasper-version-3.0.2/build/build_all 2022-02-14 15:54:28.000000000 +0100 @@ -225,15 +225,21 @@ strict=1 command_file= enable_test=1 +requested_tests=() +hard_fail=0 -while getopts hvb:cnd:swC:Xq option; do +while getopts hvb:cnd:swC:Xqt:F option; do case "$option" in n) enable=0;; + F) + hard_fail=1;; c) crostini=1;; C) command_file="$OPTARG";; + t) + requested_tests+=("$OPTARG");; b) build_dir="$OPTARG";; d) @@ -357,41 +363,55 @@ ################################################################################ -tests=() +if [ "${#requested_tests[@]}" -gt 0 ]; then + tests=("${requested_tests[@]}") +fi + +if [ "${#tests[@]}" -eq 0 ]; then + + tests=() + + # debug builds + if [ "$ubuntu_clang_hack" -eq 0 ]; then + tests+=(static_debug_mt0) + tests+=(static_debug_mt1) + tests+=(static_debug_ji_mt0) + tests+=(static_debug_ji_mt1) + tests+=(tsan) + fi + + # release builds + tests+=(shared_release_mt0) + tests+=(shared_release_mt1) + if [ "$ubuntu_clang_hack" -eq 0 ]; then + tests+=(static_release_mt0) + tests+=(static_release_mt1) + fi + tests+=(static_release) + tests+=(shared_release) -# debug builds -if [ "$ubuntu_clang_hack" -eq 0 ]; then - tests+=(static_debug_mt0) - tests+=(static_debug_mt1) - tests+=(static_debug_ji_mt0) - tests+=(static_debug_ji_mt1) - tests+=(tsan) -fi - -# release builds -tests+=(shared_release_mt0) -tests+=(shared_release_mt1) -if [ "$ubuntu_clang_hack" -eq 0 ]; then - tests+=(static_release_mt0) - tests+=(static_release_mt1) fi -tests+=(static_release) -tests+=(shared_release) failed_tests=() passed_tests=() +attempted_tests=() for id in "${tests[@]}"; do + attempted_tests+=("$id") + set_build_config "$id" if [ $? -ne 0 ]; then - failed_tests+=("id") + failed_tests+=("$id") + if [ "$hard_fail" -ne 0 ]; then + break + fi continue fi cat <<- EOF ================================================================================ - BUILD: ${build_name} + BUILD (${#attempted_tests[@]}/${#tests[@]}): ${build_name} ================================================================================ EOF @@ -400,6 +420,9 @@ "${command[@]}" if [ $? -ne 0 ]; then failed_tests+=("$id") + if [ "$hard_fail" -ne 0 ]; then + break + fi continue fi echo "build directory:" @@ -419,6 +442,9 @@ echo "Total number of tests: ${#tests[@]}" +echo "Number of attempted tests: ${#attempted_tests[@]}" + +echo "Number of passed tests: ${#passed_tests[@]}" if [ "${#passed_tests[@]}" -gt 0 ]; then echo "The following tests passed:" for test in "${passed_tests[@]}"; do @@ -426,6 +452,7 @@ done fi +echo "Number of failed tests: ${#failed_tests[@]}" if [ "${#failed_tests[@]}" -gt 0 ]; then echo "ERROR: One or more tests failed." echo "The following tests failed:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-3.0.1/build/github/deploy_gh_pages new/jasper-version-3.0.2/build/github/deploy_gh_pages --- old/jasper-version-3.0.1/build/github/deploy_gh_pages 2022-02-12 21:49:32.000000000 +0100 +++ new/jasper-version-3.0.2/build/github/deploy_gh_pages 2022-02-14 15:54:28.000000000 +0100 @@ -21,6 +21,17 @@ echo "$*" } +is_preview_release() +{ + local version="$1" + local pattern='^[0-9]+\.[0-9]+\.[0-9]+$' + if [[ "$version" =~ $pattern ]]; then + output="0" + else + output="1" + fi + echo "$output" +} # Print usage information and exit. usage() @@ -73,7 +84,7 @@ program_dir="$(dirname "$0")" || panic make_main_gh_page="$program_dir/make_main_gh_page" -latest=0 +latest= branch="gh-pages" in_dir= repo_name= @@ -84,8 +95,10 @@ verbose=1 deploy_mode= -while getopts b:i:r:t:z:fnvqm:l opt; do +while getopts b:i:r:t:z:fnvqm:lL opt; do case $opt in + L) + latest=0;; l) latest=1;; m) @@ -169,6 +182,16 @@ echo "version $version" fi +preview_release="$(is_preview_release "$version")" || \ + panic "cannot determine if release is preview release" + +if [ -z "$latest" ]; then + latest=1 + if [ "$preview_release" -ne 0 ]; then + latest=0 + fi +fi + tmp_dir="$tmp_dir/deploy" git_dir="$tmp_dir/git"
