Commit Graph

1602 Commits

Author SHA1 Message Date
Zolnai Tamás
6be202585f libgltf: check for #version string in the shader before add an own one.
Change-Id: I69dbbabc5774cbce7943e77f41bb42ed7a118bcf
2014-08-18 09:24:43 +02:00
Zolnai Tamás
c67026f270 libgltf: Append shader language version to the shader files
In general glTF shader files does not contain version
directives and in some case it make shader compiler
using GLSL 1.1 which leads to that the shader compiler
fails.
So we need to append the choosen version number which is
GLSL 1.3 in case of libgltf, but this also means that
from that point OpenGL 3.0 is the new reuirements since
GLSL 1.3 is available only from that version.

Change-Id: Ic4382266432ea474aeb3e603b32a998b9aeed280
2014-08-17 09:26:33 +02:00
Zolnai Tamás
d4fccd7d2c collada2gltf: it seems better not to add #version to glTF shader files
Here only handle precision. Using precision unconditionally
causing problems when shader source is compiled with GLSL 1.2.
The #version dircetives can be added by the glTF parser.
For example libgltf implementation:
https://gerrit.libreoffice.org/gitweb?p=libgltf.git;a=commit;
h=e4544a8b5ca8470a96bf28c6ccdb7461e78ca293

Change-Id: I934cdfa8651a8787fbcd476cea9892bf7e89dd11
2014-08-17 09:12:39 +02:00
Thomas Arnhold
1f1dfcdc91 boost: update patch states
Change-Id: I08d9692f42bd5bbce2d0c893b2eaf7eb65d4f2aa
2014-08-17 05:15:29 +02:00
Thomas Arnhold
439354a0b4 upgrade to apache-commons-1.2
Change-Id: Ic356c6a23f42b5fe37be1075e8508bb168eac9a1
Reviewed-on: https://gerrit.libreoffice.org/10927
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-08-16 21:56:35 -05:00
Zolnai Tamás
1ea4f163c5 collada2gltf: add a better name to this patch
Change-Id: Ie8fb4ff71a683e986b9fec861608590cadee8612
2014-08-15 17:05:41 +02:00
Zolnai Tamás
028c9662af collada2gltf: compatibility fix: OpenGL ES 2.0 is enough
That's why it was worked in some case, when OpenGL ES is
available then it is the default and not the GLSL 1.1.

