[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk chart2/Library_chartcore.mk cui/Library_cui.mk slideshow/Library_slideshow.mk svx/Library_svxcore.mk toolkit/Library_tk.mk vcl/CppunitTest_vc

2023-09-23 Thread Gabor Kelemen (via logerrit) 
 avmedia/Library_avmedia.mk  |4 
 chart2/Library_chartcore.mk |1 -
 cui/Library_cui.mk  |1 -
 slideshow/Library_slideshow.mk  |1 -
 svx/Library_svxcore.mk  |1 -
 toolkit/Library_tk.mk   |1 -
 vcl/CppunitTest_vcl_bitmap_test.mk  |1 -
 vcl/CppunitTest_vcl_svm_test.mk |1 -
 vcl/Executable_icontest.mk  |6 --
 vcl/Executable_lo_kde5filepicker.mk |1 -
 vcl/Executable_vcldemo.mk   |6 --
 vcl/Library_vclplug_gtk3_kde5.mk|1 -
 vcl/Library_vclplug_gtk4.mk |1 -
 13 files changed, 26 deletions(-)

New commits:
commit c17d369230b1eac80395a1aebf058bace12885be
Author: Gabor Kelemen 
AuthorDate: Sun Aug 27 01:59:18 2023 +0200
Commit: Gabor Kelemen 
CommitDate: Sat Sep 23 10:38:36 2023 +0200

Use less epoxy external headers dependency

Change-Id: If5d4e5a65a0fcea6bd67cdba48742f6aaec0811d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156556
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 72a5a67350e2..3b57e564a530 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
 
 ifneq (,$(filter AVMEDIA,$(BUILD_TYPE)))
 
-$(eval $(call gb_Library_use_externals,avmedia,\
-epoxy \
-))
-
 $(eval $(call 
gb_Library_set_componentfile,avmedia,avmedia/util/avmedia,services))
 
 $(eval $(call gb_Library_use_libraries,avmedia,\
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 54bc946766d8..ea427820a726 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -27,7 +27,6 @@ $(eval $(call 
gb_Library_set_precompiled_header,chartcore,chart2/inc/pch/precomp
 
 $(eval $(call gb_Library_use_externals,chartcore,\
boost_headers \
-epoxy \
libxml2 \
 ))
 
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 9c621a17171a..e122d2b734c4 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -71,7 +71,6 @@ $(eval $(call gb_Library_use_externals,cui,\
boost_headers \
$(call gb_Helper_optional,OPENCL,\
clew) \
-epoxy \
 icuuc \
 icu_headers \
 libxml2 \
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index a55ec61b0770..3b9f3fb3f095 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -25,7 +25,6 @@ $(eval $(call 
gb_Library_set_precompiled_header,slideshow,slideshow/inc/pch/prec
 $(eval $(call gb_Library_use_externals,slideshow,\
boost_headers \
box2d \
-epoxy \
 ))
 
 $(eval $(call gb_Library_add_defs,slideshow,\
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 51121441959a..28ed214c063f 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
 
 $(eval $(call gb_Library_use_externals,svxcore,\
boost_headers \
-epoxy \
icuuc \
icu_headers \
libxml2 \
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 75ae962cafc5..bcea9abb6d7e 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -23,7 +23,6 @@ $(eval $(call 
gb_Library_set_componentfile,tk,toolkit/util/tk,services))
 
 $(eval $(call gb_Library_use_externals,tk,\
 boost_headers \
-epoxy \
 ))
 
 $(eval $(call gb_Library_set_include,tk,\
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk 
b/vcl/CppunitTest_vcl_bitmap_test.mk
index 0edaabc9f9d9..d9cec0023fda 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -22,7 +22,6 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,vcl_bitmap_test, \
 
 $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
boost_headers \
-epoxy \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,vcl_bitmap_test,\
diff --git a/vcl/CppunitTest_vcl_svm_test.mk b/vcl/CppunitTest_vcl_svm_test.mk
index 3ed8bad38492..f689b6384b71 100644
--- a/vcl/CppunitTest_vcl_svm_test.mk
+++ b/vcl/CppunitTest_vcl_svm_test.mk
@@ -15,7 +15,6 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,vcl_svm_test, \
 
 $(eval $(call gb_CppunitTest_use_externals,vcl_svm_test,\
boost_headers \
-epoxy \
 libxml2 \
 ))
 
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index 0f8a3b60b09b..dc71ce3443b1 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -9,12 +9,6 @@
 
 $(eval $(call gb_Executable_Executable,icontest))
 
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Executable_use_externals,icontest,\
-epoxy \
-))
-endif
-
 $(eval $(call gb_Executable_add_defs,icontest,\
 -DVCL_INTERNALS \
 ))
diff --git a/vcl/Executable_lo_kde5filepicker.mk 
b/vcl/Executable_lo_kde5filepicker.mk
index 1e7d48b0a5e2..9244a8c18b09 100644
--- a/vcl/Executable_lo_kde5filepicker.mk
+++

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk chart2/Library_chartcore.mk config_host.mk.in configure.ac cui/Library_cui.mk RepositoryExternal.mk slideshow/Library_slideshow.mk svx/Librar

2022-01-05 Thread Jan-Marek Glogowski (via logerrit) 
 RepositoryExternal.mk  |   13 +++--
 avmedia/Library_avmedia.mk |2 --
 chart2/Library_chartcore.mk|7 +--
 config_host.mk.in  |1 +
 configure.ac   |1 +
 cui/Library_cui.mk |6 +-
 slideshow/Library_slideshow.mk |6 +-
 svx/Library_svxcore.mk |6 +-
 toolkit/Library_tk.mk  |6 +-
 vcl/CppunitTest_vcl_bitmap_test.mk |6 +-
 vcl/CppunitTest_vcl_svm_test.mk|7 +--
 vcl/Library_vclplug_osx.mk |7 +--
 12 files changed, 21 insertions(+), 47 deletions(-)

New commits:
commit a6fae99466cd52143a52a98b0ac89588f679f1a1
Author: Jan-Marek Glogowski 
AuthorDate: Wed Jan 5 11:49:19 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Wed Jan 5 18:00:59 2022 +0100

Disable epoxy test with --disable-gui

Instead of always testing for DISABLE_GUI, just disable the epoxy
test and handle !ENABLE_EPOXY in RepositoryExternal.mk.

Change-Id: I38213ffa77353bc93f32caa1b4164c5fa88170ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127999
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 7feb93cc150d..7262a0eaa7af 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -224,7 +224,9 @@ endef
 
 endif # SYSTEM_CPPUNIT
 
-ifneq ($(SYSTEM_EPOXY),)
+
+ifeq ($(ENABLE_EPOXY),TRUE)
+ifeq ($(SYSTEM_EPOXY),TRUE)
 
 define gb_LinkTarget__use_epoxy
 $(call gb_LinkTarget_set_include,$(1),\
@@ -260,7 +262,14 @@ $(call gb_ExternalProject_use_external_project,$(1),epoxy)
 
 endef
 
-endif # SYSTEM_EPOXY
+endif # !SYSTEM_EPOXY
+else # !ENABLE_EPOXY
+
+gb_LinkTarget__use_epoxy :=
+gb_ExternalProject__use_epoxy :=
+
+endif # !ENABLE_EPOXY
+
 
 define gb_LinkTarget__use_iconv
 ifeq ($(COM),MSC)
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index a337fa9cae73..72a5a67350e2 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -41,11 +41,9 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
 
 ifneq (,$(filter AVMEDIA,$(BUILD_TYPE)))
 
-ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,avmedia,\
 epoxy \
 ))
-endif
 
 $(eval $(call 
gb_Library_set_componentfile,avmedia,avmedia/util/avmedia,services))
 
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index f5069c7c5670..a9a23159b436 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -27,14 +27,9 @@ $(eval $(call 
gb_Library_set_precompiled_header,chartcore,chart2/inc/pch/precomp
 
 $(eval $(call gb_Library_use_externals,chartcore,\
boost_headers \
-   libxml2 \
-))
-
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,chartcore,\
 epoxy \
+   libxml2 \
 ))
-endif
 
 $(eval $(call gb_Library_use_custom_headers,chartcore,\
officecfg/registry \
diff --git a/config_host.mk.in b/config_host.mk.in
index 6d2102dd47e6..f787994bd840 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -154,6 +154,7 @@ export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
 export ENABLE_DBUS=@ENABLE_DBUS@
 export ENABLE_DCONF=@ENABLE_DCONF@
 export ENABLE_DEBUG=@ENABLE_DEBUG@
+export ENABLE_EPOXY=@ENABLE_EPOXY@
 export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
 export ENABLE_FORMULA_LOGGER=@ENABLE_FORMULA_LOGGER@
diff --git a/configure.ac b/configure.ac
index a7c23de74122..e414c2d7f15f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5252,6 +5252,7 @@ if test "$enable_gui" = "no"; then
 fi
 USING_X11=
 DISABLE_GUI=TRUE
+test_epoxy=no
 else
 AC_DEFINE(HAVE_FEATURE_UI)
 fi
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index d0cb6cf2cc08..295b8f2eed3f 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,cui,\
boost_headers \
$(call gb_Helper_optional,OPENCL,\
clew) \
+epoxy \
 icuuc \
 icu_headers \
 libxml2 \
@@ -76,11 +77,6 @@ $(eval $(call gb_Library_use_externals,cui,\
 orcus \
 zxing \
 ))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,cui,\
- epoxy \
- ))
-endif
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,cui,\
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 74a397cc2b02..a57717990124 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -25,12 +25,8 @@ $(eval $(call 
gb_Library_set_precompiled_header,slideshow,slideshow/inc/pch/prec
 $(eval $(call gb_Library_use_externals,slideshow,\
boost_headers \
box2d \
+epoxy \
 ))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,slideshow,\
- epoxy \
- ))
-endif
 
 $(eval $(call gb_Library_use_sdk_api,slideshow))
 
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk distro-configs/LibreOfficeOssFuzz.conf

2021-12-21 Thread Jan-Marek Glogowski (via logerrit) 
 avmedia/Library_avmedia.mk |2 +-
 distro-configs/LibreOfficeOssFuzz.conf |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d7bc33b5bfc4174e7190dd56e981ae7287b7a258
Author: Jan-Marek Glogowski 
AuthorDate: Tue Dec 21 13:06:33 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Tue Dec 21 17:30:31 2021 +0100

Keep GUI with --enable-avmedia and --disable-gui

So I thought I could come up with a rich MediaItem and can get
rid of all the GUI elements. But all the still needed features
require a MediaWindow. Probably not for real, but there are
multiple levels of createPlayer (some static) in MediaWindow
and priv::MediaWindowImpl.

Untangling this will require more time, so just return to the old
--disable-gui state with actually keeping all the GUI elements.

Regression from commit f9e79a91f15e10ededad0f103c4ffe0ca38fcb31
("Fix --disable-avmedia for DESKTOP build")...

Change-Id: I2b04459003d474cd3abf8b086f2f20f17274a7ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127226
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 83148b915c8d..a337fa9cae73 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -45,6 +45,7 @@ ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,avmedia,\
 epoxy \
 ))
+endif
 
 $(eval $(call 
gb_Library_set_componentfile,avmedia,avmedia/util/avmedia,services))
 
@@ -67,7 +68,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
avmedia/source/viewer/mediawindow_impl \
 ))
 
-endif # !DISABLE_GUI
 endif # AVMEDIA
 
 # vim: set noet sw=4 ts=4:
diff --git a/distro-configs/LibreOfficeOssFuzz.conf 
b/distro-configs/LibreOfficeOssFuzz.conf
index 5b1d167dbc37..434452a673f0 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -2,7 +2,6 @@
 --enable-ld=gold
 --disable-dynamic-loading
 --disable-runtime-optimizations
---disable-avmedia
 --disable-scripting
 --disable-cairo-canvas
 --disable-coinmp

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk basic/source

2021-12-06 Thread TheRock Builder (via logerrit) 
 avmedia/Library_avmedia.mk|   10 +-
 basic/source/inc/sbintern.hxx |6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 35cc52f77804eda54d4e466da1b2afbdc1555ef3
Author: TheRock Builder 
AuthorDate: Fri Dec 3 16:39:43 2021 +
Commit: Jan-Marek Glogowski 
CommitDate: Sat Dec 4 05:01:23 2021 +0100

Fix --disable-(avmedia|scripting)

So it's not a good idea to change the patch without testing it
again. I'm still hoping for a better usable MediaItem then the
previous dummy. The ODF stores a preview image and it should
allow to export the media.

The scripting fix feels like a workaround. somehow the final
class specifier triggers something that makes the linker fail
with missing destructors for all std::unique_ptr objects
derivated from SbxFactory. Implementing these as virtual
overrides didn't help, neither as {} or = default. So this
removes them in the  !"#if HAVE_FEATURE_SCRIPTING" case.

Change-Id: I9f6751f44e0247ed31c27be0ee816239795e9372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126330
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 420bbded8178..a9a9440346ba 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -16,8 +16,13 @@ $(eval $(call gb_Library_set_include,avmedia,\
 ))
 
 $(eval $(call gb_Library_use_libraries,avmedia,\
+comphelper \
+cppu \
+cppuhelper \
 sal \
 svl \
+ucbhelper \
+vcl \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,avmedia,))
@@ -44,16 +49,11 @@ $(eval $(call gb_Library_use_externals,avmedia,\
 $(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
 
 $(eval $(call gb_Library_use_libraries,avmedia,\
-   comphelper \
-   ucbhelper \
-   cppu \
-   cppuhelper \
i18nlangtag \
sfx \
svt \
tl \
utl \
-   vcl \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index 0f1b4d3114b5..fe897ab6bcd6 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -104,6 +104,7 @@ struct SbiGlobals
 {
 static SbiGlobals* pGlobals;
 SbiInstance*pInst;  // all active runtime instances
+#if HAVE_FEATURE_SCRIPTING
 std::unique_ptr   pSbFac;// StarBASIC-Factory
 std::unique_ptr pUnoFac;   // Factory for Uno-Structs at DIM 
AS NEW
 std::unique_ptr
@@ -114,6 +115,8 @@ struct SbiGlobals
 pOLEFac;// Factory for OLE types
 std::unique_ptr
 pFormFac;   // Factory for user forms
+std::unique_ptr pAppBasMgr;
+#endif
 SbModule*   pMod;   // currently active module
 SbModule*   pCompMod;   // currently compiled module
 short   nInst;  // number of BASICs
@@ -128,9 +131,6 @@ struct SbiGlobals
 OUStringaErrMsg;// buffer for GetErrorText()
 std::unique_ptr<::utl::TransliterationWrapper> pTransliterationWrapper;
// For StrComp
 boolbBlockCompilerError;
-#if HAVE_FEATURE_SCRIPTING
-std::unique_ptr   pAppBasMgr;
-#endif
 StarBASIC*  pMSOMacroRuntimLib; // Lib containing MSO Macro Runtime 
API entry symbols
 
 SbiGlobals();

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk avmedia/Module_avmedia.mk avmedia/source config_host.mk.in configure.ac oox/CppunitTest_oox_tokenmap.mk postprocess/Rdb_services.mk Repositor

2021-12-01 Thread Jan-Marek Glogowski (via logerrit) 
 Repository.mk |   12 ++-
 RepositoryModule_host.mk  |2 
 avmedia/Library_avmedia.mk|   31 --
 avmedia/Module_avmedia.mk |5 -
 avmedia/source/avmediadummy.cxx   |   93 --
 config_host.mk.in |1 
 configure.ac  |   13 +---
 oox/CppunitTest_oox_tokenmap.mk   |2 
 postprocess/Rdb_services.mk   |   14 +---
 sc/Library_sc.mk  |2 
 sd/Library_sd.mk  |2 
 slideshow/source/engine/slideshowimpl.cxx |5 +
 slideshow/source/engine/soundplayer.cxx   |5 +
 svx/Library_svxcore.mk|4 -
 svx/source/svdraw/MediaShellHelpers.cxx   |9 ++
 svx/source/svdraw/svdomedia.cxx   |   16 -
 svx/source/unodraw/unoshap4.cxx   |6 +
 sw/Library_sw.mk  |2 
 sw/source/uibase/shells/grfshex.cxx   |9 ++
 19 files changed, 88 insertions(+), 145 deletions(-)

New commits:
commit f9e79a91f15e10ededad0f103c4ffe0ca38fcb31
Author: Jan-Marek Glogowski 
AuthorDate: Tue May 18 01:11:41 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Wed Dec 1 16:50:23 2021 +0100

Fix --disable-avmedia for DESKTOP build

Probably additional bits can be removed, but this now passes.

Change-Id: I366bec43cfd6fb02e914c85c711b3b19586d534d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126161
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/Repository.mk b/Repository.mk
index 629f95354422..ec763106f30e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -324,10 +324,12 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ogltrans, \
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
acc \
-   $(call gb_Helper_optional,AVMEDIA,avmedia) \
+avmedia \
+$(call gb_Helper_optional,AVMEDIA, \
$(if $(filter MACOSX,$(OS)),\
avmediaMacAVF \
) \
+) \
$(call gb_Helper_optional,SCRIPTING, \
basctl \
basprov \
@@ -593,8 +595,10 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
-   $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
-   $(if $(filter WNT,$(OS)),avmediawin) \
+$(call gb_Helper_optional,AVMEDIA, \
+$(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
+$(if $(filter WNT,$(OS)),avmediawin) \
+) \
cached1 \
collator_data \
comphelper \
@@ -1108,7 +1112,7 @@ $(eval $(call gb_ExternalExecutable_register_executables,\
 # Resources
 $(eval $(call gb_Helper_register_mos,\
acc \
-   avmedia \
+$(call gb_Helper_optional,AVMEDIA,avmedia) \
$(call gb_Helper_optional,SCRIPTING,basctl) \
chart \
cnr \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a13278563270..021fdeb92635 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
android \
animations \
apple_remote \
-   $(call gb_Helper_optional,AVMEDIA,avmedia) \
+   avmedia \
basctl \
basegfx \
basic \
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index b27b9bae8c80..420bbded8178 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -9,15 +9,16 @@
 
 $(eval $(call gb_Library_Library,avmedia))
 
-$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
-
 $(eval $(call gb_Library_set_include,avmedia,\
$$(INCLUDE) \
-I$(SRCDIR)/avmedia/inc \
-I$(SRCDIR)/avmedia/source/inc \
 ))
 
-$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
+$(eval $(call gb_Library_use_libraries,avmedia,\
+sal \
+svl \
+))
 
 $(eval $(call gb_Library_use_sdk_api,avmedia,))
 
@@ -25,35 +26,30 @@ $(eval $(call gb_Library_use_externals,avmedia,\
boost_headers \
 ))
 
-ifeq ($(USE_AVMEDIA_DUMMY),TRUE)
-$(eval $(call gb_Library_add_exception_objects,avmedia,\
-   avmedia/source/avmediadummy \
+$(eval $(call gb_Library_add_defs,avmedia,\
+-DAVMEDIA_DLLIMPLEMENTATION \
 ))
 
-
-else
-
-
-$(eval $(call gb_Library_add_defs,avmedia,\
-   -DAVMEDIA_DLLIMPLEMENTATION \
+$(eval $(call gb_Library_add_exception_objects,avmedia,\
+avmedia/source/framework/mediaitem \
 ))
 
+ifneq (,$(filter AVMEDIA,$(BUILD_TYPE)))
+
 ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,avmedia,\
 epoxy \
 ))
-endif
 
+$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
 
 $(eval $(call gb_Library_use_libraries,avmedia,\
comphelper \
ucbhelper \
cppu \
cppuhelper \
-   sal \

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk

2019-11-29 Thread Tor Lillqvist (via logerrit) 
 avmedia/Library_avmedia.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit de62d0c77e2f9e24f72fd638cb5c5e365ff164b5
Author: Tor Lillqvist 
AuthorDate: Thu Nov 28 16:14:46 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 29 12:58:53 2019 +0200

Fix build with USE_AVMEDIA_DUMMY (iOS, at least)

We need boost headers also for avmedia/source/avmediadummy.cxx now.

Change-Id: Ib1fd2c19aaf62beb759bfee5ec51f167d0966df4
Reviewed-on: https://gerrit.libreoffice.org/84011
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 8d8a3f66e57aefd7cf7d3bb6cb62059de5beded2)

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 2bec95c47e2d..b27b9bae8c80 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -21,6 +21,10 @@ $(eval $(call 
gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
 
 $(eval $(call gb_Library_use_sdk_api,avmedia,))
 
+$(eval $(call gb_Library_use_externals,avmedia,\
+   boost_headers \
+))
+
 ifeq ($(USE_AVMEDIA_DUMMY),TRUE)
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
avmedia/source/avmediadummy \
@@ -34,10 +38,6 @@ $(eval $(call gb_Library_add_defs,avmedia,\
-DAVMEDIA_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_externals,avmedia,\
-   boost_headers \
-))
-
 ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,avmedia,\
 epoxy \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk avmedia/Library_avmediaogl.mk avmedia/Module_avmedia.mk avmedia/source config_host/config_features.h.in config_host.mk.in configure.ac distro

2017-10-30 Thread Thorsten Behrens 
 Makefile.fetch 
   |4 
 Repository.mk  
   |6 
 RepositoryExternal.mk  
   |  105 
 avmedia/Library_avmedia.mk 
   |   23 
 avmedia/Library_avmediaogl.mk  
   |   45 
 avmedia/Module_avmedia.mk  
   |5 
 avmedia/source/framework/collada_headers.hxx   
   |   29 
 avmedia/source/framework/modeltools.cxx
   |  326 -
 avmedia/source/inc/mediamisc.hxx   
   |4 
 avmedia/source/opengl/avmediaogl.component 
   |   15 
 avmedia/source/opengl/oglframegrabber.cxx  
   |   69 
 avmedia/source/opengl/oglframegrabber.hxx  
   |   48 
 avmedia/source/opengl/oglmanager.cxx   
   |   59 
 avmedia/source/opengl/oglmanager.hxx   
   |   43 
 avmedia/source/opengl/oglplayer.cxx
   |  369 -
 avmedia/source/opengl/oglplayer.hxx
   |   82 
 avmedia/source/opengl/ogluno.cxx   
   |   45 
 avmedia/source/opengl/oglwindow.cxx
   |  371 -
 avmedia/source/opengl/oglwindow.hxx
   |   82 
 avmedia/source/viewer/mediawindow_impl.cxx 
   |   24 
 config_host.mk.in  
   |   11 
 config_host/config_features.h.in   
   |   10 
 configure.ac   
   |  137 
 distro-configs/LibreOfficeFlatpak.conf 
   |1 
 distro-configs/LibreOfficeOssFuzz.conf 
   |2 
 download.lst   
   |6 
 external/Module_external.mk
   |3 
 external/collada2gltf/GitSHA1.cpp  
   |2 
 external/collada2gltf/Makefile 
   |   14 
 external/collada2gltf/Module_collada2gltf.mk   
   |   17 
 external/collada2gltf/README   
   |4 
 external/collada2gltf/StaticLibrary_collada2gltf.mk
   |  104 
 external/collada2gltf/UnpackedTarball_collada2gltf.mk  
   |   26 
 external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1
   |   13 
 external/collada2gltf/patches/collada2gltf.fix-memory-leak.patch.1 
   |   25 
 external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1
   |   18 
 external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1 
   |   12 
 external/collada2gltf/patches/drop_tr1_support.patch.1 
   |  403 -
 external/collada2gltf/patches/shader_compatibility.patch.1 
   |   14 
 external/collada2gltf/patches/wrong_uri_usage.patch.1  
   |   78 
 external/libgltf/ExternalProject_libgltf.mk
   |   79 
 external/libgltf/Makefile  
   |   14 
 external/libgltf/Module_libgltf.mk 
   |   17 
 external/libgltf/README
   |1 
 external/libgltf/UnpackedTarball_libgltf.mk
   |   26 
 external/libgltf/libgltf-add-a-vao.1   
   |   49 
 external/libgltf/libgltf-disable-non-core.1
   |   28 
 external/libgltf/libgltf-msvc-disable-sse2.patch.1 
   |   10 
 external/libgltf/libgltf-msvc-x64.patch.1  
   |  107 
 external/libgltf/libgltf-quads-to-triangles.1  
   |   69 
 external/opencollada/Makefile  
   |   14 
 external/opencollada/Module_opencollada.mk 
   |   17 
 external/opencollada/README
   |5 
 external/opencollada/StaticLibrary_opencollada_parser.mk   
   |  273 -

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk

2017-10-10 Thread jan Iversen 
 avmedia/Library_avmedia.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3515946e1c4d787aaa83e52f163903d14ec9df5d
Author: jan Iversen 
Date:   Tue Oct 10 12:14:37 2017 +0200

iOS, typo

Change-Id: I6103c8b2ca6b306bec1f5a3ef9211a351cd64f05

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 11319cb87750..449556b65a42 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -15,6 +15,8 @@ $(eval $(call gb_Library_set_include,avmedia,\
-I$(SRCDIR)/avmedia/source/inc \
 ))
 
+$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
+
 $(eval $(call gb_Library_use_sdk_api,avmedia,))
 
 ifeq ($(USE_AVMEDIA_DUMMY),TRUE)
@@ -22,7 +24,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
avmedia/source/avmediadummy \
 ))
 
-$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
 
 else
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk

2017-10-10 Thread jan Iversen 
 avmedia/Library_avmedia.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1931a45f880264433c6bc3d51bd3638da1119bc2
Author: jan Iversen 
Date:   Tue Oct 10 12:06:20 2017 +0200

iOS, readd component file.

component file is needed

Change-Id: Iaa26f0e5b9dd4a1385adb0051fc22fd87cb480f1

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index ad253dd0eb27..11319cb87750 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -22,9 +22,10 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
avmedia/source/avmediadummy \
 ))
 
-else
 $(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
 
+else
+
 
 $(eval $(call gb_Library_add_defs,avmedia,\
-DAVMEDIA_DLLIMPLEMENTATION \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk avmedia/Module_avmedia.mk avmedia/source config_host.mk.in configure.ac

2017-09-23 Thread jan Iversen 
 avmedia/Library_avmedia.mk  |9 +++
 avmedia/Module_avmedia.mk   |2 
 avmedia/source/avmediadummy.cxx |   96 
 config_host.mk.in   |1 
 configure.ac|5 +-
 5 files changed, 112 insertions(+), 1 deletion(-)

New commits:
commit 6132e8d2868e26ffe079e540b23a408e6201d339
Author: jan Iversen 
Date:   Sat Sep 23 14:49:55 2017 +0200

iOS, dummy avmedia to satisty sdi files

if disable_avmedia is defined, change avmedia
to a dummy module.

libreOfficeLight links !

Change-Id: Ibb41ed3ba48cc3143f17000f1c6073611c798e53

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 4e3104681578..334ea70da3d2 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -19,6 +19,14 @@ $(eval $(call gb_Library_set_include,avmedia,\
 
 $(eval $(call gb_Library_use_sdk_api,avmedia,))
 
+ifeq ($(USE_AVMEDIA_DUMMY),TRUE)
+$(eval $(call gb_Library_add_exception_objects,avmedia,\
+   avmedia/source/avmediadummy \
+))
+
+else
+
+
 $(eval $(call gb_Library_add_defs,avmedia,\
-DAVMEDIA_DLLIMPLEMENTATION \
 ))
@@ -84,5 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
avmedia/source/viewer/mediawindow \
avmedia/source/viewer/mediawindow_impl \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index deeae3979bef..8e1bd011d5e8 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\
Library_avmedia \
 ))
 
+ifneq ($(USE_AVMEDIA_DUMMY),TRUE)
 $(eval $(call gb_Module_add_l10n_targets,avmedia,\
 AllLangMoTarget_avmedia \
 ))
@@ -62,5 +63,6 @@ $(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaogl \
 ))
 endif
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx
new file mode 100644
index ..28f99d0a4dad
--- /dev/null
+++ b/avmedia/source/avmediadummy.cxx
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+
+#include 
+#include 
+#include "mediamisc.hxx"
+
+using namespace ::com::sun::star;
+
+namespace avmedia
+{
+MediaItem::MediaItem( sal_uInt16 i_nWhich, AVMediaSetMask )
+: SfxPoolItem( i_nWhich )
+{
+}
+
+MediaItem::MediaItem( const MediaItem& rItem )
+: SfxPoolItem( rItem )
+{
+}
+
+MediaItem::~MediaItem()
+{
+}
+
+struct MediaItem::Impl
+{
+};
+
+bool MediaItem::QueryValue( css::uno::Any&, sal_uInt8 ) const
+{
+return false;
+}
+
+bool MediaItem::GetPresentation( SfxItemPresentation, MapUnit, MapUnit, 
OUString&, const IntlWrapper& ) const
+{
+return false;
+}
+
+bool MediaItem::PutValue( const css::uno::Any&, sal_uInt8 )
+{
+  return false;
+}
+
+SfxPoolItem* MediaItem::CreateDefault()
+{
+return new MediaItem;
+}
+
+
+SfxPoolItem* MediaItem::Clone( SfxItemPool*) const
+{
+  return nullptr;
+}
+
+bool MediaItem::operator==( const SfxPoolItem& ) const
+{
+  return false;
+}
+
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/config_host.mk.in b/config_host.mk.in
index f660310b38f6..d8a7b9c14083 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -633,6 +633,7 @@ export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@
 export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
 export ZMF_CFLAGS=$(gb_SPACE)@ZMF_CFLAGS@
 export ZMF_LIBS=$(gb_SPACE)@ZMF_LIBS@
+export USE_AVMEDIA_DUMMY=@USE_AVMEDIA_DUMMY@
 
 # lang-related stuff
 include $(BUILDDIR)/config_$(gb_Side)_lang.mk
diff --git a/configure.ac b/configure.ac
index 3626601363ec..77203d4b0944 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2388,10 +2388,13 @@ if test -z "$enable_avmedia"; then
 enable_avmedia=yes
 fi
 
+BUILD_TYPE="$BUILD_TYPE AVMEDIA"
 if test "$enable_avmedia" = yes; then
-BUILD_TYPE="$BUILD_TYPE AVMEDIA"
 AC_DEFINE(HAVE_FEATURE_AVMEDIA)
+else
+

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk configure.ac desktop/Executable_oosplash.mk download.lst external/cairo external/collada2gltf external/libpng external/libzmf Makefile.fetch

2017-09-15 Thread Michael Stahl 
 Makefile.fetch  |2 
 RepositoryExternal.mk   |   12 ++---
 avmedia/Library_avmedia.mk  |2 
 configure.ac|2 
 desktop/Executable_oosplash.mk  |2 
 download.lst|4 -
 external/cairo/ExternalProject_cairo.mk |4 -
 external/collada2gltf/StaticLibrary_collada2gltf.mk |2 
 external/libpng/Module_libpng.mk|4 -
 external/libpng/StaticLibrary_libpng.mk |   42 
 external/libpng/StaticLibrary_png.mk|   42 
 external/libpng/UnpackedTarball_libpng.mk   |6 +-
 external/libzmf/ExternalProject_libzmf.mk   |2 
 vcl/commonfuzzer.mk |2 
 writerperfect/Library_wpftdraw.mk   |2 
 15 files changed, 65 insertions(+), 65 deletions(-)

New commits:
commit b0e0ee45d667df1473b47e441a6911dd2b4eadba
Author: Michael Stahl 
Date:   Thu Sep 14 14:12:40 2017 +0200

consistent naming of externals: png -> libpng

Change-Id: I82d95e74318600b390d5add716773c658817e504
Reviewed-on: https://gerrit.libreoffice.org/42296
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Makefile.fetch b/Makefile.fetch
index 81af88593c7a..af57d2f9066c 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -158,7 +158,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,LIBGPGERROR,LIBGPGERROR_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \
-   $(call fetch_Optional,LIBPNG,PNG_TARBALL) \
+   $(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \
$(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
LIBXMLSEC_TARBALL \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4794fce5541e..22dcc802aeaa 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2644,7 +2644,7 @@ endif # ENABLE_DBUS
 
 ifneq ($(SYSTEM_LIBPNG),)
 
-define gb_LinkTarget__use_png
+define gb_LinkTarget__use_libpng
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(LIBPNG_CFLAGS) \
@@ -2656,25 +2656,25 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
-gb_ExternalProject__use_png :=
+gb_ExternalProject__use_libpng :=
 
 else # !SYSTEM_LIBPNG
 
-define gb_LinkTarget__use_png
+define gb_LinkTarget__use_libpng
 $(call gb_LinkTarget_set_include,$(1),\
$(LIBPNG_CFLAGS) \
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),\
-   png \
+   libpng \
 )
 $(call gb_LinkTarget__use_zlib,$(1))
 
 endef
 
-define gb_ExternalProject__use_png
+define gb_ExternalProject__use_libpng
 $(call gb_ExternalProject_use_static_libraries,$(1),\
-   png \
+   libpng \
 )
 
 endef
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 72f46a38b5c6..4e3104681578 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -67,7 +67,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\
collada2gltf \
libxml2 \
opencollada_parser \
-   png \
+   libpng \
 ))
 
 endif
diff --git a/configure.ac b/configure.ac
index 3de1c765acf5..e5132ec4c034 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11266,7 +11266,7 @@ dnl 
===
 dnl Test whether to build libpng or rely on the system version
 dnl ===
 
-libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${WORKDIR}/UnpackedTarball/png"],["-L${WORKDIR}/LinkTarget/StaticLibrary
 -lpng"])
+libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${WORKDIR}/UnpackedTarball/libpng"],["-L${WORKDIR}/LinkTarget/StaticLibrary
 -llibpng"])
 
 dnl ===
 dnl Check for runtime JVM search path
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 3f49b2d4eabf..365b58fdab5e 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Executable_add_defs,oosplash,\
 ))
 
 $(eval $(call gb_Executable_use_externals,oosplash,\
-png \
+libpng \
 ))
 
 endif
diff --git a/download.lst b/download.lst
index 1778fa2d3ec0..f59fd67b0337 100644
--- a/download.lst
+++ b/download.lst
@@ -191,8 +191,8 @@ export PDFIUM_SHA256SUM := 
76b08c5bc9cd41ccdd58aa41491d3f8e1fad517d7cb3e16d285b6
 export PDFIUM_TARBALL := pdfium-3196.tar.bz2
 export PIXMAN_SHA256SUM :=

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk avmedia/Library_avmediaogl.mk bin/check-elf-dynamic-objects bin/lo-all-static-libs canvas/Library_oglcanvas.mk canvas/source chart2/inc chart

2016-12-13 Thread Caolán McNamara 
 Makefile.fetch  |2 
 RepositoryExternal.mk   |   46 --
 avmedia/Library_avmedia.mk  |2 
 avmedia/Library_avmediaogl.mk   |6 -
 bin/check-elf-dynamic-objects   |2 
 bin/lo-all-static-libs  |2 
 canvas/Library_oglcanvas.mk |7 -
 canvas/source/opengl/ogl_buffercontext.hxx  |2 
 canvas/source/opengl/ogl_canvascustomsprite.cxx |2 
 canvas/source/opengl/ogl_canvashelper.cxx   |2 
 canvas/source/opengl/ogl_canvastools.cxx|2 
 canvas/source/opengl/ogl_texturecache.cxx   |2 
 canvas/source/opengl/ogl_tools.hxx  |3 
 chart2/Library_chartcore.mk |9 --
 chart2/Library_chartopengl.mk   |4 
 chart2/inc/pch/precompiled_chartcore.hxx|2 
 chart2/source/view/charttypes/GL3DBarChart.cxx  |2 
 chart2/source/view/main/GL3DRenderer.cxx|8 -
 chart2/source/view/main/OpenGLRender.cxx|2 
 config_host.mk.in   |6 -
 config_host/config_opengl.h.in  |   10 --
 configure.ac|   21 ++--
 cui/Library_cui.mk  |2 
 distro-configs/LibreOfficeFlatpak.conf  |1 
 download.lst|7 -
 external/Module_external.mk |2 
 external/epoxy/Library_epoxy.mk |   63 ++
 external/epoxy/Makefile |7 +
 external/epoxy/Module_epoxy.mk  |   17 +++
 external/epoxy/README   |5 +
 external/epoxy/UnpackedTarball_epoxy.mk |   20 
 external/epoxy/epoxy.windows.api.patch  |   90 
 external/glew/ExternalPackage_glew.mk   |   33 ---
 external/glew/ExternalProject_glew.mk   |   36 
 external/glew/Makefile  |7 -
 external/glew/Module_glew.mk|   18 
 external/glew/README|6 -
 external/glew/UnpackedTarball_glew.mk   |   48 --
 external/glew/glew-macosx-install-name.patch.1  |   13 --
 external/glew/glew-msvc-disable-sse2.patch.1|   10 --
 external/glew/glew-static-only.patch.1  |   12 --
 external/glew/glew-tmpdir.patch.1   |   13 --
 external/glew/glew_use_CC_variable.patch.1  |   24 -
 external/libgltf/ExternalProject_libgltf.mk |   10 +-
 external/libgltf/libgltf-msvc-x64.patch.1   |   31 +++---
 include/vcl/opengl/OpenGLContext.hxx|6 -
 include/vcl/opengl/OpenGLHelper.hxx |2 
 include/vcl/opengl/OpenGLWrapper.hxx|2 
 slideshow/Library_OGLTrans.mk   |9 --
 slideshow/Library_slideshow.mk  |2 
 slideshow/source/engine/opengl/TransitionImpl.cxx   |1 
 slideshow/source/engine/opengl/TransitionImpl.hxx   |2 
 slideshow/source/engine/opengl/TransitionerImpl.cxx |2 
 svx/Library_svxcore.mk  |2 
 toolkit/Library_tk.mk   |2 
 vcl/CppunitTest_vcl_bitmap_test.mk  |2 
 vcl/CppunitTest_vcl_wmf_test.mk |4 
 vcl/Executable_icontest.mk  |2 
 vcl/Executable_vcldemo.mk   |2 
 vcl/Executable_visualbackendtest.mk |1 
 vcl/Library_vcl.mk  |3 
 vcl/Library_vclplug_gen.mk  |3 
 vcl/Library_vclplug_gtk.mk  |2 
 vcl/Library_vclplug_gtk3.mk |2 
 vcl/Library_vclplug_kde4.mk |2 
 vcl/inc/opengl/LineRenderUtils.hxx  |1 
 vcl/inc/opengl/VertexUtils.hxx  |2 
 vcl/inc/opengl/framebuffer.hxx  |1 
 vcl/inc/opengl/program.hxx  |1 
 vcl/inc/opengl/texture.hxx  |2 
 vcl/inc/pch/precompiled_vcl.hxx |2 
 vcl/inc/unx/saldisp.hxx |2 
 vcl/opengl/win/gdiimpl.cxx  |   34 ++-
 vcl/opengl/x11/gdiimpl.cxx  |   31 ++
 vcl/osx/salobj.cxx  |4 
 vcl/source/opengl/OpenGLContext.cxx |   34 +--
 vcl/source/opengl/OpenGLHelper.cxx  |8 -
 vcl/unx/generic/app/saldisp.cxx |1 
 vcl/workben/icontest.cxx|2 
 79 files changed, 359 insertions(+),

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk chart2/Library_chartcore.mk chart2/Module_chart2.mk config_host.mk.in configure.ac cui/Library_cui.mk postprocess/CustomTarget_registry.mk po

2016-08-03 Thread Tor Lillqvist 
 avmedia/Library_avmedia.mk   |2 +-
 chart2/Library_chartcore.mk  |8 
 chart2/Module_chart2.mk  |2 +-
 config_host.mk.in|2 +-
 configure.ac |   14 +++---
 cui/Library_cui.mk   |2 +-
 postprocess/CustomTarget_registry.mk |2 +-
 postprocess/Rdb_services.mk  |8 +++-
 scp2/InstallModule_impress.mk|2 +-
 slideshow/Library_slideshow.mk   |2 +-
 slideshow/Module_slideshow.mk|2 +-
 svx/Library_svxcore.mk   |2 +-
 toolkit/Library_tk.mk|2 +-
 vcl/CppunitTest_vcl_bitmap_test.mk   |2 +-
 vcl/Executable_icontest.mk   |2 +-
 vcl/Executable_vcldemo.mk|2 +-
 vcl/Library_vcl.mk   |2 +-
 17 files changed, 28 insertions(+), 30 deletions(-)

New commits:
commit e13aead8a19c65144fc254f9e3a694584ab1777c
Author: Tor Lillqvist 
Date:   Wed Aug 3 22:12:29 2016 +0300

Reduce ENABLE_OPENGL / ENABLE_HEADLESS confusion

ENABLE_OPENGL means whether to enable the OpenGL slideshow transition
code. It does not mean whether to enable use of OpenGL in general. So
rename it to ENABLE_OPENGL_TRANSITIONS while at it.

ENABLE_HEADLESS means whether to disable use of X11 and OpenGL on X11
(and Wayland) platforms, I think, meaning Linux and maybe Solaris and
the BSDs. Maybe it should be renamed to DISABLE_X11_AND_OPENGL.

Change-Id: Ibb30f51646b1bcc477fe691a3fa38c7a1e3944ae

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 6a0c35b..4c028ca 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\
boost_headers \
 ))
 
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_use_externals,avmedia,\
 glew \
 ))
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 75a7655..b15f634 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_use_externals,chartcore,\
glm_headers \
 ))
 
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_use_externals,chartcore,\
 glew \
 ))
@@ -119,7 +119,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
 chart2/source/view/main/VPolarTransformation \
 chart2/source/view/main/VTitle \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_add_exception_objects,chartcore,\
 chart2/source/view/main/3DChartObjects \
 chart2/source/view/main/GL3DPlotterBase \
@@ -264,12 +264,12 @@ else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
 $(eval $(call gb_Library_add_libs,chartcore,\
$(DLOPEN_LIBS) \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_add_libs,chartcore,\
 -lGL \
 -lX11 \
 ))
-endif #ENABLE_OPENGL
+endif #!ENABLE_HEADLESS
 
 endif
 
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 3b32e1c..5a88f18 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,chart2,\
 Library_chartcontroller \
 Library_chartcore \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Module_add_targets,chart2,\
  Library_chartopengl \
  Package_opengl \
diff --git a/config_host.mk.in b/config_host.mk.in
index 04613e1..91eeaba 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -159,7 +159,7 @@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
 export ENABLE_ONLINE_UPDATE_MAR=@ENABLE_ONLINE_UPDATE_MAR@
 export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
 export ENABLE_OOENV=@ENABLE_OOENV@
-export ENABLE_OPENGL=@ENABLE_OPENGL@
+export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
diff --git a/configure.ac b/configure.ac
index b9e7217..1ec2250 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10451,29 +10451,29 @@ else
 fi
 AC_SUBST(ENABLE_VLC)
 
-# this is for opengl transitions in impress slideshow
-ENABLE_OPENGL=
+ENABLE_OPENGL_TRANSITIONS=
+ENABLE_OPENGL_CANVAS=
 if test $_os = iOS -o $_os = Android; then
: # disable
 elif test "$_os" = "Darwin"; then
 # We use frameworks on Mac OS X, no need for detail checks
-ENABLE_OPENGL=TRUE
+ENABLE_OPENGL_TRANSITIONS=TRUE
 AC_DEFINE(HAVE_FEATURE_OPENGL,1)
 ENABLE_OPENGL_CANVAS=TRUE
 elif test $_os = WINNT; then
-ENABLE_OPENGL=TRUE
+ENABLE_OPENGL_TRANSITIONS=TRUE
 AC_DEFINE(HAVE_FEATURE_OPENGL,1)
 ENABLE_OPENGL_CANVAS=TRUE
 else
 if test "$USING_X11" = TRUE; then
 AC_CHECK_LIB(GL, glBegin, [:], AC_MSG_ERROR([libGL required.]))
-ENABLE_OPENGL=TRUE
+

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk avmedia/Module_avmedia.mk configure.ac

2016-04-05 Thread Oliver Specht 
 avmedia/Library_avmedia.mk |2 --
 avmedia/Module_avmedia.mk  |2 --
 configure.ac   |2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 0bb43aabab4fe772d2be7dfe3cc228473da19c2d
Author: Oliver Specht 
Date:   Wed Mar 30 09:18:58 2016 +0200

headless build: reset ENABLE_GLTF and use that setting as before

Change-Id: Iea54c59393c7c2955ec5fa321d9e9ea7b57b198a
Reviewed-on: https://gerrit.libreoffice.org/23831
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index f091822..6a0c35b 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -51,12 +51,10 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
 ))
 
 ifeq ($(ENABLE_GLTF),TRUE)
-ifeq ($(ENABLE_OPENGL),TRUE)
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
avmedia/source/framework/modeltools \
 ))
 endif
-endif
 
 ifeq ($(ENABLE_COLLADA),TRUE)
 
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index db5fcae..fb9497d 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -55,12 +55,10 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 ))
 endif
 
-ifeq ($(ENABLE_OPENGL),TRUE)
 ifeq ($(ENABLE_GLTF),TRUE)
 $(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaogl \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/configure.ac b/configure.ac
index 7ee051c..d8f67a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10463,7 +10463,7 @@ dnl Check whether to enable glTF support
 dnl ===
 AC_MSG_CHECKING([whether to enable glTF support])
 ENABLE_GLTF=
-if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android; then
+if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android -a 
"$ENABLE_HEADLESS" = ""; then
 ENABLE_GLTF=TRUE
 AC_MSG_RESULT([yes])
 AC_DEFINE(HAVE_FEATURE_GLTF,1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk avmedia/Library_avmediaogl.mk avmedia/Module_avmedia.mk avmedia/source canvas/source chart2/Library_chartcore.mk chart2/Module_chart2.mk char

2016-03-25 Thread Oliver Specht 
 Repository.mk |9 +++-
 RepositoryExternal.mk |2 
 avmedia/Library_avmedia.mk|   10 
 avmedia/Library_avmediaogl.mk |3 -
 avmedia/Module_avmedia.mk |2 
 avmedia/source/viewer/mediawindow_impl.cxx|5 +-
 canvas/source/factory/cf_service.cxx  |5 ++
 chart2/Library_chartcore.mk   |   28 +---
 chart2/Module_chart2.mk   |8 ++-
 chart2/source/controller/main/ChartWindow.cxx |6 ++
 chart2/source/model/template/ChartTypeManager.cxx |9 +++-
 chart2/source/view/main/ChartView.cxx |   24 --
 config_host/config_features.h.in  |   14 +-
 configure.ac  |   19 
 cui/Library_cui.mk|6 ++
 cui/source/options/optgdlg.cxx|   13 -
 desktop/Library_sofficeapp.mk |7 +++
 desktop/source/app/sofficemain.cxx|5 +-
 external/cairo/ExternalProject_cairo.mk   |7 +--
 include/vcl/outdev.hxx|4 +
 postprocess/Rdb_services.mk   |2 
 sd/source/ui/func/fuinsert.cxx|3 -
 sd/source/ui/view/sdview4.cxx |3 -
 slideshow/Library_slideshow.mk|6 ++
 slideshow/Module_slideshow.mk |8 ++-
 slideshow/source/engine/shapes/viewmediashape.cxx |4 +
 svx/Library_svxcore.mk|6 ++
 sw/qa/extras/uiwriter/uiwriter.cxx|9 +++-
 toolkit/Library_tk.mk |6 ++
 toolkit/source/awt/vclxtoolkit.cxx|7 +++
 vcl/CppunitTest_vcl_bitmap_test.mk|6 ++
 vcl/Executable_icontest.mk|6 ++
 vcl/Executable_vcldemo.mk |6 ++
 vcl/Library_vcl.mk|   49 ++
 vcl/headless/headlessinst.cxx |2 
 vcl/headless/svpgdi.cxx   |4 +
 vcl/inc/unx/salgdi.h  |3 -
 vcl/qa/cppunit/BitmapTest.cxx |5 ++
 vcl/source/app/svapp.cxx  |4 +
 vcl/source/app/svdata.cxx |5 ++
 vcl/source/app/svmain.cxx |8 +++
 vcl/source/gdi/bitmap3.cxx|8 +++
 vcl/source/gdi/salgdilayout.cxx   |6 ++
 vcl/source/outdev/bitmap.cxx  |7 ++-
 vcl/source/window/event.cxx   |7 ++-
 vcl/source/window/paint.cxx   |   15 +-
 vcl/source/window/status.cxx  |6 ++
 vcl/unx/generic/app/geninst.cxx   |6 ++
 vcl/workben/vcldemo.cxx   |9 ++--
 49 files changed, 312 insertions(+), 90 deletions(-)

New commits:
commit 96c1ae1d8e78ae8b9bd7d4001645cad24d62b720
Author: Oliver Specht 
Date:   Wed Mar 23 13:40:13 2016 +0100

fix headless build

disables OpenGL and glew usage, lets --without-gui do what
--without-x did before and disables X related test

Change-Id: I680b47c9962a0d43c8ece593db0b82e347ceebdb
Reviewed-on: https://gerrit.libreoffice.org/23474
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 

diff --git a/Repository.mk b/Repository.mk
index 423d58b..fc550d1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -543,7 +543,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
$(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \
$(if $(ENABLE_DIRECTX),avmediawin) \
-   $(if $(ENABLE_GLTF),avmediaogl) \
cached1 \
collator_data \
comphelper \
@@ -606,6 +605,14 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
) \
 ))
 
+ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_GLTF),TRUE)
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+avmediaogl \
+))
+endif
+endif
+
 ifeq ($(OS),WNT)
 $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \
$(if $(DISABLE_ACTIVEX),,\
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 491c398..8df085b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -183,6 +183,7 @@ endef
 
 endif # SYSTEM_CPPUNIT
 
+ifeq ($(ENABLE_OPENGL),TRUE)
 ifneq ($(SYSTEM_GLEW),)
 
 define gb_LinkTarget__use_glew
@@ -228,6 +229,7 @@ $(call gb_ExternalProject_use_external_project,$(1),glew)
 endef
 
 endif # SYSTEM_GLEW
+endif # ENABLE_OPENGL
 
 ifneq ($(SYSTEM_GLYPHY),)
 
diff --git

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk avmedia/Library_avmediaogl.mk canvas/Library_oglcanvas.mk chart2/Library_chartcore.mk chart2/Library_chartopengl.mk configure.ac desktop/Libr

2015-11-11 Thread Tor Lillqvist 
 avmedia/Library_avmedia.mk  |2 -
 avmedia/Library_avmediaogl.mk   |2 -
 canvas/Library_oglcanvas.mk |2 -
 chart2/Library_chartcore.mk |2 -
 chart2/Library_chartopengl.mk   |2 -
 configure.ac|   36 ++--
 desktop/Library_sofficeapp.mk   |1 
 external/libgltf/ExternalProject_libgltf.mk |2 -
 slideshow/Library_OGLTrans.mk   |2 -
 slideshow/Library_slideshow.mk  |2 -
 svx/Executable_gengal.mk|1 
 svx/Library_svxcore.mk  |2 -
 vcl/CppunitTest_vcl_bitmap_test.mk  |2 -
 vcl/Executable_icontest.mk  |3 --
 vcl/Executable_mtfdemo.mk   |1 
 vcl/Executable_ui-previewer.mk  |1 
 vcl/Executable_vcldemo.mk   |3 --
 vcl/StaticLibrary_glxtest.mk|1 
 18 files changed, 31 insertions(+), 36 deletions(-)

New commits:
commit b216cc1b8096eb60c27f67e8c27b7cd756c75e38
Author: Tor Lillqvist 
Date:   Thu Nov 12 01:13:01 2015 +0200

Avoid mesa_headers on X11, also link with -lGL only where necesssary

The GLEW headers are enough, and what we actually use in these
places. In addition to handling GL extension things in its dynamic
fashion, GLEW headers also have declarations for standard,
non-extension, OpenGL API, including xgl and wgl ones.

Most likely we don't need mesa_headers on Windows or OS X either, and
can drop them completely.

Change-Id: Ic0d8d6238c862f8fe4a74e99e95344dcbf540980

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index ec70670..f922486 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Library_add_defs,avmedia,\
 $(eval $(call gb_Library_use_externals,avmedia,\
boost_headers \
glew \
-   mesa_headers \
+   $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 $(eval $(call gb_Library_use_libraries,avmedia,\
diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk
index 3ff9818..117e896 100644
--- a/avmedia/Library_avmediaogl.mk
+++ b/avmedia/Library_avmediaogl.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_Library_use_externals,avmediaogl, \
 libgltf \
 glew \
 glm_headers \
-mesa_headers \
+$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 $(eval $(call gb_Library_use_libraries,avmediaogl,\
diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk
index 7f859f6..839567d 100644
--- a/canvas/Library_oglcanvas.mk
+++ b/canvas/Library_oglcanvas.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_exception_objects,oglcanvas,\
 $(eval $(call gb_Library_use_externals,oglcanvas,\
boost_headers \
glew \
-   mesa_headers \
+   $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 ifeq ($(strip $(OS)),MACOSX)
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index c65f262..f611c68 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_use_externals,chartcore,\
boost_headers \
glm_headers \
glew \
-   mesa_headers \
+   $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,chartcore,\
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index 83d52d8..440ef9e 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -22,7 +22,7 @@ $(eval $(call 
gb_Library_set_precompiled_header,chartopengl,$(SRCDIR)/chart2/inc
 $(eval $(call gb_Library_use_externals,chartopengl,\
boost_headers \
glm_headers \
-   mesa_headers \
+   $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
glew \
 ))
 
diff --git a/configure.ac b/configure.ac
index 6bdf28d..31cc1d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10410,23 +10410,25 @@ else
 fi
 ENABLE_OPENGL_CANVAS=TRUE
 
-dnl ===
-dnl Check for system Mesa
-dnl ===
-AC_MSG_CHECKING([which Mesa headers to use])
-if test "$with_system_mesa_headers" = "yes"; then
-AC_MSG_RESULT([external])
-SYSTEM_MESA_HEADERS=TRUE
-AC_LANG_PUSH(C)
-AC_CHECK_HEADER(GL/glxext.h, [],
-   [ AC_MSG_ERROR(mesa headers not found.)], [#include ])
-AC_MSG_CHECKING([whether GL/glxext.h defines 
PFNGLXBINDTEXIMAGEEXTPROC])
-AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, 
[AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
-AC_LANG_POP(C)
-else
-AC_MSG_RESULT([internal])
-SYSTEM_MESA_HEADERS=
-BUILD_TYPE="$BUILD_TYPE MESA"
+if test "$USING_X11" != TRUE; then
+

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk avmedia/source config_host/config_features.h.in config_host.mk.in configure.ac include/avmedia RepositoryExternal.mk sd/source

2014-08-07 Thread Zolnai Tamás 
 RepositoryExternal.mk   |6 +-
 avmedia/Library_avmedia.mk  |5 +
 avmedia/source/framework/modeltools.cxx |9 ++---
 config_host.mk.in   |1 +
 config_host/config_features.h.in|5 +
 configure.ac|   23 +++
 include/avmedia/modeltools.hxx  |4 
 sd/source/ui/func/fuinsert.cxx  |9 +
 8 files changed, 50 insertions(+), 12 deletions(-)

New commits:
commit 191f0944fd8fc30493eda58c7adfdfa0b538f507
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Thu Aug 7 15:21:41 2014 +0200

Handle collada libraries seperately: --disable-collada

Depends on gltf support.

Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1961829..1822f95 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3373,6 +3373,8 @@ endef
 
 endif # SYSTEN_LIBGLTF
 
+ifeq ($(ENABLE_COLLADA),TRUE)
+
 define gb_LinkTarget__use_opencollada_parser
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call 
gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
@@ -3403,7 +3405,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 )
 endef
 
-endif
+endif # ENABLE_COLLADA
+
+endif # ENABLE_GLTF
 
 ### Jars 
 
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 184c66c..7cc08fa 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
 ))
 endif
 
-ifneq (,$(filter COLLADA2GLTF,$(BUILD_TYPE)))
+ifeq ($(ENABLE_COLLADA),TRUE)
 $(eval $(call gb_Library_set_warnings_not_errors,avmedia))
 
 ifeq ($(OS),LINUX)
@@ -68,9 +68,6 @@ $(eval $(call gb_Library_use_externals,avmedia,\
png \
 ))
 
-$(eval $(call gb_Library_add_defs,avmedia,\
-   -DENABLE_COLLADA2GLTF \
-))
 endif
 
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
diff --git a/avmedia/source/framework/modeltools.cxx 
b/avmedia/source/framework/modeltools.cxx
index 87c7519..4360f42 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -29,7 +29,9 @@
 #include boost/foreach.hpp
 #include boost/optional.hpp
 
-#ifdef ENABLE_COLLADA2GLTF
+#include config_features.h
+
+#if HAVE_FEATURE_COLLADA
 #include COLLADA2GLTFWriter.h
 #include GLTFAsset.h
 #endif
@@ -42,7 +44,7 @@ using namespace boost::property_tree;
 
 namespace avmedia {
 
-#ifdef ENABLE_COLLADA2GLTF
+#if HAVE_FEATURE_COLLADA
 
 static void lcl_UnzipKmz(const OUString rSourceURL, const OUString 
rOutputFolderURL, OUString o_rDaeFileURL)
 {
@@ -241,7 +243,8 @@ bool Embed3DModel( const uno::Referenceframe::XModel 
xModel,
 const OUString rSourceURL, OUString o_rEmbeddedURL)
 {
 OUString sSource = rSourceURL;
-#ifdef ENABLE_COLLADA2GLTF
+
+#if HAVE_FEATURE_COLLADA
 if( !rSourceURL.endsWithIgnoreAsciiCase(.json) )
 KmzDae2Gltf(rSourceURL, sSource);
 #endif
diff --git a/config_host.mk.in b/config_host.mk.in
index 31dea01..1d4520cf 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -112,6 +112,7 @@ export ENABLE_COINMP=@ENABLE_COINMP@
 export SYSTEM_COINMP=@SYSTEM_COINMP@
 export COINMP_CFLAGS=@COINMP_CFLAGS@
 export COINMP_LIBS=@COINMP_LIBS@
+export ENABLE_COLLADA=@ENABLE_COLLADA@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_CURL=@ENABLE_CURL@
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 3fd1da5..f87ee27 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -142,4 +142,9 @@
  */
 #define HAVE_FEATURE_GLTF 0
 
+/*
+ * Whether we have COLLADA support.
+ */
+#define HAVE_FEATURE_COLLADA 0
+
 #endif
diff --git a/configure.ac b/configure.ac
index 12e5f81..ee388ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ AC_ARG_ENABLE(gltf,
 AS_HELP_STRING([--disable-gltf],
 [Determines whether to build libraries related to glTF 3D model 
rendering.]))
 
+AC_ARG_ENABLE(collada,
+AS_HELP_STRING([--disable-collada],
+[Disable collada support (Rendering 3D models stored in *.dae and 
*.kmz format).]))
+
 dnl ===
 dnl Optional Packages (--with/without-)
 dnl ===
@@ -10640,10 +10644,6 @@ if test x$enable_gltf != xno -a $_os != iOS -a 
$_os != Android; then
 else
BUILD_TYPE=$BUILD_TYPE LIBGLTF
 fi
-# otherwise build fails in collada2gltf external because of std::shared_ptr
-if test $have_std_shared_ptr = yes; then
-BUILD_TYPE=$BUILD_TYPE COLLADA2GLTF
-fi
 else
 AC_MSG_RESULT([no])
 fi
@@ -10652,6 +10652,21 @@ AC_SUBST(SYSTEM_LIBGLTF)
 AC_SUBST(LIBGLTF_CFLAGS)
 AC_SUBST(LIBGLTF_LIBS)
 
+dnl

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk

2014-05-15 Thread Tor Lillqvist 
 avmedia/Library_avmedia.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit eafecb57c91e943f22285d4d579df2932e5c1555
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 15 09:49:42 2014 +0300

Need zlib because of collada2gltf

Change-Id: I83a48ceb2cb2cf96e4c10d0e17d9076c663530aa

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index fcd4a07..48f36c4 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\
boost_headers \
glew \
mesa_headers \
+   zlib \
 ))
 
 $(eval $(call gb_Library_use_libraries,avmedia,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits