Re: [SCM] audacity/master: Build without sbsms to fix FTBFS on non-x86 archs. (Closes: #882173)

2017-11-25 Thread Jaromír Mikeš 
2017-11-25 11:16 GMT+01:00 James Cowgill :

> On 24/11/17 17:39, Jaromír Mikeš wrote:
> >>
> >
> > ​Thank you James for fixing this.
> > Can you provide DM flag for me to I can upload audacity do unstable now?
>
> Should be done now.
>

​Thank you! Just uploaded.

mira​
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Re: [SCM] audacity/master: Build without sbsms to fix FTBFS on non-x86 archs. (Closes: #882173)

2017-11-25 Thread James Cowgill 
Hi,

On 24/11/17 17:39, Jaromír Mikeš wrote:
> 2017-11-24 14:37 GMT+01:00 James Cowgill :
>> On 24/11/17 11:08, Jaromír Mikeš wrote:
>>> 2017-11-20 21:08 GMT+01:00 :
>>>
 The following commit has been merged in the master branch:
 commit fa79381b2f34c2af651c05a2b433ae20e4ec9007
 Author: Jaromír Mikeš 
 Date:   Mon Nov 20 21:08:12 2017 +0100

 Build without sbsms to fix FTBFS on non-x86 archs. (Closes: #882173)

 diff --git a/debian/rules b/debian/rules
 index 34d3389..6970493 100755
 --- a/debian/rules
 +++ b/debian/rules
 @@ -21,10 +21,9 @@ configure_flags := \
 --with-midi=system \
 --with-portaudio=system \
 --with-portsmf=system \
 -#  --with-sbsms=system \
 --with-soundtouch=system \
 +   --without-sbsms \
 $(NULL)
 -
  %:
 dh $@
>>>
>>>
>>> ​Hi,
>>>
>>> maybe even better would be build without sbsms conditionally on all archs
>>> except amd64? ​
>>> https://buildd.debian.org/status/package.php?p=audacity=sid
>>>
>>> Can someone implement such a condition in d/rules?
>>
>> Your patch doesn't actually fix the bug (use of sse on non-amd64). The
>> attached patch allows sbsms to work on all architectures while disabling
>> sse on all non-amd64 architectures.
>>
>> Also note that this line of your original code was wrong:
>>  #  --with-sbsms=system \
>>
>> Because there is a line continuation, this will also comment out the
>> "--with-soundtouch=system" on the next line. I've fixed that by using
>> "--with-sbsms=local" instead.
>>
> 
> ​Thank you James for fixing this.
> Can you provide DM flag for me to I can upload audacity do unstable now?

Should be done now.

Thanks,
James



signature.asc
Description: OpenPGP digital signature
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Re: [SCM] audacity/master: Build without sbsms to fix FTBFS on non-x86 archs. (Closes: #882173)

2017-11-24 Thread Jaromír Mikeš 
2017-11-24 14:37 GMT+01:00 James Cowgill :

> Hi,
>
> On 24/11/17 11:08, Jaromír Mikeš wrote:
> > 2017-11-20 21:08 GMT+01:00 :
> >
> >> The following commit has been merged in the master branch:
> >> commit fa79381b2f34c2af651c05a2b433ae20e4ec9007
> >> Author: Jaromír Mikeš 
> >> Date:   Mon Nov 20 21:08:12 2017 +0100
> >>
> >> Build without sbsms to fix FTBFS on non-x86 archs. (Closes: #882173)
> >>
> >> diff --git a/debian/rules b/debian/rules
> >> index 34d3389..6970493 100755
> >> --- a/debian/rules
> >> +++ b/debian/rules
> >> @@ -21,10 +21,9 @@ configure_flags := \
> >> --with-midi=system \
> >> --with-portaudio=system \
> >> --with-portsmf=system \
> >> -#  --with-sbsms=system \
> >> --with-soundtouch=system \
> >> +   --without-sbsms \
> >> $(NULL)
> >> -
> >>  %:
> >> dh $@
> >
> >
> > ​Hi,
> >
> > maybe even better would be build without sbsms conditionally on all archs
> > except amd64? ​
> > https://buildd.debian.org/status/package.php?p=audacity=sid
> >
> > Can someone implement such a condition in d/rules?
>
> Your patch doesn't actually fix the bug (use of sse on non-amd64). The
> attached patch allows sbsms to work on all architectures while disabling
> sse on all non-amd64 architectures.
>
> Also note that this line of your original code was wrong:
>  #  --with-sbsms=system \
>
> Because there is a line continuation, this will also comment out the
> "--with-soundtouch=system" on the next line. I've fixed that by using
> "--with-sbsms=local" instead.
>

​Thank you James for fixing this.
Can you provide DM flag for me to I can upload audacity do unstable now?
Or can you upload it yourself?

best regards

mira​
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Re: [SCM] audacity/master: Build without sbsms to fix FTBFS on non-x86 archs. (Closes: #882173)

2017-11-24 Thread James Cowgill 
Hi,

On 24/11/17 11:08, Jaromír Mikeš wrote:
> 2017-11-20 21:08 GMT+01:00 :
> 
>> The following commit has been merged in the master branch:
>> commit fa79381b2f34c2af651c05a2b433ae20e4ec9007
>> Author: Jaromír Mikeš 
>> Date:   Mon Nov 20 21:08:12 2017 +0100
>>
>> Build without sbsms to fix FTBFS on non-x86 archs. (Closes: #882173)
>>
>> diff --git a/debian/rules b/debian/rules
>> index 34d3389..6970493 100755
>> --- a/debian/rules
>> +++ b/debian/rules
>> @@ -21,10 +21,9 @@ configure_flags := \
>> --with-midi=system \
>> --with-portaudio=system \
>> --with-portsmf=system \
>> -#  --with-sbsms=system \
>> --with-soundtouch=system \
>> +   --without-sbsms \
>> $(NULL)
>> -
>>  %:
>> dh $@
> 
> 
> ​Hi,
> 
> maybe even better would be build without sbsms conditionally on all archs
> except amd64? ​
> https://buildd.debian.org/status/package.php?p=audacity=sid
> 
> Can someone implement such a condition in d/rules?

Your patch doesn't actually fix the bug (use of sse on non-amd64). The
attached patch allows sbsms to work on all architectures while disabling
sse on all non-amd64 architectures.

Also note that this line of your original code was wrong:
 #  --with-sbsms=system \

Because there is a line continuation, this will also comment out the
"--with-soundtouch=system" on the next line. I've fixed that by using
"--with-sbsms=local" instead.

James
diff --git a/debian/rules b/debian/rules
index 69704937..16108db4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -21,9 +23,16 @@ configure_flags := \
--with-midi=system \
--with-portaudio=system \
--with-portsmf=system \
+   --with-sbsms=local \
--with-soundtouch=system \
-   --without-sbsms \
$(NULL)
+
+ifeq ($(DEB_HOST_ARCH_CPU),amd64)
+configure_flags += --enable-sse=yes
+else
+configure_flags += --enable-sse=no
+endif
+
 %:
dh $@
 


signature.asc
Description: OpenPGP digital signature
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Re: [SCM] audacity/master: Build without sbsms to fix FTBFS on non-x86 archs. (Closes: #882173)

2017-11-24 Thread Jaromír Mikeš 
2017-11-20 21:08 GMT+01:00 :

> The following commit has been merged in the master branch:
> commit fa79381b2f34c2af651c05a2b433ae20e4ec9007
> Author: Jaromír Mikeš 
> Date:   Mon Nov 20 21:08:12 2017 +0100
>
> Build without sbsms to fix FTBFS on non-x86 archs. (Closes: #882173)
>
> diff --git a/debian/rules b/debian/rules
> index 34d3389..6970493 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -21,10 +21,9 @@ configure_flags := \
> --with-midi=system \
> --with-portaudio=system \
> --with-portsmf=system \
> -#  --with-sbsms=system \
> --with-soundtouch=system \
> +   --without-sbsms \
> $(NULL)
> -
>  %:
> dh $@


​Hi,

maybe even better would be build without sbsms conditionally on all archs
except amd64? ​
https://buildd.debian.org/status/package.php?p=audacity=sid

Can someone implement such a condition in d/rules?

best regards

mira
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers