incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1388734 - in /incubator/ooo/trunk: ext_sources/a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz main/external_deps.lst main/jpeg/jpeg-8c.patch main/jpeg/jpeg-8d.patch main/jpeg/makefile.mk
Date Sat, 22 Sep 2012 03:41:20 GMT
Author: pfg
Date: Sat Sep 22 03:41:19 2012
New Revision: 1388734

URL: http://svn.apache.org/viewvc?rev=1388734&view=rev
Log:
#i121079# - Update jpeg to version 8d.

While here also comment a bit on the state of beanshell.

Added:
    incubator/ooo/trunk/main/jpeg/jpeg-8d.patch
Removed:
    incubator/ooo/trunk/ext_sources/a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
    incubator/ooo/trunk/main/jpeg/jpeg-8c.patch
Modified:
    incubator/ooo/trunk/main/external_deps.lst
    incubator/ooo/trunk/main/jpeg/makefile.mk

Modified: incubator/ooo/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external_deps.lst?rev=1388734&r1=1388733&r2=1388734&view=diff
==============================================================================
--- incubator/ooo/trunk/main/external_deps.lst (original)
+++ incubator/ooo/trunk/main/external_deps.lst Sat Sep 22 03:41:19 2012
@@ -132,6 +132,12 @@ if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIK
     # URL1 = http://archive.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
+if (SYSTEM_JPEG != YES)
+    MD5 = 52654eb3b2e60c35731ea8fc87f1bd29
+    name = jpeg-8d.tar.gz
+    URL1 = http://www.ijg.org/files/jpegsrc.v8d.tar.gz
+    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+
 if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
     MD5 = 625ff5f2f968dd908bca43c9469d6e6b
     name = commons-lang-2.4-src.tar.gz
@@ -199,12 +205,6 @@ if (SOLAR_JAVA == TRUE)
     URL1 = http://dist.codehaus.org/stax/distributions/stax-src-1.2.0.zip
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if (SYSTEM_JPEG != YES)
-    MD5 = a2c10c04f396a9ce72894beb18b4e1f9
-    name = jpeg-8c.tar.gz
-    URL1 = http://www.ijg.org/files/jpegsrc.v8c.tar.gz
-    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
 if (ENABLE_MEDIAWIKI == YES)
     MD5 = a7983f859eafb2677d7ff386a023bc40
     name = xsltml_2.1.2.zip
@@ -345,6 +345,6 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_GRA
 if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && DISABLE_BEANSHELL!=YES)
     MD5 = ea570af93c284aa9e5621cd563f54f4d
     name = bsh-2.0b1-src.tar.gz
-    # This seems to be the original host, but the MD5 sum does not match.
-    # URL1 = http://www.beanshell.org/bsh-2.0b1.jar
+    # This used to be the original host, but the link is broken.
+    # URL1 = http://www.beanshell.org/bsh-2.0b1-src.zip
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)

Added: incubator/ooo/trunk/main/jpeg/jpeg-8d.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jpeg/jpeg-8d.patch?rev=1388734&view=auto
==============================================================================
--- incubator/ooo/trunk/main/jpeg/jpeg-8d.patch (added)
+++ incubator/ooo/trunk/main/jpeg/jpeg-8d.patch Sat Sep 22 03:41:19 2012
@@ -0,0 +1,174 @@
+--- misc/jpeg-8d/jconfig.h	2011-03-30 11:20:06.266329889 +0200
++++ misc/build/jpeg-8d/jconfig.h	2011-03-30 11:02:01.926080079 +0200
+@@ -1 +1,60 @@
+-dummy
++/* jconfig.h.  Generated from jconfig.cfg by configure.  */
++/* jconfig.cfg --- source file edited by configure script */
++/* see jconfig.txt for explanations */
++
++#define HAVE_PROTOTYPES 1
++#define HAVE_UNSIGNED_CHAR 1
++#define HAVE_UNSIGNED_SHORT 1
++/* #undef void */
++/* #undef const */
++/* #undef CHAR_IS_UNSIGNED */
++#define HAVE_STDDEF_H 1
++#define HAVE_STDLIB_H 1
++#define HAVE_LOCALE_H 1
++/* #undef NEED_BSD_STRINGS */
++/* #undef NEED_SYS_TYPES_H */
++/* #undef NEED_FAR_POINTERS */
++/* #undef NEED_SHORT_EXTERNAL_NAMES */
++/* Define this if you get warnings about undefined structures. */
++/* #undef INCOMPLETE_TYPES_BROKEN */
++
++/* Define "boolean" as unsigned char, not int, on Windows systems. */
++#ifdef WNT 
++#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
++typedef unsigned char boolean;
++#endif
++#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
++#endif
++
++#ifdef JPEG_INTERNALS
++
++/* #undef RIGHT_SHIFT_IS_UNSIGNED */
++#ifdef WNT
++#define INLINE __inline
++#elif defined SOLARIS
++#define INLINE 
++#else
++#define INLINE inline
++#endif
++/* These are for configuring the JPEG memory manager. */
++/* #undef DEFAULT_MAX_MEM */
++/* #undef NO_MKTEMP */
++
++#endif	/* JPEG_INTERNALS */
++
++#ifdef JPEG_CJPEG_DJPEG
++
++#undef BMP_SUPPORTED		/* BMP image file format */
++#undef GIF_SUPPORTED		/* GIF image file format */
++#undef PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
++/* #undef RLE_SUPPORTED 	*/
++#undef TARGA_SUPPORTED	/* Targa image file format */
++
++/* #undef TWO_FILE_COMMANDLINE */
++/* #undef NEED_SIGNAL_CATCHER 	*/
++/* #undef DONT_USE_B_MODE 		*/
++
++/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
++/* #undef PROGRESS_REPORT 		*/
++
++#endif /* JPEG_CJPEG_DJPEG 	*/
+--- misc/jpeg-8d/jmorecfg.h	2009-11-20 09:01:24.000000000 +0100
++++ misc/build/jpeg-8d/jmorecfg.h	2011-03-24 21:29:02.073761750 +0100
+@@ -21,7 +21,7 @@
+  * We do not support run-time selection of data precision, sorry.
+  */
+ 
+-#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
++#define BITS_IN_JSAMPLE  8	/* use 8                                                    
                                                                                         
                                                                              or 12 */
