avmedia/Module_avmedia.mk | 3 +++
postprocess/Rdb_services.mk | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 2a9018b9f52bd90396912a8cb49925646eeb3485
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu May 15 19:45:13 2014 +0300
The macavf code doesn't compile as 32-bit, sigh
Change-Id: I51336c09aaa6ecdaa5da537a4a21efbff305da6e
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index bd0382d..06bbef7 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -44,12 +44,15 @@ endif
endif
ifeq ($(OS),MACOSX)
+ifeq ($(CPUNAME),X86_64)
+# The macavf code is a bit x86_64 dependent...
ifneq (1060,$(MACOSX_SDK_VERSION))
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaMacAVF \
))
endif
endif
+endif
ifneq ($(ENABLE_DIRECTX),)
$(eval $(call gb_Module_add_targets,avmedia,\
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 9ebe6d2..750fafe 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -122,7 +122,9 @@ $(eval $(call gb_Rdb_add_components,services,\
writerperfect/source/writer/wpftwriter \
$(if $(filter MACOSX,$(OS)), \
$(if $(filter 1060,$(MACOSX_SDK_VERSION)),, \
- $(call
gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
+ $(if $(filter X86_64,$(CPUNAME)), \
+ $(call
gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
+ ) \
) \
$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
$(call
gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
