Changeset 9eb047da0ca4537c86ca0695803b3b22ed226818

Show
Ignore:
Timestamp:
20/08/08 02:00:29 (4 months ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1219190429 +0200
git-parent:

[ce718de21f000a5dda416960a2b7dffdacabd9a2]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1219190377 +0200
Message:

contribs: update libpng patch for OSX

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Patches/libpng-osx.patch

    r3da67c9 r9eb047d  
    1 diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin 
    2 --- libpng-1.2.20/scripts/makefile.darwin  2007-09-08 05:23:01.000000000 +0200 
    3 +++ libpng/scripts/makefile.darwin  2007-09-23 15:31:21.000000000 +0200 
     1diff -ruN libpng-1.2.30/scripts/makefile.darwin libpng/scripts/makefile.darwin 
     2--- libpng-1.2.30/scripts/makefile.darwin  2008-08-15 16:14:44.000000000 +0200 
     3+++ libpng/scripts/makefile.darwin  2008-08-20 01:48:40.000000000 +0200 
    44@@ -7,14 +7,14 @@ 
    55 # For conditions of distribution and use, see copyright notice in png.h 
    …… 
    2525 RM_F=/bin/rm -f 
    2626  
    27  # CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE 
    28 -CFLAGS=-I$(ZLIBINC) -Wall -O -funroll-loops 
     27 # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE 
     28-CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops 
    2929-LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz 
    30 +CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -Wall -O3 -funroll-loops 
     30+CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -W -Wall -O -funroll-loops 
    3131+LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz 
    3232  
    …… 
    4242 libpng.a: $(OBJS) 
    4343    $(AR_RC) $@ $(OBJS) 
    44 @@ -179,7 +179,7 @@ 
     44@@ -182,7 +182,7 @@ 
    4545    chmod 755 $(DB)/$(LIBNAME)-config 
    4646    (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)