SOURCES: libmng-automake.patch, libmng-gcc4.patch - updated for 1....

[qboosh]

Author: qboosh                       Date: Mon Jul 16 18:12:29 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.0.10

---- Files affected:
SOURCES:
   libmng-automake.patch (1.4 -> 1.5) , libmng-gcc4.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/libmng-automake.patch
diff -u SOURCES/libmng-automake.patch:1.4 SOURCES/libmng-automake.patch:1.5
--- SOURCES/libmng-automake.patch:1.4	Sat Feb  5 20:59:10 2005
+++ SOURCES/libmng-automake.patch	Mon Jul 16 20:12:24 2007
@@ -1,27 +1,26 @@
---- libmng-1.0.9/makefiles/Makefile.am.orig	2005-01-30 11:50:34.000000000 +0100
-+++ libmng-1.0.9/makefiles/Makefile.am	2005-02-05 20:58:13.948041296 +0100
-@@ -2,9 +2,10 @@
- 
- AUTOMAKE_OPTIONS = 1.3 foreign no-dependencies
- 
--# include the app subdirectories in the distribution
--EXTRA_DIST = makefiles doc contrib
-+SUBDIRS = doc
- 
-+# include the app subdirectories in the distribution
-+EXTRA_DIST = makefiles contrib
- 
- # libmng release @VERSION@
- libmng_la_LDFLAGS = -version-info 1:0:0
---- libmng-1.0.9/makefiles/configure.in.orig	2005-01-30 11:50:34.000000000 +0100
-+++ libmng-1.0.9/makefiles/configure.in	2005-02-05 20:58:38.560299664 +0100
+--- libmng-1.0.10/makefiles/Makefile.am.orig	2004-09-18 09:39:43.000000000 +0200
++++ libmng-1.0.10/makefiles/Makefile.am	2007-07-16 19:43:07.285858201 +0200
+@@ -2,8 +2,10 @@
+ 
+ AUTOMAKE_OPTIONS = 1.3 foreign no-dependencies
+ 
++SUBDIRS = doc
++
+ # include the app subdirectories in the distribution
+-EXTRA_DIST = makefiles doc contrib
++EXTRA_DIST = makefiles contrib
+ 
+ 
+ # libmng release @VERSION@
+--- libmng-1.0.10/makefiles/configure.in.orig	2005-01-30 11:28:00.000000000 +0100
++++ libmng-1.0.10/makefiles/configure.in	2007-07-16 19:43:24.774854842 +0200
 @@ -189,5 +189,5 @@
- 
-   test $_restore -eq 1 && CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
- 
--AC_CONFIG_FILES([Makefile])
-+  AC_CONFIG_FILES([Makefile doc/Makefile doc/man/Makefile])
- AC_OUTPUT
+ 
+   test $_restore -eq 1 && CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
+ 
+-AC_CONFIG_FILES([Makefile])
++  AC_CONFIG_FILES([Makefile doc/Makefile doc/man/Makefile])
+ AC_OUTPUT
 diff -Nru libmng-1.0.5.orig/doc/makefiles/Makefile.am libmng-1.0.5/doc/makefiles/Makefile.am
 --- libmng-1.0.5.orig/doc/makefiles/Makefile.am	Thu Jan  1 01:00:00 1970
 +++ libmng-1.0.5/doc/makefiles/Makefile.am	Tue Mar  4 09:25:11 2003

================================================================
Index: SOURCES/libmng-gcc4.patch
diff -u SOURCES/libmng-gcc4.patch:1.1 SOURCES/libmng-gcc4.patch:1.2
--- SOURCES/libmng-gcc4.patch:1.1	Sat Feb  5 22:47:36 2005
+++ SOURCES/libmng-gcc4.patch	Mon Jul 16 20:12:24 2007
@@ -4,25 +4,25 @@
 mng.c:233: error: invalid lvalue in increment
 mng.c:270: error: invalid lvalue in increment
 
---- libmng-1.0.9/contrib/gcc/fbmngplay/mng.c.orig	2005-01-30 11:50:23.000000000 +0100
-+++ libmng-1.0.9/contrib/gcc/fbmngplay/mng.c	2005-02-05 22:42:39.130650312 +0100
+--- libmng-1.0.10/contrib/gcc/fbmngplay/mng.c.orig	2003-12-07 10:45:15.000000000 +0100
++++ libmng-1.0.10/contrib/gcc/fbmngplay/mng.c	2007-07-16 19:47:18.272161096 +0200
 @@ -230,7 +230,8 @@
- 		a = a * mymng->alpha / 100;
- 		switch (mymng->fbbpp) {
- 		case 16:
--			input = *((unsigned short *) background)++;
+ 		a = a * mymng->alpha / 100;
+ 		switch (mymng->fbbpp) {
+ 		case 16:
+-			input = *((unsigned short *) background)++;
 +			input = *(unsigned short *)background;
 +			background += 2;
- 			br = (input >> 8) & 0xf8;
- 			bg = (input >> 3) & 0xfc;
- 			bb = input << 3 & 0xff;
+ 			br = (input >> 8) & 0xf8;
+ 			bg = (input >> 3) & 0xfc;
+ 			bb = input << 3 & 0xff;
 @@ -267,7 +268,8 @@
- 			b >>= 3;
- 
- 			output = (r << 11) | (g << 5) | b;
--			*((unsigned short *) dest)++ = output;
-+			*((unsigned short *)dest) = output;
+ 			b >>= 3;
+ 
+ 			output = (r << 11) | (g << 5) | b;
+-			*((unsigned short *) dest)++ = output;
++			*(unsigned short *)dest = output;
 +			dest += 2;
- 			break;
- 		case 24:
- 			*dest++ = b;
+ 			break;
+ 		case 24:
+ 			*dest++ = b;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libmng-automake.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/libmng-gcc4.patch?r1=1.1&r2=1.2&f=u