Notification time stamped 2023-03-31 19:40:37 UTC
From 5b25161fc28eba01ab5a9212ec19bd4642119971 Mon Sep 17 00:00:00 2001
From: nucleo <nucleo(a)fedoraproject.org>
Date: Mar 31 2023 19:40:22 +0000
Subject: libpgf-7.21.7
---
diff --git a/.gitignore b/.gitignore
index af00b1a..b391fd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/libpgf-6.12.27-src.tar.gz
/libpgf-6.13.45-src.tar.gz
/libpgf-src-6.14.12.tar.gz
+/libpgf.zip
diff --git a/libpgf-auto.patch b/libpgf-auto.patch
deleted file mode 100644
index c918a73..0000000
--- a/libpgf-auto.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -up libpgf/configure.ac.auto libpgf/configure.ac
---- libpgf/configure.ac.auto 2014-03-21 07:51:59.000000000 -0600
-+++ libpgf/configure.ac 2015-02-23 12:28:53.125766559 -0700
-@@ -1,4 +1,5 @@
--AC_INIT(src/PGFimage.cpp)
-+AC_INIT([libpgf], [6.14.12])
-+AC_CONFIG_SRCDIR([src/PGFimage.cpp])
-
- dnl The library interface version
- dnl see documentation for versioning in the libtool manual
-@@ -24,9 +25,10 @@ PACKAGE_RELEASE=2
-
- AC_SUBST(PACKAGE_RELEASE)
-
--AM_INIT_AUTOMAKE(libpgf,6.14.12)
-+AM_INIT_AUTOMAKE
- AC_PROG_LIBTOOL
--AC_CONFIG_HEADERS( config.h )
-+AC_CONFIG_MACRO_DIR([m4])
-+AC_CONFIG_HEADERS( [config.h] )
- AC_PROG_CXX
-
- dnl Check for doxygen support
-diff -up libpgf/Makefile.am.auto libpgf/Makefile.am
---- libpgf/Makefile.am.auto 2013-10-25 05:24:18.000000000 -0600
-+++ libpgf/Makefile.am 2015-02-23 12:26:04.338856680 -0700
-@@ -19,6 +19,8 @@ RPMEXTRACONFOPT="--disable-dependency-tr
-
- RPMRELEASE=$(PACKAGE_RELEASE)
-
-+ACLOCAL_AMFLAGS = -I m4
-+
- install-data-local:: $(PACKAGE).pc
- $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
- $(INSTALL) -m 644 $(PACKAGE).pc $(DESTDIR)$(libdir)/pkgconfig/$(PACKAGE).pc
-diff -up libpgf/src/Makefile.am.auto libpgf/src/Makefile.am
---- libpgf/src/Makefile.am.auto 2013-10-25 05:24:17.000000000 -0600
-+++ libpgf/src/Makefile.am 2015-02-23 12:26:04.338856680 -0700
-@@ -1,4 +1,4 @@
--INCLUDES = -I$(top_srcdir)/include # @PGFCODEC_CFLAGS@
-+AM_CPPFLAGS = -I$(top_srcdir)/include # @PGFCODEC_CFLAGS@
-
- lib_LTLIBRARIES = libpgf.la
- libpgf_la_LDFLAGS = -version-info @INTERFACE_VERSION@
diff --git a/libpgf-r147.patch b/libpgf-r147.patch
deleted file mode 100644
index ebfea0f..0000000
--- a/libpgf-r147.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up libpgf/include/PGFimage.h.r147 libpgf/include/PGFimage.h
---- libpgf/include/PGFimage.h.r147 2015-08-10 10:24:28.319204436 -0500
-+++ libpgf/include/PGFimage.h 2015-08-10 10:44:12.588655556 -0500
-@@ -538,7 +538,7 @@ private:
- ProgressMode m_progressMode; ///< progress mode used in Read and Write; PM_Relative
is default mode
-
- void ComputeLevels();
-- void CompleteHeader();
-+ bool CompleteHeader();
- void RgbToYuv(int pitch, UINT8* rgbBuff, BYTE bpp, int channelMap[], CallbackPtr cb,
void *data) THROW_;
- void Downsample(int nChannel);
- UINT32 UpdatePostHeaderSize() THROW_;
-diff -up libpgf/src/Decoder.cpp.r147 libpgf/src/Decoder.cpp
---- libpgf/src/Decoder.cpp.r147 2015-08-10 10:24:28.637208326 -0500
-+++ libpgf/src/Decoder.cpp 2015-08-10 10:45:04.349979345 -0500
-@@ -158,7 +158,7 @@ CDecoder::CDecoder(CPGFStream* stream, P
- if (size > 0) {
- // read post-header
- if (header.mode == ImageModeIndexedColor) {
-- ASSERT((size_t)size >= ColorTableSize);
-+ if (size < ColorTableSize) ReturnWithError(FormatCannotRead);
- // read color table
- count = expected = ColorTableSize;
- m_stream->Read(&count, postHeader.clut);
-diff -up libpgf/src/PGFimage.cpp.r147 libpgf/src/PGFimage.cpp
---- libpgf/src/PGFimage.cpp.r147 2014-03-21 07:09:10.000000000 -0500
-+++ libpgf/src/PGFimage.cpp 2015-08-10 10:45:33.371423512 -0500
-@@ -145,7 +145,7 @@ void CPGFImage::Open(CPGFStream *stream)
- m_height[0] = m_header.height;
-
- // complete header
-- CompleteHeader();
-+ if (!CompleteHeader()) ReturnWithError(FormatCannotRead);
-
- // interpret quant parameter
- if (m_header.quality > DownsampleThreshold &&
-@@ -205,7 +205,7 @@ void CPGFImage::Open(CPGFStream *stream)
- }
-
- ////////////////////////////////////////////////////////////
--void CPGFImage::CompleteHeader() {
-+bool CPGFImage::CompleteHeader() {
- if (m_header.mode == ImageModeUnknown) {
- // undefined mode
- switch(m_header.bpp) {
-@@ -261,20 +261,20 @@ void CPGFImage::CompleteHeader() {
- // change mode
- m_header.mode = ImageModeRGBA;
- }
-- ASSERT(m_header.mode != ImageModeBitmap || m_header.bpp == 1);
-- ASSERT(m_header.mode != ImageModeIndexedColor || m_header.bpp == 8);
-- ASSERT(m_header.mode != ImageModeGrayScale || m_header.bpp == 8);
-- ASSERT(m_header.mode != ImageModeGray16 || m_header.bpp == 16);
-- ASSERT(m_header.mode != ImageModeGray32 || m_header.bpp == 32);
-- ASSERT(m_header.mode != ImageModeRGBColor || m_header.bpp == 24);
-- ASSERT(m_header.mode != ImageModeRGBA || m_header.bpp == 32);
-- ASSERT(m_header.mode != ImageModeRGB12 || m_header.bpp == 12);
-- ASSERT(m_header.mode != ImageModeRGB16 || m_header.bpp == 16);
-- ASSERT(m_header.mode != ImageModeRGB48 || m_header.bpp == 48);
-- ASSERT(m_header.mode != ImageModeLabColor || m_header.bpp == 24);
-- ASSERT(m_header.mode != ImageModeLab48 || m_header.bpp == 48);
-- ASSERT(m_header.mode != ImageModeCMYKColor || m_header.bpp == 32);
-- ASSERT(m_header.mode != ImageModeCMYK64 || m_header.bpp == 64);
-+ if (m_header.mode == ImageModeBitmap && m_header.bpp != 1) return false;
-+ if (m_header.mode == ImageModeIndexedColor && m_header.bpp != 8) return
false;
-+ if (m_header.mode == ImageModeGrayScale && m_header.bpp != 8) return false;
-+ if (m_header.mode == ImageModeGray16 && m_header.bpp != 16) return false;
-+ if (m_header.mode == ImageModeGray32 && m_header.bpp != 32) return false;
-+ if (m_header.mode == ImageModeRGBColor && m_header.bpp != 24) return false;
-+ if (m_header.mode == ImageModeRGBA && m_header.bpp != 32) return false;
-+ if (m_header.mode == ImageModeRGB12 && m_header.bpp != 12) return false;
-+ if (m_header.mode == ImageModeRGB16 && m_header.bpp != 16) return false;
-+ if (m_header.mode == ImageModeRGB48 && m_header.bpp != 48) return false;
-+ if (m_header.mode == ImageModeLabColor && m_header.bpp != 24) return false;
-+ if (m_header.mode == ImageModeLab48 && m_header.bpp != 48) return false;
-+ if (m_header.mode == ImageModeCMYKColor && m_header.bpp != 32) return false;
-+ if (m_header.mode == ImageModeCMYK64 && m_header.bpp != 64) return false;
-
- // set number of channels
- if (!m_header.channels) {
-@@ -300,8 +300,7 @@ void CPGFImage::CompleteHeader() {
- m_header.channels = 4;
- break;
- default:
-- ASSERT(false);
-- m_header.channels = 3;
-+ return false;
- }
- }
-
-@@ -311,6 +310,8 @@ void CPGFImage::CompleteHeader() {
- if (!m_header.usedBitsPerChannel || m_header.usedBitsPerChannel > bpc) {
- m_header.usedBitsPerChannel = bpc;
- }
-+
-+ return true;
- }
-
- //////////////////////////////////////////////////////////////////////
diff --git a/libpgf-r148.patch b/libpgf-r148.patch
deleted file mode 100644
index 04195b0..0000000
--- a/libpgf-r148.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -up libpgf/src/Decoder.cpp.r148 libpgf/src/Decoder.cpp
---- libpgf/src/Decoder.cpp.r148 2015-08-10 10:46:21.632558343 -0500
-+++ libpgf/src/Decoder.cpp 2015-08-10 10:46:21.945565702 -0500
-@@ -87,29 +87,6 @@ CDecoder::CDecoder(CPGFStream* stream, P
-
- int count, expected;
-
-- // set number of threads
--#ifdef LIBPGF_USE_OPENMP
-- m_macroBlockLen = omp_get_num_procs();
--#else
-- m_macroBlockLen = 1;
--#endif
--
-- if (useOMP && m_macroBlockLen > 1) {
--#ifdef LIBPGF_USE_OPENMP
-- omp_set_num_threads(m_macroBlockLen);
--#endif
--
-- // create macro block array
-- m_macroBlocks = new(std::nothrow) CMacroBlock*[m_macroBlockLen];
-- if (!m_macroBlocks) ReturnWithError(InsufficientMemory);
-- for (int i=0; i < m_macroBlockLen; i++) m_macroBlocks[i] = new CMacroBlock();
-- m_currentBlock = m_macroBlocks[m_currentBlockIndex];
-- } else {
-- m_macroBlocks = 0;
-- m_macroBlockLen = 1; // there is only one macro block
-- m_currentBlock = new CMacroBlock();
-- }
--
- // store current stream position
- m_startPos = m_stream->GetPos();
-
-@@ -209,6 +186,30 @@ CDecoder::CDecoder(CPGFStream* stream, P
-
- // store current stream position
- m_encodedHeaderLength = UINT32(m_stream->GetPos() - m_startPos);
-+
-+ // set number of threads
-+#ifdef LIBPGF_USE_OPENMP
-+ m_macroBlockLen = omp_get_num_procs();
-+#else
-+ m_macroBlockLen = 1;
-+#endif
-+
-+ if (useOMP && m_macroBlockLen > 1) {
-+#ifdef LIBPGF_USE_OPENMP
-+ omp_set_num_threads(m_macroBlockLen);
-+#endif
-+
-+ // create macro block array
-+ m_macroBlocks = new(std::nothrow) CMacroBlock*[m_macroBlockLen];
-+ if (!m_macroBlocks) ReturnWithError(InsufficientMemory);
-+ for (int i = 0; i < m_macroBlockLen; i++) m_macroBlocks[i] = new CMacroBlock();
-+ m_currentBlock = m_macroBlocks[m_currentBlockIndex];
-+ } else {
-+ m_macroBlocks = 0;
-+ m_macroBlockLen = 1; // there is only one macro block
-+ m_currentBlock = new(std::nothrow) CMacroBlock();
-+ if (!m_currentBlock) ReturnWithError(InsufficientMemory);
-+ }
- }
-
- /////////////////////////////////////////////////////////////////////
diff --git a/libpgf.spec b/libpgf.spec
index 59b49ab..3cef85a 100644
--- a/libpgf.spec
+++ b/libpgf.spec
@@ -1,17 +1,11 @@
Name: libpgf
-Version: 6.14.12
-Release: 21%{?dist}
+Version: 7.21.7
+Release: 1%{?dist}
Summary: PGF (Progressive Graphics File) library
License: LGPLv2+
URL:
http://www.libpgf.org
-Source0:
http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-# Modernize automake usage
-Patch0: libpgf-auto.patch
-
-## backport upstream fixes
-Patch147: libpgf-r147.patch
-Patch148: libpgf-r148.patch
+Source0:
https://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/libp...
BuildRequires: doxygen
BuildRequires: gcc-c++
@@ -35,11 +29,11 @@ developing applications that use %{name}.
%prep
%setup -q -n %{name}
-%patch0 -p1 -b .auto
-%patch147 -p1 -b .r147
-%patch148 -p1 -b .r148
+
+mv README.txt README
+
# Fix line endings
-sed -i -e 's/\r//' configure.ac README
+sed -i -e 's/\r//' configure.ac Makefile.am src/Makefile.am autogen.sh README
sed -i 's|$(DESTDIR)$(datadir)/doc/$(DOC_MODULE)|$(RPM_BUILD_DIR)/libpgf|g'
doc/Makefile.am
@@ -61,16 +55,13 @@ export CXXFLAGS="%{optflags} -DLIBPGF_DISABLE_OPENMP
-std=c++14"
%install
%make_install
-# unpackaged files
-rm -fv %{buildroot}%{_libdir}/libpgf.la
-
%ldconfig_scriptlets
%files
%doc README
%license COPYING
-%{_libdir}/libpgf.so.6*
+%{_libdir}/libpgf.so.7*
%files devel
%doc html
@@ -81,6 +72,9 @@ rm -fv %{buildroot}%{_libdir}/libpgf.la
%changelog
+* Fri Mar 31 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 7.21.7-1
+- libpgf-7.21.7
+
* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> -
6.14.12-21
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
diff --git a/sources b/sources
index 19575d0..8e3a40b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2b13832e23ad9026bd249d57b6c26da libpgf-src-6.14.12.tar.gz
+SHA512 (libpgf.zip) =
dbc17d9dce1afbeffb272df0d573059914d2ac79d652d1d43e67c49509fd6e643be8594bbd1a3058a5aa3a9d30db100c6dcf641051345049cf8f9375d49e2799
https://src.fedoraproject.org/rpms/libpgf/c/5b25161fc28eba01ab5a9212ec19b...