[Libreoffice-commits] core.git: bin/lo-all-static-libs config_host.mk.in configure.ac download.lst emfio/CppunitTest_emfio_wmf_test.mk external/jpeg-turbo external/libjpeg-turbo external/Module_external.mk external/pdfium external/poppler Makefile.fetch RepositoryExternal.mk solenv/gbuild vcl/commonfuzzer.mk vcl/Library_vcl.mk
Michael Stahl
mstahl at redhat.com
Fri Sep 15 08:56:28 UTC 2017
Makefile.fetch | 2 -
RepositoryExternal.mk | 18 ++++++------
bin/lo-all-static-libs | 2 -
config_host.mk.in | 2 -
configure.ac | 18 ++++++------
download.lst | 4 +-
emfio/CppunitTest_emfio_wmf_test.mk | 2 -
external/Module_external.mk | 2 -
external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk | 23 ----------------
external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk | 12 ++++----
external/libjpeg-turbo/Module_libjpeg-turbo.mk | 8 ++---
external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk | 23 ++++++++++++++++
external/pdfium/Library_pdfium.mk | 2 -
external/poppler/ExternalProject_poppler.mk | 2 -
solenv/gbuild/gbuild.mk | 2 -
vcl/Library_vcl.mk | 2 -
vcl/commonfuzzer.mk | 2 -
17 files changed, 63 insertions(+), 63 deletions(-)
New commits:
commit 77d297f3e8ff4af58718d166dcbf23c39ce47ca3
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 13 22:50:14 2017 +0200
consistent naming of externals: jpeg-turbo->libjpeg-turbo
Change-Id: I63fcebc36559c2698bbedd3501285a388ce8c257
Reviewed-on: https://gerrit.libreoffice.org/42291
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index 9194164be33f..35946e0ffde8 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -148,7 +148,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBSERIALIZER_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBXML_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_SAC_TARBALL) \
- $(call fetch_Optional,JPEG_TURBO,JPEG_TURBO_TARBALL) \
+ $(call fetch_Optional,LIBJPEG_TURBO,LIBJPEG_TURBO_TARBALL) \
$(call fetch_Optional,LANGUAGETOOL,LANGUAGETOOL_TARBALL) \
$(call fetch_Optional,LCMS2,LCMS2_TARBALL) \
$(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2db2ebfb3d81..2e5d5556b9e9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -376,9 +376,9 @@ endef
endif # SYSTEM_ZLIB
-ifneq ($(SYSTEM_JPEG),)
+ifneq ($(SYSTEM_LIBJPEG),)
-define gb_LinkTarget__use_jpeg
+define gb_LinkTarget__use_libjpeg
$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS))
$(call gb_LinkTarget_set_ldflags,$(1),\
$$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
@@ -386,26 +386,26 @@ $(call gb_LinkTarget_set_ldflags,$(1),\
endef
-gb_ExternalProject__use_jpeg :=
+gb_ExternalProject__use_libjpeg :=
else
-define gb_LinkTarget__use_jpeg
+define gb_LinkTarget__use_libjpeg
$(call gb_LinkTarget_set_include,$(1),\
$(LIBJPEG_CFLAGS) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS))
-$(call gb_LinkTarget_use_external_project,$(1),jpeg-turbo,full)
+$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full)
endef
-define gb_ExternalProject__use_jpeg
-$(call gb_ExternalProject_use_external_project,$(1),jpeg-turbo)
+define gb_ExternalProject__use_libjpeg
+$(call gb_ExternalProject_use_external_project,$(1),libjpeg-turbo)
endef
-endif # SYSTEM_JPEG
+endif # SYSTEM_LIBJPEG
ifneq ($(SYSTEM_MYTHES),)
@@ -2777,7 +2777,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,poppler)/poppler/.libs/libpoppler$(gb_StaticLibrary_PLAINEXT) \
)
-$(call gb_LinkTarget_use_external,$(1),jpeg)
+$(call gb_LinkTarget_use_external,$(1),libjpeg)
ifeq ($(OS),MACOSX)
$(call gb_LinkTarget_add_libs,$(1),\
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 6c1908628183..f2bf5f647eb3 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -67,7 +67,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
$WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a \
$WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \
$WORKDIR/UnpackedTarball/icu/source/lib/*.a \
- $WORKDIR/UnpackedTarball/jpeg-turbo/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libjpeg-turbo/.libs/*.a \
$WORKDIR/UnpackedTarball/langtag/liblangtag/.libs/*.a \
$WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
$WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
diff --git a/config_host.mk.in b/config_host.mk.in
index 08385695f0f9..187cdf45a861 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -518,7 +518,7 @@ export SYSTEM_HUNSPELL=@SYSTEM_HUNSPELL@
export SYSTEM_HYPH=@SYSTEM_HYPH@
export SYSTEM_ICU=@SYSTEM_ICU@
export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@
-export SYSTEM_JPEG=@SYSTEM_JPEG@
+export SYSTEM_LIBJPEG=@SYSTEM_LIBJPEG@
export SYSTEM_LCMS2=@SYSTEM_LCMS2@
export SYSTEM_CDR=@SYSTEM_CDR@
export SYSTEM_CMIS=@SYSTEM_CMIS@
diff --git a/configure.ac b/configure.ac
index d49c20a09dac..a8375341f5aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7427,20 +7427,20 @@ dnl ===================================================================
AC_MSG_CHECKING([which libjpeg to use])
if test "$with_system_jpeg" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_JPEG=TRUE
+ SYSTEM_LIBJPEG=TRUE
AC_CHECK_HEADER(jpeglib.h, [ LIBJPEG_CFLAGS= ],
[AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ LIBJPEG_LIBS="-ljpeg" ],
[AC_MSG_ERROR(jpeg library not found or fuctional)], [])
else
- SYSTEM_JPEG=
- AC_MSG_RESULT([internal, jpeg-turbo])
- BUILD_TYPE="$BUILD_TYPE JPEG_TURBO"
- LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg-turbo"
+ SYSTEM_LIBJPEG=
+ AC_MSG_RESULT([internal, libjpeg-turbo])
+ BUILD_TYPE="$BUILD_TYPE LIBJPEG_TURBO"
+ LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/libjpeg-turbo"
if test "$COM" = "MSC"; then
- LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.lib"
+ LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/libjpeg-turbo/.libs/libjpeg.lib"
else
- LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs -ljpeg"
+ LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/libjpeg-turbo/.libs -ljpeg"
fi
case "$host_cpu" in
@@ -7605,7 +7605,7 @@ consult https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/BUILDING.md
_EOS
fi
AC_MSG_WARN([no suitable nasm (Netwide Assembler) found])
- add_warning "no suitable nasm (Netwide Assembler) found for internal jpeg-turbo"
+ add_warning "no suitable nasm (Netwide Assembler) found for internal libjpeg-turbo"
fi
;;
esac
@@ -7614,7 +7614,7 @@ fi
AC_SUBST(NASM)
AC_SUBST(LIBJPEG_CFLAGS)
AC_SUBST(LIBJPEG_LIBS)
-AC_SUBST(SYSTEM_JPEG)
+AC_SUBST(SYSTEM_LIBJPEG)
dnl ===================================================================
dnl Check for system clucene
diff --git a/download.lst b/download.lst
index 515a38d363e8..4ff62f162b74 100644
--- a/download.lst
+++ b/download.lst
@@ -117,8 +117,8 @@ export JFREEREPORT_LIBXML_SHA256SUM := 7d2797fe9f79a77009721e3f14fa4a1dec17a6d70
export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
export JFREEREPORT_SAC_SHA256SUM := 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-export JPEG_TURBO_SHA256SUM := 9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528
-export JPEG_TURBO_TARBALL := libjpeg-turbo-1.5.2.tar.gz
+export LIBJPEG_TURBO_SHA256SUM := 9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528
+export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.2.tar.gz
export LANGTAGREG_SHA256SUM := d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab
export LANGTAGREG_TARBALL := language-subtag-registry-2017-08-15.tar.bz2
export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
diff --git a/emfio/CppunitTest_emfio_wmf_test.mk b/emfio/CppunitTest_emfio_wmf_test.mk
index b612f5c5a03b..82af839c3886 100644
--- a/emfio/CppunitTest_emfio_wmf_test.mk
+++ b/emfio/CppunitTest_emfio_wmf_test.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_CppunitTest_use_libraries,emfio_wmf,\
$(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
$(if $(filter LINUX MACOSX %BSD SOLARIS,$(OS)), \
curl) \
- jpeg \
+ libjpeg \
$(if $(filter-out IOS WNT,$(OS)), \
nss3 \
plc4) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index f24a45442c22..02af9df08ae3 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,HYPHEN,hyphen) \
$(call gb_Helper_optional,ICU,icu) \
$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
- $(call gb_Helper_optional,JPEG_TURBO,jpeg-turbo) \
+ $(call gb_Helper_optional,LIBJPEG_TURBO,libjpeg-turbo) \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
$(call gb_Helper_optional,LCMS2,lcms2) \
$(call gb_Helper_optional,LIBASSUAN,libassuan) \
diff --git a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
deleted file mode 100644
index f149e037ea69..000000000000
--- a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,jpeg-turbo))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,jpeg-turbo,$(JPEG_TURBO_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_set_patchlevel,jpeg-turbo,0))
-
-$(eval $(call gb_UnpackedTarball_add_patches,jpeg-turbo,\
- external/jpeg-turbo/jpeg-turbo.build.patch.1 \
- $(if $(filter WNT,$(OS)),external/jpeg-turbo/jpeg-turbo.win_build.patch.1) \
- external/jpeg-turbo/ubsan.patch \
- external/jpeg-turbo/jpeg-turbo.iOS.patch.1 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
similarity index 67%
rename from external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
rename to external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
index f902f25e6dee..3175c433b0bf 100644
--- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
+++ b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
@@ -7,22 +7,22 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,jpeg-turbo))
+$(eval $(call gb_ExternalProject_ExternalProject,libjpeg-turbo))
-$(eval $(call gb_ExternalProject_use_autoconf,jpeg-turbo,configure))
-$(eval $(call gb_ExternalProject_use_autoconf,jpeg-turbo,build))
+$(eval $(call gb_ExternalProject_use_autoconf,libjpeg-turbo,configure))
+$(eval $(call gb_ExternalProject_use_autoconf,libjpeg-turbo,build))
-$(eval $(call gb_ExternalProject_register_targets,jpeg-turbo,\
+$(eval $(call gb_ExternalProject_register_targets,libjpeg-turbo,\
configure \
build \
))
-$(call gb_ExternalProject_get_state_target,jpeg-turbo,build) : $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure)
+$(call gb_ExternalProject_get_state_target,libjpeg-turbo,build) : $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure)
+$(call gb_ExternalProject_run,build,\
$(MAKE) \
)
-$(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) :
+$(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) :
$(call gb_ExternalProject_run,configure,\
MAKE=$(MAKE) ./configure \
--build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \
diff --git a/external/jpeg-turbo/Makefile b/external/libjpeg-turbo/Makefile
similarity index 100%
rename from external/jpeg-turbo/Makefile
rename to external/libjpeg-turbo/Makefile
diff --git a/external/jpeg-turbo/Module_jpeg-turbo.mk b/external/libjpeg-turbo/Module_libjpeg-turbo.mk
similarity index 68%
rename from external/jpeg-turbo/Module_jpeg-turbo.mk
rename to external/libjpeg-turbo/Module_libjpeg-turbo.mk
index 20899f5e3bcf..137e7557bacf 100644
--- a/external/jpeg-turbo/Module_jpeg-turbo.mk
+++ b/external/libjpeg-turbo/Module_libjpeg-turbo.mk
@@ -7,11 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Module_Module,jpeg-turbo))
+$(eval $(call gb_Module_Module,libjpeg-turbo))
-$(eval $(call gb_Module_add_targets,jpeg-turbo,\
- ExternalProject_jpeg-turbo \
- UnpackedTarball_jpeg-turbo \
+$(eval $(call gb_Module_add_targets,libjpeg-turbo,\
+ ExternalProject_libjpeg-turbo \
+ UnpackedTarball_libjpeg-turbo \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg-turbo/README b/external/libjpeg-turbo/README
similarity index 100%
rename from external/jpeg-turbo/README
rename to external/libjpeg-turbo/README
diff --git a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
new file mode 100644
index 000000000000..dd0f88becb2d
--- /dev/null
+++ b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
@@ -0,0 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libjpeg-turbo))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,libjpeg-turbo,$(LIBJPEG_TURBO_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libjpeg-turbo,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libjpeg-turbo,\
+ external/libjpeg-turbo/jpeg-turbo.build.patch.1 \
+ $(if $(filter WNT,$(OS)),external/libjpeg-turbo/jpeg-turbo.win_build.patch.1) \
+ external/libjpeg-turbo/ubsan.patch \
+ external/libjpeg-turbo/jpeg-turbo.iOS.patch.1 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg-turbo/jpeg-turbo.build.patch.1 b/external/libjpeg-turbo/jpeg-turbo.build.patch.1
similarity index 100%
rename from external/jpeg-turbo/jpeg-turbo.build.patch.1
rename to external/libjpeg-turbo/jpeg-turbo.build.patch.1
diff --git a/external/jpeg-turbo/jpeg-turbo.iOS.patch.1 b/external/libjpeg-turbo/jpeg-turbo.iOS.patch.1
similarity index 100%
rename from external/jpeg-turbo/jpeg-turbo.iOS.patch.1
rename to external/libjpeg-turbo/jpeg-turbo.iOS.patch.1
diff --git a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1 b/external/libjpeg-turbo/jpeg-turbo.win_build.patch.1
similarity index 100%
rename from external/jpeg-turbo/jpeg-turbo.win_build.patch.1
rename to external/libjpeg-turbo/jpeg-turbo.win_build.patch.1
diff --git a/external/jpeg-turbo/ubsan.patch b/external/libjpeg-turbo/ubsan.patch
similarity index 100%
rename from external/jpeg-turbo/ubsan.patch
rename to external/libjpeg-turbo/ubsan.patch
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk
index b1cae45342f5..13457c1a781e 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -531,7 +531,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
))
$(eval $(call gb_Library_use_externals,pdfium,\
- jpeg \
+ libjpeg \
lcms2 \
zlib \
))
diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk
index 9db697fd482c..61df84311fae 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,poppler))
$(eval $(call gb_ExternalProject_use_autoconf,poppler,build))
$(eval $(call gb_ExternalProject_use_externals,poppler,\
- jpeg \
+ libjpeg \
))
$(eval $(call gb_ExternalProject_register_targets,poppler,\
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b29b15e82d8b..b87f6fc569dd 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -30,7 +30,7 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
# PTHREAD_CFLAGS (Linux)
# SYSTEM_ICU (Linux)
-# SYSTEM_JPEG (Linux)
+# SYSTEM_LIBJPEG (Linux)
# SYSTEM_LIBXML (Linux)
.DELETE_ON_ERROR:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index c1ce6db40665..1aa3095d0a6c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_use_custom_headers,vcl,\
))
$(eval $(call gb_Library_use_externals,vcl,\
- jpeg \
+ libjpeg \
libeot \
$(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
))
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index 1d3aa842f78d..4c9759856852 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -30,7 +30,7 @@ fuzzer_externals = \
liblangtag \
libxslt \
libxml2 \
- jpeg \
+ libjpeg \
png \
clew \
openssl \
More information about the Libreoffice-commits
mailing list