[Libreoffice-commits] core.git: 2 commits - external/jpeg-turbo Makefile.in

[Caolán McNamara]

 Makefile.in   |2 +-
 external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk |1 +
 external/jpeg-turbo/jpeg-turbo.arm_build.patch.1  |   18 ++
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 2f5682dbc26067f3fe050889e96ebc70716abd90
Author: Caolán McNamara 
Date:   Wed Mar 15 14:34:12 2017 +

include stdint.h earlier to ensure SIZE_MAX

Change-Id: I592600e4600bfb360a154a450fcc6135f4fc3008

diff --git a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk 
b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
index 7f97422..5fdc5e4 100644
--- a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
+++ b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
@@ -16,6 +16,7 @@ $(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/jpeg-turbo.arm_build.patch.1 \
external/jpeg-turbo/ubsan.patch \
 ))
 
diff --git a/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 
b/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1
new file mode 100644
index 000..66acb52
--- /dev/null
+++ b/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1
@@ -0,0 +1,18 @@
+diff -ur jpeg.org/Makefile.am jpeg/Makefile.am
+--- jpeg.org/jmemmgr.c  2017-03-15 14:29:29.286587049 +
 jpeg/jmemmgr.c 2017-03-15 14:31:21.096378506 +
+@@ -27,12 +27,13 @@
+  * memory then you shouldn't care about a little bit of unused code...)
+  */
+ 
++#include 
++
+ #define JPEG_INTERNALS
+ #define AM_MEMORY_MANAGER   /* we define jvirt_Xarray_control structs */
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jmemsys.h"/* import the system-dependent declarations */
+-#include 
+ 
+ #ifndef NO_GETENV
+ #ifndef HAVE_STDLIB_H   /*  should declare getenv() */
commit 78dbfa9fff9c408108112302640e0cfb8aa53a11
Author: Caolán McNamara 
Date:   Wed Mar 15 13:52:28 2017 +

ppt fuzzer still needs more work to finish its run

Change-Id: I11e9c23ab8b61b86bd7abb59b853cd7432a3d11f

diff --git a/Makefile.in b/Makefile.in
index 87b4e97..bc5285b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,7 +446,7 @@ $(foreach ide,\
 eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide
 
-fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath 
Library_tl Library_basegfx Library_canvastools Library_cppcanvas 
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng 
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax 
Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi 
Library_clew Library_gie Library_icg Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer 
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer 
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer 
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer 
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer 
Executable_psdfuzzer
  Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer 
Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer 
Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer 
Executable_olefuzzer AllLangResTarget_sd Executable_pptfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath 
Library_tl Library_basegfx Library_canvastools Library_cppcanvas 
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng 
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax 
Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi 
Library_clew Library_gie Library_icg Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer 
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer 
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer 
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer 
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer 
Executable_psdfuzzer
  Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer 
Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer 
Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer 
Executable_olefuzzer 

[Libreoffice-commits] core.git: 2 commits - external/jpeg-turbo

[Stephan Bergmann]

 external/jpeg-turbo/ExternalProject_jpeg-turbo.mk |1 
 external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk |1 
 external/jpeg-turbo/abi64.patch   |  253 ++
 3 files changed, 255 insertions(+)

New commits:
commit 8729504f93c8b59cb2fd6145a1f02987d5fcdb47
Author: Stephan Bergmann 
Date:   Thu Sep 17 10:51:20 2015 +0200

external/jpeg-turbo: pass (debug) CFLAGS into external build process

Change-Id: I51db4784135be1d66f3fede5f87fcb5cd786fbc9

diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk 
b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
index c913d70..5809ff2 100644
--- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
+++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
@@ -32,6 +32,7 @@ $(call 
gb_ExternalProject_get_state_target,jpeg-turbo,configure) :
--with-jpeg8 \
--without-java \
--without-turbojpeg \
+   CFLAGS='$(if 
$(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))' \
)
 
 # vim: set noet sw=4 ts=4:
commit ea165c171661cb13e4b8a41048880b7fa7eebc08
Author: Stephan Bergmann 
Date:   Thu Sep 17 10:45:37 2015 +0200

external/jpeg-turbo: Fix calling convention confusion in asm code

...which becomes evident with recent Clang trunk versions, and is fixed for
libjpeg-turbo master with  "Fix x86-64 ABI conformance
issue in SIMD code" (but unfortunately needs a quite different patch for our
libjpeg-turbo 1.3.1 tarball).

Change-Id: Id9842cc85b4ea87b2faf73f1c8d10533621557e1

