[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 Mon, 30 May 2022 09:50:08 +0000
with message-id <E1nvc2K-0001N3-OO@fasolo.debian.org>
and subject line Bug#935590: fixed in opusfile 0.12-1
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-1
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: Mon, 30 May 2022 11:22:59 +0200
Source: opusfile
Architecture: source
Version: 0.12-1
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: 881788 899138 923031 935590 935591 965762 1007053 1009854
Changes:
 opusfile (0.12-1) unstable; urgency=medium
 .
   * Upload to unstable.
   * Fix upstream contact.
 .
 opusfile (0.12-1~exp1) experimental; urgency=medium
 .
   * New upstream version 0.12 (Closes: #935591, #881788)
 .
   * Salvage the package on behalf of the multimedia-team (Closes: #1009854)
   * Install libraries into multi-arch locations
     (Closes: #935590, #923031, #899138) (LP: #1883753)
   * Drop empty dbg package (switching to automatic dbgsym packages)
   * Add build-dependency hints to .symbols file
   * Mark lib*.la files as not-installed
   * Install AUTHORS and README.md
   * Remove trailing whitespace from d/changelog
   * d/control
     + Declare that building this package does not require 'root' powers.
     + Use Priority "optional" instead of the obsolete "extra"
     + ${misc:Depends} for libopusfile-doc
     + Fix package descriptions
     + Update Vcs-* stanzas
     + Make the doc-package "suggest" the dev-package
   * d/copyright
     + Convert to DEP-5
     + Add 'licensecheck' target to d/rules
     + Generate d/copyright_hints
   * Add salsa-ci configuration
   * Add watch file
   * Add gbp.conf
   * Switch to 3.0 source format (Closes: #1007053)
   * Bump dh-compat to 13 (Closes: #965762)
     + Drop old build script in favour of shortform 'dh'
   * Bump standards version to 4.6.0
Checksums-Sha1:
 644a6f75b8e18965a5528c17b656137c8387d3b4 2342 opusfile_0.12-1.dsc
 2ace54a27bbbc3d2197e2aedc998a2cbd05c187d 5572 opusfile_0.12-1.debian.tar.xz
Checksums-Sha256:
 ec927da64a60051ec315bb93d7871132249b7453f77d5b4858bfce75323d0b0d 2342 opusfile_0.12-1.dsc
 0eae81e129f0f9583984b2ae9a45b0304b63635a34581eb4577c65344b62de22 5572 opusfile_0.12-1.debian.tar.xz
Files:
 f885e886a0bc9b93e2175355d35d751e 2342 sound optional opusfile_0.12-1.dsc
 e0dbc607d330bd52653ba2df1a101a64 5572 sound optional opusfile_0.12-1.debian.tar.xz

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

iQJKBAEBCAA0FiEEdAXnRVdICXNIABVttlAZxH96NvgFAmKUjc4WHGZvcnVtQHVt
bGFldXRlLm11ci5hdAAKCRC2UBnEf3o2+IoaD/9W5UDFQDmfgMRl/fuvJqga1Lwr
1eeRxgoqMlCIIPtEEF5m0lJAxY6xbdJsAYZTGuu+6r7OL90FPR3CVlRThAVQ48gZ
XsTPu7k0Px2q5vLKNI0Yasi3z+WLKt7pxEJjT+AZsMUWKM740q7cv2Rv9qPKoXoQ
YGb7uBOXDqlkOiI7Z3qq9hTlDDPrVzDxHqpyv3Kbrmkd/8vvWAU6hmmPwQdMqOqj
WgRFoijAQoqeOD4b2RG3nu94uWXENxMV6fpJc3zGPzosR5/MbNRCW1ymECZLFYwV
i7rafXKJWZ/ZTWp6+GP1QjsHZOtFZT/DWyOuT22CTPq8grPbFbv6rxUi7Z8BOHir
T2S54STQP8tmXY6zXmNMiy//wtRkxQzkFvBsQiSu3LJprZ0Aeke5M1QS0uJKaTxy
CbGm3oDZnjSIwbCsSkUjmAdcKi87jK0LXw6xyp4SLXaEbbTB5Z8jceeNUTzm6wnk
Jrl5uvqpy3s5uWSL/H2pvuV9XbbiRPZfa05VHtbhdhY/jFwksE5YcoT+Z99Q6lcs
m8mkv/mvO9Jl52/y+NSnXelPUDKnpJRm9YPpaerAtsnh2LO7iLuhBBVNHkPcC2GT
gD86tE1RxJ5KgX7++w4dYk+6cMomjSLa07Ir7FCpJ6+cijrL1fk8LJGlu4VMe+EI
z2FWpC/XVSEcIeDevg==
=9Sem
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: