1 |
maekke 08/10/15 18:17:57 |
2 |
|
3 |
Added: |
4 |
pngcrush-1.6.10-makefile_and_missing_definitions.patch |
5 |
Log: |
6 |
bump to 1.6.10 by Sergey Dryabzhinsky in bug #242110 |
7 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27 i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-gfx/pngcrush/files/pngcrush-1.6.10-makefile_and_missing_definitions.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pngcrush/files/pngcrush-1.6.10-makefile_and_missing_definitions.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pngcrush/files/pngcrush-1.6.10-makefile_and_missing_definitions.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: pngcrush-1.6.10-makefile_and_missing_definitions.patch |
16 |
=================================================================== |
17 |
diff -ruN pngcrush-1.6.10-nolib.orig/Makefile pngcrush-1.6.10-nolib/Makefile |
18 |
--- pngcrush-1.6.10-nolib.orig/Makefile 1970-01-01 02:00:00.000000000 +0200 |
19 |
+++ pngcrush-1.6.10-nolib/Makefile 2008-07-30 23:01:16.000000000 +0300 |
20 |
@@ -0,0 +1,69 @@ |
21 |
+# Sample makefile for pngcrush using gcc and GNU make. |
22 |
+# Glenn Randers-Pehrson |
23 |
+# Last modified: 19 February 2005 |
24 |
+# Kapil Hari Paranjape |
25 |
+# Last modified: 12 June 2008 |
26 |
+# |
27 |
+# Invoke this makefile from a shell prompt in the usual way; for example: |
28 |
+# |
29 |
+# make -f Makefile |
30 |
+# |
31 |
+# This makefile builds a dynamically linked executable. |
32 |
+ |
33 |
+# macros -------------------------------------------------------------------- |
34 |
+ |
35 |
+GAS_VERSION := $(shell as --version | sed -n -e's/GNU assembler (.*) //p') |
36 |
+ |
37 |
+PNGINC = /usr/include |
38 |
+ |
39 |
+CC ?= gcc |
40 |
+RM = rm -f |
41 |
+ |
42 |
+CFLAGS += -I. -Wall |
43 |
+ |
44 |
+O = .o |
45 |
+E = |
46 |
+ |
47 |
+# additional defines |
48 |
+DEFINES = -DPNG_USE_PNGGCCRD -DPNG_iCCP_SUPPORTED \ |
49 |
+ -DPNG_iTXt_SUPPORTED -DPNG_USE_GLOBAL_ARRAYS \ |
50 |
+ -DGAS_VERSION="\"${GAS_VERSION}\"" \ |
51 |
+ |
52 |
+PNGCRUSH = pngcrush |
53 |
+ |
54 |
+LIBS = -lpng -lz |
55 |
+ |
56 |
+OBJS = pngcrush$(O) |
57 |
+ |
58 |
+EXES = $(PNGCRUSH)$(E) |
59 |
+ |
60 |
+ |
61 |
+# implicit make rules ------------------------------------------------------- |
62 |
+ |
63 |
+.c$(O): png.h cexcept.h $(ZHDR) |
64 |
+ $(CC) -c $(CFLAGS) $(DEFINES) $< |
65 |
+ |
66 |
+ |
67 |
+# dependencies -------------------------------------------------------------- |
68 |
+ |
69 |
+all: $(EXES) |
70 |
+ |
71 |
+png.h: |
72 |
+ ln -s $(PNGINC)/png.h png.h |
73 |
+ |
74 |
+pngcrush$(O): pngcrush.c cexcept.h |
75 |
+ $(CC) -c $(CFLAGS) $(DEFINES) $< |
76 |
+ |
77 |
+$(PNGCRUSH)$(E): $(OBJS) |
78 |
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) |
79 |
+ |
80 |
+# maintenance --------------------------------------------------------------- |
81 |
+ |
82 |
+clean: |
83 |
+ $(RM) $(EXES) $(OBJS) png.h |
84 |
+ |
85 |
+install: |
86 |
+ mkdir -p $(DESTDIR)/usr/bin/ |
87 |
+ cp $(PNGCRUSH)$(E) $(DESTDIR)/usr/bin/ |
88 |
+ chmod 0755 $(DESTDIR)/usr/bin/$(PNGCRUSH)$(E) |
89 |
+ |
90 |
|
91 |
diff -ruN pngcrush-1.6.10-nolib.orig/pngcrush.c pngcrush-1.6.10-nolib/pngcrush.c |
92 |
--- pngcrush-1.6.10-nolib.orig/pngcrush.c 2008-10-15 01:00:58.000000000 +0400 |
93 |
+++ pngcrush-1.6.10-nolib/pngcrush.c 2008-10-15 01:02:30.000000000 +0400 |
94 |
@@ -2821,7 +2821,7 @@ |
95 |
#if !defined(PNG_cHRM_SUPPORTED) || !defined(PNG_hIST_SUPPORTED) || \ |
96 |
!defined(PNG_iCCP_SUPPORTED) || !defined(PNG_sCAL_SUPPORTED) || \ |
97 |
!defined(PNG_pCAL_SUPPORTED) || !defined(PNG_sPLT_SUPPORTED) || \ |
98 |
- !defined(PNG_tIME_SUPPORTED) |
99 |
+ !defined(PNG_sTER_SUPPORTED) || !defined(PNG_tIME_SUPPORTED) |
100 |
png_byte chunk_name[5]; |
101 |
chunk_name[4] = '\0'; |
102 |
#endif |