chromium-shared-zlib.patch

   1 --- ./support/glpng/src/Makefile.gege   Mon Feb 18 15:47:42 2002
   2 +++ ./support/glpng/src/Makefile        Mon Feb 18 15:48:57 2002
   3 @@ -23,16 +23,7 @@
   4  ####### Files
   5
   6  HEADERS =      png/png.h \
   7 -               png/pngconf.h \
   8 -               zlib/infblock.h \
   9 -               zlib/infcodes.h \
  10 -               zlib/inffast.h \
  11 -               zlib/inffixed.h \
  12 -               zlib/inftrees.h \
  13 -               zlib/infutil.h \
  14 -               zlib/zconf.h \
  15 -               zlib/zlib.h \
  16 -               zlib/zutil.h
  17 +               png/pngconf.h
  18  SOURCES =      glpng.c \
  19                 png/png.c \
  20                 png/pngerror.c \
  21 @@ -44,16 +35,7 @@
  22                 png/pngrtran.c \
  23                 png/pngrutil.c \
  24                 png/pngset.c \
  25 -               png/pngtrans.c \
  26 -               zlib/adler32.c \
  27 -               zlib/crc32.c \
  28 -               zlib/infblock.c \
  29 -               zlib/infcodes.c \
  30 -               zlib/inffast.c \
  31 -               zlib/inflate.c \
  32 -               zlib/inftrees.c \
  33 -               zlib/infutil.c \
  34 -               zlib/zutil.c
  35 +               png/pngtrans.c
  36  OBJECTS =      glpng.o \
  37                 png/png.o \
  38                 png/pngerror.o \
  39 @@ -65,16 +47,7 @@
  40                 png/pngrtran.o \
  41                 png/pngrutil.o \
  42                 png/pngset.o \
  43 -               png/pngtrans.o \
  44 -               zlib/adler32.o \
  45 -               zlib/crc32.o \
  46 -               zlib/infblock.o \
  47 -               zlib/infcodes.o \
  48 -               zlib/inffast.o \
  49 -               zlib/inflate.o \
  50 -               zlib/inftrees.o \
  51 -               zlib/infutil.o \
  52 -               zlib/zutil.o
  53 +               png/pngtrans.o
  54  INTERFACES =
  55  UICDECLS =
  56  UICIMPLS =
  57 @@ -143,120 +116,45 @@
  58
  59  png/png.o: png/png.c \
  60                 png/png.h \
  61 -               png/../zlib/zlib.h \
  62                 png/pngconf.h
  63
  64  png/pngerror.o: png/pngerror.c \
  65                 png/png.h \
  66 -               png/../zlib/zlib.h \
  67                 png/pngconf.h
  68
  69  png/pngget.o: png/pngget.c \
  70                 png/png.h \
  71 -               png/../zlib/zlib.h \
  72                 png/pngconf.h
  73
  74  png/pngmem.o: png/pngmem.c \
  75                 png/png.h \
  76 -               png/../zlib/zlib.h \
  77                 png/pngconf.h
  78
  79  png/pngpread.o: png/pngpread.c \
  80                 png/png.h \
  81 -               png/../zlib/zlib.h \
  82                 png/pngconf.h
  83
  84  png/pngread.o: png/pngread.c \
  85                 png/png.h \
  86 -               png/../zlib/zlib.h \
  87                 png/pngconf.h
  88
  89  png/pngrio.o: png/pngrio.c \
  90                 png/png.h \
  91 -               png/../zlib/zlib.h \
  92                 png/pngconf.h
  93
  94  png/pngrtran.o: png/pngrtran.c \
  95                 png/png.h \
  96 -               png/../zlib/zlib.h \
  97                 png/pngconf.h
  98
  99  png/pngrutil.o: png/pngrutil.c \
 100                 png/png.h \
 101 -               png/../zlib/zlib.h \
 102                 png/pngconf.h
 103
 104  png/pngset.o: png/pngset.c \
 105                 png/png.h \
 106 -               png/../zlib/zlib.h \
 107                 png/pngconf.h
 108
 109  png/pngtrans.o: png/pngtrans.c \
 110                 png/png.h \
 111 -               png/../zlib/zlib.h \
 112                 png/pngconf.h
 113 -
 114 -zlib/adler32.o: zlib/adler32.c \
 115 -               zlib/zlib.h \
 116 -               zlib/zconf.h
 117 -
 118 -zlib/crc32.o: zlib/crc32.c \
 119 -               zlib/zlib.h \
 120 -               zlib/zconf.h
 121 -
 122 -zlib/infblock.o: zlib/infblock.c \
 123 -               zlib/zutil.h \
 124 -               zlib/zlib.h \
 125 -               zlib/zconf.h \
 126 -               zlib/infblock.h \
 127 -               zlib/inftrees.h \
 128 -               zlib/infcodes.h \
 129 -               zlib/infutil.h
 130 -
 131 -zlib/infcodes.o: zlib/infcodes.c \
 132 -               zlib/zutil.h \
 133 -               zlib/zlib.h \
 134 -               zlib/zconf.h \
 135 -               zlib/inftrees.h \
 136 -               zlib/infblock.h \
 137 -               zlib/infcodes.h \
 138 -               zlib/infutil.h \
 139 -               zlib/inffast.h
 140 -
 141 -zlib/inffast.o: zlib/inffast.c \
 142 -               zlib/zutil.h \
 143 -               zlib/zlib.h \
 144 -               zlib/zconf.h \
 145 -               zlib/inftrees.h \
 146 -               zlib/infblock.h \
 147 -               zlib/infcodes.h \
 148 -               zlib/infutil.h \
 149 -               zlib/inffast.h
 150 -
 151 -zlib/inflate.o: zlib/inflate.c \
 152 -               zlib/zutil.h \
 153 -               zlib/zlib.h \
 154 -               zlib/zconf.h \
 155 -               zlib/infblock.h
 156 -
 157 -zlib/inftrees.o: zlib/inftrees.c \
 158 -               zlib/zutil.h \
 159 -               zlib/zlib.h \
 160 -               zlib/zconf.h \
 161 -               zlib/inftrees.h \
 162 -               zlib/inffixed.h
 163 -
 164 -zlib/infutil.o: zlib/infutil.c \
 165 -               zlib/zutil.h \
 166 -               zlib/zlib.h \
 167 -               zlib/zconf.h \
 168 -               zlib/infblock.h \
 169 -               zlib/inftrees.h \
 170 -               zlib/infcodes.h \
 171 -               zlib/infutil.h
 172 -
 173 -zlib/zutil.o: zlib/zutil.c \
 174 -               zlib/zutil.h \
 175 -               zlib/zlib.h \
 176 -               zlib/zconf.h
 177
 178 --- ./support/glpng/src/Makefile.LINUX.gege     Thu Feb  8 06:03:20 2001
 179 +++ ./support/glpng/src/Makefile.LINUX  Mon Feb 18 15:49:38 2002
 180 @@ -23,16 +23,7 @@
 181  ####### Files
 182
 183  HEADERS =      png/png.h \
 184 -               png/pngconf.h \
 185 -               zlib/infblock.h \
 186 -               zlib/infcodes.h \
 187 -               zlib/inffast.h \
 188 -               zlib/inffixed.h \
 189 -               zlib/inftrees.h \
 190 -               zlib/infutil.h \
 191 -               zlib/zconf.h \
 192 -               zlib/zlib.h \
 193 -               zlib/zutil.h
 194 +               png/pngconf.h
 195  SOURCES =      glpng.c \
 196                 png/png.c \
 197                 png/pngerror.c \
 198 @@ -44,16 +35,7 @@
 199                 png/pngrtran.c \
 200                 png/pngrutil.c \
 201                 png/pngset.c \
 202 -               png/pngtrans.c \
 203 -               zlib/adler32.c \
 204 -               zlib/crc32.c \
 205 -               zlib/infblock.c \
 206 -               zlib/infcodes.c \
 207 -               zlib/inffast.c \
 208 -               zlib/inflate.c \
 209 -               zlib/inftrees.c \
 210 -               zlib/infutil.c \
 211 -               zlib/zutil.c
 212 +               png/pngtrans.c
 213  OBJECTS =      glpng.o \
 214                 png/png.o \
 215                 png/pngerror.o \
 216 @@ -65,16 +47,7 @@
 217                 png/pngrtran.o \
 218                 png/pngrutil.o \
 219                 png/pngset.o \
 220 -               png/pngtrans.o \
 221 -               zlib/adler32.o \
 222 -               zlib/crc32.o \
 223 -               zlib/infblock.o \
 224 -               zlib/infcodes.o \
 225 -               zlib/inffast.o \
 226 -               zlib/inflate.o \
 227 -               zlib/inftrees.o \
 228 -               zlib/infutil.o \
 229 -               zlib/zutil.o
 230 +               png/pngtrans.o
 231  INTERFACES =
 232  UICDECLS =
 233  UICIMPLS =
 234 @@ -143,120 +116,45 @@
 235
 236  png/png.o: png/png.c \
 237                 png/png.h \
 238 -               png/../zlib/zlib.h \
 239                 png/pngconf.h
 240
 241  png/pngerror.o: png/pngerror.c \
 242                 png/png.h \
 243 -               png/../zlib/zlib.h \
 244                 png/pngconf.h
 245
 246  png/pngget.o: png/pngget.c \
 247                 png/png.h \
 248 -               png/../zlib/zlib.h \
 249                 png/pngconf.h
 250
 251  png/pngmem.o: png/pngmem.c \
 252                 png/png.h \
 253 -               png/../zlib/zlib.h \
 254                 png/pngconf.h
 255
 256  png/pngpread.o: png/pngpread.c \
 257                 png/png.h \
 258 -               png/../zlib/zlib.h \
 259                 png/pngconf.h
 260
 261  png/pngread.o: png/pngread.c \
 262                 png/png.h \
 263 -               png/../zlib/zlib.h \
 264                 png/pngconf.h
 265
 266  png/pngrio.o: png/pngrio.c \
 267                 png/png.h \
 268 -               png/../zlib/zlib.h \
 269                 png/pngconf.h
 270
 271  png/pngrtran.o: png/pngrtran.c \
 272                 png/png.h \
 273 -               png/../zlib/zlib.h \
 274                 png/pngconf.h
 275
 276  png/pngrutil.o: png/pngrutil.c \
 277                 png/png.h \
 278 -               png/../zlib/zlib.h \
 279                 png/pngconf.h
 280
 281  png/pngset.o: png/pngset.c \
 282                 png/png.h \
 283 -               png/../zlib/zlib.h \
 284                 png/pngconf.h
 285
 286  png/pngtrans.o: png/pngtrans.c \
 287                 png/png.h \
 288 -               png/../zlib/zlib.h \
 289                 png/pngconf.h
 290 -
 291 -zlib/adler32.o: zlib/adler32.c \
 292 -               zlib/zlib.h \
 293 -               zlib/zconf.h
 294 -
 295 -zlib/crc32.o: zlib/crc32.c \
 296 -               zlib/zlib.h \
 297 -               zlib/zconf.h
 298 -
 299 -zlib/infblock.o: zlib/infblock.c \
 300 -               zlib/zutil.h \
 301 -               zlib/zlib.h \
 302 -               zlib/zconf.h \
 303 -               zlib/infblock.h \
 304 -               zlib/inftrees.h \
 305 -               zlib/infcodes.h \
 306 -               zlib/infutil.h
 307 -
 308 -zlib/infcodes.o: zlib/infcodes.c \
 309 -               zlib/zutil.h \
 310 -               zlib/zlib.h \
 311 -               zlib/zconf.h \
 312 -               zlib/inftrees.h \
 313 -               zlib/infblock.h \
 314 -               zlib/infcodes.h \
 315 -               zlib/infutil.h \
 316 -               zlib/inffast.h
 317 -
 318 -zlib/inffast.o: zlib/inffast.c \
 319 -               zlib/zutil.h \
 320 -               zlib/zlib.h \
 321 -               zlib/zconf.h \
 322 -               zlib/inftrees.h \
 323 -               zlib/infblock.h \
 324 -               zlib/infcodes.h \
 325 -               zlib/infutil.h \
 326 -               zlib/inffast.h
 327 -
 328 -zlib/inflate.o: zlib/inflate.c \
 329 -               zlib/zutil.h \
 330 -               zlib/zlib.h \
 331 -               zlib/zconf.h \
 332 -               zlib/infblock.h
 333 -
 334 -zlib/inftrees.o: zlib/inftrees.c \
 335 -               zlib/zutil.h \
 336 -               zlib/zlib.h \
 337 -               zlib/zconf.h \
 338 -               zlib/inftrees.h \
 339 -               zlib/inffixed.h
 340 -
 341 -zlib/infutil.o: zlib/infutil.c \
 342 -               zlib/zutil.h \
 343 -               zlib/zlib.h \
 344 -               zlib/zconf.h \
 345 -               zlib/infblock.h \
 346 -               zlib/inftrees.h \
 347 -               zlib/infcodes.h \
 348 -               zlib/infutil.h
 349 -
 350 -zlib/zutil.o: zlib/zutil.c \
 351 -               zlib/zutil.h \
 352 -               zlib/zlib.h \
 353 -               zlib/zconf.h
 354
 355 --- ./configure.gege    Mon Feb 18 15:47:42 2002
 356 +++ ./configure Mon Feb 18 15:50:23 2002
 357 @@ -157,7 +157,7 @@
 358
 359  ## set up other config.mak variables
 360  ######################################################################
 361 -GL_LIBS="-lglpng -lGL -lGLU -lm"
 362 +GL_LIBS="-lglpng -lGL -lGLU -lm -lz"
 363  AL_LIBS="-L../support/openal/lib -lopenal -ldl"
 364  AL_CFLAGS="-I../support/openal/linux/include -I../support/openal/include"
 365