Thu Apr 17 14:07:49 PDT 2014

chart2/CppunitTest_chart2_export.mk               |    1 -
 chart2/CppunitTest_chart2_import.mk               |    1 -
 chart2/CppunitTest_chart2_xshape.mk               |    1 -
 dbaccess/CppunitTest_dbaccess_dialog_save.mk      |    1 -
 dbaccess/CppunitTest_dbaccess_macros_test.mk      |    1 -
 postprocess/Rdb_services.mk                       |    2 +-
 sc/CppunitTest_sc_annotationobj.mk                |    1 -
 sc/CppunitTest_sc_annotationshapeobj.mk           |    1 -
 sc/CppunitTest_sc_annotationsobj.mk               |    1 -
 sc/CppunitTest_sc_cellrangeobj.mk                 |    1 -
 sc/CppunitTest_sc_chart_regression_test.mk        |    1 -
 sc/CppunitTest_sc_databaserangeobj.mk             |    1 -
 sc/CppunitTest_sc_datapilotfieldobj.mk            |    1 -
 sc/CppunitTest_sc_datapilottableobj.mk            |    1 -
 sc/CppunitTest_sc_editfieldobj_cell.mk            |    1 -
 sc/CppunitTest_sc_editfieldobj_header.mk          |    1 -
 sc/CppunitTest_sc_filters_test.mk                 |    1 -
 sc/CppunitTest_sc_macros_test.mk                  |    1 -
 sc/CppunitTest_sc_modelobj.mk                     |    1 -
 sc/CppunitTest_sc_namedrangeobj.mk                |    1 -
 sc/CppunitTest_sc_namedrangesobj.mk               |    1 -
 sc/CppunitTest_sc_opencl_test.mk                  |    1 -
 sc/CppunitTest_sc_outlineobj.mk                   |    1 -
 sc/CppunitTest_sc_rangelst_test.mk                |    1 -
 sc/CppunitTest_sc_subsequent_export_test.mk       |    1 -
 sc/CppunitTest_sc_subsequent_filters_test.mk      |    1 -
 sc/CppunitTest_sc_tableautoformatfield.mk         |    1 -
 sc/CppunitTest_sc_tablesheetobj.mk                |    1 -
 sc/CppunitTest_sc_tablesheetsobj.mk               |    1 -
 sc/CppunitTest_sc_ucalc.mk                        |    2 +-
 sd/CppunitTest_sd_filters_test.mk                 |    1 -
 sd/CppunitTest_sd_html_export_tests.mk            |    1 -
 sd/CppunitTest_sd_import_tests.mk                 |    2 +-
 sd/CppunitTest_sd_uimpress.mk                     |    2 +-
 slideshow/CppunitTest_slideshow.mk                |    1 -
 slideshow/source/engine/shapes/viewmediashape.cxx |   11 +++++++++--
 sw/CppunitTest_sw_layout_test.mk                  |    1 -
 sw/CppunitTest_sw_macros_test.mk                  |    1 -
 sw/CppunitTest_sw_uwriter.mk                      |    2 +-
 39 files changed, 14 insertions(+), 40 deletions(-)

New commits:
commit be862ff4f7239497625125067c646bf5adab7741
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 18 00:05:44 2014 +0300

    Try making it possible to use --disable-avmedia for desktop platforms too
    
    Unfinished work in progress.
    
    Change-Id: I978755d73630b8653b169a53f937c1332799e22e

diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk
index ab37efb..de05471 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,chart2_export, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index 0aec8bd..59ed1f0 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,chart2_import, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk
index f2b3c15..fd6edb5 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,chart2_xshape, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
index 4d99ed8..66abc7c 100644
--- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_externals,dbaccess_dialog_save,\
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialog_save, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index d5baaea..df8d67b 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_externals,dbaccess_macros_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 3e9424c..8053b7d 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -218,7 +218,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	) \
 	$(if $(ENABLE_OPENGL), \
 		slideshow/source/engine/OGLTrans/ogltrans \
-		avmedia/source/opengl/avmediaogl \
+		$(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
 	) \
 	$(if $(ENABLE_TDE), \
 		shell/source/backends/kdebe/tdebe1 \
diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk
index 297c16e..a70dc32 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_annotationobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index 16158c1..ac335e3 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annonationshapeobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk
index e26df98..1e6d54e 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationsobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_annotationsobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index c111a39..ffa39b6 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangeobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangeobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index b44caeb..35866e1 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_chart_regression_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index c4aa12e..2dcbcf2 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_databaserangeobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 9435535..56159f9 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index c467c2d..0759d6f 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottableobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index ca83173..b84ba96 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_cell, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index eb6c494..12532f3 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_header, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 92f7982..1d4e3d1 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index a7a2f9c..352866a 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_macros_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 43f3cb0..2aca4d9 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_modelobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 0cf0c4a..62dc7fc 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangeobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 60c589c..14a9612 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangesobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk
index b170865..1a892fa 100644
--- a/sc/CppunitTest_sc_opencl_test.mk
+++ b/sc/CppunitTest_sc_opencl_test.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk
index e8cc335..d64f3c9 100644
--- a/sc/CppunitTest_sc_outlineobj.mk
+++ b/sc/CppunitTest_sc_outlineobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_outlineobj, \
 $(eval $(call gb_CppunitTest_use_external,sc_outlineobj,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_outlineobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index b5ae3da..6d0e33c 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_library_objects,sc_rangelst_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 6345a9c..65fa468 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 9dd130d..3ad9d3b 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 53f38fa..4b7285c 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tableautoformatfield, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 493b3bf..138ddd3 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tablesheetobj, \
 $(eval $(call gb_CppunitTest_use_external,sc_tablesheetobj,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 7a61187..f0ad912 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tablesheetsobj, \
 $(eval $(call gb_CppunitTest_use_external,sc_tablesheetsobj,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetsobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index b9353ca..f46622d 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
-    avmedia \
+	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     comphelper \
     cppu \
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 45c29aa..646b112 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_add_defs,sd_filters_test,\
 endif
 
 $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk
index 4fcc680..457e907 100644
--- a/sd/CppunitTest_sd_html_export_tests.mk
+++ b/sd/CppunitTest_sd_html_export_tests.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_html_export_tests, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sd_html_export_tests, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index 3661de7..ce8ad63 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_import_tests, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sd_import_tests, \
-    avmedia \
+	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     comphelper \
     cppu \
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index ad43f7e..b4fe76a 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_uimpress,\
 $(eval $(call gb_CppunitTest_use_library_objects,sd_uimpress,sd))
 
 $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
-    avmedia \
+	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     canvastools \
     comphelper \
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
index bc5c9a5..2207a83 100644
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_api,slideshow,\
 $(eval $(call gb_CppunitTest_use_library_objects,slideshow,slideshow))
 
 $(eval $(call gb_CppunitTest_use_libraries,slideshow,\
-    avmedia \
     basegfx \
     canvastools \
     comphelper \
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 7f3c2e7..135a372 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 
-// must be first
 #include <canvas/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <canvas/verbosetrace.hxx>
@@ -180,6 +180,9 @@ namespace slideshow
 
         bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds ) const
         {
+#if !HAVE_FEATURE_AVMEDIA
+            (void) rBounds;
+#else
             ::cppcanvas::CanvasSharedPtr pCanvas = mpViewLayer->getCanvas();
 
             if( !pCanvas )
@@ -216,7 +219,7 @@ namespace slideshow
                                                      aViewState,
                                                      aRenderState );
             }
-
+#endif
             return true;
         }
 
@@ -401,6 +404,9 @@ namespace slideshow
 
         void ViewMediaShape::implInitializeMediaPlayer( const OUString& rMediaURL )
         {
+#if !HAVE_FEATURE_AVMEDIA
+            (void) rMediaURL;
+#else
             if( !mxPlayer.is() )
             {
                 try
@@ -422,6 +428,7 @@ namespace slideshow
                         uno::Reference<uno::XInterface>() );
                 }
             }
+#endif
         }
 
 
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index a440050..dd8af0c 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_layout_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 72a7301..385e0c1 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_macros_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk
index 0b71cc1..9c43d3d 100644
--- a/sw/CppunitTest_sw_uwriter.mk
+++ b/sw/CppunitTest_sw_uwriter.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_uwriter, \
 $(eval $(call gb_CppunitTest_use_library_objects,sw_uwriter,sw))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \
-    avmedia \
+	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     comphelper \
     cppu \
