summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-07-30 15:15:58 +0200
committerMichael Meeks <michael.meeks@suse.com>2012-08-09 20:46:16 +0100
commit21d7f4b4bba79558de830d9e815e127f67274355 (patch)
treef0c4e2ab7f96fdcf1ce9393477b773eb64cdd01b /scp2
parent95938a123cbc8c0741a505b61ca874c0153c3f7a (diff)
gstreamer: make gstreamer 1.0 and 0.10 dual compile
Add fallback activation of an _OLD media component to the core. Compile both a 0.10 and 1.0 version of the gstreamer component Change-Id: I91f65d05391cb2d7e02f9cff18f96178a128705O1
Diffstat (limited to 'scp2')
-rw-r--r--scp2/InstallModule_ooo.mk3
-rw-r--r--scp2/source/ooo/file_library_ooo.scp6
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp19
3 files changed, 18 insertions, 10 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index edfebe697c63..685b70ea86d1 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -152,6 +152,9 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
$(if $(filter TRUE,$(ENABLE_GSTREAMER)),\
-DGSTREAMER \
) \
+ $(if $(filter TRUE,$(ENABLE_GSTREAMER_0_10)),\
+ -DGSTREAMER_0_10 \
+ ) \
$(if $(WINDOWS_SDK_HOME),\
-DHAVE_WINDOWS_SDK \
) \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 79f48c510891..eaeb58f29969 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1476,7 +1476,11 @@ STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
#ifdef GSTREAMER
SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
-#elif defined WNT
+#endif
+#ifdef GSTREAMER_0_10
+SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer_0_10, avmediagst_0_10 )
+#endif
+#if defined WNT
#ifdef ENABLE_DIRECTX
SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index c0b3495000ee..66563e5be241 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -202,15 +202,15 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Chartcontroller,
gid_File_Lib_Ctl,
gid_File_Lib_Cui,
- gid_File_Lib_Sdbt,
- gid_File_Lib_Dbmm,
+ gid_File_Lib_Sdbt,
+ gid_File_Lib_Dbmm,
gid_File_Lib_Dba,
gid_File_Lib_Dbase2,
gid_File_Lib_Dbaxml,
gid_File_Lib_Dbt,
gid_File_Lib_Dbfile,
gid_File_Lib_Drawinglayer,
- gid_File_Lib_Editeng,
+ gid_File_Lib_Editeng,
gid_File_Lib_Flat,
gid_File_Lib_For,
gid_File_Lib_Forui,
@@ -249,15 +249,16 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Svx,
gid_File_Lib_AVMedia,
gid_File_Lib_AVMediaWin,
- gid_File_Lib_AVMediaGStreamer,
+ gid_File_Lib_AVMediaGStreamer,
+ gid_File_Lib_AVMediaGStreamer_0_10,
gid_File_Lib_BaseGfx,
- gid_File_Lib_Merged,
+ gid_File_Lib_Merged,
gid_File_Lib_Sysdtrans,
gid_File_Lib_Sw,
gid_File_Lib_TextConversionDlgs,
gid_File_Lib_Tk,
- gid_File_Lib_Acc,
- gid_File_Lib_BaseBmp,
+ gid_File_Lib_Acc,
+ gid_File_Lib_BaseBmp,
gid_File_Lib_Tools,
gid_File_Lib_Utl,
gid_File_Lib_Uui,
@@ -283,8 +284,8 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Fwm,
gid_File_Lib_Lprx2,
gid_File_Lib_Lprxw,
- gid_File_Lib_Libtextcat,
- gid_File_Lib_Guesslang,
+ gid_File_Lib_Libtextcat,
+ gid_File_Lib_Guesslang,
gid_File_Lib_Tfu);
End