changeset in /hg/icedtea: 2007-10-24 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Wed Nov 7 08:23:49 PST 2007
changeset 8d9b3ea59444 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d9b3ea59444
description:
2007-10-24 Lillian Angel <langel at redhat.com>
* patches/icedtea-libraries.patch: Updated jpeg patches to properly
create OpenJDK's libjpeg.so without files common to the system
installed libjpeg.so.
diffstat:
2 files changed, 25301 insertions(+), 222 deletions(-)
ChangeLog | 6
patches/icedtea-libraries.patch |25517 ++++++++++++++++++++++++++++++++++++++-
diffs (truncated from 25551 to 500 lines):
diff -r 335f71762c44 -r 8d9b3ea59444 ChangeLog
--- a/ChangeLog Mon Oct 22 16:10:10 2007 -0400
+++ b/ChangeLog Wed Oct 24 22:28:39 2007 -0400
@@ -1,3 +1,9 @@ 2007-10-23 Christan Thalinger <twisti@
+2007-10-24 Lillian Angel <langel at redhat.com>
+
+ * patches/icedtea-libraries.patch: Updated jpeg patches to properly
+ create OpenJDK's libjpeg.so without files common to the system
+ installed libjpeg.so.
+
2007-10-23 Christan Thalinger <twisti at complang.tuwien.ac.at>
* j2se/make/common/Defs-linux.gmk: Updated for b22.
diff -r 335f71762c44 -r 8d9b3ea59444 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch Mon Oct 22 16:10:10 2007 -0400
+++ b/patches/icedtea-libraries.patch Wed Oct 24 22:28:39 2007 -0400
@@ -20,210 +20,6 @@
#define GIF_TRANSPARENT 0x01
#define GIF_USER_INPUT 0x02
---- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2007-10-12 04:03:51.000000000 -0400
-+++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2007-10-22 12:50:36.000000000 -0400
-@@ -25,11 +25,9 @@
-
- #include "splashscreen_impl.h"
-
--#include "jinclude.h"
--#include "jpeglib.h"
--#include "jerror.h"
--
-+#include <jerror.h>
- #include <setjmp.h>
-+#include <jpeglib.h>
-
- /* stream input handling */
-
-@@ -105,13 +103,9 @@
- stream_src_ptr src;
-
- if (cinfo->src == NULL) { /* first time for this JPEG object? */
-- cinfo->src = (struct jpeg_source_mgr *)
-- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
-- JPOOL_PERMANENT, SIZEOF(stream_source_mgr));
-+ cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(stream_source_mgr));
- src = (stream_src_ptr) cinfo->src;
-- src->buffer = (JOCTET *)
-- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
-- JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
-+ src->buffer = (JOCTET *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
- }
-
- src = (stream_src_ptr) cinfo->src;
---- openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk 2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/j2se/make/sun/jpeg/FILES_c.gmk 2007-10-22 12:50:36.000000000 -0400
-@@ -23,53 +23,7 @@
- # have any questions.
- #
-
--FILES_c = \
-- imageioJPEG.c \
-- jpegdecoder.c \
-- jcomapi.c \
-- jdapimin.c \
-- jdapistd.c \
-- jdcoefct.c \
-- jdcolor.c \
-- jddctmgr.c \
-- jdhuff.c \
-- jdinput.c \
-- jdmainct.c \
-- jdmarker.c \
-- jdmaster.c \
-- jdmerge.c \
-- jdphuff.c \
-- jdpostct.c \
-- jdsample.c \
-- jerror.c \
-- jidctflt.c \
-- jidctfst.c \
-- jidctint.c \
-- jidctred.c \
-- jmemmgr.c \
-- jmemnobs.c \
-- jquant1.c \
-- jquant2.c \
-- jutils.c \
-- jcapimin.c \
-- jcapistd.c \
-- jccoefct.c \
-- jccolor.c \
-- jcdctmgr.c \
-- jchuff.c \
-- jcinit.c \
-- jcmainct.c \
-- jcmarker.c \
-- jcmaster.c \
-- jcparam.c \
-- jcphuff.c \
-- jcprepct.c \
-- jcsample.c \
-- jctrans.c \
-- jdtrans.c \
-- jfdctflt.c \
-- jfdctfst.c \
-- jfdctint.c
-+
-
- ifndef OPENJDK
- FILES_c += \
---- openjdk.old/j2se/make/sun/splashscreen/Makefile 2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/j2se/make/sun/splashscreen/Makefile 2007-10-22 13:17:21.000000000 -0400
-@@ -59,12 +59,12 @@
- # C Flags
- #
-
--CFLAGS += -DSPLASHSCREEN
-+CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
-
- ifneq ($(PLATFORM), windows)
- CFLAGS += -DWITH_X11
- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
-- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
-+ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
- else # PLATFORM
- CFLAGS += -DWITH_WIN32
- OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
-@@ -76,12 +76,7 @@
- #
- vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
- vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
--vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/giflib
--vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
--vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/libpng
--vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
- vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
-
- CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
--CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
-
---- openjdk.old/j2se/make/sun/splashscreen/FILES_c.gmk 2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/j2se/make/sun/splashscreen/FILES_c.gmk 2007-10-22 13:18:28.000000000 -0400
-@@ -30,81 +30,5 @@
- splashscreen_impl.c \
- splashscreen_jpeg.c \
- splashscreen_png.c \
-- splashscreen_sys.c \
-- png.c \
-- pngerror.c \
-- pngget.c \
-- pngmem.c \
-- pngpread.c \
-- pngread.c \
-- pngrio.c \
-- pngrtran.c \
-- pngrutil.c \
-- pngset.c \
-- pngtrans.c \
-- pngwio.c \
-- pngwrite.c \
-- pngwtran.c \
-- pngwutil.c \
-- dgif_lib.c \
-- gif_err.c \
-- gifalloc.c \
-- compress.c \
-- deflate.c \
-- gzio.c \
-- infblock.c \
-- infcodes.c \
-- inffast.c \
-- inflate.c \
-- inftrees.c \
-- infutil.c \
-- trees.c \
-- uncompr.c \
-- zadler32.c \
-- zcrc32.c \
-- zutil.c \
-- jcomapi.c \
-- jdapimin.c \
-- jdapistd.c \
-- jdcoefct.c \
-- jdcolor.c \
-- jddctmgr.c \
-- jdhuff.c \
-- jdinput.c \
-- jdmainct.c \
-- jdmarker.c \
-- jdmaster.c \
-- jdmerge.c \
-- jdphuff.c \
-- jdpostct.c \
-- jdsample.c \
-- jerror.c \
-- jidctflt.c \
-- jidctfst.c \
-- jidctint.c \
-- jidctred.c \
-- jmemmgr.c \
-- jmemnobs.c \
-- jquant1.c \
-- jquant2.c \
-- jutils.c \
-- jcapimin.c \
-- jcapistd.c \
-- jccoefct.c \
-- jccolor.c \
-- jcdctmgr.c \
-- jchuff.c \
-- jcinit.c \
-- jcmainct.c \
-- jcmarker.c \
-- jcmaster.c \
-- jcparam.c \
-- jcphuff.c \
-- jcprepct.c \
-- jcsample.c \
-- jctrans.c \
-- jdtrans.c \
-- jfdctflt.c \
-- jfdctfst.c \
-- jfdctint.c
-+ splashscreen_sys.c
-
--- openjdk.old/j2se/src/share/native/java/util/zip/Adler32.c 2007-10-12 04:03:46.000000000 -0400
+++ openjdk/j2se/src/share/native/java/util/zip/Adler32.c 2007-10-22 13:21:09.000000000 -0400
@@ -29,7 +29,7 @@
@@ -235,24 +31,6 @@
#include "java_util_zip_Adler32.h"
---- openjdk.old/j2se/src/share/native/java/util/zip/zip_util.c 2007-10-12 04:03:46.000000000 -0400
-+++ openjdk/j2se/src/share/native/java/util/zip/zip_util.c 2007-10-22 13:22:05.000000000 -0400
-@@ -36,6 +36,7 @@
- #include <time.h>
- #include <ctype.h>
- #include <assert.h>
-+#include <zlib.h>
-
- #include "jni.h"
- #include "jni_util.h"
-@@ -44,7 +45,6 @@
- #include "io_util.h"
- #include "io_util_md.h"
- #include "zip_util.h"
--#include "zlib.h"
-
- /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
- #ifdef USE_MMAP
--- openjdk.old/j2se/src/share/native/java/util/zip/Deflater.c 2007-10-12 04:03:46.000000000 -0400
+++ openjdk/j2se/src/share/native/java/util/zip/Deflater.c 2007-10-22 13:22:34.000000000 -0400
@@ -32,7 +32,7 @@
@@ -441,3 +219,25298 @@
#include "java_util_zip_Inflater.h"
#define ThrowDataFormatException(env, msg) \
+--- openjdk.old/j2se/src/share/native/java/util/zip/zip_util.c 2007-10-12 04:03:46.000000000 -0400
++++ openjdk/j2se/src/share/native/java/util/zip/zip_util.c 2007-10-23 14:33:18.000000000 -0400
+@@ -44,7 +44,8 @@
+ #include "io_util.h"
+ #include "io_util_md.h"
+ #include "zip_util.h"
+-#include "zlib.h"
++
++#include <zlib.h>
+
+ /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
+ #ifdef USE_MMAP
+--- openjdk.old/j2se/make/sun/splashscreen/FILES_c.gmk 2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/splashscreen/FILES_c.gmk 2007-10-23 16:15:48.000000000 -0400
+@@ -30,81 +30,5 @@
+ splashscreen_impl.c \
+ splashscreen_jpeg.c \
+ splashscreen_png.c \
+- splashscreen_sys.c \
+- png.c \
+- pngerror.c \
+- pngget.c \
+- pngmem.c \
+- pngpread.c \
+- pngread.c \
+- pngrio.c \
+- pngrtran.c \
+- pngrutil.c \
+- pngset.c \
+- pngtrans.c \
+- pngwio.c \
+- pngwrite.c \
+- pngwtran.c \
+- pngwutil.c \
+- dgif_lib.c \
+- gif_err.c \
+- gifalloc.c \
+- compress.c \
+- deflate.c \
+- gzio.c \
+- infblock.c \
+- infcodes.c \
+- inffast.c \
+- inflate.c \
+- inftrees.c \
+- infutil.c \
+- trees.c \
+- uncompr.c \
+- zadler32.c \
+- zcrc32.c \
+- zutil.c \
+- jcomapi.c \
+- jdapimin.c \
+- jdapistd.c \
+- jdcoefct.c \
+- jdcolor.c \
+- jddctmgr.c \
+- jdhuff.c \
+- jdinput.c \
+- jdmainct.c \
+- jdmarker.c \
+- jdmaster.c \
+- jdmerge.c \
+- jdphuff.c \
+- jdpostct.c \
+- jdsample.c \
+- jerror.c \
+- jidctflt.c \
+- jidctfst.c \
+- jidctint.c \
+- jidctred.c \
+- jmemmgr.c \
+- jmemnobs.c \
+- jquant1.c \
+- jquant2.c \
+- jutils.c \
+- jcapimin.c \
+- jcapistd.c \
+- jccoefct.c \
+- jccolor.c \
+- jcdctmgr.c \
+- jchuff.c \
+- jcinit.c \
+- jcmainct.c \
+- jcmarker.c \
+- jcmaster.c \
+- jcparam.c \
+- jcphuff.c \
+- jcprepct.c \
+- jcsample.c \
+- jctrans.c \
+- jdtrans.c \
+- jfdctflt.c \
+- jfdctfst.c \
+- jfdctint.c
++ splashscreen_sys.c
+
+--- openjdk.old/j2se/make/sun/splashscreen/Makefile 2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/splashscreen/Makefile 2007-10-23 16:20:24.000000000 -0400
+@@ -59,12 +59,12 @@
+ # C Flags
+ #
+
+-CFLAGS += -DSPLASHSCREEN
++CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
+
+ ifneq ($(PLATFORM), windows)
+ CFLAGS += -DWITH_X11
+ CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
++ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
+ else # PLATFORM
+ CFLAGS += -DWITH_WIN32
+ OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
+@@ -76,12 +76,8 @@
+ #
+ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
+-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/giflib
+-vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/libpng
+ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
+ vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
+
+ CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+
+--- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2007-10-12 04:03:51.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2007-10-23 16:29:30.000000000 -0400
+@@ -25,9 +25,8 @@
+
+ #include "splashscreen_impl.h"
+
+-#include "jinclude.h"
+-#include "jpeglib.h"
+-#include "jerror.h"
++#include <jpeglib.h>
++#include <jerror.h>
+
+ #include <setjmp.h>
+
+@@ -105,13 +104,9 @@
+ stream_src_ptr src;
+
+ if (cinfo->src == NULL) { /* first time for this JPEG object? */
+- cinfo->src = (struct jpeg_source_mgr *)
+- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
+- JPOOL_PERMANENT, SIZEOF(stream_source_mgr));
++ cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(stream_source_mgr));
+ src = (stream_src_ptr) cinfo->src;
+- src->buffer = (JOCTET *)
+- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
+- JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
++ src->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
+ }
+
+ src = (stream_src_ptr) cinfo->src;
+diff -ruN openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk openjdk/j2se/make/sun/jpeg/FILES_c.gmk
+--- openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk 2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/jpeg/FILES_c.gmk 2007-10-23 17:13:59.000000000 -0400
+@@ -25,51 +25,7 @@
+
+ FILES_c = \
+ imageioJPEG.c \
+- jpegdecoder.c \
+- jcomapi.c \
+- jdapimin.c \
+- jdapistd.c \
+- jdcoefct.c \
+- jdcolor.c \
+- jddctmgr.c \
+- jdhuff.c \
+- jdinput.c \
+- jdmainct.c \
+- jdmarker.c \
+- jdmaster.c \
+- jdmerge.c \
+- jdphuff.c \
+- jdpostct.c \
+- jdsample.c \
+- jerror.c \
+- jidctflt.c \
+- jidctfst.c \
+- jidctint.c \
+- jidctred.c \
+- jmemmgr.c \
+- jmemnobs.c \
+- jquant1.c \
+- jquant2.c \
+- jutils.c \
+- jcapimin.c \
+- jcapistd.c \
+- jccoefct.c \
+- jccolor.c \
+- jcdctmgr.c \
+- jchuff.c \
+- jcinit.c \
+- jcmainct.c \
+- jcmarker.c \
+- jcmaster.c \
+- jcparam.c \
+- jcphuff.c \
+- jcprepct.c \
+- jcsample.c \
+- jctrans.c \
+- jdtrans.c \
+- jfdctflt.c \
+- jfdctfst.c \
+- jfdctint.c
++ jpegdecoder.c
+
+ ifndef OPENJDK
+ FILES_c += \
+diff -ruN openjdk.old/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c openjdk/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c
+--- openjdk.old/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c 2007-10-12 04:03:48.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c 1969-12-31 19:00:00.000000000 -0500
+@@ -1,284 +0,0 @@
+-/*
+- * reserved comment block
+- * DO NOT REMOVE OR ALTER!
+- */
+-/*
+- * jcapimin.c
+- *
+- * Copyright (C) 1994-1998, Thomas G. Lane.
+- * This file is part of the Independent JPEG Group's software.
+- * For conditions of distribution and use, see the accompanying README file.
+- *
+- * This file contains application interface code for the compression half
+- * of the JPEG library. These are the "minimum" API routines that may be
+- * needed in either the normal full-compression case or the transcoding-only
+- * case.
+- *
+- * Most of the routines intended to be called directly by an application
+- * are in this file or in jcapistd.c. But also see jcparam.c for
+- * parameter-setup helper routines, jcomapi.c for routines shared by
+- * compression and decompression, and jctrans.c for the transcoding case.
+- */
+-
+-#define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
+-
+-
More information about the distro-pkg-dev
mailing list