[vlc-devel] commit: contribs: update libpng patch for OSX (Derk-Jan Hartman )

[git version control]

vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Wed Aug 20 01:59:37 2008 +0200| [9eb047da0ca4537c86ca0695803b3b22ed226818] | committer: Derk-Jan Hartman 

contribs: update libpng patch for OSX

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9eb047da0ca4537c86ca0695803b3b22ed226818
---

 extras/contrib/src/Patches/libpng-osx.patch |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extras/contrib/src/Patches/libpng-osx.patch b/extras/contrib/src/Patches/libpng-osx.patch
index f85f065..f88c55a 100644
--- a/extras/contrib/src/Patches/libpng-osx.patch
+++ b/extras/contrib/src/Patches/libpng-osx.patch
@@ -1,6 +1,6 @@
-diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin
---- libpng-1.2.20/scripts/makefile.darwin	2007-09-08 05:23:01.000000000 +0200
-+++ libpng/scripts/makefile.darwin	2007-09-23 15:31:21.000000000 +0200
+diff -ruN libpng-1.2.30/scripts/makefile.darwin libpng/scripts/makefile.darwin
+--- libpng-1.2.30/scripts/makefile.darwin	2008-08-15 16:14:44.000000000 +0200
++++ libpng/scripts/makefile.darwin	2008-08-20 01:48:40.000000000 +0200
 @@ -7,14 +7,14 @@
  # For conditions of distribution and use, see copyright notice in png.h
  
@@ -24,10 +24,10 @@ diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin
 @@ -39,8 +39,8 @@
  RM_F=/bin/rm -f
  
- # CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
--CFLAGS=-I$(ZLIBINC) -Wall -O -funroll-loops
+ # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
+-CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops
 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
-+CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -Wall -O3 -funroll-loops
++CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -W -Wall -O -funroll-loops
 +LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz
  
  INCPATH=$(prefix)/include
@@ -41,7 +41,7 @@ diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin
  
  libpng.a: $(OBJS)
  	$(AR_RC) $@ $(OBJS)
-@@ -179,7 +179,7 @@
+@@ -182,7 +182,7 @@
  	chmod 755 $(DB)/$(LIBNAME)-config
  	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)