Browse Source

fake:


			
			
				rocklinux
			
			
		
fake 20 years ago
parent
commit
48945db334
6 changed files with 4 additions and 126 deletions
  1. +0
    -24
      package/rene/libpng/2-CAN-2002-1363.patch
  2. +0
    -41
      package/rene/libpng/3b-CAN-2004-0421.patch
  3. +0
    -24
      package/rene/libpng/4-CAN-2002-1363b.patch
  4. +2
    -2
      package/rene/libpng/libpng.conf
  5. +2
    -2
      package/rene/libpng/libpng.desc
  6. +0
    -33
      package/rene/libpng/makefile.patch.disabled

+ 0
- 24
package/rene/libpng/2-CAN-2002-1363.patch

@ -1,24 +0,0 @@
--- ./pngrtran.c 9 Jan 2004 18:22:43 -0000 1.1
+++ ./pngrtran.c 3 May 2004 08:19:51 -0000 1.2
@@ -1965,8 +1965,8 @@
/* This changes the data from RRGGBB to RRGGBBXX */
if (flags & PNG_FLAG_FILLER_AFTER)
{
- png_bytep sp = row + (png_size_t)row_width * 3;
- png_bytep dp = sp + (png_size_t)row_width;
+ png_bytep sp = row + (png_size_t)row_width * 6;
+ png_bytep dp = sp + (png_size_t)row_width * 2;
for (i = 1; i < row_width; i++)
{
*(--dp) = hi_filler;
@@ -1987,8 +1987,8 @@
/* This changes the data from RRGGBB to XXRRGGBB */
else
{
- png_bytep sp = row + (png_size_t)row_width * 3;
- png_bytep dp = sp + (png_size_t)row_width;
+ png_bytep sp = row + (png_size_t)row_width * 6;
+ png_bytep dp = sp + (png_size_t)row_width * 2;
for (i = 0; i < row_width; i++)
{
*(--dp) = *(--sp);

+ 0
- 41
package/rene/libpng/3b-CAN-2004-0421.patch

@ -1,41 +0,0 @@
*** ./pngconf.h_125 2002-10-03 07:32:27.000000000 -0400
--- ./pngconf.h 2004-05-06 09:41:33.000000000 -0400
***************
*** 1280,1285 ****
--- 1285,1291 ----
# define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
# define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
# define png_strcpy _fstrcpy
+ # define png_strncpy _fstrncpy /* Added to v 1.2.6 */
# define png_strlen _fstrlen
# define png_memcmp _fmemcmp /* SJT: added */
# define png_memcpy _fmemcpy
***************
*** 1288,1293 ****
--- 1294,1300 ----
# define CVT_PTR(ptr) (ptr)
# define CVT_PTR_NOCHECK(ptr) (ptr)
# define png_strcpy strcpy
+ # define png_strncpy strncpy /* Added to v 1.2.6 */
# define png_strlen strlen
# define png_memcmp memcmp /* SJT: added */
# define png_memcpy memcpy
*** ./pngerror.c_125 2002-10-03 07:32:27.000000000 -0400
--- ./pngerror.c 2004-05-06 09:41:28.000000000 -0400
***************
*** 137,143 ****
{
buffer[iout++] = ':';
buffer[iout++] = ' ';
! png_memcpy(buffer+iout, error_message, 64);
buffer[iout+63] = 0;
}
}
--- 137,143 ----
{
buffer[iout++] = ':';
buffer[iout++] = ' ';
! png_strncpy(buffer+iout, error_message, 63);
buffer[iout+63] = 0;
}
}

+ 0
- 24
package/rene/libpng/4-CAN-2002-1363b.patch

@ -1,24 +0,0 @@
--- ./pngrtran.c Thu Oct 3 06:32:29 2002
+++ ./pngrtran.c Fri Jul 23 18:51:26 2004
@@ -1889,8 +1889,8 @@
/* This changes the data from GG to GGXX */
if (flags & PNG_FLAG_FILLER_AFTER)
{
- png_bytep sp = row + (png_size_t)row_width;
- png_bytep dp = sp + (png_size_t)row_width;
+ png_bytep sp = row + (png_size_t)row_width * 2;
+ png_bytep dp = sp + (png_size_t)row_width * 2;
for (i = 1; i < row_width; i++)
{
*(--dp) = hi_filler;
@@ -1907,8 +1907,8 @@
/* This changes the data from GG to XXGG */
else
{
- png_bytep sp = row + (png_size_t)row_width;
- png_bytep dp = sp + (png_size_t)row_width;
+ png_bytep sp = row + (png_size_t)row_width * 2;
+ png_bytep dp = sp + (png_size_t)row_width * 2;
for (i = 0; i < row_width; i++)
{
*(--dp) = *(--sp);

+ 2
- 2
package/rene/libpng/libpng.conf

@ -20,8 +20,8 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
makeopt="prefix=$root/$prefix $makeopt"
makeinstopt="prefix=$root/$prefix $makeinstopt"
var_append makeopt ' ' "prefix=$root/$prefix"
var_append makeinstopt ' ' "prefix=$root/$prefix"
premake="ln -s scripts/makefile.linux Makefile"
postmake="ln -sf libpng12/png.h /usr/include/png.h ; \

+ 2
- 2
package/rene/libpng/libpng.desc

@ -39,8 +39,8 @@
[L] OpenSource
[S] Stable
[V] 1.2.5
[V] 1.2.7
[P] X -?---5---9 112.550
[D] 4079565284 libpng-1.2.5.tar.bz2 http://dl.sourceforge.net/sourceforge/libpng/
[D] 1805532704 libpng-1.2.7.tar.bz2 http://dl.sourceforge.net/sourceforge/libpng/

+ 0
- 33
package/rene/libpng/makefile.patch.disabled

@ -1,33 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/libpng/makefile.patch.disabled
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- libpng-1.2.4/scripts/makefile.linux.orig 2002-07-08 02:15:16.000000000 +0200
+++ libpng-1.2.4/scripts/makefile.linux 2002-09-11 16:34:00.000000000 +0200
@@ -13,7 +13,7 @@
# where "make install" puts libpng12.a, libpng12.so*,
# libpng12/png.h and libpng12/pngconf.h
# Prefix must be a full pathname.
-prefix=/usr/local
+prefix=/usr
# Where the zlib library and include files are located.
#ZLIBLIB=/usr/local/lib

Loading…
Cancel
Save