Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libXISF for openSUSE:Factory checked in at 2023-04-12 12:52:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXISF (Old) and /work/SRC/openSUSE:Factory/.libXISF.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXISF" Wed Apr 12 12:52:23 2023 rev:3 rq:1078590 version:0.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libXISF/libXISF.changes 2023-03-21 17:42:57.514240788 +0100 +++ /work/SRC/openSUSE:Factory/.libXISF.new.19717/libXISF.changes 2023-04-12 12:52:24.441214948 +0200 @@ -1,0 +2,6 @@ +Wed Apr 12 07:58:26 UTC 2023 - Paolo Stivanin <i...@paolostivanin.com> + +- Update to 0.2.3: + * Fix issue with ColorFilterArray. + +------------------------------------------------------------------- Old: ---- libXISF-0.2.1.tar.gz New: ---- libXISF-0.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXISF.spec ++++++ --- /var/tmp/diff_new_pack.Ml1Z2b/_old 2023-04-12 12:52:24.953217941 +0200 +++ /var/tmp/diff_new_pack.Ml1Z2b/_new 2023-04-12 12:52:24.961217988 +0200 @@ -18,13 +18,16 @@ %define sover 0 Name: libXISF -Version: 0.2.1 +Version: 0.2.3 Release: 0 Summary: Library to read/write PixInsight XISF files License: GPL-3.0-or-later URL: https://gitea.nouspiro.space/nou/libXISF Source: https://gitea.nouspiro.space/nou/libXISF/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake +BuildRequires: liblz4-devel +BuildRequires: pugixml-devel +BuildRequires: zlib-devel BuildRequires: cmake(Qt5Core) >= 5.14.0 %if 0%{?suse_version} < 1590 BuildRequires: gcc10-c++ @@ -60,7 +63,8 @@ %endif -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_BUILD_TYPE=release \ - -DLIBDIR=%{_libdir} + -DLIBDIR=%{_libdir} \ + -DUSE_BUNDLED_LIBS=OFF %cmake_build %install ++++++ libXISF-0.2.1.tar.gz -> libXISF-0.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxisf/CMakeLists.txt new/libxisf/CMakeLists.txt --- old/libxisf/CMakeLists.txt 2023-03-19 22:11:24.000000000 +0100 +++ new/libxisf/CMakeLists.txt 2023-04-11 12:25:14.000000000 +0200 @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.14) -project(libXISF VERSION 0.2.1 LANGUAGES CXX C) +project(libXISF VERSION 0.2.3 LANGUAGES CXX C) + +include(CMakeDependentOption) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_CXX_STANDARD 17) @@ -9,39 +11,53 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) option(BUILD_SHARED_LIBS "Build using shared libraries" ON) -option(USE_BUNDLED_LIBS "Use bundled LZ4 PugiXML and Zlib" ON) - -if(USE_BUNDLED_LIBS) -set(THIRD_PARTY_SRC - lz4/lz4.c - lz4/lz4.h - lz4/lz4hc.c - lz4/lz4hc.h - pugixml/pugixml.cpp - zlib/adler32.c - zlib/compress.c - zlib/crc32.c - zlib/deflate.c - zlib/gzclose.c - zlib/gzlib.c - zlib/gzread.c - zlib/gzwrite.c - zlib/inflate.c - zlib/infback.c - zlib/inftrees.c - zlib/inffast.c - zlib/trees.c - zlib/uncompr.c - zlib/zutil.c) +option(USE_BUNDLED_LIBS "Use bundled LZ4 PugiXML and Zlib. You can still exclude some" ON) +cmake_dependent_option(USE_BUNDLED_LZ4 "Use bundled LZ4" ON "USE_BUNDLED_LIBS" OFF) +cmake_dependent_option(USE_BUNDLED_PUGIXML "Use bundled PugiXML" ON "USE_BUNDLED_LIBS" OFF) +cmake_dependent_option(USE_BUNDLED_ZLIB "Use bundled Zlib" ON "USE_BUNDLED_LIBS" OFF) + +find_package(PkgConfig REQUIRED) + +if(USE_BUNDLED_LZ4) + list(APPEND THIRD_PARTY_SRC + lz4/lz4.c + lz4/lz4.h + lz4/lz4hc.c + lz4/lz4hc.h) + list(APPEND THIRD_PARTY_INCLUDE lz4) +else(USE_BUNDLED_LZ4) + pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED) +endif(USE_BUNDLED_LZ4) +if(USE_BUNDLED_PUGIXML) + list(APPEND THIRD_PARTY_SRC pugixml/pugixml.cpp) + list(APPEND THIRD_PARTY_INCLUDE pugixml) +else(USE_BUNDLED_PUGIXML) + pkg_check_modules(PUGIXML pugixml IMPORTED_TARGET REQUIRED) +endif(USE_BUNDLED_PUGIXML) +if(USE_BUNDLED_ZLIB) + list(APPEND THIRD_PARTY_SRC + zlib/adler32.c + zlib/compress.c + zlib/crc32.c + zlib/deflate.c + zlib/gzclose.c + zlib/gzlib.c + zlib/gzread.c + zlib/gzwrite.c + zlib/inflate.c + zlib/infback.c + zlib/inftrees.c + zlib/inffast.c + zlib/trees.c + zlib/uncompr.c + zlib/zutil.c) set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib.pc.cmakein ${ZLIB_PC} @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY) -else(USE_BUNDLED_LIBS) - find_package(PkgConfig REQUIRED) - pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED) - pkg_check_modules(PUGIXML pugixml IMPORTED_TARGET REQUIRED) + list(APPEND THIRD_PARTY_INCLUDE zlib) +else(USE_BUNDLED_ZLIB) pkg_check_modules(ZLIB zlib IMPORTED_TARGET REQUIRED) -endif(USE_BUNDLED_LIBS) +endif(USE_BUNDLED_ZLIB) add_library(XISF bytearray.cpp @@ -54,7 +70,16 @@ ) if(USE_BUNDLED_LIBS) - target_include_directories(XISF PRIVATE lz4 pugixml zlib) + target_include_directories(XISF PRIVATE ${THIRD_PARTY_INCLUDE}) + if(NOT USE_BUNDLED_LZ4) + target_link_libraries(XISF PUBLIC PkgConfig::LZ4) + endif(NOT USE_BUNDLED_LZ4) + if(NOT USE_BUNDLED_PUGIXML) + target_link_libraries(XISF PUBLIC PkgConfig::PUGIXML) + endif(NOT USE_BUNDLED_PUGIXML) + if(NOT USE_BUNDLED_ZLIB) + target_link_libraries(XISF PUBLIC PkgConfig::ZLIB) + endif(NOT USE_BUNDLED_ZLIB) else(USE_BUNDLED_LIBS) target_link_libraries(XISF PUBLIC PkgConfig::LZ4 PkgConfig::PUGIXML PkgConfig::ZLIB) endif(USE_BUNDLED_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxisf/debian/changelog new/libxisf/debian/changelog --- old/libxisf/debian/changelog 2023-03-19 22:11:24.000000000 +0100 +++ new/libxisf/debian/changelog 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -libxisf (0.2.0-ubuntu2) UNRELEASED; urgency=medium - - * Fix lintian errors - - -- Dušan Poizl <nou@nouspiro.space> Sun, 19 Mar 2023 22:10:39 +0100 - -libxisf (0.2.0-ubuntu1) focal; urgency=medium - - * Rewrite to remove Qt as dependency - - -- Dušan Poizl <nou@nouspiro.space> Fri, 10 Mar 2023 22:10:01 +0100 - -libxisf (0.1.3-ubuntu1) focal; urgency=medium - - * Write missing pixelStorage attribute - - -- Dušan Poizl <nou@nouspiro.space> Fri, 17 Feb 2023 16:57:30 +0100 - -libxisf (0.1.2-ubuntu1) focal; urgency=medium - - * Add qtbase5-dev as dependency to libxisf-dev - - -- Dušan Poizl <nou@nouspiro.space> Thu, 09 Feb 2023 21:28:45 +0100 - -libxisf (0.1.1-ubuntu1) focal; urgency=medium - - * Fixed packaging - - -- Dušan Poizl <nou@nouspiro.space> Wed, 08 Feb 2023 18:57:50 +0100 - -libxisf (0.1.0-ubuntu1) focal; urgency=low - - * Initial release. - - -- Dušan Poizl <nou@nouspiro.space> Tue, 07 Feb 2023 10:47:08 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxisf/debian/compat new/libxisf/debian/compat --- old/libxisf/debian/compat 2023-03-19 22:11:24.000000000 +0100 +++ new/libxisf/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxisf/debian/control new/libxisf/debian/control --- old/libxisf/debian/control 2023-03-19 22:11:24.000000000 +0100 +++ new/libxisf/debian/control 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -Source: libxisf -Priority: optional -Maintainer: Dušan Poizl <nou@nouspiro.space> -Build-Depends: debhelper (>= 9), - cdbs, - cmake, -Standards-Version: 4.5.0 -Section: libs -Homepage: https://gitea.nouspiro.space/nou/libXISF -Vcs-Git: https://gitea.nouspiro.space/nou/libXISF.git - -Package: libxisf-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: libxisf (= ${binary:Version}), ${misc:Depends}, qtbase5-dev -Description: Library to load and save XISF images - Native format of PixInsight astroprocessing suite - -Package: libxisf -Architecture: any -Multi-Arch: same -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Library to load and save XISF images - Native format of PixInsight astroprocessing suite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxisf/debian/copyright new/libxisf/debian/copyright --- old/libxisf/debian/copyright 2023-03-19 22:11:24.000000000 +0100 +++ new/libxisf/debian/copyright 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: libxisf -Source: https://gitea.nouspiro.space/nou/libXISF - -Files: * debian/* -Copyright: (c) 2023 <Dušan Poizl nou@nouspiro.space> -License: GPL-3+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - . - On Debian systems, the complete texts of the GNU General Public Licenses - version 2 and 3 can be found in '/usr/share/common-licenses/GPL-2' and - '/usr/share/common-licenses/GPL-3'. - -Files: lz4/* -Copyright: (c) 2011-2020, Yann Collet -License: BSD-2-clause - LZ4 Library - Copyright (c) 2011-2020, Yann Collet - All rights reserved. - . - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - . - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - . - * Redistributions in binary form must reproduce the above copyright notice, this - list of conditions and the following disclaimer in the documentation and/or - other materials provided with the distribution. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Files: zlib/* -Copyright: (c) 1995-2022 Jean-loup Gailly and Mark Adler -License: Zlib - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - . - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - . - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - . - Jean-loup Gailly Mark Adler - jl...@gzip.org mad...@alumni.caltech.edu - -Files: pugixml/* -Copyright: (c) 2006-2022 Arseny Kapoulkine -License: MIT - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - . - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxisf/debian/libxisf-dev.install new/libxisf/debian/libxisf-dev.install --- old/libxisf/debian/libxisf-dev.install 2023-03-19 22:11:24.000000000 +0100 +++ new/libxisf/debian/libxisf-dev.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/include -usr/lib/*/*.so diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxisf/debian/libxisf.install new/libxisf/debian/libxisf.install --- old/libxisf/debian/libxisf.install 2023-03-19 22:11:24.000000000 +0100 +++ new/libxisf/debian/libxisf.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/*.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxisf/debian/rules new/libxisf/debian/rules --- old/libxisf/debian/rules 2023-03-19 22:11:24.000000000 +0100 +++ new/libxisf/debian/rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -#!/usr/bin/make -f - -#!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk - -export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxisf/debian/source/format new/libxisf/debian/source/format --- old/libxisf/debian/source/format 2023-03-19 22:11:24.000000000 +0100 +++ new/libxisf/debian/source/format 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.0 (quilt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxisf/libxisf.cpp new/libxisf/libxisf.cpp --- old/libxisf/libxisf.cpp 2023-03-19 22:11:24.000000000 +0100 +++ new/libxisf/libxisf.cpp 2023-04-11 12:25:14.000000000 +0200 @@ -912,7 +912,7 @@ if(image._cfa.width && image._cfa.height) { - pugi::xml_node cfa_node = node.append_child("ColorFilterArray"); + pugi::xml_node cfa_node = image_node.append_child("ColorFilterArray"); cfa_node.append_attribute("pattern").set_value(image._cfa.pattern.c_str()); cfa_node.append_attribute("width").set_value(image._cfa.width); cfa_node.append_attribute("height").set_value(image._cfa.height);
