[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - postprocess/packcomponents

[Herbert Dürr]

 postprocess/packcomponents/makefile.mk |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit c1498d1638bb563017230b324a31a59cea476cb6
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue May 13 12:12:12 2014 +0000

    #i124875# pre-register the Mac AVFoundation component

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index d2de088..4ef5f14 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -315,6 +315,7 @@ my_components += \
 .IF "$(OS)" == "MACOSX"
 my_components += \
     avmediaQuickTime \
+    avmediaMacAVF \
     fps_aqua \
     macab1 \
     macbe1 \
commit a4773fde20d4be3caa815a409a144aa7003cb25d
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue May 13 12:10:19 2014 +0000

    #i124800# reenable pre-registration of the quicktime component

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index ebdc907..d2de088 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -314,13 +314,11 @@ my_components += \
 
 .IF "$(OS)" == "MACOSX"
 my_components += \
+    avmediaQuickTime \
     fps_aqua \
     macab1 \
     macbe1 \
     MacOSXSpell
-.IF "${MACOSX_DEPLOYMENT_TARGET}" == ""
-    my_components += avmediaQuickTime
-.END
 .END
 
 .IF "$(OS)" == "WNT"