Hello community, here is the log from the commit of package ansilove for openSUSE:Factory checked in at 2020-09-21 17:38:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ansilove (Old) and /work/SRC/openSUSE:Factory/.ansilove.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansilove" Mon Sep 21 17:38:02 2020 rev:7 rq:835475 version:4.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ansilove/ansilove.changes 2020-07-06 16:34:45.748170865 +0200 +++ /work/SRC/openSUSE:Factory/.ansilove.new.4249/ansilove.changes 2020-09-21 17:43:00.700889758 +0200 @@ -1,0 +2,14 @@ +Fri Sep 18 19:07:18 UTC 2020 - Martin Hauke <[email protected]> + +- Update to version 4.1.3 + * Adjust SAUCE flag output to be binary + * Add -S flag to use SAUCE info for rendering hints. Users must + now use -S to get iCE color info. This was previously + automatically pulled without any extra options. + * Document the new -S flag, allowing to use SAUCE info for + render options + * Add support for seccomp on arm + * Add missing test for __NR_mmap, the mmap syscall doesn't exist + on arm + +------------------------------------------------------------------- Old: ---- ansilove-4.1.2.tar.gz New: ---- ansilove-4.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ansilove.spec ++++++ --- /var/tmp/diff_new_pack.RdVHRA/_old 2020-09-21 17:43:02.216891186 +0200 +++ /var/tmp/diff_new_pack.RdVHRA/_new 2020-09-21 17:43:02.220891190 +0200 @@ -2,7 +2,7 @@ # spec file for package ansilove # # Copyright (c) 2020 SUSE LLC -# Copyright (c) 2019, Martin Hauke <[email protected]> +# Copyright (c) 2019-2020, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: ansilove -Version: 4.1.2 +Version: 4.1.3 Release: 0 Summary: ANSI and ASCII art to PNG converter License: BSD-2-Clause ++++++ ansilove-4.1.2.tar.gz -> ansilove-4.1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/.travis.yml new/ansilove-4.1.3/.travis.yml --- old/ansilove-4.1.2/.travis.yml 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/.travis.yml 2020-09-18 09:05:20.000000000 +0200 @@ -35,7 +35,7 @@ coverity_scan: project: name: "ansilove/ansilove" - version: 4.1.2 + version: 4.1.3 description: "ANSi / ASCII art to PNG converter in C" notification_email: [email protected] build_command_prepend: cmake . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/ChangeLog new/ansilove-4.1.3/ChangeLog --- old/ansilove-4.1.2/ChangeLog 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/ChangeLog 2020-09-18 09:05:20.000000000 +0200 @@ -1,3 +1,15 @@ +AnsiLove/C 4.1.3 (2020-09-18) + +- Adjust SAUCE flag output to be binary +- Add -S flag to use SAUCE info for rendering hints. Users must now use -S + to get iCE color info. This was previously automatically pulled without + any extra options. +- Document the new -S flag, allowing to use SAUCE info for render options +- Add support for seccomp on arm +- Add missing test for __NR_mmap, the mmap syscall doesn't exist on arm + + + AnsiLove/C 4.1.2 (2020-07-04) - Define _GNU_SOURCE in CMakeLists.txt to avoid cluttering source files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/FILE_ID.DIZ new/ansilove-4.1.3/FILE_ID.DIZ --- old/ansilove-4.1.2/FILE_ID.DIZ 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/FILE_ID.DIZ 2020-09-18 09:05:20.000000000 +0200 @@ -17,7 +17,7 @@ - -----------//______|----------------- - : : | | - | Ansilove/C 4.1.2 | + | Ansilove/C 4.1.3 | | | | ANSi=>PNG converter & library | | | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/README.md new/ansilove-4.1.3/README.md --- old/ansilove-4.1.2/README.md 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/README.md 2020-09-18 09:05:20.000000000 +0200 @@ -64,7 +64,7 @@ - Mac OS X: `brew install cmake` - Alpine Linux: `apk add cmake gcc make musl-dev` - Debian / Ubuntu / Mint: `apt-get install build-essential cmake` -- Fedora: `yum install cmake gcc make` +- Fedora: `dnf install cmake gcc make` - Solus: `eopkg install -c system.devel` Binary packages for `libansilove` are available on OpenBSD, NetBSD, @@ -166,6 +166,8 @@ -s Show SAUCE record without generating output. + -S If available, use SAUCE info for render options (ex: width). + -v Show version information. ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/ansilove.1 new/ansilove-4.1.3/ansilove.1 --- old/ansilove-4.1.2/ansilove.1 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/ansilove.1 2020-09-18 09:05:20.000000000 +0200 @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: February 17 2020 $ +.Dd $Mdocdate: August 28 2020 $ .Dt ANSILOVE 1 .Os .Sh NAME @@ -32,7 +32,7 @@ .Nd ANSI / ASCII art to PNG converter .Sh SYNOPSIS .Nm -.Op Fl dhiqrsv +.Op Fl dhiqrsSv .Op Fl b Ar bits .Op Fl c Ar columns .Op Fl f Ar font @@ -166,6 +166,8 @@ .El .It Fl s Show SAUCE record without generating output. +.It Fl S +If available, use SAUCE info for render options (ex: width). .It Fl v Show version information. .El diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/src/ansilove.c new/ansilove-4.1.3/src/ansilove.c --- old/ansilove-4.1.2/src/ansilove.c 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/src/ansilove.c 2020-09-18 09:05:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * ansilove.c - * Ansilove 4.1.2 + * Ansilove 4.1.3 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -42,7 +42,7 @@ synopsis(void) { fprintf(stdout, "SYNOPSIS\n" - " ansilove [-dhiqrsv] [-b bits] [-c columns] [-f font]" + " ansilove [-dhiqrsSv] [-b bits] [-c columns] [-f font]" " [-m mode] [-o file]\n" " [-R factor] [-t type] file\n"); } @@ -63,6 +63,7 @@ /* SAUCE record related bool types */ bool justDisplaySAUCE = false; bool fileHasSAUCE = false; + bool useSAUCEInfo = false; int getoptFlag; @@ -97,7 +98,7 @@ if (ansilove_init(&ctx, &options) == -1) errx(EXIT_FAILURE, "%s", ansilove_error(&ctx)); - while ((getoptFlag = getopt(argc, argv, "b:c:df:him:o:qrR:st:v")) != -1) { + while ((getoptFlag = getopt(argc, argv, "b:c:df:him:o:qrR:sSt:v")) != -1) { switch (getoptFlag) { case 'b': options.bits = strtonum(optarg, 8, 9, &errstr); @@ -118,12 +119,6 @@ break; case 'f': font = optarg; - for (size_t loop = 0; loop < FONTS; loop++) { - if (!strcmp(fonts[loop], font)) { - options.font = fontsId[loop]; - break; - } - } break; case 'h': synopsis(); @@ -159,6 +154,9 @@ case 's': justDisplaySAUCE = true; break; + case 'S': + useSAUCEInfo = true; + break; case 't': type = strtolower(optarg); break; @@ -199,6 +197,122 @@ } if (!justDisplaySAUCE) { + /* gather rendering hints from SAUCE */ + if (useSAUCEInfo && fileHasSAUCE) { + bool usedSAUCE = false; + if (record->dataType == 1) { + if (record->fileType == 0 || record->fileType == 1 || record->fileType == 2) { + options.columns = record->tinfo1; + if (record->flags & 1) + options.icecolors = true; + if ((record->flags & 6) == 4) + options.bits = 9; + if ((record->flags & 24) == 8) + options.dos = true; + usedSAUCE = true; + } + if (record->fileType == 8) { + options.columns = record->tinfo1; + usedSAUCE = true; + } + } + if (record->dataType == 5) { + options.columns = record->tinfo1; + usedSAUCE = true; + } + /* XBIN (dataType == 6) could also use tinfo1 for width, but we trust the XBIN header more */ + /* font info */ + if ((record->dataType == 1 && (record->fileType == 0 || record->fileType == 1 || record->fileType == 2)) || record->dataType == 5 ) { + if (strcmp(record->tinfos, "IBM VGA") == 0) { + font = "80x25"; + } + if (strcmp(record->tinfos, "IBM VGA50") == 0) { + font = "80x50"; + } + if (strcmp(record->tinfos, "IBM VGA 437") == 0) { + font = "80x25"; + } + if (strcmp(record->tinfos, "IBM VGA50 437") == 0) { + font = "80x50"; + } + if (strcmp(record->tinfos, "IBM VGA 775") == 0) { + font = "baltic"; + } + if (strcmp(record->tinfos, "IBM VGA50 855") == 0) { + font = "cyrillic"; + } + if (strcmp(record->tinfos, "IBM VGA 863") == 0) { + font = "french-canadian"; + } + if (strcmp(record->tinfos, "IBM VGA 737") == 0) { + font = "greek"; + } + if (strcmp(record->tinfos, "IBM VGA 869") == 0) { + font = "greek-869"; + } + if (strcmp(record->tinfos, "IBM VGA 862") == 0) { + font = "hebrew"; + } + if (strcmp(record->tinfos, "IBM VGA 861") == 0) { + font = "icelandic"; + } + if (strcmp(record->tinfos, "IBM VGA 850") == 0) { + font = "latin1"; + } + if (strcmp(record->tinfos, "IBM VGA 852") == 0) { + font = "latin2"; + } + if (strcmp(record->tinfos, "IBM VGA 865") == 0) { + font = "nordic"; + } + if (strcmp(record->tinfos, "IBM VGA 860") == 0) { + font = "portuguese"; + } + if (strcmp(record->tinfos, "IBM VGA 866") == 0) { + font = "russian"; + } + if (strcmp(record->tinfos, "IBM VGA 857") == 0) { + font = "turkish"; + } + if (strcmp(record->tinfos, "Amiga MicroKnight") == 0) { + font = "microknight"; + } + if (strcmp(record->tinfos, "Amiga MicroKnight+") == 0) { + font = "microknight+"; + } + if (strcmp(record->tinfos, "Amiga mOsOul") == 0) { + font = "mosoul"; + } + if (strcmp(record->tinfos, "Amiga P0T-NOoDLE") == 0) { + font = "pot-noodle"; + } + if (strcmp(record->tinfos, "Amiga Topaz 1") == 0) { + font = " topaz500"; + } + if (strcmp(record->tinfos, "Amiga Topaz 1+") == 0) { + font = "topaz500+"; + } + if (strcmp(record->tinfos, "Amiga Topaz 2") == 0) { + font = "topaz"; + } + if (strcmp(record->tinfos, "Amiga Topaz 2+") == 0) { + font = "topaz+"; + } + } + if (usedSAUCE) { + fprintf(messages, "SAUCE info used for rendering hints\n\n"); + } + } + + if (font) { + for (size_t loop = 0; loop < FONTS; loop++) { + if (!strcmp(fonts[loop], font)) { + options.font = fontsId[loop]; + break; + } + } + } + /* create output file name if output is not specified */ if (!output) { /* appending ".png" extension to output file name */ @@ -227,10 +341,6 @@ if (fileHasSAUCE) ctx.length -= 129 - (record->comments > 0 ? 5 + 64 * record->comments : 0); - /* set icecolors to true if defined in SAUCE record ANSiFlags */ - if (fileHasSAUCE && (record->flags & 1)) - options.icecolors = true; - int (*loader)(struct ansilove_ctx *, struct ansilove_options *) = NULL; /* if type was specified, attempt to find a loader */ @@ -306,7 +416,7 @@ fprintf(messages, "Filetype: %d\n", record->fileType); if (record->flags) - fprintf(messages, "Flags: %d\n", record->flags); + fprintf(messages, "Flags: 0b%d%d%d%d%d%d%d%d\n", record->flags >> 7, record->flags >> 6 & 1, record->flags >> 5 & 1, record->flags >> 4 & 1, record->flags >> 3 & 1, record->flags >> 2 & 1, record->flags >> 1 & 1, record->flags & 1); if (record->tinfo1) fprintf(messages, "Tinfo1: %d\n", record->tinfo1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/src/config.h new/ansilove-4.1.3/src/config.h --- old/ansilove-4.1.2/src/config.h 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/src/config.h 2020-09-18 09:05:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * config.h - * Ansilove 4.1.2 + * Ansilove 4.1.3 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -16,7 +16,7 @@ #include <stdint.h> /* configuration defines */ -#define VERSION "4.1.2" +#define VERSION "4.1.3" enum { FONTS = 38, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/src/fonts.h new/ansilove-4.1.3/src/fonts.h --- old/ansilove-4.1.2/src/fonts.h 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/src/fonts.h 2020-09-18 09:05:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * fonts.h - * Ansilove 4.1.2 + * Ansilove 4.1.3 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/src/sauce.c new/ansilove-4.1.3/src/sauce.c --- old/ansilove-4.1.2/src/sauce.c 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/src/sauce.c 2020-09-18 09:05:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * sauce.c - * Ansilove 4.1.2 + * Ansilove 4.1.3 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/src/sauce.h new/ansilove-4.1.3/src/sauce.h --- old/ansilove-4.1.2/src/sauce.h 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/src/sauce.h 2020-09-18 09:05:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * sauce.h - * Ansilove 4.1.2 + * Ansilove 4.1.3 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/src/seccomp.h new/ansilove-4.1.3/src/seccomp.h --- old/ansilove-4.1.2/src/seccomp.h 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/src/seccomp.h 2020-09-18 09:05:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * seccomp.h - * Ansilove 4.1.2 + * Ansilove 4.1.3 * https://www.ansilove.org * * Copyright (c) 2019-2020, Frederic Cambus @@ -25,10 +25,12 @@ #define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386 #elif defined(__x86_64__) #define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64 +#elif defined(__arm__) +#define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARM #elif defined(__aarch64__) #define SECCOMP_AUDIT_ARCH AUDIT_ARCH_AARCH64 #else -#error "Seccomp is only supported on i386, amd64, and arm64 architectures." +#error "Seccomp is only supported on i386, x86_64, arm, and aarch64 architectures." #endif #define ANSILOVE_SYSCALL_ALLOW(syscall) \ @@ -62,7 +64,9 @@ #endif ANSILOVE_SYSCALL_ALLOW(openat), ANSILOVE_SYSCALL_ALLOW(madvise), +#if defined(__NR_mmap) ANSILOVE_SYSCALL_ALLOW(mmap), +#endif #if defined(__NR_mmap2) ANSILOVE_SYSCALL_ALLOW(mmap2), /* i386 glibc */ #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/src/strtolower.c new/ansilove-4.1.3/src/strtolower.c --- old/ansilove-4.1.2/src/strtolower.c 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/src/strtolower.c 2020-09-18 09:05:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * strtolower.c - * Ansilove 4.1.2 + * Ansilove 4.1.3 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/src/strtolower.h new/ansilove-4.1.3/src/strtolower.h --- old/ansilove-4.1.2/src/strtolower.h 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/src/strtolower.h 2020-09-18 09:05:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * strtolower.h - * Ansilove 4.1.2 + * Ansilove 4.1.3 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/src/types.c new/ansilove-4.1.3/src/types.c --- old/ansilove-4.1.2/src/types.c 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/src/types.c 2020-09-18 09:05:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * types.c - * Ansilove 4.1.2 + * Ansilove 4.1.3 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.2/src/types.h new/ansilove-4.1.3/src/types.h --- old/ansilove-4.1.2/src/types.h 2020-07-04 21:38:11.000000000 +0200 +++ new/ansilove-4.1.3/src/types.h 2020-09-18 09:05:20.000000000 +0200 @@ -1,6 +1,6 @@ /* * types.h - * Ansilove 4.1.2 + * Ansilove 4.1.3 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus
