[pkg-mad-maintainers] Bug#850461: Bug#850461: libmad0-dev: move mad.pc to a multiarch location

Tue Oct 31 22:18:35 UTC 2017

Control: tags -1 + pending


Hi,

2017-10-31 08:33 Kurt Roeckx:
>On Mon, Oct 30, 2017 at 11:55:26PM +0100, Manuel A. Fernandez Montecelo wrote:
>> Hi,
>>
>> 2017-01-06 19:33 Helmut Grohne:
>> > Package: libmad0-dev
>> > Version: 0.15.1b-8
>> > Tags: patch
>> > User: helmutg at debian.org
>> > Usertags: rebootstrap
>> > Control: affects -1 + audacity
>> >
>> > audacity fails to cross build from source, because it cannot find
>> > mad.pc. During cross compilation, pkg-config only searches
>> > /usr/share/pkgconfig and /usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig, but
>> > it doesn't search /usr/lib/pkgconfig. Thus it fails finding mad.pc.
>> > Please move mad.pc to a multiarch location. I am attaching a patch for
>> > your convenience.
>>
>> There are many reverse deps of this package, it would be nice to get
>> this fixed.
>>
>> Would it help if we NMU?
>
>I forgot all about this bug, sorry.
>
>Feel free to NMU it.

So I am about to upload with the attached changes.

To check that things are all right after moving the header, I chose 4
packages that I think that are amongst the most representative.  All
build fine, and detect/include the libmad library properly.

=============

# for src in {alsaplayer,sox,audacity,vlc}; do date; echo ${src}; cowbuilder --build ${src}_*.dsc &> ${src}.build-log; done
Tue 31 Oct 22:44:44 CET 2017
alsaplayer
Tue 31 Oct 22:46:28 CET 2017
sox
Tue 31 Oct 22:48:26 CET 2017
audacity
Tue 31 Oct 22:54:15 CET 2017
vlc

results:

-rw-r--r-- 1 root root 8.7K Oct 31 22:46 /var/cache/pbuilder/result/alsaplayer_0.99.81-2_amd64.changes
-rw-r--r-- 1 root root 6.9K Oct 31 22:48 /var/cache/pbuilder/result/sox_14.4.1-5_amd64.changes
-rw-r--r-- 1 root root 2.5K Oct 31 22:54 /var/cache/pbuilder/result/audacity_2.1.2-2_amd64.changes
-rw-r--r-- 1 root root  15K Oct 31 23:03 /var/cache/pbuilder/result/vlc_2.2.6-6_amd64.changes

build logs:

-rw-r--r-- 1 root root 323K Oct 31 22:46 alsaplayer.build-log
-rw-r--r-- 1 root root 218K Oct 31 22:48 sox.build-log
-rw-r--r-- 1 root root 893K Oct 31 22:54 audacity.build-log
-rw-r--r-- 1 root root 5.6M Oct 31 23:03 vlc.build-log

# grep _amd64.changes *.build-log
alsaplayer.build-log: dpkg-genchanges  >../alsaplayer_0.99.81-2_amd64.changes
audacity.build-log: dpkg-genchanges  >../audacity_2.1.2-2_amd64.changes
sox.build-log: dpkg-genchanges  >../sox_14.4.1-5_amd64.changes
vlc.build-log: dpkg-genchanges  >../vlc_2.2.6-6_amd64.changes

==========

in alsaplayer:

checking for mad_stream_init in -lmad... yes
...
checking mad.h usability... yes
checking mad.h presence... yes
checking for mad.h... yes
...
  Use libmad shared library:          yes
...
Making all in mad
make[4]: Entering directory '/build/alsaplayer-0.99.81/input/mad'
...
Making install in mad
make[3]: Entering directory '/build/alsaplayer-0.99.81/input/mad'
make[4]: Entering directory '/build/alsaplayer-0.99.81/input/mad'
 /bin/mkdir -p '/build/alsaplayer-0.99.81/debian/tmp/usr/lib/x86_64-linux-gnu/alsaplayer/input'
 /bin/bash ../../libtool   --mode=install /usr/bin/install -c   libmad_in.la '/build/alsaplayer-0.99.81/debian/tmp/usr/lib/x86_64-linux-gnu/alsaplayer/input'
libtool: install: /usr/bin/install -c .libs/libmad_in.so /build/alsaplayer-0.99.81/debian/tmp/usr/lib/x86_64-linux-gnu/alsaplayer/input/libmad_in.so
libtool: install: /usr/bin/install -c .libs/libmad_in.lai /build/alsaplayer-0.99.81/debian/tmp/usr/lib/x86_64-linux-gnu/alsaplayer/input/libmad_in.la
libtool: install: /usr/bin/install -c .libs/libmad_in.a /build/alsaplayer-0.99.81/debian/tmp/usr/lib/x86_64-linux-gnu/alsaplayer/input/libmad_in.a


==========

in audacity:

checking for mad_decoder_init in -lmad... yes
configure: libmad libraries are available as system libraries

==========

in sox:

checking mad.h usability... yes
checking mad.h presence... yes
checking for mad.h... yes
...
checking for mad_stream_buffer in -lmad... yes
...
 mad.......................yes
 dlopen mad................no
 
==========

in vlc:

checking mad.h usability... yes
checking mad.h presence... yes
checking for mad.h... yes
checking for mad_bit_init in -lmad... yes


-- 
Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
-------------- next part --------------
diff -u libmad-0.15.1b/debian/changelog libmad-0.15.1b/debian/changelog

--- libmad-0.15.1b/debian/changelog
+++ libmad-0.15.1b/debian/changelog
@@ -1,3 +1,13 @@
+libmad (0.15.1b-8.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove Clément Stenac from Uploaders (Closes: #868708)
+
+  [ Helmut Grohne ]
+  * Move mad.pc to a multiarch location. (Closes: #850461)
+
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Tue, 31 Oct 2017 22:16:36 +0100
+
 libmad (0.15.1b-8) unstable; urgency=low
 
   * Add multiarch support.  (Closes: #653676)
diff -u libmad-0.15.1b/debian/control libmad-0.15.1b/debian/control
--- libmad-0.15.1b/debian/control
+++ libmad-0.15.1b/debian/control
@@ -3,7 +3,7 @@
 Section: sound
 Build-Depends: debhelper (>= 8.1.3~), gettext, cdbs (>= 0.4.93~), autotools-dev, quilt, dh-autoreconf
 Maintainer: Mad Maintainers <pkg-mad-maintainers at lists.alioth.debian.org>
-Uploaders: Kurt Roeckx <kurt at roeckx.be>, Clément Stenac <zorglub at debian.org>, Sam Clegg <samo at debian.org>
+Uploaders: Kurt Roeckx <kurt at roeckx.be>, Sam Clegg <samo at debian.org>
 Standards-Version: 3.7.3
 
 Package: libmad0
diff -u libmad-0.15.1b/debian/libmad0-dev.install libmad-0.15.1b/debian/libmad0-dev.install
--- libmad-0.15.1b/debian/libmad0-dev.install
+++ libmad-0.15.1b/debian/libmad0-dev.install
@@ -4 +3,0 @@
-debian/mad.pc /usr/lib/pkgconfig
diff -u libmad-0.15.1b/debian/rules libmad-0.15.1b/debian/rules
--- libmad-0.15.1b/debian/rules
+++ libmad-0.15.1b/debian/rules
@@ -6,6 +6,7 @@
 
 DEB_DH_MAKESHLIBS_ARGS_libmad0 = -V 'libmad0 (>= 0.15.1b-3)'
 
+include /usr/share/dpkg/architecture.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -25,0 +27,3 @@
+
+install/libmad0-dev::
+	install -m644 -D debian/mad.pc debian/libmad0-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mad.pc
