[Libreoffice-commits] core.git: avmedia/Library_avmediagst_0_10.mk avmedia/Module_avmedia.mk avmedia/source bin/check-elf-dynamic-objects config_host.mk.in configure.ac distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf distro-configs/LibreOfficeCoverity.conf postprocess/Rdb_services.mk Repository.mk solenv/clang-format
Michael Weghorn (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 7 09:08:27 UTC 2019
Repository.mk | 1
avmedia/Library_avmediagst_0_10.mk | 46 ------
avmedia/Module_avmedia.mk | 6
avmedia/source/gstreamer/avmediagstreamer_0_10.component | 15 --
avmedia/source/gstreamer/gst_0_10.cxx | 27 ----
avmedia/source/gstreamer/gstframegrabber.cxx | 33 ----
avmedia/source/gstreamer/gstplayer.cxx | 101 ---------------
avmedia/source/gstreamer/gstuno.cxx | 9 -
avmedia/source/inc/mediamisc.hxx | 1
avmedia/source/viewer/mediawindow_impl.cxx | 5
bin/check-elf-dynamic-objects | 4
config_host.mk.in | 3
configure.ac | 42 ------
distro-configs/LibreOfficeAndroid.conf | 1
distro-configs/LibreOfficeAndroidAarch64.conf | 1
distro-configs/LibreOfficeAndroidX86.conf | 1
distro-configs/LibreOfficeCoverity.conf | 1
postprocess/Rdb_services.mk | 3
solenv/clang-format/blacklist | 1
19 files changed, 10 insertions(+), 291 deletions(-)
New commits:
commit 6b911ae9eb9484bebbdc1323210020486f5ef33f
Author: Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Jun 6 18:16:36 2019 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Jun 7 11:07:42 2019 +0200
Drop support for gstreamer-0.10
Drop all GStreamer 0.10 support according to
ESC decision of 2019-06-06.
GStreamer 0.10 is obsolete and no longer needed,
superseded by GStreamer 1.0 which is available in
baseline (RHEL 7 or CentOS 7) and all relevant distros.
Change-Id: Ic317eba04d2c17e141acc983f37fbfa4301c9f3f
Reviewed-on: https://gerrit.libreoffice.org/73619
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/Repository.mk b/Repository.mk
index a88b0f282897..a0faa0d2a026 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -600,7 +600,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_VLC),avmediavlc) \
$(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
- $(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \
$(if $(filter WNT,$(OS)),avmediawin) \
cached1 \
collator_data \
diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk
deleted file mode 100644
index 16f2d5db1440..000000000000
--- a/avmedia/Library_avmediagst_0_10.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,avmediagst_0_10))
-
-$(eval $(call gb_Library_set_componentfile,avmediagst_0_10,avmedia/source/gstreamer/avmediagstreamer_0_10))
-
-$(eval $(call gb_Library_set_include,avmediagst_0_10,\
- $$(INCLUDE) \
- -I$(SRCDIR)/avmedia/source/inc \
- $(GSTREAMER_0_10_CFLAGS) \
-))
-
-$(eval $(call gb_Library_use_externals,avmediagst_0_10,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_Library_use_sdk_api,avmediagst_0_10))
-
-$(eval $(call gb_Library_use_libraries,avmediagst_0_10,\
- comphelper \
- cppu \
- cppuhelper \
- sal \
- salhelper \
- tl \
- vcl \
-))
-
-$(eval $(call gb_Library_add_libs,avmediagst_0_10,\
- $(GSTREAMER_0_10_LIBS) \
- -lgstinterfaces-0.10 \
-))
-
-$(eval $(call gb_Library_add_exception_objects,avmediagst_0_10,\
- avmedia/source/gstreamer/gst_0_10 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index a3a3895f3ec7..9d8895a8eee8 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -24,12 +24,6 @@ $(eval $(call gb_Module_add_targets,avmedia,\
))
endif
-ifeq ($(ENABLE_GSTREAMER_0_10),TRUE)
-$(eval $(call gb_Module_add_targets,avmedia,\
- Library_avmediagst_0_10 \
-))
-endif
-
ifeq ($(ENABLE_VLC),TRUE)
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediavlc \
diff --git a/avmedia/source/gstreamer/avmediagstreamer_0_10.component b/avmedia/source/gstreamer/avmediagstreamer_0_10.component
deleted file mode 100644
index 849173cea28c..000000000000
--- a/avmedia/source/gstreamer/avmediagstreamer_0_10.component
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
--->
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
- prefix="avmediagst" xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.media.Manager_GStreamer_0_10">
- <service name="com.sun.star.comp.avmedia.Manager_GStreamer_0_10"/>
- </implementation>
-</component>
diff --git a/avmedia/source/gstreamer/gst_0_10.cxx b/avmedia/source/gstreamer/gst_0_10.cxx
deleted file mode 100644
index a29c40155622..000000000000
--- a/avmedia/source/gstreamer/gst_0_10.cxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#define AVMEDIA_GST_0_10
-
-// forward compatibility goodness
-#include <gst/interfaces/xoverlay.h>
-#define gst_video_overlay_expose(a) gst_x_overlay_expose(GST_X_OVERLAY (a))
-#define gst_video_overlay_set_window_handle(a,b) gst_x_overlay_set_xwindow_id( \
- reinterpret_cast<GstXOverlay *>(a), (b) )
-#define GST_VIDEO_OVERLAY(a) reinterpret_cast<GstVideoOverlay *>(a)
-
-// #define GstVideoOverlay GstXOverlay
-
-#include "gstmanager.cxx"
-#include "gstplayer.cxx"
-#include "gstuno.cxx"
-#include "gstwindow.cxx"
-#include "gstframegrabber.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index def1018baeed..e41386882d20 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -31,13 +31,8 @@
#include <string>
-#ifdef AVMEDIA_GST_0_10
-# define AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_GStreamer_0_10"
-# define AVMEDIA_GST_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_GStreamer_0_10"
-#else
-# define AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_GStreamer"
-# define AVMEDIA_GST_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_GStreamer"
-#endif
+#define AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_GStreamer"
+#define AVMEDIA_GST_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_GStreamer"
using namespace ::com::sun::star;
@@ -58,15 +53,8 @@ FrameGrabber::FrameGrabber( const OUString &rURL ) :
{
gchar *pPipelineStr;
pPipelineStr = g_strdup_printf(
-#ifdef AVMEDIA_GST_0_10
- "uridecodebin uri=%s ! ffmpegcolorspace ! videoscale ! appsink "
- "name=sink caps=\"video/x-raw-rgb,format=RGB,pixel-aspect-ratio=1/1,"
- "bpp=(int)24,depth=(int)24,endianness=(int)4321,"
- "red_mask=(int)0xff0000, green_mask=(int)0x00ff00, blue_mask=(int)0x0000ff\"",
-#else
"uridecodebin uri=%s ! videoconvert ! videoscale ! appsink "
"name=sink caps=\"video/x-raw,format=RGB,pixel-aspect-ratio=1/1\"",
-#endif
OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() );
GError *pError = nullptr;
@@ -125,11 +113,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
GstCaps *pCaps = nullptr;
// synchronously fetch the frame
-#ifdef AVMEDIA_GST_0_10
- g_signal_emit_by_name( pSink, "pull-preroll", &pBuf, nullptr );
- if( pBuf )
- pCaps = GST_BUFFER_CAPS( pBuf );
-#else
GstSample *pSample = nullptr;
g_signal_emit_by_name( pSink, "pull-preroll", &pSample, nullptr );
@@ -138,7 +121,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
pBuf = gst_sample_get_buffer( pSample );
pCaps = gst_sample_get_caps( pSample );
}
-#endif
// get geometry
int nWidth = 0, nHeight = 0;
@@ -156,29 +138,18 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
if( pBuf && nWidth > 0 && nHeight > 0 &&
// sanity check the size
-#ifdef AVMEDIA_GST_0_10
- GST_BUFFER_SIZE( pBuf ) >= static_cast<unsigned>( nWidth * nHeight * 3 )
-#else
gst_buffer_get_size( pBuf ) >= static_cast<unsigned>( nWidth * nHeight * 3 )
-#endif
)
{
sal_uInt8 *pData = nullptr;
-#ifdef AVMEDIA_GST_0_10
- pData = GST_BUFFER_DATA( pBuf );
-#else
GstMapInfo aMapInfo;
gst_buffer_map( pBuf, &aMapInfo, GST_MAP_READ );
pData = aMapInfo.data;
-#endif
int nStride = GST_ROUND_UP_4( nWidth * 3 );
BitmapEx aBmp = vcl::bitmap::CreateFromData(pData, nWidth, nHeight, nStride, 24 );
-#ifndef AVMEDIA_GST_0_10
gst_buffer_unmap( pBuf, &aMapInfo );
-#endif
-
xRet = Graphic( aBmp ).GetXGraphic();
}
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index e12259ad0bec..07b58898e070 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -42,23 +42,14 @@
#include "gstframegrabber.hxx"
#include "gstwindow.hxx"
-#ifdef AVMEDIA_GST_0_10
-# define AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_GStreamer_0_10"
-# define AVMEDIA_GST_PLAYER_SERVICENAME "com.sun.star.media.Player_GStreamer_0_10"
-#else
-# include <gst/video/videooverlay.h>
-# define AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_GStreamer"
-# define AVMEDIA_GST_PLAYER_SERVICENAME "com.sun.star.media.Player_GStreamer"
-#endif
+#include <gst/video/videooverlay.h>
+#define AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_GStreamer"
+#define AVMEDIA_GST_PLAYER_SERVICENAME "com.sun.star.media.Player_GStreamer"
#include <gst/pbutils/missing-plugins.h>
#include <gst/pbutils/pbutils.h>
-#ifdef AVMEDIA_GST_0_10
-# define AVVERSION "gst 0.10: "
-#else
-# define AVVERSION "gst 1.0: "
-#endif
+#define AVVERSION "gst 1.0: "
using namespace ::com::sun::star;
@@ -435,27 +426,15 @@ void Player::processMessage( GstMessage *message )
static gboolean wrap_element_query_position (GstElement *element, GstFormat format, gint64 *cur)
{
-#ifdef AVMEDIA_GST_0_10
- GstFormat my_format = format;
- return gst_element_query_position( element, &my_format, cur) && my_format == format && *cur > 0;
-#else
return gst_element_query_position( element, format, cur );
-#endif
}
static gboolean wrap_element_query_duration (GstElement *element, GstFormat format, gint64 *duration)
{
-#ifdef AVMEDIA_GST_0_10
- GstFormat my_format = format;
- return gst_element_query_duration( element, &my_format, duration) && my_format == format && *duration > 0;
-#else
return gst_element_query_duration( element, format, duration );
-#endif
}
-#ifndef AVMEDIA_GST_0_10
-
#define LCL_WAYLAND_DISPLAY_HANDLE_CONTEXT_TYPE "GstWaylandDisplayHandleContextType"
static gboolean lcl_is_wayland_display_handle_need_context_message(GstMessage* msg)
@@ -478,8 +457,6 @@ static GstContext* lcl_wayland_display_handle_context_new(void* display)
return context;
}
-#endif
-
GstBusSyncReply Player::processSyncMessage( GstMessage *message )
{
#if OSL_DEBUG_LEVEL > 0
@@ -498,12 +475,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
if (!mbUseGtkSink)
{
-#ifdef AVMEDIA_GST_0_10
- if (message->structure &&
- !strcmp( gst_structure_get_name( message->structure ), "prepare-xwindow-id" ) )
-#else
if (gst_is_video_overlay_prepare_window_handle_message (message) )
-#endif
{
SAL_INFO( "avmedia.gstreamer", AVVERSION << this << " processSyncMessage prepare window id: " <<
GST_MESSAGE_TYPE_NAME( message ) << " " << static_cast<int>(mnWindowID) );
@@ -515,16 +487,13 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
if ( mnWindowID != 0 )
{
gst_video_overlay_set_window_handle( mpXOverlay, mnWindowID );
-#ifndef AVMEDIA_GST_0_10
gst_video_overlay_handle_events(mpXOverlay, 0); // Let the parent window handle events.
if (maArea.Width > 0 && maArea.Height > 0)
gst_video_overlay_set_render_rectangle(mpXOverlay, maArea.X, maArea.Y, maArea.Width, maArea.Height);
-#endif
}
return GST_BUS_DROP;
}
-#ifndef AVMEDIA_GST_0_10
else if (lcl_is_wayland_display_handle_need_context_message(message))
{
GstContext *context = lcl_wayland_display_handle_context_new(mpDisplay);
@@ -532,65 +501,8 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
return GST_BUS_DROP;
}
-#endif
}
-#ifdef AVMEDIA_GST_0_10
- if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_STATE_CHANGED ) {
- if( message->src == GST_OBJECT( mpPlaybin ) ) {
- GstState newstate, pendingstate;
-
- gst_message_parse_state_changed (message, nullptr, &newstate, &pendingstate);
-
- SAL_INFO( "avmedia.gstreamer", AVVERSION << this << " state change received, new state " << static_cast<int>(newstate) << " pending " << static_cast<int>(pendingstate) );
- if( newstate == GST_STATE_PAUSED &&
- pendingstate == GST_STATE_VOID_PENDING ) {
-
- SAL_INFO( "avmedia.gstreamer", AVVERSION << this << " change to paused received" );
-
- if( mnDuration == 0) {
- gint64 gst_duration = 0;
- if( wrap_element_query_duration( mpPlaybin, GST_FORMAT_TIME, &gst_duration) )
- mnDuration = gst_duration;
- }
-
- if( mnWidth == 0 ) {
- GList *pStreamInfo = nullptr;
-
- g_object_get( G_OBJECT( mpPlaybin ), "stream-info", &pStreamInfo, nullptr );
-
- for ( ; pStreamInfo != nullptr; pStreamInfo = pStreamInfo->next) {
- GObject *pInfo = G_OBJECT( pStreamInfo->data );
-
- if( !pInfo )
- continue;
-
- int nType;
- g_object_get( pInfo, "type", &nType, nullptr );
- GEnumValue *pValue = g_enum_get_value( G_PARAM_SPEC_ENUM( g_object_class_find_property( G_OBJECT_GET_CLASS( pInfo ), "type" ) )->enum_class,
- nType );
-
- if( !g_ascii_strcasecmp( pValue->value_nick, "video" ) ) {
- GstStructure *pStructure;
- GstPad *pPad;
-
- g_object_get( pInfo, "object", &pPad, nullptr );
- pStructure = gst_caps_get_structure( GST_PAD_CAPS( pPad ), 0 );
- if( pStructure ) {
- gst_structure_get_int( pStructure, "width", &mnWidth );
- gst_structure_get_int( pStructure, "height", &mnHeight );
- SAL_INFO( "avmedia.gstreamer", AVVERSION "queried size: " << mnWidth << "x" << mnHeight );
- }
- g_object_unref (pPad);
- }
- }
-
- maSizeCondition.set();
- }
- }
- }
-#else
- // We get to use the exciting new playbin2 ! (now known as playbin)
if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ASYNC_DONE ) {
if( mnDuration == 0) {
gint64 gst_duration = 0;
@@ -623,7 +535,6 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
maSizeCondition.set();
}
-#endif // AVMEDIA_GST_0_10
} else if (gst_is_missing_plugin_message(message)) {
TheMissingPluginInstaller::get().report(this, message);
if( mnWidth == 0 ) {
@@ -692,11 +603,7 @@ void Player::preparePlaybin( const OUString& rURL, GstElement *pSink )
mnWatchID = gst_bus_add_watch( pBus, pipeline_bus_callback, this );
mbWatchID = true;
SAL_INFO( "avmedia.gstreamer", AVVERSION << this << " set sync handler" );
-#ifdef AVMEDIA_GST_0_10
- gst_bus_set_sync_handler( pBus, pipeline_bus_sync_handler, this );
-#else
gst_bus_set_sync_handler( pBus, pipeline_bus_sync_handler, this, nullptr );
-#endif
g_object_unref( pBus );
}
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 655f076e2cc5..cefdf619a455 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -27,13 +27,8 @@ using namespace ::com::sun::star;
// - factory methods -
-#ifdef AVMEDIA_GST_0_10
-# define IMPL_NAME "com.sun.star.comp.media.Manager_GStreamer_0_10"
-# define SERVICE_NAME AVMEDIA_MANAGER_SERVICE_NAME_OLD // "com.sun.star.comp.avmedia.Manager_GStreamer_0_10"
-#else
-# define IMPL_NAME "com.sun.star.comp.media.Manager_GStreamer"
-# define SERVICE_NAME AVMEDIA_MANAGER_SERVICE_NAME // "com.sun.star.comp.avmedia.Manager_GStreamer"
-#endif
+#define IMPL_NAME "com.sun.star.comp.media.Manager_GStreamer"
+#define SERVICE_NAME AVMEDIA_MANAGER_SERVICE_NAME // "com.sun.star.comp.avmedia.Manager_GStreamer"
static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& )
{
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 8289aa09d53b..99c230badbb9 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -30,7 +30,6 @@
#ifdef MACOSX
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_MacAVF"
#else
-#define AVMEDIA_MANAGER_SERVICE_NAME_OLD "com.sun.star.comp.avmedia.Manager_GStreamer_0_10"
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer"
#endif
#endif
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index d76923bf09f8..dfadbd1a2eb0 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -195,11 +195,6 @@ uno::Reference<media::XPlayer> MediaWindowImpl::createPlayer(const OUString& rUR
{
AVMEDIA_MANAGER_SERVICE_PREFERRED,
AVMEDIA_MANAGER_SERVICE_NAME,
-// a fallback path just for gstreamer which has
-// two significant versions deployed at once ...
-#ifdef AVMEDIA_MANAGER_SERVICE_NAME_OLD
- AVMEDIA_MANAGER_SERVICE_NAME_OLD
-#endif
};
for (sal_uInt32 i = 0; !xPlayer.is() && i < SAL_N_ELEMENTS( aServiceManagers ); ++i)
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index de9601dae334..803755fab5bf 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -92,7 +92,6 @@ globalwhitelist="ld-linux-x86-64.so.2 ld-linux.so.2 libc.so.6 libm.so.6 libdl.so
x11whitelist="libX11.so.6 libXext.so.6 libSM.so.6 libICE.so.6 libXinerama.so.1 libXrender.so.1 libXrandr.so.2 libcairo.so.2"
openglwhitelist="libGL.so.1"
giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
-gstreamer010whitelist="libgstpbutils-0.10.so.0 libgstinterfaces-0.10.so.0 libgstreamer-0.10.so.0"
gstreamerwhitelist="libgstaudio-1.0.so.0 libgstpbutils-1.0.so.0 libgstvideo-1.0.so.0 libgstbase-1.0.so.0 libgstreamer-1.0.so.0"
gtk2whitelist="libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
@@ -122,9 +121,6 @@ local file="$1"
*/libavmediagst.so)
whitelist="${whitelist} ${gtk3whitelist} ${gstreamerwhitelist}"
;;
- */libavmediagst_0_10.so)
- whitelist="${whitelist} ${gtk2whitelist} ${gstreamer010whitelist}"
- ;;
*/libvclplug_kde5lo.so|*/libkde5be1lo.so)
if [ "$ENABLE_KDE5" = TRUE ]; then
whitelist="${whitelist} ${qt5whitelist} ${kf5whitelist} libxcb.so.1"
diff --git a/config_host.mk.in b/config_host.mk.in
index 90bb4e37c891..3711857b5bd4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -139,7 +139,6 @@ export ENABLE_FORMULA_LOGGER=@ENABLE_FORMULA_LOGGER@
export ENABLE_GDB_INDEX=@ENABLE_GDB_INDEX@
export ENABLE_GIO=@ENABLE_GIO@
export ENABLE_GPGMEPP=@ENABLE_GPGMEPP@
-export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
export ENABLE_GSTREAMER_1_0=@ENABLE_GSTREAMER_1_0@
export ENABLE_GTK3=@ENABLE_GTK3@
export ENABLE_GTK=@ENABLE_GTK@
@@ -232,8 +231,6 @@ export HARFBUZZ_CFLAGS=$(gb_SPACE)@HARFBUZZ_CFLAGS@
export HARFBUZZ_LIBS=$(gb_SPACE)@HARFBUZZ_LIBS@
@x_Cygwin@ export GREP=@WIN_GREP@
export GSSAPI_LIBS=@GSSAPI_LIBS@
-export GSTREAMER_0_10_CFLAGS=$(gb_SPACE)@GSTREAMER_0_10_CFLAGS@
-export GSTREAMER_0_10_LIBS=$(gb_SPACE)@GSTREAMER_0_10_LIBS@
export GSTREAMER_1_0_CFLAGS=$(gb_SPACE)@GSTREAMER_1_0_CFLAGS@
export GSTREAMER_1_0_LIBS=$(gb_SPACE)@GSTREAMER_1_0_LIBS@
export GTHREAD_CFLAGS=$(gb_SPACE)@GTHREAD_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 37f9b6ff62e2..7b86e2ed823f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -577,7 +577,6 @@ case "$host_os" in
solaris*)
test_gtk=yes
build_gstreamer_1_0=yes
- build_gstreamer_0_10=yes
test_freetype=yes
_os=SunOS
@@ -604,7 +603,6 @@ solaris*)
linux-gnu*|k*bsd*-gnu*)
test_gtk=yes
build_gstreamer_1_0=yes
- build_gstreamer_0_10=yes
test_kde5=yes
test_gtk3_kde5=yes
test_gdb_index=yes
@@ -699,7 +697,6 @@ darwin*) # macOS or iOS
freebsd*)
test_gtk=yes
build_gstreamer_1_0=yes
- build_gstreamer_0_10=yes
test_kde5=yes
test_gtk3_kde5=yes
test_freetype=yes
@@ -728,7 +725,6 @@ freebsd*)
*netbsd*)
test_gtk=yes
build_gstreamer_1_0=yes
- build_gstreamer_0_10=yes
test_kde5=yes
test_gtk3_kde5=yes
test_freetype=yes
@@ -754,7 +750,6 @@ openbsd*)
dragonfly*)
test_gtk=yes
build_gstreamer_1_0=yes
- build_gstreamer_0_10=yes
test_kde5=yes
test_gtk3_kde5=yes
test_freetype=yes
@@ -764,7 +759,6 @@ dragonfly*)
linux-android*)
build_gstreamer_1_0=no
- build_gstreamer_0_10=no
enable_lotuswordpro=no
enable_mpl_subset=yes
enable_coinmp=yes
@@ -796,7 +790,6 @@ haiku*)
test_xrender=no
test_freetype=yes
enable_odk=no
- enable_gstreamer_0_10=no
enable_gstreamer_1_0=no
enable_vlc=no
enable_coinmp=no
@@ -1290,14 +1283,9 @@ libo_FUZZ_ARG_ENABLE(randr,
libo_FUZZ_ARG_ENABLE(gstreamer-1-0,
AS_HELP_STRING([--disable-gstreamer-1-0],
- [Disable building with the new gstreamer 1.0 avmedia backend.]),
+ [Disable building with the gstreamer 1.0 avmedia backend.]),
,test "${enable_gstreamer_1_0+set}" = set || enable_gstreamer_1_0=yes)
-AC_ARG_ENABLE(gstreamer-0-10,
- AS_HELP_STRING([--enable-gstreamer-0-10],
- [Enable building with the gstreamer 0.10 avmedia backend.]),
-,enable_gstreamer_0_10=no)
-
libo_FUZZ_ARG_ENABLE(vlc,
AS_HELP_STRING([--enable-vlc],
[Enable building with the (experimental) VLC avmedia backend.]),
@@ -4729,7 +4717,6 @@ if test "$cross_compiling" = "yes"; then
./configure \
--disable-cups \
--disable-gstreamer-1-0 \
- --disable-gstreamer-0-10 \
--disable-gtk \
--disable-gtk3 \
--disable-pdfimport \
@@ -4865,7 +4852,6 @@ if test "$USING_X11" != TRUE; then
test_dbus=no
test_gtk=no
build_gstreamer_1_0=no
- build_gstreamer_0_10=no
test_kde5=no
test_qt5=no
test_gtk3_kde5=no
@@ -10505,14 +10491,13 @@ AC_SUBST(ENABLE_CAIRO_CANVAS)
dnl ===================================================================
dnl Check whether the GStreamer libraries are available.
-dnl It's possible to build avmedia with both GStreamer backends!
dnl ===================================================================
ENABLE_GSTREAMER_1_0=""
if test "$build_gstreamer_1_0" = "yes"; then
- AC_MSG_CHECKING([whether to enable the new GStreamer 1.0 avmedia backend])
+ AC_MSG_CHECKING([whether to enable the GStreamer 1.0 avmedia backend])
if test "$enable_avmedia" = yes -a "$enable_gstreamer_1_0" != no; then
ENABLE_GSTREAMER_1_0="TRUE"
AC_MSG_RESULT([yes])
@@ -10528,29 +10513,6 @@ AC_SUBST(GSTREAMER_1_0_CFLAGS)
AC_SUBST(GSTREAMER_1_0_LIBS)
AC_SUBST(ENABLE_GSTREAMER_1_0)
-
-ENABLE_GSTREAMER_0_10=""
-if test "$build_gstreamer_0_10" = "yes"; then
-
- AC_MSG_CHECKING([whether to enable the GStreamer 0.10 avmedia backend])
- if test "$enable_avmedia" = yes -a "$enable_gstreamer_0_10" != no; then
- ENABLE_GSTREAMER_0_10="TRUE"
- AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10 gstreamer-pbutils-0.10 gstreamer-interfaces-0.10],, [
- PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10 gstreamer-pbutils-0.10] )
- ])
- GSTREAMER_0_10_CFLAGS=$(printf '%s' "$GSTREAMER_0_10_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
- FilterLibs "${GSTREAMER_0_10_LIBS}"
- GSTREAMER_0_10_LIBS="${filteredlibs}"
- else
- AC_MSG_RESULT([no])
- fi
-fi
-
-AC_SUBST(GSTREAMER_0_10_CFLAGS)
-AC_SUBST(GSTREAMER_0_10_LIBS)
-AC_SUBST(ENABLE_GSTREAMER_0_10)
-
dnl ===================================================================
dnl Check whether to build the VLC avmedia backend
dnl ===================================================================
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index cc82b0df393b..0c72075041c3 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -1,7 +1,6 @@
--host=arm-linux-androideabi
--disable-cairo-canvas
--disable-cups
---disable-gstreamer-0-10
--disable-gstreamer-1-0
--disable-randr
--without-export-validation
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf
index 7a8c6416d500..0cf3388b6852 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -1,7 +1,6 @@
--host=aarch64-linux-android
--disable-cairo-canvas
--disable-cups
---disable-gstreamer-0-10
--disable-gstreamer-1-0
--disable-randr
--without-export-validation
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index d66b1b87ed27..722df76820c2 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -1,7 +1,6 @@
--host=i686-linux-android
--disable-cairo-canvas
--disable-cups
---disable-gstreamer-0-10
--disable-gstreamer-1-0
--disable-randr
--without-export-validation
diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf
index 34b9593a6984..eee0914ca2f0 100644
--- a/distro-configs/LibreOfficeCoverity.conf
+++ b/distro-configs/LibreOfficeCoverity.conf
@@ -4,7 +4,6 @@
--without-myspell-dicts
--disable-ccache
--disable-pdfium
---disable-gstreamer-0-10
--enable-gstreamer-1-0
--enable-option-checking=fatal
--with-system-libs
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index d8975449173e..0b9e1cfcc9fb 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -204,9 +204,6 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_GSTREAMER_1_0), \
avmedia/source/gstreamer/avmediagstreamer \
) \
- $(if $(ENABLE_GSTREAMER_0_10), \
- avmedia/source/gstreamer/avmediagstreamer_0_10 \
- ) \
$(if $(ENABLE_VLC), \
avmedia/source/vlc/avmediavlc \
) \
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index c38bd65eb9d4..ead4321db620 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -171,7 +171,6 @@ avmedia/source/framework/mediaplayer.cxx
avmedia/source/framework/mediatoolbox.cxx
avmedia/source/framework/soundhandler.cxx
avmedia/source/framework/soundhandler.hxx
-avmedia/source/gstreamer/gst_0_10.cxx
avmedia/source/gstreamer/gstcommon.hxx
avmedia/source/gstreamer/gstframegrabber.cxx
avmedia/source/gstreamer/gstframegrabber.hxx
More information about the Libreoffice-commits
mailing list