sergiomb pushed to pngquant (el6). "New upstream version 2.3.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 19 15:36:00 UTC 2015
>From 68f49b50772f818697bda7accb8072388ac0a6ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Basto?= <sergio at serjux.com>
Date: Sat, 27 Sep 2014 06:50:36 +0100
Subject: New upstream version 2.3.0
diff --git a/.gitignore b/.gitignore
index 4a406bf..eacbfff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*.rpm
*.tar*
results_*/
+/pngquant-2.3.0-src.tar.bz2
diff --git a/pngquant-2.0.0_fix-Makefile.patch b/pngquant-2.0.0_fix-Makefile.patch
deleted file mode 100644
index 511c85e..0000000
--- a/pngquant-2.0.0_fix-Makefile.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Index: pngquant-2.0.0/Makefile
-===================================================================
---- pngquant-2.0.0.orig/Makefile
-+++ pngquant-2.0.0/Makefile
-@@ -13,13 +13,18 @@ BINPREFIX = $(PREFIX)/bin
- CUSTOMLIBPNG ?= ../libpng
- CUSTOMZLIB ?= ../zlib
-
--CFLAGSOPT ?= -DNDEBUG -O3 -fstrict-aliasing -ffast-math -funroll-loops -fomit-frame-pointer -ffinite-math-only
-+CFLAGS = $(CFLAGSOPT) $(shell echo $$CFLAGS)
-
--CFLAGS ?= -Wall -Wno-unknown-pragmas -I. -I$(CUSTOMLIBPNG) -I$(CUSTOMZLIB) -I/usr/local/include/ -I/usr/include/ -I/usr/X11/include/ $(CFLAGSOPT)
--CFLAGS += -std=c99 $(CFLAGSADD)
--
--LDFLAGS ?= -L$(CUSTOMLIBPNG) -L$(CUSTOMZLIB) -L/usr/local/lib/ -L/usr/lib/ -L/usr/X11/lib/
--LDFLAGS += -lpng -lz -lm lib/libimagequant.a -lm $(LDFLAGSADD)
-+CFLAGSOPT ?= -DNDEBUG -O3 -fstrict-aliasing -ffast-math -funroll-loops
-+CFLAGSOPT += -fomit-frame-pointer -ffinite-math-only -Wall -Wno-unknown-pragmas
-+CFLAGSOPT += -I. -I$(CUSTOMLIBPNG) -I$(CUSTOMZLIB) -I/usr/local/include/
-+CFLAGSOPT += -I/usr/include/ -I/usr/X11/include/ -std=c99 $(CFLAGSADD)
-+
-+LDFLAGS ?= $(shell echo $$LDFLAGS)
-+
-+LDFLAGSOPT ?= -L$(CUSTOMLIBPNG) -L$(CUSTOMZLIB) -L/usr/local/lib/ -L/usr/lib/
-+LDFLAGSOPT += -L/usr/X11/lib/ -L$(shell pwd)/lib -limagequant -lpng -lz -lm
-+LDFLAGSOPT += $(LDFLAGSADD)
-
- OBJS = pngquant.o rwpng.o
- COCOA_OBJS = rwpng_cocoa.o
-@@ -30,7 +35,7 @@ TARNAME = pngquant-$(VERSION)
- TARFILE = $(TARNAME)-src.tar.bz2
-
- ifdef USE_COCOA
--CFLAGS += -DUSE_COCOA=1
-+CFLAGSOPT += -DUSE_COCOA=1
- OBJS += $(COCOA_OBJS)
- FRAMEWORKS += -framework Cocoa
- endif
-@@ -40,13 +45,13 @@ BUILD_CONFIGURATION="$(CC) $(CFLAGS) $(L
- all: $(BIN)
-
- lib/libimagequant.a::
-- $(MAKE) -C lib -$(MAKEFLAGS) static
-+ $(MAKE) -C lib $(MAKEFLAGS) shared
-
- openmp::
- $(MAKE) CFLAGSADD=-fopenmp OPENMPFLAGS="-Bstatic -lgomp" -j8 -$(MAKEFLAGS)
-
- $(BIN): $(OBJS) lib/libimagequant.a
-- $(CC) $(OBJS) $(LDFLAGS) $(OPENMPFLAGS) $(FRAMEWORKS) -o $@
-+ $(CC) $(OBJS) $(LDFLAGS) $(LDFLAGSOPT) $(OPENMPFLAGS) $(FRAMEWORKS) -o $@
-
- rwpng_cocoa.o: rwpng_cocoa.m
- clang -c $(CFLAGS) -o $@ $<
-Index: pngquant-2.0.0/lib/Makefile
-===================================================================
---- pngquant-2.0.0.orig/lib/Makefile
-+++ pngquant-2.0.0/lib/Makefile
-@@ -5,14 +5,13 @@ VERSION=2.0.0
- CC := $(patsubst cc,gcc,$(CC))
-
- STATICLIB=libimagequant.a
-+SHAREDLIB=libimagequant.so
-+SOVER=0
- DLL=libimagequant.dll
- DLLIMP=libimagequant_dll.a
- DLLDEF=libimagequant_dll.def
-
--CFLAGSOPT ?= -DNDEBUG -O3 -fstrict-aliasing -ffast-math -funroll-loops -fomit-frame-pointer -ffinite-math-only
--
--CFLAGS ?= -Wall -Wno-unknown-pragmas -I. $(CFLAGSOPT)
--CFLAGS += -std=c99 $(CFLAGSADD)
-+CFLAGS += -fPIC
-
- OBJS = pam.o mediancut.o blur.o mempool.o viter.o nearest.o libimagequant.o
-
-@@ -22,10 +21,12 @@ DISTFILES = $(OBJS:.o=.c) *.h MANUAL.md
- TARNAME = libimagequant-$(VERSION)
- TARFILE = $(TARNAME)-src.tar.bz2
-
--all: static
-+all: shared
-
- static: $(STATICLIB)
-
-+shared: $(SHAREDLIB)
-+
- dll:
- $(MAKE) CFLAGSADD="-DLIQ_EXPORT='__declspec(dllexport)'" $(DLL)
-
-@@ -38,6 +39,10 @@ $(DLL) $(DLLIMP): $(OBJS)
- $(STATICLIB): $(OBJS)
- $(AR) $(ARFLAGS) $@ $^
-
-+$(SHAREDLIB): $(OBJS)
-+ $(CC) -shared -Wl,-soname,$(SHAREDLIB).$(SOVER) $(LDFLAGS) $(OBJS) -o $(SHAREDLIB).$(SOVER)
-+ ln -fs $(SHAREDLIB).$(SOVER) $(SHAREDLIB)
-+
- $(OBJS): pam.h build_configuration
-
- dist: $(TARFILE)
diff --git a/pngquant.spec b/pngquant.spec
index 89b0d38..841bfdf 100644
--- a/pngquant.spec
+++ b/pngquant.spec
@@ -1,8 +1,8 @@
%global libname libimagequant
Name: pngquant
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
Summary: PNG quantization tool for reducing image file size
%{?el5:Group: Applications/Multimedia}
@@ -10,11 +10,16 @@ License: BSD with advertising
URL: http://%{name}.org
Source0: %{url}/%{name}-%{version}-src.tar.bz2
-Patch0: %{name}-2.0.0_fix-Makefile.patch
+Patch0: %{name}-2.3.0_fix-Makefile.patch
%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
-BuildRequires: libpng-devel
+BuildRequires: libpng-devel%{?_isa} >= 1.2.46-1
+BuildRequires: zlib-devel%{?_isa} >= 1.2.3-1
+BuildRequires: gcc%{?_isa} >= 4.2-1
+BuildRequires: lcms2-devel
+Requires: libpng%{?_isa} >= 1.2.46-1
+Requires: zlib%{?isa} >= 1.2.3-1
%description
@@ -49,13 +54,16 @@ There is also some brief API-documentation.
%prep
+%global optflags %(echo %{optflags} -fno-math-errno -funroll-loops -fomit-frame-pointer -fPIC )
%setup -q
%patch0 -p1
+rm lib/configure
%build
+%configure || :
# export compiler-flags properly
-%configure ||:
+./configure --prefix=/usr
make %{?_smp_mflags} PREFIX=%{_prefix}
@@ -63,15 +71,13 @@ make %{?_smp_mflags} PREFIX=%{_prefix}
%install
%{?el5:rm -rf %{buildroot}}
-# make install will rebuild otherwise
-%configure ||:
-
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
-
mkdir -p %{buildroot}%{_includedir}/imagequant \
+ %{buildroot}%{_bindir} \
%{buildroot}%{_libdir} \
%{buildroot}%{_mandir}/man1
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+
# install libimagequant
install -pm 0755 lib/%{libname}.so.0 \
%{buildroot}%{_libdir}
@@ -110,6 +116,9 @@ install -pm 0644 %{name}.1 \
%changelog
+* Sat Sep 27 2014 Sérgio Basto <sergio at serjux.com> - 2.3.0-1
+- New upstream version 2.3.0
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index acb4e9d..4ac76e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bb20c5c07e5db4ae9c5a16f5bb870b6 pngquant-2.0.0-src.tar.bz2
+0ce07508367032634b0694bd9897c17f pngquant-2.3.0-src.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/pngquant.git/commit/?h=el6&id=68f49b50772f818697bda7accb8072388ac0a6ac
More information about the scm-commits
mailing list