Commit 906ee53a authored by Thibault Saunier's avatar Thibault Saunier 🌵
Browse files

Add a way to disable xptv support

This formatter is in very bad shape and is generally not useful.

It has been deprecated since 1.0... and I bet noone uses it.
parent 7bfcaf37
Pipeline #10766 passed with stages
in 8 minutes and 27 seconds
......@@ -37,6 +37,7 @@
#include <libxml/xmlwriter.h>
#include "ges-internal.h"
#include <ges/ges-pitivi-formatter.h>
#include <ges/ges.h>
/* The Pitivi etree formatter is 0.1 we set GES one to 0.2 */
......
......@@ -35,6 +35,10 @@
#include "ges/gstframepositioner.h"
#include "ges-internal.h"
#ifndef DISABLE_XPTV
#include <ges/ges-pitivi-formatter.h>
#endif
#define GES_GNONLIN_VERSION_NEEDED_MAJOR 1
#define GES_GNONLIN_VERSION_NEEDED_MINOR 2
#define GES_GNONLIN_VERSION_NEEDED_MICRO 0
......@@ -100,7 +104,9 @@ ges_init_post (GOptionContext * context, GOptionGroup * group, gpointer data,
g_type_class_ref (GES_TYPE_GROUP);
/* register formatter types with the system */
#ifndef DISABLE_XPTV
g_type_class_ref (GES_TYPE_PITIVI_FORMATTER);
#endif
g_type_class_ref (GES_TYPE_COMMAND_LINE_FORMATTER);
g_type_class_ref (GES_TYPE_XML_FORMATTER);
......@@ -171,7 +177,10 @@ ges_deinit (void)
g_type_class_unref (g_type_class_peek (GES_TYPE_GROUP));
/* register formatter types with the system */
#ifndef DISABLE_XPTV
g_type_class_unref (g_type_class_peek (GES_TYPE_PITIVI_FORMATTER));
#endif
g_type_class_unref (g_type_class_peek (GES_TYPE_COMMAND_LINE_FORMATTER));
g_type_class_unref (g_type_class_peek (GES_TYPE_XML_FORMATTER));
......
......@@ -76,7 +76,6 @@
#include <ges/ges-effect-asset.h>
#include <ges/ges-effect.h>
#include <ges/ges-formatter.h>
#include <ges/ges-pitivi-formatter.h>
#include <ges/ges-command-line-formatter.h>
#include <ges/ges-utils.h>
#include <ges/ges-meta-container.h>
......
......@@ -40,7 +40,6 @@ ges_sources = [
'ges-effect.c',
'ges-screenshot.c',
'ges-formatter.c',
'ges-pitivi-formatter.c',
'ges-asset.c',
'ges-uri-asset.c',
'ges-clip-asset.c',
......@@ -109,7 +108,6 @@ ges_headers = [
'ges-text-overlay.h',
'ges-screenshot.h',
'ges-formatter.h',
'ges-pitivi-formatter.h',
'ges-asset.h',
'ges-uri-asset.h',
'ges-clip-asset.h',
......@@ -126,6 +124,10 @@ ges_headers = [
'ges-group.h'
]
if libxml_dep.found()
ges_sources += ['ges-pitivi-formatter.c']
ges_headers += ['ges-pitivi-formatter.h']
endif
version_data = configuration_data()
version_data.set('GES_VERSION_MAJOR', gst_version_major)
......
......@@ -86,7 +86,8 @@ gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : f
fallback : ['gst-devtools', 'validate_dep'])
gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep'])
libxml_dep = dependency('libxml-2.0', fallback: ['libxml2', 'xml2lib_dep'])
libxml_dep = dependency('libxml-2.0', required: get_option('xptv'))
cdata.set('DISABLE_XPTV', not libxml_dep.found())
# TODO Properly port to Gtk 3
# gtk_dep = dependency('gtk+-3.0', required : false)
......
......@@ -6,3 +6,5 @@ option('tests', type : 'feature', value : 'auto', yield : true,
description : 'Build and enable unit tests')
option('pygi-overrides-dir', type : 'string', value : '',
description: 'Path to pygobject overrides directory')
option('xptv', type : 'feature', value : 'auto',
description : 'Build the deprecated xptv formater')
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment