Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
Am 19.06.2012 17:57, schrieb Han Boetes: That is exactly the difference between a working and a non-working binary. You're on the right track. Alright. Since I consider CPPFLAGS and LDFLAGS quite harmless, could you please leave them as they are and rebuild another time with only CFLAGS reset to an empty string? - Fabian ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
On 20-06-12 09:14, Fabian Greffrath wrote: Am 19.06.2012 17:57, schrieb Han Boetes: Alright. Since I consider CPPFLAGS and LDFLAGS quite harmless, could you please leave them as they are and rebuild another time with only CFLAGS reset to an empty string? Most certainly. With only the CFLAGS cleared the library still works, just like you suspected. # Han ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
Am 20.06.2012 10:09, schrieb Han Boetes: Most certainly. With only the CFLAGS cleared the library still works, just like you suspected. So it seems to choke on the stack-protector... ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
With CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security it fails and with CFLAGS=-g -O2 it works fine indeed. ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
Am 20.06.2012 11:07, schrieb Han Boetes: With CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security it fails and with CFLAGS=-g -O2 it works fine indeed. 1) Could you check if it works with the latest SVN snapshot of libmpc: svn co http://svn.musepack.net/libmpc 2) Could you provide an example sound file somewhere? I do not have one myself. From then on I'll leave it up to the actual maintainer to further investigate this issue. ;) - Fabian ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
tags 665974 patch upstream
thanks
Am Mittwoch, den 20.06.2012, 16:47 +0200 schrieb Fabian Greffrath:
1) Could you check if it works with the latest SVN snapshot of libmpc:
svn co http://svn.musepack.net/libmpc
2) Could you provide an example sound file somewhere? I do not have
one myself.
Thanks for the example sound file.
The fix is in upstream SVN commit 479, please find the patch attached to
this mail.
Best regards,
Fabian
r479 | r2d | 2012-03-30 22:03:53 +0200 (Fri, 30 Mar 2012) | 1 line
add extern keyword to global variable declaration (don't know it worked without ... thanks Dmitry)
--- libmpc-0.1~r459.orig/libmpcdec/requant.h
+++ libmpc-0.1~r459/libmpcdec/requant.h
@@ -47,9 +47,9 @@ extern C {
/* C O N S T A N T S */
-const mpc_uint8_t Res_bit [18]; /// Bits per sample for chosen quantizer
-const MPC_SAMPLE_FORMAT __Cc[1 + 18]; /// Requantization coefficients
-const mpc_int16_t __Dc[1 + 18]; /// Requantization offset
+extern const mpc_uint8_t Res_bit [18]; /// Bits per sample for chosen quantizer
+extern const MPC_SAMPLE_FORMAT __Cc[1 + 18]; /// Requantization coefficients
+extern const mpc_int16_t __Dc[1 + 18]; /// Requantization offset
#define Cc (__Cc + 1)
#define Dc (__Dc + 1)
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Processed: Re: Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
Processing commands for cont...@bugs.debian.org: tags 665974 patch upstream Bug #665974 [libmpcdec6] moc: does not play .mpc files with 'Error in the stream!' message Bug #665753 [libmpcdec6] libmpcdec6: musepack files cannot be played with libmpcdec6 from testing/unstable Bug #678113 [libmpcdec6] libmpcdec6: Can't play mpc files with libmpcdec6 despite recent update Added tag(s) upstream and patch. Added tag(s) upstream and patch. Added tag(s) upstream and patch. thanks Stopping processing here. Please contact me if you need assistance. -- 665753: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665753 665974: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665974 678113: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678113 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
Your patch seems to fix the issue. https://en.wikipedia.org/wiki/External_variable#Definition.2C_declaration_and_the_extern_keyword # Han ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
Am 13.06.2012 23:23, schrieb Han Boetes: So if there is a difference between the two packages it should be in this diff. [...] --- libmpc_0.1~r459-1/compat2010-05-31 16:25:23.0 +0200 +++ libmpc_0.1~r459-2/compat2012-02-14 23:27:59.0 +0100 @@ -1 +1 @@ -7 +9 This change is not as marginal as it seems, as the above line implies usage of hardened build flags a.o. Would you mind rebuilding the package with CFLAGS, CPPFLAGS and LDFLAGS reset to empty strings in debian/rules? - Fabian ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
That is exactly the difference between a working and a non-working binary. You're on the right track. I've repeated the buildprocess twice so that the only diffence is the proposed flag changes. # Han ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#665974: Diff between the two libmpc_0.1~r459-X.debian.tar.gz files
So if there is a difference between the two packages it should be in
this diff.
And when looking at it: the differences in libmpcdec6.install... Does it
really mean the installed binaries are the ones found in /usr/lib rather
than in the fake installation directory?
diff -upwr libmpc_0.1~r459-1/changelog libmpc_0.1~r459-2/changelog
--- libmpc_0.1~r459-1/changelog 2010-05-31 16:34:48.0 +0200
+++ libmpc_0.1~r459-2/changelog 2012-02-15 01:12:00.0 +0100
@@ -1,3 +1,13 @@
+libmpc (2:0.1~r459-2) unstable; urgency=low
+
+ * Team upload.
+ * Update maintainer information.
+ * Add watch file.
+ * Build for Multiarch.
+ * Bump Standards.
+
+ -- Alessio Treglia ales...@debian.org Wed, 15 Feb 2012 01:11:57 +0100
+
libmpc (2:0.1~r459-1) unstable; urgency=low
* New upstream SVN snapshot.
diff -upwr libmpc_0.1~r459-1/compat libmpc_0.1~r459-2/compat
--- libmpc_0.1~r459-1/compat2010-05-31 16:25:23.0 +0200
+++ libmpc_0.1~r459-2/compat2012-02-14 23:27:59.0 +0100
@@ -1 +1 @@
-7
+9
diff -upwr libmpc_0.1~r459-1/control libmpc_0.1~r459-2/control
--- libmpc_0.1~r459-1/control 2010-05-31 16:42:04.0 +0200
+++ libmpc_0.1~r459-2/control 2012-02-15 01:10:45.0 +0100
@@ -1,20 +1,24 @@
Source: libmpc
Section: sound
Priority: optional
-Maintainer: Debian multimedia packages maintainers
pkg-multimedia-maintainers@lists.alioth.debian.org
+Maintainer: Debian Multimedia Maintainers
pkg-multimedia-maintainers@lists.alioth.debian.org
Uploaders: Sebastian Dröge sl...@debian.org,
Jorge Salamero Sanz ben...@cauterized.net
-Build-Depends: cdbs (= 0.4.20),
- debhelper (= 7),
+Build-Depends: cdbs (= 0.4.93~),
+ debhelper (= 9),
pkg-config,
libreplaygain-dev (= 1.0~r412),
libcue-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Homepage: http://www.musepack.net
+Vcs-Git: git://anonscm.debian.org/pkg-multimedia/libmpc.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libmpc.git
Package: libmpcdec6
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: MusePack decoder - library
@@ -29,6 +33,7 @@ Description: MusePack decoder - library
Package: libmpcdec-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libmpcdec6 (= ${binary:Version}),
${misc:Depends}
@@ -47,7 +52,6 @@ Description: MusePack decoder - developm
Package: musepack-tools
Architecture: any
-Section: sound
Depends: ${shlibs:Depends},
${misc:Depends}
Description: MusePack commandline utilities
Only in libmpc_0.1~r459-2: gbp.conf
diff -upwr libmpc_0.1~r459-1/libmpcdec6.install
libmpc_0.1~r459-2/libmpcdec6.install
--- libmpc_0.1~r459-1/libmpcdec6.install2010-05-30 11:59:59.0
+0200
+++ libmpc_0.1~r459-2/libmpcdec6.install2012-02-14 23:28:10.0
+0100
@@ -1 +1 @@
-debian/tmp/usr/lib/libmpcdec.so.*
+usr/lib/*/libmpcdec.so.*
diff -upwr libmpc_0.1~r459-1/libmpcdec-dev.install
libmpc_0.1~r459-2/libmpcdec-dev.install
--- libmpc_0.1~r459-1/libmpcdec-dev.install 2010-05-30
11:59:59.0 +0200
+++ libmpc_0.1~r459-2/libmpcdec-dev.install 2012-02-14
23:28:25.0 +0100
@@ -1,3 +1,3 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/libmpcdec.so
-debian/tmp/usr/lib/libmpcdec.a
+usr/include
+usr/lib/*/libmpcdec.so
+usr/lib/*/libmpcdec.a
diff -upwr libmpc_0.1~r459-1/musepack-tools.install
libmpc_0.1~r459-2/musepack-tools.install
--- libmpc_0.1~r459-1/musepack-tools.install2010-05-30
11:59:59.0 +0200
+++ libmpc_0.1~r459-2/musepack-tools.install2012-02-14
23:28:30.0 +0100
@@ -1 +1 @@
-debian/tmp/usr/bin
+usr/bin
diff -upwr libmpc_0.1~r459-1/rules libmpc_0.1~r459-2/rules
--- libmpc_0.1~r459-1/rules 2010-05-31 16:36:31.0 +0200
+++ libmpc_0.1~r459-2/rules 2012-02-14 23:27:02.0 +0100
@@ -4,8 +4,11 @@ include /usr/share/cdbs/1/rules/debhelpe
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/utils.mk
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
common-binary-post-install-arch:: list-missing
DEB_DH_MAKESHLIBS_ARGS_libmpcdec6 := -V 'libmpcdec6 (= 1:0.1~r435)'
DEB_CONFIGURE_EXTRA_FLAGS += --enable-mpcchap
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
Only in libmpc_0.1~r459-2: watch
# Han
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
