[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#935590: marked as done (libopusfile0: Please make multi-arch co-installable)

Your message dated Tue, 31 May 2022 11:19:01 +0000
with message-id <E1nvztt-0002Gf-3E@fasolo.debian.org>
and subject line Bug#935590: fixed in opusfile 0.12-2
has caused the Debian Bug report #935590,
regarding libopusfile0: Please make multi-arch co-installable
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
935590: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935590
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: libopusfile0
Version: 0.9+20170913-1
Severity: normal
Tags: patch
Control: block -1 by 899138
Control: block 923031 by -1

libopusfile0 and libopusfile-dev are not Multi-Arch co-installable,
which makes it awkward to use them for cross-compilation, or depend on
libopusfile0 in i386 software that is to be installed on amd64 machines
(for example, it would be problematic if Wine wanted to use opusfile).

The attached patches are a minimal change to address this, building on
what Helmut Grohne provided in #899138. Please consider applying them.

The same changes are in active use in the Steam Runtime[1], a library
runtime environment for Steam games, for which multiarch co-installability
is particularly important because many older games are i386-only. The
version of opusfile in the Steam Runtime has also been updated to 0.11,
which did not require any particular packaging changes.

Thanks,
    smcv

[1] http://repo.steamstatic.com/steamrt/pool/main/o/opusfile/

>From 204f60efa9e6b16ecef2f892b6aba23d1bdf858d Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Sat, 19 May 2018 20:16:21 +0200
Subject: [PATCH 1/2] Install library and pkg-config metadata to multiarch
 locations

Closes: #899138
---
 debian/libopusfile-dev.install | 6 +++---
 debian/libopusfile0.install    | 2 +-
 debian/rules                   | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/libopusfile-dev.install b/debian/libopusfile-dev.install
index bbc9008..abebe49 100644
--- a/debian/libopusfile-dev.install
+++ b/debian/libopusfile-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*.pc
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*.pc
diff --git a/debian/libopusfile0.install b/debian/libopusfile0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libopusfile0.install
+++ b/debian/libopusfile0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 515ea57..fa29142 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,7 @@ PARALLEL = $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 NJOBS    = -j$(or $(PARALLEL),$(NUM_CPUS),1)
 
 
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+include /usr/share/dpkg/architecture.mk
 
 
 # -fstack-protector-all is added by the default autoconf tests.
@@ -70,6 +68,7 @@ $(objdir)/config.status: configure
 				     --host=$(DEB_HOST_GNU_TYPE)	\
 				     --build=$(DEB_BUILD_GNU_TYPE)	\
 				     --prefix=/usr			\
+				     --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
 				     $(EXTRA_CONFIG_FLAGS)		\
 				     CPPFLAGS="$(CPPFLAGS)"		\
 				     CFLAGS="$(CFLAGS)"			\
-- 
2.23.0


>From 1b8253749254ef4cea8eec658c121cc4dc8c0d89 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 19 Dec 2018 19:42:35 +0000
Subject: [PATCH 2/2] Mark libopusfile0, libopusfile-dev as Multi-Arch: same

This builds on Helmut Grohne's work in #899138 to allow (for example)
libopusfile-dev:amd64 and libopusfile-dev:s390x to be co-installed,
making it possible to do cross-builds without either using a chroot
or removing the host architecture's libopusfile.

Signed-off-by: Simon McVittie <smcv@debian.org>
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index f4e30af..6045af8 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Vcs-Browser: https://salsa.debian.org/ron/opusfile
 Package: libopusfile0
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}
 Description: High-level API for basic manipulation of Ogg Opus audio streams
  libopusfile provides several sets of built-in routines for file and stream
@@ -29,6 +30,7 @@ Description: High-level API for basic manipulation of Ogg Opus audio streams
 Package: libopusfile-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libopusfile0 (= ${binary:Version}), libopus-dev (>= 1.0.1), libogg-dev (>= 1.3.0)
 Recommends: libssl-dev
 Description: High-level API for basic manipulation of Ogg Opus audio streams
-- 
2.23.0

--- End Message ---
--- Begin Message --- 
Source: opusfile
Source-Version: 0.12-2
Done: IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>

We believe that the bug you reported is fixed in the latest version of
opusfile, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 935590@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> (supplier of updated opusfile package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Tue, 31 May 2022 12:53:05 +0200
Source: opusfile
Architecture: source
Version: 0.12-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Changed-By: IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>
Closes: 935590
Changes:
 opusfile (0.12-2) unstable; urgency=medium
 .
   [ Simon McVittie ]
   * Mark libopusfile0, libopusfile-dev as Multi-Arch: same (Closes: #935590)
   * d/control: Mark libopusfile-doc as Multi-Arch: foreign
 .
   [ IOhannes m zmölnig (Debian/GNU) ]
   * Add autopkgtests
Checksums-Sha1:
 be6e78ac493ef5ced77be635e23103858372ee54 2392 opusfile_0.12-2.dsc
 168c1a287ab6e8235df5a92d88e0948caa3000f2 6040 opusfile_0.12-2.debian.tar.xz
Checksums-Sha256:
 e5d8ccf3eea82da7db03ddf00eeef36ba21d7b6e9c9a34bc2ae7ef094942b787 2392 opusfile_0.12-2.dsc
 3aaedeb0e9a49162b76973f9729a7e2d844b23d9fccb8ee9c8c656f4e87279d6 6040 opusfile_0.12-2.debian.tar.xz
Files:
 f8f8ed505c2791c4ddfc0a57160e3f2a 2392 sound optional opusfile_0.12-2.dsc
 9942c29c8dc98da8618b0ee47efa84d7 6040 sound optional opusfile_0.12-2.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEdAXnRVdICXNIABVttlAZxH96NvgFAmKV9NAACgkQtlAZxH96
NvhujQ//YjOG0DCCYiPgOmuBpbxeNiHo0FTvYBmaynQNcgV8aHk5o11FpA8muE52
alqy0fCqQeStjYgM4y5vyGC1rEQpmN7UZlHQRM5aTGDsPnXOAhwdRddnIXCn1b2L
uABR6xHyknLFzKJnBAyQpEUqdl8RPaurMHwA7bsqIkxuIog2cS/5SnTH2RFvav0B
j9nWQ5O1Jc2y6gy/4Jq9yUBWmjzVLaxHB+JRzcohB8zcNbT3Li1CQGumyDXkxzJ8
FcxFBHp4G6K/nxtxdlV90b/gR/WxxXTzUEz3sMOU++cXA/eytPWcQc8mx2NS1idn
aGXtZkhxjnzxhJgtvgjmnFy9A3NSwpgD8i+CVg9Mev3U0u9tKe4CTtqqp6lR3LrX
CVWwuHB80O3Wcnn+xjFDjxFSIH9rKRITe+cEICSOmT4zVJAeSlm1kxTmSKNnCFJk
GojgPcZNHW/7CzeuMVoi9qV8mJf+btc2Ea47XInpJO3HD138hXOsBT05Uz+xoo9z
zGEolbNDITizKNFtcfPHpsDFBgVQ6AQWB2io9mptyLhsVEPmnE1rjHJkTZxhbWBb
VyOPIa5GCDky34gepC3D7OfLHo6DqSJyHuuqpGyTlq7lMZAk0iUEPnmDbMYAOlSA
MxQdegYRDhbg/HzHNpMxKibdr48WEx5TzocF3BRPt+afNGMTOMQ=
=SNUz
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: