[vlc-devel] commit: Updated for current release ( Felix Paul Kühne )

[git version control]

vlc | branch: 0.8.6-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Sat May 24 02:02:49 2008 +0200| [aa8b34253dcc544efbb0c4ca6df20b0ea765ef99]

Updated for current release

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

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

diff --git a/extras/contrib/src/Patches/libpng-osx.patch b/extras/contrib/src/Patches/libpng-osx.patch
index e4a973d..476b9d7 100644
--- a/extras/contrib/src/Patches/libpng-osx.patch
+++ b/extras/contrib/src/Patches/libpng-osx.patch
@@ -1,12 +1,11 @@
-diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
---- libpng-1.2.12/scripts/makefile.darwin	2006-06-27 22:22:40.000000000 +0200
-+++ libpng/scripts/makefile.darwin	2006-12-08 18:15:36.000000000 +0100
+--- libpng/scripts/makefile.darwin.orig	2008-05-08 13:58:09.000000000 +0200
++++ libpng/scripts/makefile.darwin	2008-05-24 02:01:02.000000000 +0200
 @@ -7,14 +7,14 @@
  # For conditions of distribution and use, see copyright notice in png.h
  
  # where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
 -prefix=/usr/local
-+prefix=??PREFIX??
++prefix=/Users/fpk/Desktop/vlc/extras/contrib
  exec_prefix=$(prefix)
  
  # Where the zlib library and include files are located
@@ -21,18 +20,18 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
  
  # Library name:
  LIBNAME = libpng12
-@@ -38,8 +38,8 @@
- RANLIB=ranlib
+@@ -39,8 +39,8 @@
  RM_F=/bin/rm -f
  
--CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
+ # CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
+-CFLAGS=-I$(ZLIBINC) -Wall -O -funroll-loops
 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
 +CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -Wall -O3 -funroll-loops
 +LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz
  
  INCPATH=$(prefix)/include
  LIBPATH=$(exec_prefix)/lib
-@@ -72,7 +72,7 @@
+@@ -73,7 +73,7 @@
  .c.pic.o:
  	$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
  
@@ -41,7 +40,7 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
  
  libpng.a: $(OBJS)
  	$(AR_RC) $@ $(OBJS)
-@@ -178,7 +178,7 @@
+@@ -182,7 +182,7 @@
  	chmod 755 $(DB)/$(LIBNAME)-config
  	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)