+ 
+ 
+ /*
+@@ -158,7 +158,8 @@
+ 
+ /* INT32 must hold at least signed 32-bit values. */
+ 
+-#ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */
++#ifndef XMD_H           /* X11/xmd.h correctly defines INT32 */
++#ifndef _SOLAR_H
+ #ifndef _BASETSD_H_		/* Microsoft defines it in basetsd.h */
+ #ifndef _BASETSD_H		/* MinGW is slightly different */
+ #ifndef QGLOBAL_H		/* Qt defines it in qglobal.h */
+@@ -166,6 +167,7 @@
+ #endif
+ #endif
+ #endif
++#endif
+ #endif
+ 
+ /* Datatype used for image dimensions.  The JPEG standard only supports
+--- misc/jpeg-8d/makefile.mk	2011-03-24 21:20:52.540761397 +0100
++++ misc/build/jpeg-8d/makefile.mk	2011-03-24 21:15:20.712761156 +0100
+@@ -1 +1,77 @@
+-dummy
++#*************************************************************************
++#
++#   Copyright according the GNU Public License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..
++
++PRJNAME=jpeg
++TARGET=jpeglib
++LIBTARGET=NO
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++VISIBILITY_HIDDEN=TRUE
++
++# --- Settings -----------------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++.IF "$(GUI)$(CPU)"=="WNTP"
++CFLAGS=$(CFLAGS) -Od
++.ENDIF
++
++# --- Files --------------------------------------------------------
++
++SLOFILES=	$(SLO)$/jaricom.obj		\
++			$(SLO)$/jcapimin.obj	\
++			$(SLO)$/jcapistd.obj	\
++			$(SLO)$/jcarith.obj		\
++			$(SLO)$/jccoefct.obj	\
++			$(SLO)$/jccolor.obj		\
++			$(SLO)$/jcdctmgr.obj	\
++			$(SLO)$/jchuff.obj		\
++			$(SLO)$/jcinit.obj		\
++			$(SLO)$/jcmainct.obj	\
++			$(SLO)$/jcmarker.obj	\
++			$(SLO)$/jcmaster.obj	\
++			$(SLO)$/jcomapi.obj		\
++			$(SLO)$/jcparam.obj		\
++			$(SLO)$/jcprepct.obj	\
++			$(SLO)$/jcsample.obj	\
++			$(SLO)$/jctrans.obj		\
++			$(SLO)$/jdapimin.obj	\
++			$(SLO)$/jdapistd.obj	\
++			$(SLO)$/jdarith.obj		\
++			$(SLO)$/jdatadst.obj	\
++			$(SLO)$/jdatasrc.obj	\
++			$(SLO)$/jdcoefct.obj	\
++			$(SLO)$/jdcolor.obj		\
++			$(SLO)$/jddctmgr.obj	\
++			$(SLO)$/jdhuff.obj		\
++			$(SLO)$/jdinput.obj		\
++			$(SLO)$/jdmainct.obj	\
++			$(SLO)$/jdmarker.obj	\
++			$(SLO)$/jdmaster.obj	\
++			$(SLO)$/jdmerge.obj		\
++			$(SLO)$/jdpostct.obj	\
++			$(SLO)$/jdsample.obj	\
++			$(SLO)$/jdtrans.obj		\
++			$(SLO)$/jerror.obj		\
++			$(SLO)$/jfdctflt.obj	\
++			$(SLO)$/jfdctfst.obj	\
++			$(SLO)$/jfdctint.obj	\
++			$(SLO)$/jidctflt.obj	\
++			$(SLO)$/jidctfst.obj	\
++			$(SLO)$/jidctint.obj	\
++			$(SLO)$/jquant1.obj		\
++			$(SLO)$/jquant2.obj		\
++			$(SLO)$/jutils.obj		\
++			$(SLO)$/jmemmgr.obj		\
++			$(SLO)$/jmemnobs.obj	\
++			$(SLO)$/jutils.obj		
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++.INCLUDE :  target.mk

Modified: incubator/ooo/trunk/main/jpeg/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jpeg/makefile.mk?rev=1388734&r1=1388733&r2=1388734&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jpeg/makefile.mk (original)
+++ incubator/ooo/trunk/main/jpeg/makefile.mk Sat Sep 22 03:41:19 2012
@@ -38,11 +38,11 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=jpeg-8c
+TARFILE_NAME=jpeg-8d
 
-TARFILE_MD5=a2c10c04f396a9ce72894beb18b4e1f9
+TARFILE_MD5=52654eb3b2e60c35731ea8fc87f1bd29
 
-PATCH_FILES=jpeg-8c.patch
+PATCH_FILES=jpeg-8d.patch
 
 ADDITIONAL_FILES=makefile.mk jconfig.h	
 



Mime
View raw message