Author: hdu
Date: Wed Jan 8 17:03:23 2014
New Revision: 1556579
URL: http://svn.apache.org/r1556579
Log:
#i114728# the quicktime framework is is no longer available in OSX SDKs>=10.7
Modified:
openoffice/trunk/main/avmedia/source/quicktime/makefile.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/scp2/source/ooo/makefile.mk
openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/types.mk
openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
openoffice/trunk/main/vcl/Library_vcl.mk
openoffice/trunk/main/vcl/util/makefile.mk
Modified: openoffice/trunk/main/avmedia/source/quicktime/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/quicktime/makefile.mk?rev=1556579&r1=1556578&r2=1556579&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/quicktime/makefile.mk (original)
+++ openoffice/trunk/main/avmedia/source/quicktime/makefile.mk Wed Jan 8
17:03:23 2014
@@ -25,7 +25,8 @@ PRJ=..$/..
PRJNAME=avmedia
TARGET=avmediaQuickTime
-.IF "$(GUIBASE)"=="aqua"
+# the QuickTime API has been removed in OSX SDK 10.7
+.IF "$(GUIBASE)"=="aqua" && "${MACOSX_DEPLOYMENT_TARGET:s/.//}"<"107"
# --- Settings ----------------------------------
@@ -43,10 +44,10 @@ SLOFILES= \
$(SLO)$/quicktimeuno.obj \
$(SLO)$/manager.obj \
$(SLO)$/window.obj \
- $(SLO)$/framegrabber.obj \
$(SLO)$/player.obj
EXCEPTIONSFILES= \
+ $(SLO)$/framegrabber.obj \
$(SLO)$/quicktimeuno.obj
SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
@@ -87,3 +88,4 @@ $(MISC)/avmediaQuickTime.component .ERRR
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
+
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1556579&r1=1556578&r2=1556579&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Wed Jan 8
17:03:23 2014
@@ -310,11 +310,13 @@ my_components += \
.IF "$(OS)" == "MACOSX"
my_components += \
- avmediaQuickTime \
fps_aqua \
macab1 \
macbe1 \
MacOSXSpell
+.IF "${MACOSX_DEPLOYMENT_TARGET:s/.//}"<"107"
+ my_components += avmediaQuickTime
+.END
.END
.IF "$(OS)" == "WNT"
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1556579&r1=1556578&r2=1556579&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Wed Jan 8
17:03:23 2014
@@ -586,7 +586,6 @@ End
#endif
#ifdef MACOSX
-#ifdef QUARTZ
File gid_File_Lib_Fps_Aqua
TXT_FILE_BODY;
Styles = (PACKED);
@@ -601,14 +600,15 @@ File gid_File_Lib_MacOSXSpell
Dir = SCP2_OOO_BIN_DIR;
End
+#if MACOSX_DEPLOYMENT_TARGET<107
File gid_File_Lib_avmediaQuickTime
TXT_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(avmediaQuickTime);
Dir = SCP2_OOO_BIN_DIR;
End
-#endif
-#endif
+#endif // MACOSX_DEPLOYMENT_TARGET
+#endif // MACOSX
#ifdef OS2
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_offi )
Modified: openoffice/trunk/main/scp2/source/ooo/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/makefile.mk?rev=1556579&r1=1556578&r2=1556579&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/trunk/main/scp2/source/ooo/makefile.mk Wed Jan 8 17:03:23 2014
@@ -306,6 +306,9 @@ SCPDEFS+=-DSYSTEM_LIBJPEG
SCPDEFS+=-DSYSTEM_PANGO
.ENDIF
+.IF "${MACOSX_DEPLOYMENT_TARGET}" != ""
+SCPDEFS+=-DMACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:s/.//}
+.ENDIF
# The variables ENABLE_ONLINE_UPDATE, WITHOUT_MATHMLDTD, WITH_CATA_FONTS,
WITH_CATB_FONTS,
# and WITHOUT_PPDS are added (or not) in configure to SCPDEFS.
Modified: openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/types.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/types.mk?rev=1556579&r1=1556578&r2=1556579&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/types.mk (original)
+++ openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/types.mk Wed Jan 8
17:03:23 2014
@@ -122,6 +122,8 @@ namespace gb { namespace types
void set_dll_target(Path dlltarget);
/// Set additional flags for the link command.
void set_ldflags(List<Path> ldflags);
+ /// Add additional flags for the link command.
+ void add_ldflags(List<Path> ldflags);
};
/// A target that delivers headers of some kind.
class DeliversHeaders
Modified: openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/LinkTarget.mk?rev=1556579&r1=1556578&r2=1556579&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/LinkTarget.mk Wed Jan 8 17:03:23 2014
@@ -448,6 +448,10 @@ define gb_LinkTarget_set_ldflags
$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2)
endef
+define gb_LinkTarget_add_ldflags
+$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS:=$$(LDFLAGS) $(2)
+endef
+
define gb_LinkTarget_add_linked_libs
ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
$$(eval $$(call gb_Output_info,currently known libraries are: $(sort
$(gb_Library_KNOWNLIBS)),ALL))
Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1556579&r1=1556578&r2=1556579&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Wed Jan 8 17:03:23 2014
@@ -510,13 +510,14 @@ ifeq ($(GUIBASE),aqua)
$(eval $(call gb_Library_add_linked_libs,vcl,\
AppleRemote \
))
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
- -framework QuickTime \
+$(eval $(call gb_Library_add_ldflags,vcl,\
-framework Cocoa \
-framework Carbon \
-framework CoreFoundation \
))
+ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
+$(eval $(call gb_Library_add_ldflags,vcl, -framework QuickTime ))
+endif
endif
ifeq ($(OS),WNT)
Modified: openoffice/trunk/main/vcl/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/util/makefile.mk?rev=1556579&r1=1556578&r2=1556579&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/util/makefile.mk (original)
+++ openoffice/trunk/main/vcl/util/makefile.mk Wed Jan 8 17:03:23 2014
@@ -193,8 +193,12 @@ SHL1USE_EXPORTS=name
.IF "$(GUIBASE)"=="aqua"
SHL1STDLIBS+= \
$(BASEBMPLIB) \
- -lAppleRemote$(DLLPOSTFIX) \
- -framework QuickTime
+ -lAppleRemote$(DLLPOSTFIX)
+
+# the QuickTime API has been removed in OSX SDK 10.7
+.IF "${MACOSX_DEPLOYMENT_TARGET:s/.//}"<"107"
+SHL1STDLIBS+= -framework QuickTime
+.ENDIF
LIB1FILES+= \
$(SLB)$/sala11y.lib