Change-Id: I60d545e76115396433df8dc300bc13935099c776
2014-08-15 16:50:35 +02:00
Zolnai Tamás
e961d99b95 collada2gltf/patches: remove useless line from patch
Change-Id: Ie4c291819f0f8d8a2797d26cc55e5bad1507bdaf
2014-08-15 16:04:34 +02:00
Zolnai Tamás
2a8da8a548 collada2gltf: fix compatibility issues of *.kmz/*.dae files under linux
It seems under linux we need to specify the version number
explicitly, because otherwise shader compiler will use GLSL 1.1
and will fail. Base line is GLSL 1.3 or OpenGL ES 3.0.

Change-Id: Ie143275ade8d6989fda055ab96943b25ef220e9d
2014-08-15 15:42:19 +02:00
Thomas Arnhold
4b8a131d38 upgrade to cppunit 1.13.2
* remove obsolete patch part
* enable x64 target for vc project file on win64

Change-Id: Ie794c08c9f739ad8c9c68c423f72e79ed4f6b0ff
Reviewed-on: https://gerrit.libreoffice.org/10856
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-08-14 15:54:31 -05:00
Michael Stahl
8bd6bf93b7 fdo#82430: configure: MSVC build: avoid using SSE2 instructions
MSVC 2012 for x86 defaults to -arch:SSE2; binaries do not run on any AMD
32-bit CPU, neither on Intel Pentium III.

http://msdn.microsoft.com/en-us/library/vstudio/7t5yh4fd%28v=vs.110%29.aspx

Change-Id: Ie8253137db2699f2a7fa69c4ac4e7ded90931e3e
2014-08-14 18:55:17 +02:00
Thomas Arnhold
38f259e79c win64: make openssl work
fix windows style path separator to unix style, needed for cygwin.

Change-Id: I4de78d6901378644857c28a59467b59ef886f47b
Reviewed-on: https://gerrit.libreoffice.org/10855
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-08-13 13:47:36 -05:00
Tor Lillqvist
142d527a6b Make NSS build also as 64-bit ARM code for iOS
Change-Id: I03cda6ca1886a3cfad87cc438282eeea8c2a5299
2014-08-13 20:08:19 +03:00
Miklos Vajna
6b3869cf74 libmwaw: avoid 'MWAWDocument::isFileFormatSupported()' when opening .doc files
There is only a single libmwaw switch to enable both "noopt + symbols"
and "debug messages", and we enable that switch in debug builds.
Backport upstream patch to avoid a debug message during type detection.

Change-Id: I53440ceed90529e3db7c9d91c788c7a3b2723eb1
2014-08-13 14:45:59 +02:00
Tor Lillqvist
d87cf30fe6 More NSS static linking patches
I noticed in the debugger that this code tried to load a freebl dylib, but
after then making it link to the freebl entry point statically, I no longer
see it being entered. Huh, confusing. Making NSS work on iOS to the extent we
need is a pain.

Change-Id: Iafc3785752587c38566441f566e187859022733e
2014-08-12 19:56:08 +03:00
Tor Lillqvist
d308eda13d Use Chromium's patch to build NSS statically for iOS
Change-Id: Ica2cf641bc54f6e924b759cd4cf96dd96347c53b
2014-08-12 17:03:45 +03:00
Tor Lillqvist
3442b004e6 Now that we build NSS, we can build libxmlsec and libxsec_xmlsec for iOS, too
Change-Id: I65ab8aad0744a2aa254fefc7732cd8130bb249fb
2014-08-12 17:03:31 +03:00
Stephan Bergmann
eda3beff19 Let building lpsolve fail when its ccc script fails
(hopefully, the various ccc script variants do not include code that would
unintentionally fail the script with -e)

Change-Id: Ia04291983d99a8cf5a74e6a0078e179c17a93f2b
2014-08-12 12:20:16 +02:00
Lionel Elie Mamane
8994fac528 mysqlcppconn: do not force (partial) rebuild each time
Change-Id: I2eb014f143dda22011161e82fbf06fcba32ce3c6
2014-08-12 10:04:45 +02:00
Lionel Elie Mamane
6ec17530c5 mysqlcppconn: limit cmake to the role we left it
generate version_info.h

Change-Id: I6ea57ef1403974d19a0dca1f76e40a6d68a9e44c
2014-08-12 09:11:43 +02:00
Lionel Elie Mamane
a1bed60da4 mysqlcppconn: when using internal boost, point cmake to it
Change-Id: Ibc6971599be3e4a4b6bd95fabd74c8cacaf350d6
2014-08-12 04:40:19 +02:00
Lionel Elie Mamane
2493184153 mysqlcppconn: make mysqlcppconn_configure depend on one .o file
so that the build directory at least exists

Change-Id: Iaddeb59d60e81b0823ded73c85c2ffd19244d3c2
2014-08-12 03:51:28 +02:00
Tor Lillqvist
5c37960d95 First attempt at building NSS for iOS, too
Let's hope that the various static archives that get built by the NSS
build machinery contain what an iOS app that needs NSS services
requires. I patch out the construction of any dylibs and executables
in nss. We don't use any dylibs on iOS anyway, and of course don't
need any NSS executables either.

Change-Id: Ic977c6e3d6c4e953202e78f8e08c4e61f6c9cb1b
2014-08-11 19:40:36 +03:00
Lionel Elie Mamane
213e1f9f85 fixup
Change-Id: I35996d4337421317ae1c6da2a4647b231782d882
2014-08-11 16:27:30 +02:00
Lionel Elie Mamane
d9c2eb046c update mysqlcppconn to latest version
Change-Id: I2e60d97b777727878daf811c2f3da697af69c484
2014-08-11 15:48:00 +02:00
Lionel Elie Mamane
35836d2494 switch internal mariadb client to version 2
and reenable it: hopefully the worst bugs are fixed now

Change-Id: I8033ef87d02ba6619e5f778b5255fa803ba63c5b
2014-08-11 13:51:38 +02:00
Caolán McNamara
d79d2f0ef7 Resolves: icu#11054 crashes in bracketAddOpening
Change-Id: I5dd63fa41c1568e8bf2d120cc0de5d2c44dd789c
2014-08-09 21:15:52 +01:00
Thomas Arnhold
0b684fa3e9 VS2013: Override ToolsVersion setting
Otherwise those external projects will fail, because with only VS2013 installed
there is no ToolsVersion 4.0 (which is set inside the VC projects files).

http://msdn.microsoft.com/en-us/library/bb383985.aspx

Change-Id: I144ba1ef95372226ebadb082e3a78155cca316fd
2014-08-09 16:47:52 +02:00
Stephan Bergmann
5ab1098d5f Generalize -fsanitize=address checks
...that are at least also relevant for -fsanitize=undefined

Change-Id: I39044d2a73912a605af8e965eb1cdf8dfd4f0051
2014-08-08 16:07:24 +02:00
Douglas Mencken
6c4de44909 fix external/coinmp on OSX: bad symlinking
instdir/LibreOfficeDev.app/Contents/MacOS/libCbc.3.dylib -> libCbc.3.8.8.dylib
(which does not exist)

See also: 9f339a8945

Change-Id: I398d649c2e918b496c9b92364189da4796682653
Reviewed-on: https://gerrit.libreoffice.org/10614
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-08-07 12:53:00 +00:00
Stephan Bergmann
83e5c3e93d left shift of 4276994303 by 32 places cannot be represented in type 'long'
Change-Id: Ie9ddc5a42116720e0602d7fb38360f01b71df69c
2014-08-06 16:50:11 +02:00
Jan-Marek Glogowski
c7b975c412 Drop unneeded libgltf autotools changes
For whatever reason the tinderboxes still try to regenerate the
autotools based files, even after applying the generated file
change after the template changes.

These patches aren't needed, as the original problem is the CPPFLAGS
environment visibility, so we drop them.

Change-Id: Idb5caf662c997221337416686313101ad2193e40
2014-08-06 13:55:02 +02:00
Jan-Marek Glogowski
1f23cc159d Fix libgltf dbgutil build
The libgltf configure.ac script changes the autotools user variables
CFLAGS and CXXFLAGS, which is not allowed and can overwrite user
settings (which it does for the -D_GLIBCXX_DEBUG flag).

So this moves the special compile settings to seperate variables and
passes them to AM_CXXFLAGS and AM_CPPFLAGS, so the library actually
gets compiled with libstdc++ debug objects.

Change-Id: I00989f5fb629a6aac43ee5a2eb287b0491a3b86d
2014-08-06 12:05:56 +02:00
Simon Danner
4d5ec5a0c3 libgltf: rename pathces dir to patches
Change-Id: Ibd28dcdab17b1248d62205e5bf94d0c92c3f8841
Reviewed-on: https://gerrit.libreoffice.org/10750
Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com>
Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
2014-08-05 11:24:34 +00:00
Zolnai Tamás
841d50ec23 libgltf: remove obsolete patch
Change-Id: Iec8a026f43cdcf1801f530e6303a9557374c92c7
2014-08-05 11:47:43 +02:00
Zolnai Tamás
d085bba913 libgltf: missing <cstdio> include
Change-Id: I69ac77f954434c080a70ae9833ee60a99d7f9eef
2014-08-05 11:47:43 +02:00
Zolnai Tamás
dabfe7dd02 libgltf: fix dbgutil build
Change-Id: Icc5105d0668d5e4e3eb58bbaed6b2f059c30be99
2014-08-05 11:17:20 +02:00
David Tardon
6cf40d263e fdo#82035 fix loader paths
Change-Id: Ibecd7a89491b487bec54e8a86edbb1b133cdb8f0
2014-08-04 14:02:30 +02:00
Tor Lillqvist
1e03324c2e Make coinmp build with VS2013
Add a patch to mangle the project files a bit so that they work better
on a machine with only VS2013 installed. At least in my case. But why
we still need to *also* have those /p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 in the ExternalProject_coinmp.mk I don't
know.

Change-Id: Ieebd729c3ba89cf22231fb943f3739d6be5c7acd
2014-07-29 20:25:19 +03:00
Tor Lillqvist
31bf50b6cb Make python3 build with VS2013
This time use a patch to mangle the project files a bit so that
msbuild likes them.

Change-Id: I1293f4a92164ec6431b96c39f118cbdedbe5fe32
2014-07-29 18:20:58 +03:00
Tor Lillqvist
7f0e4cf20e Add separate project file for VS2013
Easier than trying to figure out how to make the VC2010 project work
with VS2013, it seems. Luckily it works fine tojust have VS2013
upgrade the old project file and then pass that to msbuild.

Change-Id: I94c0248211767d97f2898f35b1b677aee372a329
2014-07-28 22:07:43 +03:00
Tor Lillqvist
0778e00579 Add separate project file for VS2013
Easier than trying to figure out how to make the VC2010 projec work
with VS2013, it seems. We only need a project file for the lcms2_DLL
project.

Change-Id: Icab47ac7625b9a492942ea0835fe52ef06cdf2d9
2014-07-28 22:07:42 +03:00
rbuj
02085703db jfreereport_librepository: [deprecation] toURL() in File has been deprecated
http://docs.oracle.com/javase/6/docs/api/java/io/File.html#toURL()

Change-Id: I27d67f930ab15b69319a733b4bdedde834aba48d
Reviewed-on: https://gerrit.libreoffice.org/10530
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-07-26 15:50:27 +00:00
rbuj
66f4347aff jfreereport_libloader: [deprecation] toURL() in File has been deprecated
http://docs.oracle.com/javase/6/docs/api/java/io/File.html#toURL()

Change-Id: I5ff457cdbeff0049a9e31d6aa66dd973289d5f05
Reviewed-on: https://gerrit.libreoffice.org/10506
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-07-26 15:49:00 +00:00
Michael Stahl
057613c686 icu: un-break installation of Java extensions on Windows (rel. fdo#63756)
Linking libxml2 against ICU libraries has a nasty side effect:
The URE library javavm.dll links against URE libxml2.dll, which
is now linked against OOO icuuc53.dll; when a URE program, like
uno.exe, tries to load javavm.dll it fails because the OOO layer
"program" dir is not on PATH; this breaks the installation of Java
extensions.

Fix that by splitting up ICU libraries and putting the required ones
into URE layer.

(regression from 7515b1a90f)

Change-Id: If98dd0357162cb632d9762cd2d20162de5eb1a52
2014-07-24 00:36:14 +02:00
Markus Mohrhard
887c088f20 make libgltf compile on OSX
Change-Id: Ie39292137f931bfd557f66c485e104cf5d5089b8
2014-07-23 21:51:42 +02:00
rbuj
8f4cba8686 jfreereport_libbase: [deprecation] toURL() in File has been deprecated
http://docs.oracle.com/javase/6/docs/api/java/io/File.html#toURL()

Change-Id: I4322254d04e3ccf894acebf8b71de6f51e0a110a
Reviewed-on: https://gerrit.libreoffice.org/10467
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-23 08:00:15 +00:00
rbuj
3c891408ea beanshell: encode(String) in URLEncoder has been deprecated
http://docs.oracle.com/javase/1.5.0/docs/api/java/net/URLEncoder.html

Change-Id: Ie21fdd12206c7954e99761826f98686c4567aa64
Reviewed-on: https://gerrit.libreoffice.org/10482
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2014-07-23 07:57:09 +00:00
rbuj
37594357cb beanshell: [deprecation] show() in Window has been deprecated
http://docs.oracle.com/javase/1.5.0/docs/api/java/awt/Window.html#show()

Change-Id: Id02e622f3335315747e7c66724f5a3f37992e85d
Reviewed-on: https://gerrit.libreoffice.org/10481
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-23 07:56:53 +00:00
rbuj
5d1c5d558a beanshell: [deprecation] toURL() in File has been deprecated
http://docs.oracle.com/javase/6/docs/api/java/io/File.html#toURL()

Change-Id: I7f5ee6ad89ce73fa3b217396669fa42ea6e75c8a
Reviewed-on: https://gerrit.libreoffice.org/10473
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-23 07:56:35 +00:00