From 51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandru=20B=C4=83lu=C8=9B?= <alexandru.balut@gmail.com>
Date: Fri, 4 Oct 2019 02:07:22 +0200
Subject: [PATCH] Complete switching to gst-transcoder in gst-plugins-bad

---
 build/flatpak/gst-transcoder-configure | 30 --------------------------
 meson.build                            |  4 ----
 tests/__init__.py                      |  6 +-----
 3 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100755 build/flatpak/gst-transcoder-configure

diff --git a/build/flatpak/gst-transcoder-configure b/build/flatpak/gst-transcoder-configure
deleted file mode 100755
index 65cdb7007..000000000
--- a/build/flatpak/gst-transcoder-configure
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-which meson > /dev/null 2>&1
-if [ $? != 0 ]
-then
-    echo "You should install mesonbuild to build gst-transcoder: http://mesonbuild.com/"
-    echo "You can simply install it with:"
-    echo "    $ sudo pip3 install meson"
-
-    exit 1
-fi
-
-rm -Rf build > /dev/null 2>&1
-mkdir build/ && cd build && meson ../ $@
-
-cat <<EOF > $DIR/Makefile
-all:
-	cd build && ninja
-
-install:
-	cd build && ninja install
-
-clean:
-	rm -Rf build
-	rm Makefile
-
-EOF
-
diff --git a/meson.build b/meson.build
index 53634eb79..d55362fc8 100644
--- a/meson.build
+++ b/meson.build
@@ -11,7 +11,6 @@ if get_option('build-gst')
         'gst-plugins-base:disable_gtkdoc=true',
         'gstreamer:disable_gtkdoc=true',
         ])
-    subproject('gst-transcoder')
 endif
 
 gst_dep = dependency('gstreamer-1.0', version : '>= 1.14.1',
@@ -19,9 +18,6 @@ gst_dep = dependency('gstreamer-1.0', version : '>= 1.14.1',
 cairo_dep = dependency('cairo')
 pycairo_dep = dependency('py3cairo')
 
-gst_transcoder_dep = dependency('gst-transcoder-1.0', version : '>= 1.8.1',
-    fallback : ['gst-transcoder', 'gst_transcoder_dep'])
-
 gnome = import('gnome')
 i18n = import('i18n')
 
diff --git a/tests/__init__.py b/tests/__init__.py
index 1e7d4a0f7..a2dc639de 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -59,12 +59,8 @@ def setup():
 
     # Make available the compiled C code.
     sys.path.append(configure.BUILDDIR)
-    subproject_paths = os.path.join(configure.BUILDDIR, "subprojects", "gst-transcoder")
 
-    _prepend_env_paths(LD_LIBRARY_PATH=subproject_paths,
-                       GST_PLUGIN_PATH=subproject_paths,
-                       GI_TYPELIB_PATH=subproject_paths,
-                       GST_PRESET_PATH=[os.path.join(pitivi_dir, "data", "videopresets"),
+    _prepend_env_paths(GST_PRESET_PATH=[os.path.join(pitivi_dir, "data", "videopresets"),
                                         os.path.join(pitivi_dir, "data", "audiopresets")],
                        GST_ENCODING_TARGET_PATH=[os.path.join(pitivi_dir, "tests", "test-encoding-targets"),
                                                  os.path.join(pitivi_dir, "data", "encoding-profiles")])
-- 
GitLab