Attachment 78354 Details for Bug 112728 – file.diff

[patch] file.diff

file.diff (text/plain), 4.17 KB, created by Eygene Ryabinkin on 2007-05-17 08:00:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eygene Ryabinkin

Created: 2007-05-17 08:00:11 UTC

Size: 4.17 KB

patch

obsolete

>diff -urN ../png.orig/Makefile ./Makefile
>--- ../png.orig/Makefile	Thu May 17 10:17:58 2007
>+++ ./Makefile	Thu May 17 10:19:03 2007
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	png
>-PORTVERSION=	1.2.14
>+PORTVERSION=	1.2.17
> CATEGORIES=	graphics
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	lib${PORTNAME}
>diff -urN ../png.orig/distinfo ./distinfo
>--- ../png.orig/distinfo	Thu May 17 10:17:58 2007
>+++ ./distinfo	Thu May 17 10:20:28 2007
>@@ -1,3 +1,3 @@
>-MD5 (libpng-1.2.14.tar.bz2) = 2ec1e1beb2e6376b09d090f74d259160
>-SHA256 (libpng-1.2.14.tar.bz2) = 2678855a235ed02d5b30831a70dff84d5b562c5de388f1323bd680ac5cdd1722
>-SIZE (libpng-1.2.14.tar.bz2) = 620379
>+MD5 (libpng-1.2.17.tar.bz2) = 9afd60d96a1720d98194f8f94b2f0477
>+SHA256 (libpng-1.2.17.tar.bz2) = 0a0af5e905fc93d27ebef2e6334372a691bd5451a24d2ff39115ca76d58f1317
>+SIZE (libpng-1.2.17.tar.bz2) = 623999
>diff -urN ../png.orig/files/patch-aa ./files/patch-aa
>--- ../png.orig/files/patch-aa	Thu May 17 10:17:58 2007
>+++ ./files/patch-aa	Thu May 17 10:27:03 2007
>@@ -1,22 +1,13 @@
>---- scripts/makefile.freebsd.orig	Sat Feb 25 15:37:11 2006
>-+++ scripts/makefile.freebsd	Thu Jul 27 22:03:50 2006
>-@@ -8,27 +8,26 @@
>- LIB=		png
>- SHLIB_MAJOR=	${SHLIB_VER}
>- SHLIB_MINOR=	0
>-+.if (${OSVERSION} > 600007)
>-+NO_PROFILE=	YES
>-+NO_OBJ=		YES
>-+.else
>- NOPROFILE=	YES
>--NOOBJ=          YES
>-+NOOBJ=		YES
>-+.endif
>+--- scripts/makefile.freebsd.orig	Thu Jan  4 22:04:52 2007
>++++ scripts/makefile.freebsd	Thu May 17 10:25:29 2007
>+@@ -12,22 +12,22 @@
>+ NOOBJ=          YES
>  
>  # where make install puts libpng.a and png.h
> -DESTDIR=	${PREFIX}
> -LIBDIR=		/lib
>-+LIBDIR=		${PREFIX}/lib
>++#DESTDIR=	${PREFIX}
>++LIBDIR=		$(PREFIX)/lib
>  INCS=		png.h pngconf.h
> -INCSDIR=	/include/libpng
> +INCSDIR=	${PREFIX}/include/libpng
>@@ -31,13 +22,16 @@
>  
> -CFLAGS+= -I. -DPNG_USE_PNGGCCRD
> -.if (${MACHINE_ARCH} != "i386")
>--CFLAGS+= -DPNG_NO_ASSEMBLER_CODE
>+-CFLAGS+= -DPNG_NO_MMX_CODE
> -.endif
>--
>++#CFLAGS+= -I. -DPNG_USE_PNGGCCRD
>++#.if (${MACHINE_ARCH} != "i386")
>++#CFLAGS+= -DPNG_NO_MMX_CODE
>++#.endif
>+ 
>  SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
>  	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
>- 	pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c
>-@@ -44,5 +43,23 @@
>+@@ -44,5 +44,23 @@
>  DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
>  writelock:
>  	chmod a-w *.[ch35] $(DOCS) scripts/*
>diff -urN ../png.orig/files/patch-ab ./files/patch-ab
>--- ../png.orig/files/patch-ab	Thu May 17 10:17:58 2007
>+++ ./files/patch-ab	Thu May 17 10:30:49 2007
>@@ -12,7 +12,7 @@
>  
>  Name: libpng
>  Description: Loads and saves PNG files
>- Version: 1.2.14
>+ Version: 1.2.17
> -Libs: -L${libdir} -lpng12
> +Libs: -L${libdir} -lpng -lz -lm
>  Cflags: -I${includedir}
>diff -urN ../png.orig/files/patch-ad ./files/patch-ad
>--- ../png.orig/files/patch-ad	Thu May 17 10:17:58 2007
>+++ ./files/patch-ad	Thu May 17 10:32:41 2007
>@@ -1,9 +1,9 @@
>---- pngconf.h.bak	Wed Jun 28 00:22:34 2006
>-+++ pngconf.h	Thu Jul 27 22:01:04 2006
>-@@ -722,7 +722,7 @@
>- 
>- /* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0 
>-    even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */
>+--- pngconf.h.orig	Mon May 14 23:27:28 2007
>++++ pngconf.h	Thu May 17 10:32:24 2007
>+@@ -729,7 +729,7 @@
>+  * PNG_NO_MMX_CODE disables the use of MMX code without changing the API.
>+  * When MMX code is off, then optimized C replacement functions are used.
>+ */
> -#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
> +#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__)
>  #  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
>diff -urN ../png.orig/files/patch-ae ./files/patch-ae
>--- ../png.orig/files/patch-ae	Thu Jan  1 03:00:00 1970
>+++ ./files/patch-ae	Thu May 17 10:39:38 2007
>@@ -0,0 +1,18 @@
>+--- pnggccrd.c.orig	Thu May 17 10:38:20 2007
>++++ pnggccrd.c	Thu May 17 10:39:10 2007
>+@@ -359,6 +359,7 @@
>+    _pctemp = _pctemp;
>+    _MMXLength = _MMXLength;
>+ #endif
>++#if 0 /* Strange code: all these variables are const's */
>+    _const4  = _const4;
>+    _const6  = _const6;
>+    _mask8_0  = _mask8_0;
>+@@ -377,6 +378,7 @@
>+    _mask48_2 = _mask48_2;
>+    _mask48_1 = _mask48_1;
>+    _mask48_0 = _mask48_0;
>++#endif /* 0 */
>+ }
>+ #endif /* PNG_MMX_CODE_SUPPORTED */
>+

Actions: View | Diff

Attachments on bug 112728: 78354