update to 1.2.2 and make libpng threads safe

Changed files:
    libpng-opt.patch -> 1.8

diff --git a/libpng-opt.patch b/libpng-opt.patch
index 8d44373036dc7e501a16e3f1f2df3f816576a607..f6eef96a050bcc5f7884a8ddeb7b6edc2fde54dd 100644 (file)
--- a/libpng-opt.patch
+++ b/libpng-opt.patch
@@ -1,7 +1,6 @@
-diff -urN libpng-1.2.0.org/scripts/makefile.gcmmx libpng-1.0.9/scripts/makefile.gcmmx
---- libpng-1.2.0.org/scripts/makefile.gcmmx    Thu Feb  1 15:22:46 2001
-+++ libpng-1.2.0/scripts/makefile.gcmmx        Thu Feb  1 15:26:38 2001
-@@ -17,8 +17,8 @@
+--- libpng-1.2.2/scripts/makefile.gcmmx.wiget  Mon Apr 15 16:25:45 2002
++++ libpng-1.2.2/scripts/makefile.gcmmx        Tue Apr 16 15:54:12 2002
+@@ -27,8 +27,8 @@
  # Where the zlib library and include files are located
  #ZLIBLIB=/usr/local/lib
  #ZLIBINC=/usr/local/include
@@ -12,21 +11,20 @@ diff -urN libpng-1.2.0.org/scripts/makefile.gcmmx libpng-1.0.9/scripts/makefile.
  
  ALIGN=
  # for i386:
-@@ -31,8 +31,8 @@
-
+@@ -42,8 +42,8 @@
+ 
  # Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety
  ### for generic gcc:
 -CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \
--              -O3 $(ALIGN) -funroll-loops \
-+CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \
+-      -O3 $(ALIGN) -funroll-loops \
++CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \
 +      $(OPT_FLAGS) $(ALIGN) -funroll-loops \
        -fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
  ### for gcc 2.95.2 on 686:
  #CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \
-diff -urN libpng-1.0.9.org/scripts/makefile.linux libpng-1.0.9/scripts/makefile.linux
---- libpng-1.0.9.org/scripts/makefile.linux    Thu Feb  1 15:22:46 2001
-+++ libpng-1.0.9/scripts/makefile.linux        Thu Feb  1 15:25:49 2001
-@@ -11,8 +11,8 @@
+--- libpng-1.2.2/scripts/makefile.linux.wiget  Mon Apr 15 16:25:46 2002
++++ libpng-1.2.2/scripts/makefile.linux        Tue Apr 16 15:48:37 2002
+@@ -17,8 +17,8 @@
  # Where the zlib library and include files are located
  #ZLIBLIB=/usr/local/lib
  #ZLIBINC=/usr/local/include
@@ -37,12 +35,12 @@ diff -urN libpng-1.0.9.org/scripts/makefile.linux libpng-1.0.9/scripts/makefile.
  
  ALIGN=
  # for i386:
-@@ -24,7 +24,7 @@
+@@ -30,7 +30,7 @@
  
  # for pgcc version 2.95.1, -O3 is buggy; don't use it.
  
 -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
 +CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
- LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
  
+ LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm