On Mon, 17 Aug 2020 10:21:48 -0300 Antonio Terceiro <terce...@debian.org> wrote:
> Control: reassign -1 pitivi
> Control: retitle -1 pitivi: ships a copy of gstreamer libraries
> Control: found -1 0.999-2
>
> On Mon, Aug 17, 2020 at 03:27:21PM +0300, Sebastian Dröge wrote:
> > On Mon, 2020-08-17 at 09:10 -0300, Antonio Terceiro wrote:
> > >
> > > This file is already present in pitivi on stable, and
> > > gstreamer1.0-plugins-bad-apps is only present in experimental. testing
> > > and unstable are unaffected by this, or testing would be unaffected if
> > > this hadn't caused pitivi to be removed.
> > >
> > > I'm reassigning to gstreamer1.0-plugins-bad-apps.
> >
> > It's a bug in pitivi. It should've never shipped these files outside
> > its private library directory.
> >
> > It will be fixed once there's a new pitivi release, which I'm waiting
> > for currently. Please reassign this back to pitivi, thanks.
>
> That's a funny way of seeing it, but it's your call.
>
> Thanks for you work.
Hello, I found that pitivi was using the gst-transcoder only if not found on
the system,
and upstream commit "51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e" worked in fixing
that.
I prepared a version on Debomatic with that change, and it stopped installing
the binary/pkgconfig/libraries.
http://debomatic-amd64.debian.net/distribution#unstable/pitivi/0.999-3/buildlog
I would like to upload to sid, but unfortunately gst-plugins-bad1.0 conflicts
with pitivi << 0.9999, so it won't fix the uninstallability...
Sebastian, how do you feel about relaxing that one?
I'm attaching a diff here (I'll change also VCS fields, and fix some lintian
sandess here and there)
G.
diff -Nru pitivi-0.999/debian/changelog pitivi-0.999/debian/changelog
--- pitivi-0.999/debian/changelog 2020-02-21 18:59:53.000000000 +0100
+++ pitivi-0.999/debian/changelog 2020-09-23 09:00:44.000000000 +0200
@@ -1,3 +1,12 @@
+pitivi (0.999-3) unstable; urgency=medium
+
+ * No change rebuild against new gstreamer 1.18 (so transcoder embedded
+ dependency doesn't get built anymore) Closes: #965007
+ - cherry-pick and rebase upstream commit
51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e
+ - add new build and runtime dependency on gstreamer1.0-plugins-bad-apps
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 23 Sep 2020
09:00:44 +0200
+
pitivi (0.999-2) unstable; urgency=medium
[ Gianfranco Costamagna ]
diff -Nru pitivi-0.999/debian/control pitivi-0.999/debian/control
--- pitivi-0.999/debian/control 2020-02-07 19:00:40.000000000 +0100
+++ pitivi-0.999/debian/control 2020-09-23 09:00:44.000000000 +0200
@@ -17,6 +17,7 @@
libgtk-3-dev (>= 3.20),
libgstreamer1.0-dev (>= 1.14.2),
libgstreamer-plugins-base1.0-dev (>= 1.14.2),
+ gstreamer1.0-plugins-bad-apps,
libgirepository1.0-dev,
python3-cairo-dev
X-Python-Version: >= 3.3
@@ -48,6 +49,7 @@
gstreamer1.0-plugins-base (>= 1.14.2),
gstreamer1.0-plugins-good (>= 1.14.2),
gstreamer1.0-plugins-bad (>= 1.14.2),
+ gstreamer1.0-plugins-bad-apps,
gstreamer1.0-pulseaudio | gstreamer1.0-audiosink,
gstreamer1.0-gtk3,
gstreamer1.0-x | gstreamer1.0-videosink
diff -Nru
pitivi-0.999/debian/patches/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch
pitivi-0.999/debian/patches/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch
--- pitivi-0.999/debian/patches/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch
2020-02-21 18:59:53.000000000 +0100
+++ pitivi-0.999/debian/patches/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch
2020-09-23 09:00:44.000000000 +0200
@@ -1,6 +1,3 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
From 0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandru=20B=C4=83lu=C8=9B?= <alexandru.ba...@gmail.com>
Date: Tue, 28 Jan 2020 22:34:40 +0100
diff -Nru
pitivi-0.999/debian/patches/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch
pitivi-0.999/debian/patches/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch
--- pitivi-0.999/debian/patches/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch
1970-01-01 01:00:00.000000000 +0100
+++ pitivi-0.999/debian/patches/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch
2020-09-23 09:00:44.000000000 +0200
@@ -0,0 +1,89 @@
+From 51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandru=20B=C4=83lu=C8=9B?= <alexandru.ba...@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 65cdb700..00000000
+--- 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 53634eb7..d55362fc 100644
+--- a/meson.build
++++ b/meson.build
+@@ -22,7 +22,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.2',
+@@ -30,9 +29,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'])
+-
+ pkgdatadir = join_paths(get_option('datadir'), meson.project_name())
+
+ git = find_program('git', required : false)
+
+diff --git a/tests/__init__.py b/tests/__init__.py
+index 1e7d4a0f..a2dc639d 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")])
diff -Nru pitivi-0.999/debian/patches/series pitivi-0.999/debian/patches/series
--- pitivi-0.999/debian/patches/series 2020-02-21 18:59:53.000000000 +0100
+++ pitivi-0.999/debian/patches/series 2020-09-23 09:00:44.000000000 +0200
@@ -1,2 +1,3 @@
9fc400ca6f3f59fd2b2abfb8e39f0cf7a4031e09.patch
0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch
+51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch
