On Thu, Oct 13, 2016 at 10:23:33AM +0200, Sebastian Dröge wrote:
> On Tue, 2016-10-11 at 00:40 +0300, Adrian Bunk wrote:
> > Package: gstreamer1.0-plugins-good
> > Version: 1.8.3-1+b1
> > Severity: important
> >
> > Several packages like quodlibet (#785432) or buzztrax contain the
> > following in the dependencies:
> > Depends: ..., gstreamer1.0-plugins-good, ...
> > gstreamer1.0-pulseaudio | gstreamer1.0-audiosink, ...
> >
> >
> > This does not work due to gstreamer1.0-plugins-good providing
> > gstreamer1.0-audiosink (since it contains libgstjack).
> >
> >
> > The result is that many users end up with having only the JACK
> > audiosink installed, and this is causing a huge amount of headaches
> > for users and maintainers of packages using GStreamer (I can provide
> > more bug numbers if necessary).
> >
> >
> > There are two possible solutions for this problem:
> > 1. split all audiosinks into own packages, so that
> > "gstreamer1.0-pulseaudio | gstreamer1.0-audiosink" works as
> > expected
> > 2. merge the ALSA and PulseAudio sinks into -base and -good,
> > so depending on -good would ensure all common audio sinks are
> > present
> >
> > Are there any cases where option 2 would cause problems?
>
> I'm not aware of any possible problems there, no. If anything it would
> probably make sense to split out JACK and have PulseAudio in -good...
> having JACK the default makes no sense at all.
>
> Do you want to provide a patch for merging the PulseAudio plugin
> directly into the gst-plugins-good package?
Apologies for the delay, patch is attached.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
>From 20b3664c53eab2266ce4af233065d34fd80d4699 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <[email protected]>
Date: Tue, 24 Jan 2017 20:49:23 +0200
Subject: Merge the PulseAudio audio sink into -good
https://bugs.debian.org/840359
---
debian/control | 23 +++++------------------
debian/control.in | 23 +++++------------------
debian/gstreamer-plugins-good.install | 1 +
debian/gstreamer-pulseaudio.install | 1 -
debian/rules | 2 +-
5 files changed, 12 insertions(+), 38 deletions(-)
delete mode 100644 debian/gstreamer-pulseaudio.install
diff --git a/debian/control b/debian/control
index 29a7c7da..77209f78 100644
--- a/debian/control
+++ b/debian/control
@@ -34,24 +34,11 @@ Architecture: any
Multi-Arch: same
Section: sound
Depends: ${misc:Depends},
- ${shlibs:Depends}
+ gstreamer1.0-plugins-good (>= 1.10.2-2~)
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}
-Description: GStreamer plugin for PulseAudio
- 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 PulseAudio, a sound server
- for POSIX and WIN32 systems.
+Description: GStreamer plugin for PulseAudio (transitional package)
+ This is a transitional package for the PulseAudio plugin that is
+ now part of gstreamer1.0-plugins-good.
Package: gstreamer1.0-plugins-good
Architecture: any
@@ -62,7 +49,7 @@ 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)
+Replaces: gstreamer1.0-plugins-bad (<< 1.1.2), gstreamer1.0-pulseaudio (<< 1.10.2-2~)
Breaks: gstreamer1.0-plugins-bad (<< 1.7.90)
XB-GStreamer-Version: ${gstreamer:Version}
XB-GStreamer-Elements: ${gstreamer:Elements}
diff --git a/debian/control.in b/debian/control.in
index f48a908f..8927b20e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -34,24 +34,11 @@ Architecture: any
Multi-Arch: same
Section: sound
Depends: ${misc:Depends},
- ${shlibs:Depends}
+ @GST_PKGNAME@-plugins-good (>= 1.10.2-2~)
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}
-Description: GStreamer plugin for PulseAudio
- 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 PulseAudio, a sound server
- for POSIX and WIN32 systems.
+Description: GStreamer plugin for PulseAudio (transitional package)
+ This is a transitional package for the PulseAudio plugin that is
+ now part of @GST_PKGNAME@-plugins-good.
Package: @GST_PKGNAME@-plugins-good
Architecture: any
@@ -62,7 +49,7 @@ 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)
+Replaces: gstreamer1.0-plugins-bad (<< 1.1.2), gstreamer1.0-pulseaudio (<< 1.10.2-2~)
Breaks: gstreamer1.0-plugins-bad (<< 1.7.90)
XB-GStreamer-Version: ${gstreamer:Version}
XB-GStreamer-Elements: ${gstreamer:Elements}
diff --git a/debian/gstreamer-plugins-good.install b/debian/gstreamer-plugins-good.install
index 047470cd..9610a943 100644
--- a/debian/gstreamer-plugins-good.install
+++ b/debian/gstreamer-plugins-good.install
@@ -39,6 +39,7 @@ debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmultifile.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmultipart.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstnavigationtest.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstpng.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstpulse.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstossaudio.so
@oss4@
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstisomp4.so
diff --git a/debian/gstreamer-pulseaudio.install b/debian/gstreamer-pulseaudio.install
deleted file mode 100644
index 49032e9a..00000000
--- a/debian/gstreamer-pulseaudio.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstpulse.so
diff --git a/debian/rules b/debian/rules
index 5007edeb..3d463984 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,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 += plugins-good
CONFIG_ARGS :=
ifeq ($(DEB_HOST_ARCH_OS),linux)
PLUGINS +=
--
2.11.0
