pool/netpbm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netpbm?expand=0&rev=4

Browse Source
This commit is contained in:
OBS User unknown 2007-08-09 23:26:03 +00:00 committed by Git OBS Bridge
parent d41ed58dcb
commit e1389a5220
24 changed files with 80 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netpbm-10.26.22-documentation.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:472e503559fc537ff1e8c8b6435a0a79a001f4da1d8b816fbfa12d376ef24ef6
size 470787

3
netpbm-10.26.22-nohpcdtoppm-nojbig.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37b15829b58494eacc71bf27afeafd9c1428e6885ad8b5812602d330e0c7c49c
size 1721408

21
netpbm-10.26.22-pbmtext.patch
View File

@ -1,21 +0,0 @@
--- generator/pbmtext.c
+++ generator/pbmtext.c
@@ -217,7 +217,7 @@
/* logical: we haven't seen any renderable characters yet in
the line.
*/
- struct glyph * lastGlyphP;
+ struct glyph * lastGlyphP = NULL;
/* Glyph of last character processed so far. Undefined if
'no_chars_yet'.
*/
@@ -248,8 +248,8 @@
*bwid_p += full_pixels;
accumulated_ics -= full_pixels;
}
- lastGlyphP = glyphP;
}
+ lastGlyphP = glyphP;
*bwid_p += glyphP->xadd;
}
}

0
netpbm-10.26.22-aliasing.patch → netpbm-10.26.44-aliasing.patch
View File

0
netpbm-10.26.22-colornames-init.diff → netpbm-10.26.44-colornames-init.diff
View File

3
netpbm-10.26.44-documentation.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f8e83e8ac287dc57aacb3e4ef2764fdad6075ccdd361358398f50c489733d57
size 564985

0
netpbm-10.26.22-endian.patch → netpbm-10.26.44-endian.patch
View File

25
netpbm-10.26.22-fixes.patch → netpbm-10.26.44-fixes.patch
View File

