summaryrefslogtreecommitdiff
path: root/avmedia/Library_avmedia.mk
AgeCommit message (Collapse)Author
2023-09-23Use less epoxy external headers dependencyGabor Kelemen
Change-Id: If5d4e5a65a0fcea6bd67cdba48742f6aaec0811d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156556 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
2022-01-05Disable epoxy test with --disable-guiJan-Marek Glogowski
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 <glogow@fbihome.de>
2021-12-21Keep GUI with --enable-avmedia and --disable-guiJan-Marek Glogowski
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 <glogow@fbihome.de>
2021-12-10Generally determine Rdb content from gb_*_set_componentfile callsStephan Bergmann
...instead of by listing the content somewhat redundantly in the Rdb_*.mk files, to avoid duplication of logic for components that are only built conditionally (and thus should only be included conditionally in the corresponding Rdb). To achieve that, add an "rdb" parameter to gb_ComponentTarget_ComponentTarget (and to the gb_*_set_componentfile macros that internally call gb_ComponentTarget_ComponentTarget), which is used to make the appropriate gb_Rdb_add_component call internally from within gb_ComponentTarget_ComponentTarget. (As a special case, gb_CppunitTest_set_componentfile shall not call gb_Rdb_add_component, as that has already been done by the corresponding gb_Library_set_componentfile call, so allow the gb_ComponentTarget_ComponentTarget "rdb" parameter to be empty to support that special case.) Most Rdb_*.mk files are thus mostly empty now. One exception is i18npool/Rdb_saxparser.mk, which duplicates some of the Rdb_services content as needed during the build in CustomTarget_i18npool/localedata. 1c9a40299d328c78c035ca63ccdf22c5c669a03b "gbuild: create services.rdb from built components" had already tried to do something similar (in addition to other things) under a new --enable-services-rdb-from-build option. However, that approach had four drawbacks that this approach here addresses (and which thus partly reverts 1c9a40299d328c78c035ca63ccdf22c5c669a03b): 1 Rdb_services shall not contain the component files of all libraries that are built. While that commit filtered out the component files that go into Rdb_ure/services (ure/Rdb_ure.mk), it failed to filter out the component files that go into others like Rdb_postgresql-sdbc (connectivity/Rdb_postgresql-sdbc.mk). 2 The code added by that commit to Makefile.gbuild codified the knowledge that there is an Rdb_services, which is brittle. 3 The code added by that commit to solenv/gbuild/Rdb.mk codified the knowledge (for gb_Rdb__URECOMPONENTS) that there is an Rdb_ure/services, which is brittle. 4 Introducing an --enable-services-rdb-from-build option needlessly provided two different ways how the content of Rdb_services is assembled. The changes done here would leave --enable-services-rdb-from-build as a misnomer, as it no longer controls how Rdb_services is assembled. I thus renamed it to --enable-customtarget-components, as that is apparently what it still does now. Change-Id: Ia5e8df4b640146c77421fcec6daa11a9cd260265 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126577 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-12-04Fix --disable-(avmedia|scripting)TheRock Builder
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 <glogow@fbihome.de>
2021-12-01Fix --disable-avmedia for DESKTOP buildJan-Marek Glogowski
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 <glogow@fbihome.de>
2019-11-29Fix build with USE_AVMEDIA_DUMMY (iOS, at least)Tor Lillqvist
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 <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 8d8a3f66e57aefd7cf7d3bb6cb62059de5beded2)
2018-08-27rename ENABLE_HEADLESS option to DISABLE_GUINoel Grandin
since it has nothing to do with the headless command line option, so use the name it has in the configure.ac file Change-Id: Ibf0615ed02695d6e48a797f5632e4f417c010c70 Reviewed-on: https://gerrit.libreoffice.org/59611 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-22lokdialog: Allow switching language of some of the ResMgr's.Jan Holesovsky
This way, it is possible to have all the strings translated in dialogs even when different users use different languages. [It was already possible to have different languages previously, but not everything in the dialog has switched - like the buttons at the bottom of the dialogs etc.] Change-Id: I29a5ae6d31a370eec60397884200b684ec1bf5b9 Reviewed-on: https://gerrit.libreoffice.org/46417 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/46979 Tested-by: Jenkins <ci@libreoffice.org>
2017-10-30related: tdf#103884 remove gltf/collada featureThorsten Behrens
Change-Id: Icd26ad96c0337844ef1463dabfbe791caa00dd2d Reviewed-on: https://gerrit.libreoffice.org/43972 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-10-10Revert "iOS, removed unneeded avmedia libraries"jan Iversen
sorry for the noise. This reverts commit 032b1e87078fe60cf8b59b756d93b02b278ed8c8.
2017-10-10iOS, typojan Iversen
Change-Id: I6103c8b2ca6b306bec1f5a3ef9211a351cd64f05
2017-10-10iOS, readd component file.jan Iversen
component file is needed Change-Id: Iaa26f0e5b9dd4a1385adb0051fc22fd87cb480f1
2017-10-10iOS, removed unneeded avmedia librariesjan Iversen
add USE_AVMEDIA_DUMMY to .mk to stop libraries from being generated Change-Id: Ic8a81d681bfaa3f7124b3ad79007527517aaecd9
2017-09-23iOS, dummy avmedia to satisty sdi filesjan Iversen
if disable_avmedia is defined, change avmedia to a dummy module. libreOfficeLight links ! Change-Id: Ibb41ed3ba48cc3143f17000f1c6073611c798e53
2017-09-15consistent naming of externals: png -> libpngMichael Stahl
Change-Id: I82d95e74318600b390d5add716773c658817e504 Reviewed-on: https://gerrit.libreoffice.org/42296 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky
Uwinapi is discontinued. Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01 Reviewed-on: https://gerrit.libreoffice.org/23198 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2016-12-13change from glew to epoxyCaolán McNamara
because that works under wayland out of the box and gtk3 uses it already Change-Id: Iefaac31e325534a81a5389f752804af917c1baef Reviewed-on: https://gerrit.libreoffice.org/31213 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-08-15tdf#87794: Media Playback PanelYousuf Philips
Change-Id: I2ad02ea031c2a1f558f76bd4c5dd816e400c5269 Reviewed-on: https://gerrit.libreoffice.org/27363 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2016-08-03Reduce ENABLE_OPENGL / ENABLE_HEADLESS confusionTor Lillqvist
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
2016-04-05headless build: reset ENABLE_GLTF and use that setting as beforeOliver Specht
Change-Id: Iea54c59393c7c2955ec5fa321d9e9ea7b57b198a Reviewed-on: https://gerrit.libreoffice.org/23831 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
2016-03-25fix headless buildOliver Specht
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 <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
2015-11-12Bin mesa_headers completelyTor Lillqvist
We don't need them in a MSVC or OS X compilation either. Change-Id: I00181fe0a047df09bbdfcce34c07eb2ebc45a2da
2015-11-12Avoid mesa_headers on X11, also link with -lGL only where necesssaryTor Lillqvist
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
2014-11-10merge vcllo and vclopenglloMarkus Mohrhard
Change-Id: I419ca67dc1f87dd9ac751aa5a094fecf58136edb
2014-10-17More fine grained disabling of -Werror for collada headers onlyStephan Bergmann
Change-Id: I4f80d480e6e053038b85f6b26f74abc5921c2f38
2014-08-07Handle collada libraries seperately: --disable-colladaZolnai Tamás
Depends on gltf support. Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
2014-06-25Update libgltf: new build system and various fixesZolnai Tamás
Building: - The new tarball has reasonable build system so build libgltf as external package instead of compiling source files directly. - Freetype dependancy is removed Improvements comes with the new libgltf - Can rotate the models too (orbit mode) - Two camera handling mode: walkthrough and orbit (press M to change). - gltf_animation_set_time() works - FPS can be displayed without freetype (press F) Additional notes: - There were some bugs/regressions which are fixed during the integration (see patches). - License files are uddated now. - libgltf building is enabled only on those platforms on which gltf support actually works (windows and linux) Change-Id: Ia6c9c4da53a9b4fedba0d73aa5791489f8ad424b Reviewed-on: https://gerrit.libreoffice.org/9895 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-06-12Introduce HAVE_FEATURE_GLTF to enable/disable gltf related codeZolnai Tamás
When it is a release build then enable it only on Windows and Linux. Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742
2014-05-19libavmedia.so needs to link to librt under LinuxJeroen Nijhof
libavmedia.so links to libopencollada2gltf.a, which contains a reference to clock_gettime(). And for clock_gettime one needs to link to librt, under Linux, at least. So add -lrt when linking libavmedia.so. Change-Id: I28547c6216738b44701baaed7eaf44f5ca97e98a
2014-05-15Need zlib because of collada2gltfTor Lillqvist
Change-Id: I83a48ceb2cb2cf96e4c10d0e17d9076c663530aa
2014-05-13Use collada2gltf to open .dae files and convert them to .json.Matúš Kukan
Change-Id: Idb70da1db2516eeb6d518b39eb732a7e7d0a14ab
2014-04-28prefer makefile-gmake-modeTakeshi Abe
Change-Id: I9cc9bfbddd3a90e00eee3e674994e5d6207f9034
2014-04-27avmedia: create a special SystemChildWindow for 3D modelsZolnai Tamás
Change-Id: Id5f5ba2cf72ea78506ba226b269fae59b1163858
2014-04-02glTF 3D model embedding: Embed all external resources of *.json fileZolnai Tamás
Store them under /Model/<json_file_name_without_extension>/ modeltools: functions for handling 3D models inside avmedia Change-Id: Ia2bdad6064db372e1c946b6ab02c434545d1ed45
2013-11-18Fold MediaWindowBaseImpl into MediaWindowImplStephan Bergmann
Change-Id: Ie6366d8b1facb39a5f44279f0c49a229b019bcaa
2013-04-30Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks
2013-04-24gbuild: drop uses of removed packagesDavid Tardon
Change-Id: I400fad08c0ae7b6b34bad63693f54856867e4dac Reviewed-on: https://gerrit.libreoffice.org/3502 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-05new module i18nlangtagEike Rathke
Moved portions from module i18npool, all of former i18nisolang1 library that now is i18nlangtag. Included are languagetag, isolang and mslangid. This i18nlangtag code is now even used by module comphelper, so disentangling i18npool and making this an own module was needed to not create circular module dependencies. Change-Id: Ib887c3d6dde667403fd22d382310ba5f1a9b0015
2013-01-26gbuild: do not copy boost headers aroundMichael Stahl
- do not use gb_UnpackedTarball_copy_header_files for boost - adapt the optimization in concat-deps.c for new path - use boost_headers in all LinkTargets that require it - add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9
2012-11-22AllSettings with LanguageTagEike Rathke
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
2012-09-28gbuild: invert handling of standard system libraries:Michael Stahl
Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
2012-09-28gbuild: replace direct gb_STDLIBS use with ...Michael Stahl
... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
2012-09-28gbuild: split uwinapi out of gb_STDLIBSMichael Stahl
Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7
2012-07-02targetted improvement of UNO API includes / usageMichael Meeks
2012-04-08LinkTarget.mk: remove gb_LinkTarget_add_package_headersMichael Stahl
2012-04-08gbuild: "use" vs. "add":Michael Stahl
Naming convention for gbuild methods: - "add" is used for stuff that is logically a part of the target (i.e. not registered at the Module, but defined in the target's makefile) - "use" is used for stuff that is logically a different target (i.e. it is registered at the Module, has it's own makefile, may be in a different module than the target)
2012-03-10gbuild: get rid of realpath in gb_Foo_set_includeMatúš Kukan
2011-12-03add avmedia::EmbedMediaMichael Stahl
This new function is used by sc,sd,sw to embed media in the document storage.
2011-08-22convert avmedia to gbuildMatúš Kukan
generated by cgit (git 2.34.1) at 2024-12-26 22:47:44 +0000