Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jasper for openSUSE:Factory checked in at 2021-04-19 21:06:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jasper (Old) and /work/SRC/openSUSE:Factory/.jasper.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jasper" Mon Apr 19 21:06:25 2021 rev:10 rq:886663 version:2.0.32 Changes: -------- --- /work/SRC/openSUSE:Factory/jasper/jasper.changes 2021-04-01 14:18:31.232092921 +0200 +++ /work/SRC/openSUSE:Factory/.jasper.new.12324/jasper.changes 2021-04-19 21:06:54.148110609 +0200 @@ -1,0 +2,14 @@ +Mon Apr 19 11:38:47 UTC 2021 - Michael Vetter <[email protected]> + +- Update to 2.0.32: + * Between 2.0.29 and 2.0.32 were only experiments with + GitHub Actions + +------------------------------------------------------------------- +Mon Apr 19 11:38:25 UTC 2021 - Michael Vetter <[email protected]> + +- Update to 2.0.29: + * Loosen some overly tight restrictions on JP2 codestreams, + which caused some valid codestreams to be rejected. (#289) + +------------------------------------------------------------------- Old: ---- version-2.0.28.tar.gz New: ---- version-2.0.32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jasper.spec ++++++ --- /var/tmp/diff_new_pack.yqzTkz/_old 2021-04-19 21:06:54.792111574 +0200 +++ /var/tmp/diff_new_pack.yqzTkz/_new 2021-04-19 21:06:54.796111580 +0200 @@ -17,7 +17,7 @@ Name: jasper -Version: 2.0.28 +Version: 2.0.32 Release: 0 Summary: An Implementation of the JPEG-2000 Standard, Part 1 License: SUSE-Public-Domain ++++++ version-2.0.28.tar.gz -> version-2.0.32.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-2.0.28/.github/workflows/ci.yml new/jasper-version-2.0.32/.github/workflows/ci.yml --- old/jasper-version-2.0.28/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jasper-version-2.0.32/.github/workflows/ci.yml 2021-04-19 07:06:02.000000000 +0200 @@ -0,0 +1,20 @@ +name: ci + +on: [push] + +jobs: + build: + strategy: + matrix: + #os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest] + compiler: [gcc, clang] + fail-fast: false + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - name: testing + env: + CC: ${{ matrix.compiler }} + shell: bash + run: build/my_build -A -U -d -t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-2.0.28/.github/workflows/release.yml new/jasper-version-2.0.32/.github/workflows/release.yml --- old/jasper-version-2.0.28/.github/workflows/release.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jasper-version-2.0.32/.github/workflows/release.yml 2021-04-19 07:06:02.000000000 +0200 @@ -0,0 +1,23 @@ +name: release + +on: + push: + tags: + - 'version-*.*.*' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Prepare + run: build/make_release -r ${{github.ref}} -w ${{github.workspace}} -t ${{runner.temp}}/tmp -o ${{runner.temp}}/out + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: | + ${{runner.temp}}/out/jasper.tar.gz + body_path: ${{runner.temp}}/out/release_notes.txt + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-2.0.28/CMakeLists.txt new/jasper-version-2.0.32/CMakeLists.txt --- old/jasper-version-2.0.28/CMakeLists.txt 2021-03-29 16:57:11.000000000 +0200 +++ new/jasper-version-2.0.32/CMakeLists.txt 2021-04-19 07:06:02.000000000 +0200 @@ -17,7 +17,7 @@ # The major, minor, and micro version numbers of the project. set(JAS_VERSION_MAJOR 2) set(JAS_VERSION_MINOR 0) -set(JAS_VERSION_PATCH 28) +set(JAS_VERSION_PATCH 32) # The project version. set(JAS_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-2.0.28/NEWS new/jasper-version-2.0.32/NEWS --- old/jasper-version-2.0.28/NEWS 2021-03-29 16:57:11.000000000 +0200 +++ new/jasper-version-2.0.32/NEWS 2021-04-19 07:06:02.000000000 +0200 @@ -1,3 +1,14 @@ +2.0.32 (2021-04-18) +=================== + +* Test release performed with GitHub Actions. + +2.0.29 (2021-04-16) +=================== + +* Loosen some overly tight restrictions on JP2 codestreams, which caused + some valid codestreams to be rejected. (#289) + 2.0.28 (2021-03-29) =================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-2.0.28/build/extract_release_notes new/jasper-version-2.0.32/build/extract_release_notes --- old/jasper-version-2.0.28/build/extract_release_notes 1970-01-01 01:00:00.000000000 +0100 +++ new/jasper-version-2.0.32/build/extract_release_notes 2021-04-19 07:06:02.000000000 +0200 @@ -0,0 +1,21 @@ +#! /usr/bin/env bash + +cat <<- EOF +The comments below are automatically extracted from the beginning of the +NEWS document. +EOF +echo + +awk ' + BEGIN { + count = 0; + } + /^[0-9]+\.[0-9]+\.[0-9]+ \([0-9]+-[0-9]+-[0-9]+\)/ { + ++count; + } + { + if (count >= 1 && count < 2) { + print $0; + } + } +' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-2.0.28/build/make_release new/jasper-version-2.0.32/build/make_release --- old/jasper-version-2.0.28/build/make_release 1970-01-01 01:00:00.000000000 +0100 +++ new/jasper-version-2.0.32/build/make_release 2021-04-19 07:06:02.000000000 +0200 @@ -0,0 +1,151 @@ +#! /usr/bin/env bash + +cmd_dir="$(dirname "$0")" || panic + +panic() +{ + echo "ERROR: $@" + exit 1 +} + +warn() +{ + echo "WARNING: $@" +} + +usage() +{ + echo "bad usage: $@" + exit 2 +} + +tmp_dir= +workspace_dir= +out_dir= +github_ref= + +while getopts t:w:o:r: opt; do + case "$opt" in + w) + workspace_dir="$OPTARG";; + t) + tmp_dir="$OPTARG";; + o) + out_dir="$OPTARG";; + r) + github_ref="$OPTARG";; + \?) + usage "invalid option $opt" + break;; + esac +done +shift $((OPTIND - 1)) + + +if [ -z "$github_ref" ]; then + usage "no GitHub ref specified" +fi +if [ -z "$out_dir" ]; then + usage "no output directory specified" +fi +if [ -z "$workspace_dir" ]; then + usage "no workspace directory specified" +fi +if [ -z "$tmp_dir" ]; then + usage "no temporary directory specified" +fi + +# Ensure an absolute pathname. +workspace_dir="$(readlink -f "$workspace_dir")" || \ + panic "cannot get absolute pathname" + +if [ ! -d "$workspace_dir" ]; then + panic "no such directory $workspace_dir" +fi + +echo "temporary directory: $tmp_dir" +echo "workspace directory: $workspace_dir" +echo "GitHub ref: $github_ref" + +commit="$(git -C "$workspace_dir" rev-parse HEAD)" || \ + panic "cannot get commit" +#tag="$(git -C "$workspace_dir" describe "$commit")" || \ +# panic "cannot get tag" +tag="$(awk -v FS="/" '{print $3;}' <<< "$github_ref")" || \ + panic "cannot get tag" +version="$(awk -v FS="-" '{print $2;}' <<< "$tag")" || \ + panic "cannot get version" +name="jasper-$version" + +source_dir="$tmp_dir/$name" +build_dir="$tmp_dir/build" +install_dir="$tmp_dir/install" +news_file="$workspace_dir/NEWS" +changelog_file="$source_dir/ChangeLog" +release_notes_file="$out_dir/release_notes.txt" +archive_file="$out_dir/jasper.tar.gz" + +echo "name: $name" +echo "commit: $commit" +echo "tag: $tag" +echo "version: $version" + +for dir in "$tmp_dir" "$out_dir" "$build_dir" "$source_dir" "$install_dir"; do + if [ ! -d "$dir" ]; then + mkdir -p "$dir" || panic "cannot make directory $dir" + fi +done + +cp -a "$workspace_dir/." "$source_dir" || \ + panic "cannot copy" +#(cd "$workspace_dir" && tar -cf - . ) | (cd "$source_dir" && tar -xf -) || \ +# panic "cannot copy" +rm -rf "$source_dir/.git" || \ + panic "cannot remove .git directory" + +git -C "$workspace_dir" log --stat -M -C --name-status --no-color | \ + fmt --split-only > "$changelog_file" || \ + panic "cannot generate changelog" + +"$cmd_dir"/extract_release_notes < "$news_file" > "$release_notes_file" || \ + panic + +cmake \ + -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX="$install_dir" \ + -DJAS_ENABLE_DOC=false \ + -DJAS_ENABLE_OPENGL=false \ + -H"$source_dir" -B"$build_dir" || \ + panic "cmake failed" + +cmake --build "$build_dir" --clean-first || \ + panic "make clean/all failed" + +#mv "$build_dir/doc/html" "$source_dir/doc/html" || \ +# panic "cannot move html" + +#mv "$build_dir/doc/latex/refman.pdf" "$source_dir/doc/manual.pdf" || \ +# panic "cannot move manual.pdf" + +remove_list=() +remove_list+=(appveyor.yml) +remove_list+=(.github) +remove_list+=(.travis.yml) +remove_list+=(.gitignore) +remove_list+=(.gitattributes) +remove_list+=(build/my_build) +remove_list+=(build/appveyor) +remove_list+=(build/travis) +remove_list+=(build/make_dist) +remove_list+=(data/test/bad/1_crash.jpg) +for file in "${remove_list[@]}"; do + if [ ! -e "$source_dir/$file" ]; then + warn "missing file/directory $file" + fi + rm -rf "$source_dir/$file" || \ + panic "cannot remove file/directory $file" +done + +tar -C "$tmp_dir" -czf - "$name" > "$archive_file" || \ + panic "cannot make archive" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-2.0.28/build/my_build new/jasper-version-2.0.32/build/my_build --- old/jasper-version-2.0.28/build/my_build 2021-03-29 16:57:11.000000000 +0200 +++ new/jasper-version-2.0.32/build/my_build 2021-04-19 07:06:02.000000000 +0200 @@ -92,26 +92,22 @@ echo "Running cmake ${configure_opts[@]}" cmake "${configure_opts[@]}" || panic "cmake failed" -make_opts=() +build_opts=() +install_opts=() if [ "$verbose" -ne 0 ]; then - make_opts+=("VERBOSE=1") + build_opts+=(--verbose) + install_opts+=(--verbose) fi -targets=() -targets+=(clean) -targets+=(all) -if [ "$do_install" -ne 0 ]; then - targets+=(install) -fi -for target in "${targets[@]}"; do - (cd "$build_dir" && make "$target" "${make_opts[@]}") || \ - panic "make $target failed" -done +cmake --build "$build_dir" --clean-first \ + "${build_opts[@]}" || \ + panic "cmake build failed" -make_opts=() -if [ "$verbose" -ne 0 ]; then - make_opts+=("ARGS=-V") -fi +cmake --build "$build_dir" --target install \ + "${install_opts[@]}" || \ + panic "cmake install failed" + +test_opts=() +test_opts+=(--output-on-failure) if [ "$do_make_test" -ne 0 ]; then - (cd "$build_dir" && make test "${make_opts[@]}") || \ - panic "make test failed" + (cd "$build_dir" && ctest "${test_opts[@]}") || panic "ctest failed" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jasper-version-2.0.28/src/libjasper/jp2/jp2_dec.c new/jasper-version-2.0.32/src/libjasper/jp2/jp2_dec.c --- old/jasper-version-2.0.28/src/libjasper/jp2/jp2_dec.c 2021-03-29 16:57:11.000000000 +0200 +++ new/jasper-version-2.0.32/src/libjasper/jp2/jp2_dec.c 2021-04-19 07:06:02.000000000 +0200 @@ -107,7 +107,10 @@ unsigned int i; jp2_cmap_t *cmapd; jp2_pclr_t *pclrd; +#if 0 + /* The following code appears to no longer be needed. */ jp2_cdef_t *cdefd; +#endif unsigned int channo; int newcmptno; int_fast32_t *lutents; @@ -368,15 +371,18 @@ dec->chantocmptlut[i] = i; } } else { - /* Check to ensure that CMAP/PCLR/CDEF were initialized. */ - if (!dec->cmap || !dec->pclr || !dec->cdef) { - jas_eprintf("missing CMAP/PCLR/CDEF box\n"); + /* Check to ensure that CMAP/PCLR were initialized. */ + if (!dec->cmap || !dec->pclr) { + jas_eprintf("missing CMAP/PCLR box\n"); goto error; } cmapd = &dec->cmap->data.cmap; pclrd = &dec->pclr->data.pclr; +#if 0 + /* The following code appears to no longer be needed. */ cdefd = &dec->cdef->data.cdef; +#endif for (channo = 0; channo < cmapd->numchans; ++channo) { cmapent = &cmapd->ents[channo]; if (cmapent->map == JP2_CMAP_DIRECT) { @@ -403,6 +409,7 @@ dec->chantocmptlut[channo] = newcmptno; jas_free(lutents); #if 0 + /* The following code appears to no longer be needed. */ if (dec->cdef) { cdefent = jp2_cdef_lookup(cdefd, channo); if (!cdefent) { @@ -412,9 +419,6 @@ } else { jas_image_setcmpttype(dec->image, newcmptno, jp2_getct(jas_image_clrspc(dec->image), 0, channo + 1)); } -#else - /* suppress -Wunused-but-set-variable */ - (void)cdefd; #endif } else { jas_eprintf("error: invalid MTYP in CMAP box\n"); @@ -423,6 +427,8 @@ } } +#if 0 + /* The following code appears to no longer be needed. */ /* Ensure that the number of channels being used by the decoder matches the number of image components. */ if (dec->numchans != jas_image_numcmpts(dec->image)) { @@ -430,6 +436,7 @@ dec->numchans, jas_image_numcmpts(dec->image)); goto error; } +#endif /* Mark all components as being of unknown type. */ @@ -484,9 +491,6 @@ jas_eprintf("error: no components\n"); goto error; } -#if 0 -jas_eprintf("no of components is %d\n", jas_image_numcmpts(dec->image)); -#endif /* Prevent the image from being destroyed later. */ image = dec->image;
