From 02a832a23a4c79367c68368af9e79aa6d6248ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Sat, 17 Feb 2018 21:15:16 +0200
Subject: [PATCH] New upstream development release.
---
debian/build-deps | 12 +++-
debian/build-deps.in | 12 +++-
debian/changelog | 6 ++
debian/control | 62 +++++++++++++++++--
debian/control.in | 60 ++++++++++++++++--
debian/gstreamer-gtk3.install | 1 +
debian/gstreamer-plugins-good.install | 3 +
debian/gstreamer-qt5.install | 1 +
...1-qml-Link-against-libEGL-explicitly.patch | 26 ++++++++
debian/patches/series | 1 +
debian/rules | 4 +-
11 files changed, 171 insertions(+), 17 deletions(-)
create mode 100644 debian/gstreamer-gtk3.install
create mode 100644 debian/gstreamer-qt5.install
create mode 100644 debian/patches/0001-qml-Link-against-libEGL-explicitly.patch
diff --git a/debian/build-deps b/debian/build-deps
index 4ca9a1417..c4b6a98c1 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -1,6 +1,6 @@
@GST_LIB_DEV_DEP@
@GST_EXTRA_BUILD_DEPENDS@
-libgstreamer-plugins-base@GST_ABI@-dev (>= 1.12.0)
+libgstreamer-plugins-base@GST_ABI@-dev (>= 1.13.1)
autotools-dev
dh-autoreconf
automake (>= 1.14)
@@ -27,10 +27,10 @@ libxdamage-dev
libxext-dev
libxfixes-dev
libxv-dev
-libgtk-3-dev
+libgtk-3-dev (>= 3.15)
libtag1-dev (>= 1.5)
libwavpack-dev (>= 4.60)
-gstreamer@GST_ABI@-plugins-base (>= 1.12.0)
+gstreamer@GST_ABI@-plugins-base (>= 1.13.1)
libsoup2.4-dev (>= 2.48)
libpulse-dev (>= 2.0)
libbz2-dev
@@ -38,3 +38,9 @@ gstreamer@GST_ABI@-doc
gstreamer@GST_ABI@-plugins-base-doc
libjack-jackd2-dev
libvpx-dev (>= 1.3.0)
+libmp3lame-dev
+libmpg123-dev (>= 1.13)
+libtwolame-dev (>= 0.3.10)
+qtbase5-dev
+qtdeclarative5-dev
+libqt5x11extras5-dev
diff --git a/debian/build-deps.in b/debian/build-deps.in
index 4ca9a1417..c4b6a98c1 100644
--- a/debian/build-deps.in
+++ b/debian/build-deps.in
@@ -1,6 +1,6 @@
@GST_LIB_DEV_DEP@
@GST_EXTRA_BUILD_DEPENDS@
-libgstreamer-plugins-base@GST_ABI@-dev (>= 1.12.0)
+libgstreamer-plugins-base@GST_ABI@-dev (>= 1.13.1)
autotools-dev
dh-autoreconf
automake (>= 1.14)
@@ -27,10 +27,10 @@ libxdamage-dev
libxext-dev
libxfixes-dev
libxv-dev
-libgtk-3-dev
+libgtk-3-dev (>= 3.15)
libtag1-dev (>= 1.5)
libwavpack-dev (>= 4.60)
-gstreamer@GST_ABI@-plugins-base (>= 1.12.0)
+gstreamer@GST_ABI@-plugins-base (>= 1.13.1)
libsoup2.4-dev (>= 2.48)
libpulse-dev (>= 2.0)
libbz2-dev
@@ -38,3 +38,9 @@ gstreamer@GST_ABI@-doc
gstreamer@GST_ABI@-plugins-base-doc
libjack-jackd2-dev
libvpx-dev (>= 1.3.0)
+libmp3lame-dev
+libmpg123-dev (>= 1.13)
+libtwolame-dev (>= 0.3.10)
+qtbase5-dev
+qtdeclarative5-dev
+libqt5x11extras5-dev
diff --git a/debian/changelog b/debian/changelog
index 82653a56f..69e86284e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gst-plugins-good1.0 (1.13.1-1) experimental; urgency=medium
+
+ * New upstream development release.
+
+ -- Sebastian Dröge <slomo@debian.org> Sat, 17 Feb 2018 21:00:50 +0200
+
gst-plugins-good1.0 (1.12.4-1) unstable; urgency=medium
* New upstream bugfix release
diff --git a/debian/control b/debian/control
index 3f237a60c..8c49115e3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Maintainers of GStreamer packages <pkg-gstreamer-maintainers@lists.a
Uploaders: Loic Minier <lool@dooz.org>,
Sebastian Dröge <slomo@debian.org>,
Sjoerd Simons <sjoerd@debian.org>
-Build-Depends: libgstreamer1.0-dev (>= 1.12.0), libraw1394-dev (>= 2.0.0) [linux-any] , libiec61883-dev (>= 1.0.0) [linux-any] , libavc1394-dev [linux-any] , libv4l-dev [linux-any] , libgudev-1.0-dev (>= 143) [linux-any], libgstreamer-plugins-base1.0-dev (>= 1.12.0), autotools-dev, dh-autoreconf, automake (>= 1.14), autoconf (>= 2.69), libtool (>= 2.2.6), autopoint (>= 0.17), cdbs (>= 0.4.93), debhelper (>= 9), dpkg-dev (>= 1.15.1), pkg-config (>= 0.11.0), gtk-doc-tools (>= 1.12), libglib2.0-dev (>= 2.40), liborc-0.4-dev (>= 1:0.4.17), libcairo2-dev (>= 1.10.0), libcaca-dev, libspeex-dev (>= 1.1.6), libpng-dev, libshout3-dev, libjpeg-dev, libaa1-dev (>= 1.4p5), libflac-dev (>= 1.1.4), libdv4-dev | libdv-dev, libxdamage-dev, libxext-dev, libxfixes-dev, libxv-dev, libgtk-3-dev, libtag1-dev (>= 1.5), libwavpack-dev (>= 4.60), gstreamer1.0-plugins-base (>= 1.12.0), libsoup2.4-dev (>= 2.48), libpulse-dev (>= 2.0), libbz2-dev, gstreamer1.0-doc, gstreamer1.0-plugins-base-doc, libjack-jackd2-dev, libvpx-dev (>= 1.3.0)
+Build-Depends: libgstreamer1.0-dev (>= 1.13.1), libraw1394-dev (>= 2.0.0) [linux-any] , libiec61883-dev (>= 1.0.0) [linux-any] , libavc1394-dev [linux-any] , libv4l-dev [linux-any] , libgudev-1.0-dev (>= 143) [linux-any], libgstreamer-plugins-base1.0-dev (>= 1.13.1), autotools-dev, dh-autoreconf, automake (>= 1.14), autoconf (>= 2.69), libtool (>= 2.2.6), autopoint (>= 0.17), cdbs (>= 0.4.93), debhelper (>= 9), dpkg-dev (>= 1.15.1), pkg-config (>= 0.11.0), gtk-doc-tools (>= 1.12), libglib2.0-dev (>= 2.40), liborc-0.4-dev (>= 1:0.4.17), libcairo2-dev (>= 1.10.0), libcaca-dev, libspeex-dev (>= 1.1.6), libpng-dev, libshout3-dev, libjpeg-dev, libaa1-dev (>= 1.4p5), libflac-dev (>= 1.1.4), libdv4-dev | libdv-dev, libxdamage-dev, libxext-dev, libxfixes-dev, libxv-dev, libgtk-3-dev (>= 3.15), libtag1-dev (>= 1.5), libwavpack-dev (>= 4.60), gstreamer1.0-plugins-base (>= 1.13.1), libsoup2.4-dev (>= 2.48), libpulse-dev (>= 2.0), libbz2-dev, gstreamer1.0-doc, gstreamer1.0-plugins-base-doc, libjack-jackd2-dev, libvpx-dev (>= 1.3.0), libmp3lame-dev, libmpg123-dev (>= 1.13), libtwolame-dev (>= 0.3.10), qtbase5-dev, qtdeclarative5-dev, libqt5x11extras5-dev
Standards-Version: 3.9.3
Vcs-Git: git://anonscm.debian.org/pkg-gstreamer/gst-plugins-good1.0.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-gstreamer/gst-plugins-good1.0.git;a=summary
@@ -53,6 +53,56 @@ Description: GStreamer plugin for PulseAudio
This package contains the GStreamer plugin for PulseAudio, a sound server
for POSIX and WIN32 systems.
+Package: gstreamer1.0-qt5
+Architecture: any
+Multi-Arch: same
+Section: graphics
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+XB-GStreamer-Version: ${gstreamer:Version}
+XB-GStreamer-Elements: ${gstreamer:Elements}
+XB-GStreamer-URI-Sources: ${gstreamer:URISources}
+XB-GStreamer-URI-Sinks: ${gstreamer:URISinks}
+XB-GStreamer-Encoders: ${gstreamer:Encoders}
+XB-GStreamer-Decoders: ${gstreamer:Decoders}
+Provides: ${gstreamer:Provides}
+Replaces: gstreamer1.0-plugins-bad (<< 1.13.1)
+Breaks: gstreamer1.0-plugins-bad (<< 1.13.1)
+Description: GStreamer plugin for Qt5
+ GStreamer is a streaming media framework, based on graphs of filters
+ which operate on media data. Applications using this library can do
+ anything from real-time sound processing to playing videos, and just
+ about anything else media-related. Its plugin-based architecture means
+ that new data types or processing capabilities can be added simply by
+ installing new plug-ins.
+ .
+ This package contains the GStreamer plugin for Qt5.
+
+Package: gstreamer1.0-gtk3
+Architecture: any
+Multi-Arch: same
+Section: graphics
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+XB-GStreamer-Version: ${gstreamer:Version}
+XB-GStreamer-Elements: ${gstreamer:Elements}
+XB-GStreamer-URI-Sources: ${gstreamer:URISources}
+XB-GStreamer-URI-Sinks: ${gstreamer:URISinks}
+XB-GStreamer-Encoders: ${gstreamer:Encoders}
+XB-GStreamer-Decoders: ${gstreamer:Decoders}
+Provides: ${gstreamer:Provides}
+Replaces: gstreamer1.0-plugins-bad (<< 1.13.1)
+Breaks: gstreamer1.0-plugins-bad (<< 1.13.1)
+Description: GStreamer plugin for GTK+3
+ GStreamer is a streaming media framework, based on graphs of filters
+ which operate on media data. Applications using this library can do
+ anything from real-time sound processing to playing videos, and just
+ about anything else media-related. Its plugin-based architecture means
+ that new data types or processing capabilities can be added simply by
+ installing new plug-ins.
+ .
+ This package contains the GStreamer plugin for GTK+3.
+
Package: gstreamer1.0-plugins-good
Architecture: any
Multi-Arch: same
@@ -62,8 +112,8 @@ Depends: ${misc:Depends},
gstreamer1.0-pulseaudio | gstreamer1.0-audiosink,
gstreamer1.0-plugins-base,
Recommends: gstreamer1.0-x
-Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
-Breaks: gstreamer1.0-plugins-bad (<< 1.7.90)
+Replaces: gstreamer1.0-plugins-bad (<< 1.13.1)
+Breaks: gstreamer1.0-plugins-bad (<< 1.13.1)
XB-GStreamer-Version: ${gstreamer:Version}
XB-GStreamer-Elements: ${gstreamer:Elements}
XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -89,9 +139,11 @@ Section: debug
Priority: extra
Depends: gstreamer1.0-plugins-good (= ${binary:Version}),
gstreamer1.0-pulseaudio (= ${binary:Version}),
+ gstreamer1.0-qt5 (= ${binary:Version}),
+ gstreamer1.0-gtk3 (= ${binary:Version}),
${misc:Depends}
-Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
-Breaks: gstreamer1.0-plugins-bad (<< 1.7.90)
+Replaces: gstreamer1.0-plugins-bad (<< 1.13.1)
+Breaks: gstreamer1.0-plugins-bad (<< 1.13.1)
Description: GStreamer plugins from the "good" set
GStreamer is a streaming media framework, based on graphs of filters
which operate on media data. Applications using this library can do
diff --git a/debian/control.in b/debian/control.in
index f48a908fe..28c92f09e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -53,6 +53,56 @@ Description: GStreamer plugin for PulseAudio
This package contains the GStreamer plugin for PulseAudio, a sound server
for POSIX and WIN32 systems.
+Package: @GST_PKGNAME@-qt5
+Architecture: any
+Multi-Arch: same
+Section: graphics
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+XB-GStreamer-Version: ${gstreamer:Version}
+XB-GStreamer-Elements: ${gstreamer:Elements}
+XB-GStreamer-URI-Sources: ${gstreamer:URISources}
+XB-GStreamer-URI-Sinks: ${gstreamer:URISinks}
+XB-GStreamer-Encoders: ${gstreamer:Encoders}
+XB-GStreamer-Decoders: ${gstreamer:Decoders}
+Provides: ${gstreamer:Provides}
+Replaces: gstreamer1.0-plugins-bad (<< 1.13.1)
+Breaks: gstreamer1.0-plugins-bad (<< 1.13.1)
+Description: GStreamer plugin for Qt5
+ GStreamer is a streaming media framework, based on graphs of filters
+ which operate on media data. Applications using this library can do
+ anything from real-time sound processing to playing videos, and just
+ about anything else media-related. Its plugin-based architecture means
+ that new data types or processing capabilities can be added simply by
+ installing new plug-ins.
+ .
+ This package contains the GStreamer plugin for Qt5.
+
+Package: @GST_PKGNAME@-gtk3
+Architecture: any
+Multi-Arch: same
+Section: graphics
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+XB-GStreamer-Version: ${gstreamer:Version}
+XB-GStreamer-Elements: ${gstreamer:Elements}
+XB-GStreamer-URI-Sources: ${gstreamer:URISources}
+XB-GStreamer-URI-Sinks: ${gstreamer:URISinks}
+XB-GStreamer-Encoders: ${gstreamer:Encoders}
+XB-GStreamer-Decoders: ${gstreamer:Decoders}
+Provides: ${gstreamer:Provides}
+Replaces: gstreamer1.0-plugins-bad (<< 1.13.1)
+Breaks: gstreamer1.0-plugins-bad (<< 1.13.1)
+Description: GStreamer plugin for GTK+3
+ GStreamer is a streaming media framework, based on graphs of filters
+ which operate on media data. Applications using this library can do
+ anything from real-time sound processing to playing videos, and just
+ about anything else media-related. Its plugin-based architecture means
+ that new data types or processing capabilities can be added simply by
+ installing new plug-ins.
+ .
+ This package contains the GStreamer plugin for GTK+3.
+
Package: @GST_PKGNAME@-plugins-good
Architecture: any
Multi-Arch: same
@@ -62,8 +112,8 @@ Depends: ${misc:Depends},
@GST_PKGNAME@-pulseaudio | @GST_PKGNAME@-audiosink,
gstreamer@GST_ABI@-plugins-base,
Recommends: @GST_PKGNAME@-x
-Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
-Breaks: gstreamer1.0-plugins-bad (<< 1.7.90)
+Replaces: gstreamer1.0-plugins-bad (<< 1.13.1)
+Breaks: gstreamer1.0-plugins-bad (<< 1.13.1)
XB-GStreamer-Version: ${gstreamer:Version}
XB-GStreamer-Elements: ${gstreamer:Elements}
XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -89,9 +139,11 @@ Section: debug
Priority: extra
Depends: @GST_PKGNAME@-plugins-good (= ${binary:Version}),
@GST_PKGNAME@-pulseaudio (= ${binary:Version}),
+ @GST_PKGNAME@-qt5 (= ${binary:Version}),
+ @GST_PKGNAME@-gtk3 (= ${binary:Version}),
${misc:Depends}
-Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
-Breaks: gstreamer1.0-plugins-bad (<< 1.7.90)
+Replaces: gstreamer1.0-plugins-bad (<< 1.13.1)
+Breaks: gstreamer1.0-plugins-bad (<< 1.13.1)
Description: GStreamer plugins from the "good" set
GStreamer is a streaming media framework, based on graphs of filters
which operate on media data. Applications using this library can do
diff --git a/debian/gstreamer-gtk3.install b/debian/gstreamer-gtk3.install
new file mode 100644
index 000000000..6573ec65e
--- /dev/null
+++ b/debian/gstreamer-gtk3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstgtk.so
diff --git a/debian/gstreamer-plugins-good.install b/debian/gstreamer-plugins-good.install
index 0dcf139ff..b2bcd0a91 100644
--- a/debian/gstreamer-plugins-good.install
+++ b/debian/gstreamer-plugins-good.install
@@ -31,9 +31,11 @@ debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstinterleave.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstid3demux.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstjack.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstjpeg.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstlame.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstlevel.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmatroska.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmonoscope.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmpg123.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmulaw.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmultifile.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmultipart.so
@@ -53,6 +55,7 @@ debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstsoup.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstspectrum.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstspeex.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgsttaglib.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgsttwolame.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstudp.so
@video4linux2@
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstvideobox.so
diff --git a/debian/gstreamer-qt5.install b/debian/gstreamer-qt5.install
new file mode 100644
index 000000000..a94ea9539
--- /dev/null
+++ b/debian/gstreamer-qt5.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstqmlgl.so
diff --git a/debian/patches/0001-qml-Link-against-libEGL-explicitly.patch b/debian/patches/0001-qml-Link-against-libEGL-explicitly.patch
new file mode 100644
index 000000000..4db282400
--- /dev/null
+++ b/debian/patches/0001-qml-Link-against-libEGL-explicitly.patch
@@ -0,0 +1,26 @@
+From 773ae2fdbc39d31be83e9f12547b671887f205a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Sat, 17 Feb 2018 21:14:39 +0200
+Subject: [PATCH] qml: Link against libEGL explicitly
+
+---
+ ext/qt/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/ext/qt/Makefile.am b/ext/qt/Makefile.am
+index cf2f761c..7622cc0c 100644
+--- a/ext/qt/Makefile.am
++++ b/ext/qt/Makefile.am
+@@ -45,7 +45,8 @@ libgstqmlgl_la_LIBADD = \
+ $(GST_GL_LIBS) \
+ -lgstvideo-$(GST_API_VERSION) \
+ $(GST_BASE_LIBS) \
+- $(QT_LIBS)
++ $(QT_LIBS) \
++ -lEGL
+
+ libgstqmlgl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+
+--
+2.16.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29bb..d533f07ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-qml-Link-against-libEGL-explicitly.patch
diff --git a/debian/rules b/debian/rules
index cb3949590..6d613c7b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ gst_abi=$(gst_major).$(gst_minor)
gst_lib=libgstreamer$(gst_abi)-0
gst_lib_dev=libgstreamer$(gst_abi)-dev
# what gstreamer version is needed
-gst_lib_dev_dep=$(gst_lib_dev) (>= 1.12.0)
+gst_lib_dev_dep=$(gst_lib_dev) (>= 1.13.1)
gst_pkgname=gstreamer$(gst_abi)
gst_deb_abi=$(gst_abi)-0
@@ -75,7 +75,7 @@ export OIL_CPU_FLAGS
# Link special names to a template file.
# still need "*.install" to be done by hand
-PLUGINS += pulseaudio plugins-good
+PLUGINS += pulseaudio gtk3 qt5 plugins-good
CONFIG_ARGS :=
ifeq ($(DEB_HOST_ARCH_OS),linux)
PLUGINS +=
--
GitLab