Skip to content

V
vlc-gpu
Commit 3da67c98 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contribs - libpng: Updates to 1.2.20. No more MMX optimisations, a few bugs are fixed.

parent a1e027b6
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
extras/contrib/src/Patches/libpng-osx.patch
View file @ 3da67c98
diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin
--- libpng-1.2.12/scripts/makefile.darwin 2006-06-27 22:22:40.000000000 +0200 --- libpng-1.2.20/scripts/makefile.darwin 2007-09-08 05:23:01.000000000 +0200
+++ libpng/scripts/makefile.darwin 2006-12-08 18:15:36.000000000 +0100 +++ libpng/scripts/makefile.darwin 2007-09-23 15:31:21.000000000 +0200
@@ -7,14 +7,14 @@ @@ -7,14 +7,14 @@
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
...@@ -21,18 +21,18 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin ...@@ -21,18 +21,18 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
# Library name: # Library name:
LIBNAME = libpng12 LIBNAME = libpng12
@@ -38,8 +38,8 @@ @@ -39,8 +39,8 @@
RANLIB=ranlib
RM_F=/bin/rm -f 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 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
+CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -Wall -O3 -funroll-loops +CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -Wall -O3 -funroll-loops
+LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz +LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib LIBPATH=$(exec_prefix)/lib
@@ -72,7 +72,7 @@ @@ -73,7 +73,7 @@
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
...@@ -41,7 +41,7 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin ...@@ -41,7 +41,7 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)
@@ -178,7 +178,7 @@ @@ -179,7 +179,7 @@
chmod 755 $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config
(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
......
extras/contrib/src/packages.mak
View file @ 3da67c98
...@@ -122,7 +122,7 @@ VCDIMAGER_VERSION=0.7.23 ...@@ -122,7 +122,7 @@ VCDIMAGER_VERSION=0.7.23
VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
CDIO_VERSION=0.78.2 CDIO_VERSION=0.78.2
CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
PNG_VERSION=1.2.18 PNG_VERSION=1.2.20
PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
GPGERROR_VERSION=1.5 GPGERROR_VERSION=1.5
GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2 GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment