You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/05/08 20:20:01 UTC
svn commit: r1480387 - in /openoffice/branches/rejuvenate01/main:
avmedia/source/quicktime/makefile.mk avmedia/source/quicktime/player.hxx
postprocess/packcomponents/makefile.mk scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/makefile.mk
Author: hdu
Date: Wed May 8 18:20:00 2013
New Revision: 1480387
URL: http://svn.apache.org/r1480387
Log:
#i122195# quicktime support is no longer available in OSX SDKs>=10.7
Modified:
openoffice/branches/rejuvenate01/main/avmedia/source/quicktime/makefile.mk
openoffice/branches/rejuvenate01/main/avmedia/source/quicktime/player.hxx
openoffice/branches/rejuvenate01/main/postprocess/packcomponents/makefile.mk
openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp
openoffice/branches/rejuvenate01/main/scp2/source/ooo/makefile.mk
Modified: openoffice/branches/rejuvenate01/main/avmedia/source/quicktime/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/avmedia/source/quicktime/makefile.mk?rev=1480387&r1=1480386&r2=1480387&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/avmedia/source/quicktime/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/avmedia/source/quicktime/makefile.mk Wed May 8 18:20:00 2013
@@ -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/.//}"<="106"
# --- 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/branches/rejuvenate01/main/avmedia/source/quicktime/player.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/avmedia/source/quicktime/player.hxx?rev=1480387&r1=1480386&r2=1480387&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/avmedia/source/quicktime/player.hxx (original)
+++ openoffice/branches/rejuvenate01/main/avmedia/source/quicktime/player.hxx Wed May 8 18:20:00 2013
@@ -99,7 +99,7 @@ private:
int mnWidth;
int mnHeight;
- long mnVersion;
+ int mnVersion;
oslCondition maSizeCondition;
};
Modified: openoffice/branches/rejuvenate01/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/postprocess/packcomponents/makefile.mk?rev=1480387&r1=1480386&r2=1480387&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/postprocess/packcomponents/makefile.mk Wed May 8 18:20:00 2013
@@ -310,11 +310,13 @@ my_components += \
.IF "$(OS)" == "MACOSX"
my_components += \
- avmediaQuickTime \
fps_aqua \
macab1 \
macbe1 \
MacOSXSpell
+.IF "$(CPU)" == "I"
+ my_components += avmediaQuickTime
+.END
.END
.IF "$(OS)" == "WNT"
Modified: openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp?rev=1480387&r1=1480386&r2=1480387&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp Wed May 8 18:20:00 2013
@@ -571,7 +571,6 @@ End
#endif
#ifdef MACOSX
-#ifdef QUARTZ
File gid_File_Lib_Fps_Aqua
TXT_FILE_BODY;
Styles = (PACKED);
@@ -586,14 +585,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/branches/rejuvenate01/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scp2/source/ooo/makefile.mk?rev=1480387&r1=1480386&r2=1480387&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/scp2/source/ooo/makefile.mk Wed May 8 18:20:00 2013
@@ -311,6 +311,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.