diff --git a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk 
b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
index 7f97422..9676d3a 100644
--- a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
+++ b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
@@ -17,6 +17,7 @@ $(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/abi64.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jpeg-turbo/abi64.patch b/external/jpeg-turbo/abi64.patch
new file mode 100644
index 000..2bd6072
--- /dev/null
+++ b/external/jpeg-turbo/abi64.patch
@@ -0,0 +1,253 @@
+cf.  "Fix x86-64 ABI conformance issue in
+SIMD code":
+--- simd/jcclrss2-64.asm
 simd/jcclrss2-64.asm
+@@ -50,14 +50,14 @@
+   collect_args
+   pushrbx
+ 
+-  mov rcx, r10
++  mov ecx, r10d
+   testrcx,rcx
+   jz  near .return
+ 
+   pushrcx
+ 
+   mov rsi, r12
+-  mov rcx, r13
++  mov ecx, r13d
+   mov rdi, JSAMPARRAY [rsi+0*SIZEOF_JSAMPARRAY]
+   mov rbx, JSAMPARRAY [rsi+1*SIZEOF_JSAMPARRAY]
+   mov rdx, JSAMPARRAY [rsi+2*SIZEOF_JSAMPARRAY]
+--- simd/jcgryss2-64.asm
 simd/jcgryss2-64.asm
+@@ -50,14 +50,14 @@
+   collect_args
+   pushrbx
+ 
+-  mov rcx, r10
++  mov ecx, r10d
+   testrcx,rcx
+   jz  near .return
+ 
+   pushrcx
+ 
+   mov rsi, r12
+-  mov rcx, r13
++  mov ecx, r13d
+   mov rdi, JSAMPARRAY [rsi+0*SIZEOF_JSAMPARRAY]
+   lea rdi, [rdi+rcx*SIZEOF_JSAMPROW]
+ 
+--- simd/jcqnts2f-64.asm
 simd/jcqnts2f-64.asm
+@@ -50,7 +50,7 @@
+   packsswb xmm7,xmm7  ; xmm7 = PB_CENTERJSAMPLE (0x808080..)
+ 
+   mov rsi, r10
+-  mov rax, r11
++  mov eax, r11d
+   mov rdi, r12
+   mov rcx, DCTSIZE/2
+ .convloop:
+--- simd/jcqnts2i-64.asm
 simd/jcqnts2i-64.asm
+@@ -50,7 +50,7 @@
+   psllw   xmm7,7  ; xmm7={0xFF80 0xFF80 0xFF80 0xFF80 ..}
+ 
+   mov rsi, r10
+-  mov rax, r11
++  mov eax, r11d
+   mov rdi, r12
+   mov rcx, DCTSIZE/4
+ .convloop:
+--- simd/jcsamss2-64.asm
 simd/jcsamss2-64.asm
+@@ -49,11 +49,11 @@
+   mov rbp,rsp
+   collect_args
+ 
+-  mov rcx, r13
++  mov ecx, r13d
+   shl rcx,3   ; imul rcx,DCTSIZE (rcx = output_cols)
+   jz  near .return
+ 
+-  mov rdx, r10
++  mov edx, r10d
+ 
+   ; -- expand_right_edge
+ 
+@@ -90,7 +90,7 @@
+ 
+   ; -- h2v1_downsample
+ 
+-  mov rax, r12; rowctr
++  mov eax, r12d   ; rowctr
+   testeax,eax
+   jle near .return
+ 
+@@ -193,11 +193,11 @@
+   mov rbp,rsp
+   collect_args
+ 
+-  mov rcx, r13
++  mov rcx, r13
+   shl rcx,3   ; imul rcx,DCTSIZE (rcx = output_cols)
+   jz  near .return
+ 
+-  mov rdx, r10
++  mov edx, r10d

[Libreoffice-commits] core.git: 2 commits - external/jpeg-turbo unotest/Library_unobootstrapprotector.mk

[Michael Stahl]

 external/jpeg-turbo/jpeg-turbo.win_build.patch.1 |   11 +++
 unotest/Library_unobootstrapprotector.mk |5 +
 2 files changed, 16 insertions(+)

New commits:
commit 9c6ce47eaf1a891edf7c200145de400fd1cf2871
Author: Michael Stahl mst...@redhat.com
Date:   Sat Feb 21 20:37:00 2015 +0100

jpeg-turbo: work around failure in AC_PROG_MAKE_SET on WNT

autoconf  2.61a uses echo here and for some bizarre reason that
converts  inside ' to \ so remove the  to get it to work.

echo 'foo=bar'
foo=\bar

Change-Id: I6bee94d4d075ce953f5788b7fdf9d3b66a7db0c7

diff --git a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1 
b/external/jpeg-turbo/jpeg-turbo.win_build.patch.1
index 1dc5b1e..dc767ab 100644
--- a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1
+++ b/external/jpeg-turbo/jpeg-turbo.win_build.patch.1
@@ -13,3 +13,14 @@ diff -ur jpeg.org/simd/Makefile.in jpeg/simd/Makefile.in
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
+--- jpeg-turbo/configure.orig  2015-02-21 19:44:23.63960 +0100
 jpeg-turbo/configure   2015-02-21 19:44:33.76400 +0100
+@@ -1847,7 +1847,7 @@
+ else
+   cat conftest.make \_ACEOF
+ all:
+-  @echo 'ac_maketemp=$(MAKE)'
++  @echo 'ac_maketemp=$(MAKE)'
+ _ACEOF
+ # GNU make sometimes prints make[1]: Entering..., which would confuse us.
+ eval `${MAKE-make} -f conftest.make 2/dev/null | grep temp=`
commit 7289ee9b9ce2346fa58dfa7c2f2b318f6db40d4d
Author: Michael Stahl mst...@redhat.com
Date:   Sat Feb 21 20:35:59 2015 +0100

unotest: unobootstrapprotector needs runtime dependency on unorc

Change-Id: Ie6ed784bb9676b9de8a51762aa58d0c75e071cfd

diff --git a/unotest/Library_unobootstrapprotector.mk 
b/unotest/Library_unobootstrapprotector.mk
index cb32bf9..3ec8b16 100644
--- a/unotest/Library_unobootstrapprotector.mk
+++ b/unotest/Library_unobootstrapprotector.mk
@@ -29,4 +29,9 @@ $(eval $(call 
gb_Library_add_exception_objects,unobootstrapprotector,\
unotest/source/cpp/unobootstrapprotector/unobootstrapprotector \
 ))
 
+# runtime dependency: needs unorc/uno.ini
+$(eval $(call gb_Library_use_package,unobootstrapprotector,\
+   instsetoo_native_setup_ure \
+))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits