Hello,
On Wed, 21 Apr 2021 09:31:12 +0300 =?utf-8?q?Sebastian_Dr=C3=B6ge?=
<sl...@debian.org> wrote:
> Please unblock package gstreamer1.0
>
> GStreamer 1.18.4 is a bugfix release on top of 1.18.3, which is
currently in
> testing/unstable. 1.18.4 is currently waiting in experimental until the
> unblock request is accepted.
>
> This does not affect only the gstreamer1.0 source package but also:
> - gst-plugins-base1.0
> - gst-plugins-good1.0
> - gst-plugins-bad1.0
Yesterday, I uploaded src:gst-plugins-bad1.0 1.18.4-3 without knowing
that the unblock was already requested.
My changes (see in the attached patch) are not impacting the release
architectures, they are fixing issues with different ports.
Are my changes a problem for the release team? Should they be reverted?
Sorry for the disturbance,
Kind regards,
Laurent Bigonville
diff --git a/debian/changelog b/debian/changelog
index 3cf3095a..1b45bf3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gst-plugins-bad1.0 (1.18.4-3) unstable; urgency=medium
+
+ * Team upload.
+ * debian/control: Add more architectures to the opencv BD
+ * debian/control: Do not make libgstreamer-plugins-bad1.0-dev depend on
+ opencv where it's not available (Closes: #987396)
+ * Do not try to install the sctp on non-linux architectures
+
+ -- Laurent Bigonville <bi...@debian.org> Mon, 26 Apr 2021 17:07:50 +0200
+
gst-plugins-bad1.0 (1.18.4-2) unstable; urgency=medium
* Upload to unstable.
diff --git a/debian/control b/debian/control
index e2dece74..de5bbf23 100644
--- a/debian/control
+++ b/debian/control
@@ -51,8 +51,8 @@ Build-Depends: debhelper,
libnice-dev (>= 0.1.14),
libofa0-dev (>= 0.9.3),
libopenal-dev (>= 1:1.14),
- libopencv-dev (>= 3.0.0) [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64],
- opencv-data [amd64 arm64 armel armhf i386 mips64el mipsel
ppc64el s390x powerpc ppc64 riscv64],
+ libopencv-dev (>= 3.0.0) [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha hppa hurd-i386 m68k powerpc ppc64 riscv64],
+ opencv-data [amd64 arm64 armel armhf i386 mips64el mipsel
ppc64el s390x alpha hppa hurd-i386 m68k powerpc ppc64 riscv64],
libwpebackend-fdo-1.0-dev (>= 1.6.0) [amd64 arm64 armel
armhf hppa i386 mipsel ppc64 ppc64el s390x sparc64 x32],
libwpewebkit-1.0-dev (>= 2.28.0) [amd64 arm64 armel armhf hppa i386 mipsel ppc64 ppc64el s390x sparc64 x32],
libopenexr-dev,
@@ -166,7 +166,7 @@ Description: GStreamer plugins from the "bad" set
real live maintainer, or some actual wide use.
Package: gstreamer1.0-opencv
-Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x
powerpc ppc64 riscv64
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x
alpha hppa hurd-i386 m68k powerpc ppc64 riscv64
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
@@ -248,7 +248,7 @@ Description: GStreamer libraries from the "bad" set
is not guaranteed to be stable.
Package: libgstreamer-opencv1.0-0
-Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x
powerpc ppc64 riscv64
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x
alpha hppa hurd-i386 m68k powerpc ppc64 riscv64
Section: libs
Priority: optional
Multi-Arch: same
@@ -279,11 +279,11 @@ Section: libdevel
Priority: optional
Depends: ${misc:Depends},
libgstreamer-plugins-bad1.0-0 (= ${binary:Version}),
- libgstreamer-opencv1.0-0 (= ${binary:Version}),
+ libgstreamer-opencv1.0-0 (= ${binary:Version}) [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha hppa hurd-i386 m68k powerpc ppc64 riscv64],
libgstreamer1.0-dev,
libgstreamer-plugins-base1.0-dev,
gir1.2-gst-plugins-bad-1.0 (= ${binary:Version}),
- libopencv-dev (>= 2.3.0)
+ libopencv-dev (>= 2.3.0) [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha hppa hurd-i386 m68k powerpc ppc64 riscv64]
Conflicts: pitivi (<< 0.9999)
Description: GStreamer development files for libraries from the "bad" set
GStreamer is a streaming media framework, based on graphs of filters
diff --git a/debian/gstreamer1.0-plugins-bad.install b/debian/gstreamer1.0-plugins-bad.install
index 7949901b..fe627515 100644
--- a/debian/gstreamer1.0-plugins-bad.install
+++ b/debian/gstreamer1.0-plugins-bad.install
@@ -84,7 +84,6 @@ debian/tmp/usr/lib/*/gstreamer-1.0/libgstrtmp.so
debian/tmp/usr/lib/*/gstreamer-1.0/libgstrtmp2.so
debian/tmp/usr/lib/*/gstreamer-1.0/libgstrtponvif.so
debian/tmp/usr/lib/*/gstreamer-1.0/libgstrtpmanagerbad.so
-debian/tmp/usr/lib/*/gstreamer-1.0/libgstsctp.so
debian/tmp/usr/lib/*/gstreamer-1.0/libgstsdpelem.so
debian/tmp/usr/lib/*/gstreamer-1.0/libgstsegmentclip.so
debian/tmp/usr/lib/*/gstreamer-1.0/libgstshm.so
diff --git a/debian/rules b/debian/rules
index 6f557135..3be9be58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
dh_install -pgstreamer1.0-plugins-bad debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstva.so
dh_install -pgstreamer1.0-plugins-bad debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstv4l2codecs.so
dh_install -pgstreamer1.0-plugins-bad debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstopenni2.so
+ dh_install -pgstreamer1.0-plugins-bad debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstsctp.so
ifeq ($(DEB_HOST_ARCH),amd64)
dh_install -pgstreamer1.0-plugins-bad debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstmsdk.so
endif
