Hello community, here is the log from the commit of package libansilove for openSUSE:Factory checked in at 2019-12-05 17:34:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libansilove (Old) and /work/SRC/openSUSE:Factory/.libansilove.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libansilove" Thu Dec 5 17:34:13 2019 rev:2 rq:753983 version:1.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libansilove/libansilove.changes 2019-12-04 14:19:13.086379364 +0100 +++ /work/SRC/openSUSE:Factory/.libansilove.new.4691/libansilove.changes 2019-12-05 17:34:45.453444623 +0100 @@ -1,0 +2,14 @@ +Mon Nov 18 19:13:14 UTC 2019 - Martin Hauke <[email protected]> + +- Update to version 1.1.6 + * Use CMAKE_INSTALL_{LIB,INCLUDE}DIR instead of hardcoding + directories. + * Introduce a XBIN_PALETTE_LENGTH macro + * Use XBIN_HEADER_LENGTH and XBIN_PALETTE_LENGTH macros instead + of magic numbers + * Add another format validation check (palette size) in the + XBin loader +- Drop patch (fixed by upstream): + * libansilove-libsuffix.patch + +------------------------------------------------------------------- Old: ---- libansilove-1.1.5.tar.gz libansilove-libsuffix.patch New: ---- libansilove-1.1.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libansilove.spec ++++++ --- /var/tmp/diff_new_pack.ETT7Gl/_old 2019-12-05 17:34:46.933444414 +0100 +++ /var/tmp/diff_new_pack.ETT7Gl/_new 2019-12-05 17:34:46.937444413 +0100 @@ -19,7 +19,7 @@ %global sover 1 %global libname %{name}%{sover} Name: libansilove -Version: 1.1.5 +Version: 1.1.6 Release: 0 Summary: Library for converting ANSI, ASCII, and other formats to PNG Group: Productivity/Graphics/Other @@ -27,7 +27,6 @@ URL: https://www.ansilove.org #Git-Clone: https://github.com/ansilove/libansilove.git Source: https://github.com/ansilove/libansilove/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: libansilove-libsuffix.patch BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: pkgconfig(gdlib) @@ -67,7 +66,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake ++++++ libansilove-1.1.5.tar.gz -> libansilove-1.1.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/.travis.yml new/libansilove-1.1.6/.travis.yml --- old/libansilove-1.1.5/.travis.yml 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/.travis.yml 2019-11-18 10:16:21.000000000 +0100 @@ -1,3 +1,14 @@ +arch: + - amd64 + - arm64 + +matrix: + include: + - os: linux + arch: amd64 + - os: linux + arch: arm64 + language: c compiler: @@ -25,4 +36,4 @@ notification_email: [email protected] build_command_prepend: cmake . build_command: make -j 4 - branch_pattern: master + branch_pattern: coverity_scan diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/CMakeLists.txt new/libansilove-1.1.6/CMakeLists.txt --- old/libansilove-1.1.5/CMakeLists.txt 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/CMakeLists.txt 2019-11-18 10:16:21.000000000 +0100 @@ -2,7 +2,7 @@ set(LIB_VERSION_MAJOR 1) set(LIB_VERSION_MINOR 1) -set(LIB_VERSION_PATCH 5) +set(LIB_VERSION_PATCH 6) set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}) project (ansilove C) @@ -35,6 +35,6 @@ set_target_properties(ansilove PROPERTIES VERSION ${LIB_VERSION_STRING} SOVERSION ${LIB_VERSION_MAJOR}) -install(TARGETS ansilove DESTINATION lib) -install(FILES include/ansilove.h DESTINATION include) +install(TARGETS ansilove DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(FILES include/ansilove.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(FILES libansilove.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/ChangeLog new/libansilove-1.1.6/ChangeLog --- old/libansilove-1.1.5/ChangeLog 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/ChangeLog 2019-11-18 10:16:21.000000000 +0100 @@ -1,3 +1,13 @@ +libansilove 1.1.6 (2019-11-18) + +- Use CMAKE_INSTALL_{LIB,INCLUDE}DIR instead of hardcoding directories +- Introduce a XBIN_PALETTE_LENGTH macro +- Use XBIN_HEADER_LENGTH and XBIN_PALETTE_LENGTH macros instead of magic + numbers +- Add another format validation check (palette size) in the XBin loader + + + libansilove 1.1.5 (2019-10-14) - Move background transparency operations in the output function diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/include/ansilove.h new/libansilove-1.1.6/include/ansilove.h --- old/libansilove-1.1.5/include/ansilove.h 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/include/ansilove.h 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * ansilove.h - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -18,11 +18,11 @@ #include <stdint.h> /* Version number */ -#define ANSILOVE_VERSION "1.1.5" +#define ANSILOVE_VERSION "1.1.6" #define ANSILOVE_VERSION_MAJOR 1 #define ANSILOVE_VERSION_MINOR 1 -#define ANSILOVE_VERSION_PATCH 5 +#define ANSILOVE_VERSION_PATCH 6 /* Error codes */ #define ANSILOVE_INVALID_PARAM 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/clean.c new/libansilove-1.1.6/src/clean.c --- old/libansilove-1.1.5/src/clean.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/clean.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * clean.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/config.h new/libansilove-1.1.6/src/config.h --- old/libansilove-1.1.5/src/config.h 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/config.h 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * config.h - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/drawchar.c new/libansilove-1.1.6/src/drawchar.c --- old/libansilove-1.1.5/src/drawchar.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/drawchar.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * drawchar.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/drawchar.h new/libansilove-1.1.6/src/drawchar.h --- old/libansilove-1.1.5/src/drawchar.h 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/drawchar.h 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * drawchar.h - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/error.c new/libansilove-1.1.6/src/error.c --- old/libansilove-1.1.5/src/error.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/error.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * error.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/fonts.c new/libansilove-1.1.6/src/fonts.c --- old/libansilove-1.1.5/src/fonts.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/fonts.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * fonts.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/fonts.h new/libansilove-1.1.6/src/fonts.h --- old/libansilove-1.1.5/src/fonts.h 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/fonts.h 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * fonts.h - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/init.c new/libansilove-1.1.6/src/init.c --- old/libansilove-1.1.5/src/init.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/init.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * init.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/loaders/ansi.c new/libansilove-1.1.6/src/loaders/ansi.c --- old/libansilove-1.1.5/src/loaders/ansi.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/loaders/ansi.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * ansi.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/loaders/artworx.c new/libansilove-1.1.6/src/loaders/artworx.c --- old/libansilove-1.1.5/src/loaders/artworx.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/loaders/artworx.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * artworx.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/loaders/binary.c new/libansilove-1.1.6/src/loaders/binary.c --- old/libansilove-1.1.5/src/loaders/binary.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/loaders/binary.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * binary.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/loaders/icedraw.c new/libansilove-1.1.6/src/loaders/icedraw.c --- old/libansilove-1.1.5/src/loaders/icedraw.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/loaders/icedraw.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * icedraw.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/loaders/pcboard.c new/libansilove-1.1.6/src/loaders/pcboard.c --- old/libansilove-1.1.5/src/loaders/pcboard.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/loaders/pcboard.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * pcboard.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/loaders/tundra.c new/libansilove-1.1.6/src/loaders/tundra.c --- old/libansilove-1.1.5/src/loaders/tundra.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/loaders/tundra.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * tundra.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/loaders/xbin.c new/libansilove-1.1.6/src/loaders/xbin.c --- old/libansilove-1.1.5/src/loaders/xbin.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/loaders/xbin.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * xbin.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -21,6 +21,7 @@ #include "output.h" #define XBIN_HEADER_LENGTH 11 /* 4 + 1 + 2 + 2 + 1 + 1 */ +#define XBIN_PALETTE_LENGTH 48 int ansilove_xbin(struct ansilove_ctx *ctx, struct ansilove_options *options) @@ -69,13 +70,18 @@ } uint32_t colors[16]; - uint32_t offset = 11; + uint32_t offset = XBIN_HEADER_LENGTH; /* palette */ if ((xbin_flags & 1) == 1) { uint32_t loop; uint32_t index; + if (offset + XBIN_PALETTE_LENGTH > ctx->length) { + ctx->error = ANSILOVE_FORMAT_ERROR; + return -1; + } + for (loop = 0; loop < 16; loop++) { index = (loop * 3) + offset; @@ -85,7 +91,7 @@ (ctx->buffer[index + 2] << 2 | ctx->buffer[index + 2] >> 4)); } - offset += 48; + offset += XBIN_PALETTE_LENGTH; } else { for (int i = 0; i < 16; i++) { colors[i] = gdImageColorAllocate(canvas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/loadfile.c new/libansilove-1.1.6/src/loadfile.c --- old/libansilove-1.1.5/src/loadfile.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/loadfile.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * loadfile.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/output.c new/libansilove-1.1.6/src/output.c --- old/libansilove-1.1.5/src/output.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/output.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * output.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/output.h new/libansilove-1.1.6/src/output.h --- old/libansilove-1.1.5/src/output.h 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/output.h 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * output.h - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.1.5/src/savefile.c new/libansilove-1.1.6/src/savefile.c --- old/libansilove-1.1.5/src/savefile.c 2019-10-14 12:04:16.000000000 +0200 +++ new/libansilove-1.1.6/src/savefile.c 2019-11-18 10:16:21.000000000 +0100 @@ -1,6 +1,6 @@ /* * savefile.c - * libansilove 1.1.5 + * libansilove 1.1.6 * https://www.ansilove.org * * Copyright (c) 2011-2019 Stefan Vogt, Brian Cassidy, and Frederic Cambus