@ -63,6 +63,16 @@
}
pm_message("WRITING %s FILE",
*output_type_p == PPM_TYPE ? "PPM" : "PGM");
--- converter/other/pamtopfm.c
+++ converter/other/pamtopfm.c
@@ -239,6 +239,7 @@
enum endian const endian) {
struct pfmHeader pfmHeader;
+ memset(&pfmHeader, 0, sizeof(pfmHeader));
pfmHeader.width = pamP->width;
pfmHeader.height = pamP->height;
--- converter/other/pamtouil.c
+++ converter/other/pamtouil.c
@@ -377,11 +377,15 @@
@ -84,17 +94,6 @@
}
}
--- converter/other/pfmtopam.c
+++ converter/other/pfmtopam.c
@@ -136,7 +136,7 @@
Type converter
-----------------------------------------------------------------------------*/
if (machineEndianness == pfmEndianness) {
- const float * const floatPointer = (float *)&sample;
+ const float * const floatPointer = (float *)(void *)&sample;
return *floatPointer;
} else {
unsigned char reversed[sizeof(pfmSample)];
--- converter/other/pgmtopbm.c
+++ converter/other/pgmtopbm.c
@@ -549,6 +549,8 @@
@ -106,7 +105,7 @@
/* Scale dither matrix. */
for (row = 0; row < 16; ++row) {
@@ -619,6 +621,7 @@
@@ -621,6 +623,7 @@
converter.cols = cols;
converter.convertRow = &clusterConvertRow;
converter.destroy = &clusterDestroy;
@ -116,7 +115,7 @@
--- converter/other/pnmtofits.c
+++ converter/other/pnmtofits.c
@@ -121,13 +121,13 @@
@@ -122,13 +122,13 @@
sprintf( card, "NAXIS3 = 3 " );
write_card( card ); ++i;
}

0
netpbm-10.26.22-manpages.patch → netpbm-10.26.44-manpages.patch
View File

0
netpbm-10.26.22-manpages.tar.bz2 → netpbm-10.26.44-manpages.tar.bz2
View File

3
netpbm-10.26.44-nohpcdtoppm-nojbig.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:259d0ad28c1450fd06d9208aa068db50d0295af960ed59330c42fbf8840d8659
size 1725501

0
netpbm-10.26.22-overflow.patch → netpbm-10.26.44-overflow.patch
View File

0
netpbm-10.26.22-pamtouil.patch → netpbm-10.26.44-pamtouil.patch
View File

8
netpbm-10.26.22-pnmtopng-CAN-2005-2978.patch → netpbm-10.26.44-pnmtopng-CAN-2005-2978.patch
View File

@ -1,6 +1,6 @@
--- converter/other/pnmtopng.c.pnmtopng 2004-08-28 04:53:12.000000000 +0200
+++ converter/other/pnmtopng.c 2005-09-16 14:17:47.129390456 +0200
@@ -159,7 +159,7 @@
--- converter/other/pnmtopng.c
+++ converter/other/pnmtopng.c
@@ -160,7 +160,7 @@
unsigned int * const bestMatchP) {
unsigned int paletteIndex;
@ -9,7 +9,7 @@
unsigned int bestMatch;
bestMatch = UINT_MAX;
@@ -1566,7 +1566,7 @@
@@ -1578,7 +1578,7 @@
/* The color part of the color/alpha palette passed to the PNG
compressor
*/

2
netpbm-10.26.22-pnmtopng-overflow.patch → netpbm-10.26.44-pnmtopng-overflow.patch
View File

@ -1,6 +1,6 @@
--- converter/other/pnmtopng.c
+++ converter/other/pnmtopng.c
@@ -913,9 +913,9 @@
@@ -919,9 +919,9 @@
colorhist_vector chv;
unsigned int colors;

4
netpbm-10.26.22-pnmtopng-transparent.patch → netpbm-10.26.44-pnmtopng-transparent.patch
View File

@ -1,6 +1,6 @@
--- converter/other/pnmtopng.c
+++ converter/other/pnmtopng.c
@@ -1322,7 +1322,7 @@
@@ -1328,7 +1328,7 @@
computePixelWidth(PNM_FORMAT_TYPE(format), pnm_meaningful_bits, alpha,
NULL, &bitsPerPixel);
@ -9,7 +9,7 @@
/* No palette can beat 1 bit per pixel -- no need to waste time
counting the colors.
*/
@@ -1345,7 +1345,7 @@
@@ -1351,7 +1351,7 @@
"colormapped PNG", MAXCOLORS);
} else {
/* There are few enough colors that a palette is possible */

0
netpbm-10.26.22-pstopnm-gs-options.patch → netpbm-10.26.44-pstopnm-gs-options.patch
View File

0
netpbm-10.26.22-rgb.patch → netpbm-10.26.44-rgb.patch
View File

0
netpbm-10.26.22-tmpfile.patch → netpbm-10.26.44-tmpfile.patch
View File

0
netpbm-10.26.22-ximtoppm-fixes.patch → netpbm-10.26.44-ximtoppm-fixes.patch
View File

0
netpbm-10.26.22.dif → netpbm-10.26.44.dif
View File

8
netpbm.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jul 19 11:34:07 CEST 2007 - nadvornik@suse.cz
- updated to 10.26.44 (many bugfixes)
- applied Shared Library Packaging Policy:
* created libnetpbm-devel subpackage
* renamed libnetpbm to libnetpbm10
-------------------------------------------------------------------
Wed Apr 11 16:19:31 CEST 2007 - nadvornik@suse.cz

66
netpbm.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package netpbm (Version 10.26.22)
# spec file for package netpbm (Version 10.26.44)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -16,8 +16,8 @@ License: Any permissive, Artistic License
Group: Productivity/Graphics/Convertors
Provides: pbmplus
Autoreqprov: on
Version: 10.26.22
Release: 46
Version: 10.26.44
Release: 1
Summary: A Powerful Graphics Conversion Package
Source: netpbm-%{version}-nohpcdtoppm-nojbig.tar.bz2
Source1: netpbm-%{version}-documentation.tar.bz2
@ -35,12 +35,25 @@ Patch10: netpbm-%{version}-endian.patch
Patch11: netpbm-%{version}-pnmtopng-CAN-2005-2978.patch
Patch12: netpbm-%{version}-pnmtopng-overflow.patch
Patch13: netpbm-%{version}-ximtoppm-fixes.patch
Patch14: netpbm-%{version}-pbmtext.patch
Patch15: netpbm-%{version}-rgb.patch
Patch16: netpbm-%{version}-pamtouil.patch
Patch17: netpbm-%{version}-pnmtopng-transparent.patch
URL: http://netpbm.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n libnetpbm10
License: LGPL v2 or later
Summary: Libraries for the NetPBM (NetPortableBitmap) Graphic Formats
Group: System/Libraries
Autoreqprov: on
Provides: libnetpbm = %{version}
Obsoletes: libnetpbm < %{version}
%package -n libnetpbm-devel
License: LGPL v2 or later
Summary: Libraries for the NetPBM Graphic Formats - files mandatory for development
Group: Development/Libraries/C and C++
Autoreqprov: on
Requires: libnetpbm10 = %{version}
Provides: libnetpbm:/usr/include/pbm.h
%description
The latest version of the Portable Bitmap Plus Utilities. This large
@ -89,17 +102,21 @@ Authors:
Wilson H. Bent. Jr. <whb@evtech.com>
Wolfgang Stuerzlinger <wrzl@gup.uni-linz.ac.at>
%package -n libnetpbm
Version: 1.0.0
Release: 689
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Summary: Libraries for the NetPBM (NetPortableBitmap) Graphic Formats
Group: System/Libraries
Autoreqprov: on
Provides: libnetpb
Obsoletes: libnetpb
%description -n libnetpbm
%description -n libnetpbm10
These are the libs for the netpbm graphic formats. The tools can be
found in the netpbm package. The sources are contained in the netpbm
source package.
Authors:
--------
Rob Hooft <hooft@EMBL-Heidelberg.DE>
Michael Mauldin <mlm@cs.cmu.edu>
%description -n libnetpbm-devel
These are the libs for the netpbm graphic formats. The tools can be
found in the netpbm package. The sources are contained in the netpbm
source package.
@ -128,7 +145,6 @@ rm -rf libtiff
%patch11
%patch12
%patch13
%patch14
%patch15
%patch16
%patch17
@ -139,7 +155,7 @@ cp -v ../converter/other/pnmtopalm/README .
%build
cp Makefile.config.in Makefile.config
make CFLAGS="$RPM_OPT_FLAGS -fPIC -fstack-protector"
make CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
%install
mkdir -p $RPM_BUILD_ROOT/usr/{bin,include,%_lib,share/man}
@ -153,6 +169,7 @@ ln -sf libnetpbm.so $RPM_BUILD_ROOT/usr/%_lib/libpnm.so
ln -sf libnetpbm.so $RPM_BUILD_ROOT/usr/%_lib/libppm.so
cp -pd package/include/* $RPM_BUILD_ROOT/usr/include
cp -prd man/* $RPM_BUILD_ROOT/usr/share/man
rm $RPM_BUILD_ROOT/usr/%_lib/*.a
mkdir -p $RPM_BUILD_ROOT/usr/share/netpbm
install -m 644 converter/other/pnmtopalm/*.map $RPM_BUILD_ROOT/usr/share/netpbm
rm $RPM_BUILD_ROOT/usr/bin/g3topbm #conflict with g3utils
@ -160,10 +177,10 @@ rm $RPM_BUILD_ROOT/usr/bin/g3topbm #conflict with g3utils
%clean
rm -rf $RPM_BUILD_ROOT
%post -n libnetpbm
%post -n libnetpbm10
%run_ldconfig
%postun -n libnetpbm
%postun -n libnetpbm10
%run_ldconfig
%files
@ -176,12 +193,21 @@ rm -rf $RPM_BUILD_ROOT
/usr/bin/*
/usr/share/netpbm
%files -n libnetpbm
%files -n libnetpbm10
%defattr(-,root,root)
%{_libdir}/lib*.so.*
%files -n libnetpbm-devel
%defattr(-,root,root)
/usr/include/*
%{_libdir}/lib*
%{_libdir}/lib*.so
%changelog
* Thu Jul 19 2007 - nadvornik@suse.cz
- updated to 10.26.44 (many bugfixes)
- applied Shared Library Packaging Policy:
* created libnetpbm-devel subpackage
* renamed libnetpbm to libnetpbm10
* Wed Apr 11 2007 - nadvornik@suse.cz
- removed ppmtompeg sources [#261140]
* Thu Mar 29 2007 - rguenther@suse.de

2
prepare-src-tarball
View File

@ -5,7 +5,7 @@
#netpbm-$VER.tgz can be found at http://sourceforge.net/projects/netpbm/
VER=10.26.22
VER=10.26.44
rm -rf REMOVE
mkdir REMOVE
cd REMOVE