summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.in26
-rw-r--r--jpeg/jpeg-6b.patch113
-rw-r--r--jpeg/makefile.mk3
-rw-r--r--scp2/source/ooo/makefile.mk4
5 files changed, 0 insertions, 147 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index 0adc5fe85756..da7b3b41f87f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -488,7 +488,6 @@ export SYSTEM_LIBCROCO=@SYSTEM_LIBCROCO@
export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
export SYSTEM_LIBGSF=@SYSTEM_LIBGSF@
-export SYSTEM_LIBJPEG=@SYSTEM_LIBJPEG@
export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
export SYSTEM_LIBRSVG=@SYSTEM_LIBRSVG@
export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@
diff --git a/configure.in b/configure.in
index 595ba71bbb0f..4dd184caabab 100644
--- a/configure.in
+++ b/configure.in
@@ -10623,32 +10623,6 @@ fi
AC_SUBST(SYSTEM_LIBPNG)
dnl ===================================================================
-dnl Test whether to build libjpeg or rely on the system version
-dnl ===================================================================
-dnl FIXME: this is currently because we have jpeg-6b for our filters
-dnl and jpeg-8 as dependency for librsvg
-dnl this should be unified into using only one version for both
-
-AC_MSG_CHECKING([whether to use the system libjpeg])
-
-if test "$SYSTEM_JPEG" = "YES"; then
- SYSTEM_LIBJPEG=YES
- AC_MSG_RESULT([yes])
-else
- case "$_os" in
- WINNT|Darwin|iOS|Android)
- SYSTEM_LIBJPEG=NO
- AC_MSG_RESULT([no])
- ;;
- *)
- SYSTEM_LIBJPEG=YES
- AC_MSG_RESULT([yes])
- ;;
- esac
-fi
-AC_SUBST(SYSTEM_LIBJPEG)
-
-dnl ===================================================================
dnl Check for runtime JVM search path
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
diff --git a/jpeg/jpeg-6b.patch b/jpeg/jpeg-6b.patch
deleted file mode 100644
index 1180e7a63115..000000000000
--- a/jpeg/jpeg-6b.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- misc/jpeg-6b/jconfig.h 2009-03-19 11:30:46.000000000 +0100
-+++ misc/build/jpeg-6b/jconfig.h 2009-03-19 11:30:30.000000000 +0100
-@@ -1 +1,16 @@
--dummy
-+#define HAVE_PROTOTYPES
-+#define HAVE_UNSIGNED_CHAR
-+#define HAVE_UNSIGNED_SHORT
-+#undef CHAR_IS_UNSIGNED
-+#define HAVE_STDDEF_H
-+#define HAVE_STDLIB_H
-+#undef NEED_BSD_STRINGS
-+#undef NEED_SYS_TYPES_H
-+#undef NEED_FAR_POINTERS
-+#undef NEED_SHORT_EXTERNAL_NAMES
-+#undef INCOMPLETE_TYPES_BROKEN
-+
-+#ifdef JPEG_INTERNALS
-+#undef RIGHT_SHIFT_IS_UNSIGNED
-+#define NO_GETENV
-+#endif
---- misc/jpeg-6b/jmorecfg.h 1997-08-10 01:58:56.000000000 +0200
-+++ misc/build/jpeg-6b/jmorecfg.h 2009-03-19 11:30:30.000000000 +0100
-@@ -157,8 +157,8 @@
-
- /* INT32 must hold at least signed 32-bit values. */
-
--#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
--typedef long INT32;
-+#if !defined XMD_H && !defined _SOLAR_H /* X11/xmd.h correctly defines INT32 */
-+typedef int INT32;
- #endif
-
- /* Datatype used for image dimensions. The JPEG standard only supports
---- misc/jpeg-6b/makefile.mk 2009-03-19 11:30:46.000000000 +0100
-+++ misc/build/jpeg-6b/makefile.mk 2009-03-19 11:30:30.000000000 +0100
-@@ -1 +1,76 @@
--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)$/jcapimin.obj \
-+ $(SLO)$/jcapistd.obj \
-+ $(SLO)$/jccoefct.obj \
-+ $(SLO)$/jccolor.obj \
-+ $(SLO)$/jcdctmgr.obj \
-+ $(SLO)$/jcinit.obj \
-+ $(SLO)$/jchuff.obj \
-+ $(SLO)$/jcphuff.obj \
-+ $(SLO)$/jcmainct.obj \
-+ $(SLO)$/jcmarker.obj \
-+ $(SLO)$/jcmaster.obj \
-+ $(SLO)$/jcomapi.obj \
-+ $(SLO)$/jcparam.obj \
-+ $(SLO)$/jcprepct.obj \
-+ $(SLO)$/jcsample.obj \
-+ $(SLO)$/jdhuff.obj \
-+ $(SLO)$/jdinput.obj \
-+ $(SLO)$/jdtrans.obj \
-+ $(SLO)$/jdapimin.obj \
-+ $(SLO)$/jdapistd.obj \
-+ $(SLO)$/jdatadst.obj \
-+ $(SLO)$/jdatasrc.obj \
-+ $(SLO)$/jdcoefct.obj \
-+ $(SLO)$/jdcolor.obj \
-+ $(SLO)$/jddctmgr.obj \
-+ $(SLO)$/jdphuff.obj \
-+ $(SLO)$/jdmainct.obj \
-+ $(SLO)$/jdmarker.obj \
-+ $(SLO)$/jdmaster.obj \
-+ $(SLO)$/jdmerge.obj \
-+ $(SLO)$/jdpostct.obj \
-+ $(SLO)$/jdsample.obj \
-+ $(SLO)$/jerror.obj \
-+ $(SLO)$/jfdctflt.obj \
-+ $(SLO)$/jfdctfst.obj \
-+ $(SLO)$/jfdctint.obj \
-+ $(SLO)$/jidctflt.obj \
-+ $(SLO)$/jidctfst.obj \
-+ $(SLO)$/jidctint.obj \
-+ $(SLO)$/jidctred.obj \
-+ $(SLO)$/jmemmgr.obj \
-+ $(SLO)$/jmemnobs.obj \
-+ $(SLO)$/jquant1.obj \
-+ $(SLO)$/jquant2.obj \
-+ $(SLO)$/jutils.obj
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+.INCLUDE : target.mk
diff --git a/jpeg/makefile.mk b/jpeg/makefile.mk
index adc0c664c127..839fbd61644f 100644
--- a/jpeg/makefile.mk
+++ b/jpeg/makefile.mk
@@ -42,13 +42,10 @@ all:
# --- Files --------------------------------------------------------
-#TARFILE_NAME=jpeg-6b
TARFILE_NAME=jpeg-8c
-#TARFILE_MD5=dbd5f3b47ed13132f04c685d608a7547
TARFILE_MD5=a2c10c04f396a9ce72894beb18b4e1f9
-#PATCH_FILES=jpeg-6b.patch
PATCH_FILES=jpeg-8c.patch
ADDITIONAL_FILES=makefile.mk jconfig.h
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0702c7e98b00..b385f8dd1548 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -453,10 +453,6 @@ SCPDEFS+=-DSYSTEM_GLIB
SCPDEFS+=-DSYSTEM_LIBCROCO
.ENDIF
-.IF "$(SYSTEM_LIBJPEG)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBJPEG
-.ENDIF
-
.IF "$(ENABLE_LIBRSVG)" == "INTERNAL"
SCPDEFS+=-DENABLE_LIBRSVG
.ENDIF
generated by cgit (git 2.34.1) at 2024-06-29 17:26:08 +0000