Commit Graph

20 Commits

Author SHA1 Message Date
b536cabf97 fix build errors related to AVFoundation @ OS X <10.7
AVFoundation framework is available in OS X v10.7 and later

related commits:
  7822b5535cccc68e5b454d04a66a6b4f27675ec6
  0b49cc5b03b39aa1dfddf924c6eaf8cb42e791a8

Change-Id: If771fca79c41d70e51eab533faec7bb9997803b7
Reviewed-on: https://gerrit.libreoffice.org/9769
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2014-07-07 15:58:53 +00:00
7822b5535c Make the MacAVF code build also as 32-bit
When compiling 32-bit OS X code, the code will use the "legacy
Objective-C runtime", which means that instance variables of an
Objective-C class must be declared in the @interface block, not in the
@implementation.

CGRect and NSRect are not the same for 32-bit code.

Also, use boost::unordered_map.

Change-Id: Icc56ff298203565a7568714b0e9f42c7c6b89737
2014-05-16 12:43:03 +03:00
2a9018b9f5 The macavf code doesn't compile as 32-bit, sigh
Change-Id: I51336c09aaa6ecdaa5da537a4a21efbff305da6e
2014-05-15 19:45:13 +03:00
0a829b062c The AVFoundation framework appeared in OS X 10.7
Change-Id: I76eb213ff4cb93196ea81dd43a465da61c0cdee2
2014-05-15 19:26:52 +03:00
c0a3bc0570 The AVMedia framework is not deprecated
So no reason to avoid it when building for the Mac App Store
(i.e. when building a sandboxed LibreOffice). (At least I assume it
was because of the deprecatedness of QuickTime that it was conditional
on not building a sandboxed LibreOffice.)

Change-Id: I9d50490aa878ba5e40594b39eac88f23df3ef0a6
2014-05-15 19:00:49 +03:00
f3b3144133 AOO: #i124875# support Mac AV-Foundation API for multimedia content
Adapted as needed and gbuildified by tml. For the files that actually
are Objective-C++ use the .mm suffix.

Change-Id: Ieec40b722df6463a1061d19d38154828ff8adca2
2014-05-15 18:49:14 +03:00
541761d7b8 prefer makefile-gmake-mode
Change-Id: I9cc9bfbddd3a90e00eee3e674994e5d6207f9034
2014-04-28 23:35:42 +09:00
5f6fd413a3 avmediaogl: build depends on ENABLE_GLTF instead
Change-Id: I03d0d7c0446b6316e388ae717aded6bb7dcc88f1
2014-04-19 18:10:13 +02:00
4f48dc2f97 Skeleton of OpenGL avmedia service for playing 3D models
Change-Id: I3bf9e68e1a08ff3db065ec7f4e135119b7d1a4ef
2014-03-27 11:22:32 +01:00
5fc9a33b9a Drop the deprecated QuickTime stuff when building a sandboxed LO
A sandboxed build is presumably intended for the Mac App Store and we
don't want to be using deprecated crap there.

Change-Id: I0b0098f7002643b1ed53a5caaee9ffee3c9fc970
2014-02-03 11:43:58 +01:00
04dead1c6b make l10n buildable separately
- this renames the 'almost' module target to non-l10n
- and adds a l10n target which is intended to only build l10n parts of
  the product
- packagers should then be able to build l10n and non-l10n parts of the
  product independently, thus:
   - enable quicker rebuilds
   - distribution of load
   - updates to l10n without a full rebuild
   - security fixes to binaries without rebuilding all l10n
- the new targets are called build-l10n-only and build-non-l10n-only
- note this is not intended to move a concept of split packages
  upstream -- while this exsists in distros, the number of test
  scenarios for this would explode upstream

Change-Id: Ib8ccc9bc52718d9b0ebbfee76ad93dc29c260863

Conflicts:
	filter/Module_filter.mk
2013-11-14 16:45:02 +01:00
791e2f6665 initial vlc component build / conditionals and hookup.
Change-Id: I12e4a368e18a58099160ee65eebe837744e11378
2013-07-26 10:50:16 +01:00
72e5d0c8fb Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-30 13:34:06 +01:00
b9337e22ce execute move of global headers
see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-23 22:20:31 +02:00
12152d253e Replace GUIBASE checks with equivalent OS checks
The idea is to get rid of GUIBASE and GUI checks as much as possible.

GUIBASE=aqua <=> OS=MACOSX
GUIBASE=WIN <=> OS=WNT
GUIBASE=cocoatouch <=> OS=IOS
GUIBASE=android <=> OS=ANDROID

Don't set GUIBASE to these values any more in configure.ac
either.

GUIBASE_FOR_BUILD is not used anywhere.

Conflicts:
	configure.ac
	postprocess/packcomponents/makefile.mk
	postprocess/packregistry/makefile.mk

Change-Id: Ie0526b40e1073f2328ba6c333e28752104b0fed3
2012-12-18 20:52:24 -05:00
e37eb6345d postprocess: convert to gbuild
Change-Id: I6c81fa0f1b8d7273541d5d9883b5fc96a5091bbd
Reviewed-on: https://gerrit.libreoffice.org/1080
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-15 21:20:27 +00:00
4671e25d99 No need for BITNESS_OVERRIDE in makefilery as CPU etc work fine
Change-Id: I59f4d5ad275af62c997723908754112c062a31be
2012-09-29 08:16:31 +03:00
ff4f54eed2 No 64-bit Quicktime framework
Change-Id: Ie0b9ae2a908814eed43b351f15436a2b9c5ad484
2012-09-21 14:01:03 +03:00
21d7f4b4bb gstreamer: make gstreamer 1.0 and 0.10 dual compile
Add fallback activation of an _OLD media component to the core.
Compile both a 0.10 and 1.0 version of the gstreamer component

Change-Id: I91f65d05391cb2d7e02f9cff18f96178a128705O1
2012-08-09 20:46:16 +01:00
e85875b901 convert avmedia to gbuild 2011-08-22 15:18:52 +02:00