Hello community,
here is the log from the commit of package sox for openSUSE:Factory
checked in at Mon Jan 10 12:07:53 CET 2011.
--------
--- sox/sox.changes 2010-04-13 09:01:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/sox/sox.changes 2010-09-21 05:32:13.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Sep 21 03:23:26 UTC 2010 - reddwarf@opensuse.org
+
+- Add libmagic support
+- Added sox-14.3.1-undefined.patch and sox-14.3.1-aliasing.patch
+- Run spec-cleaner and general cleanup
+- Fix MP3 support linking directly against needed libraries
+- Fix License tag
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
sox-14.3.1-aliasing.patch
sox-14.3.1-undefined.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sox.spec ++++++
--- /var/tmp/diff_new_pack.I3ZYkd/_old 2011-01-10 12:07:28.000000000 +0100
+++ /var/tmp/diff_new_pack.I3ZYkd/_new 2011-01-10 12:07:28.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sox (Version 14.3.1)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,8 +23,20 @@
%bcond_with amrnb
Name: sox
-BuildRequires: alsa-devel flac-devel ladspa-devel libao-devel libgsm-devel libid3tag-devel libpng-devel
-BuildRequires: libpulse-devel libsamplerate-devel libsndfile-devel libvorbis-devel pkg-config wavpack-devel
+BuildRequires: alsa-devel
+BuildRequires: file-devel
+BuildRequires: flac-devel
+BuildRequires: ladspa-devel
+BuildRequires: libao-devel
+BuildRequires: libgsm-devel
+BuildRequires: libid3tag-devel
+BuildRequires: libpng-devel
+BuildRequires: libpulse-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: pkg-config
+BuildRequires: wavpack-devel
%if %{with ffmpeg}
BuildRequires: libffmpeg-devel
%endif
@@ -40,18 +52,21 @@
%if %{with amrnb}
BuildRequires: libamrnb-devel
%endif
-License: BSD3c(or similar) ; GPLv2+
-Group: Productivity/Multimedia/Sound/Editors and Convertors
-AutoReqProv: on
Version: 14.3.1
-Release: 1
+Release: 4
+License: LGPLv2.1+ ; GPLv2+
Summary: Sound Conversion Tools and Library
Url: http://sox.sourceforge.net
+Group: Productivity/Multimedia/Sound/Editors and Convertors
Source: %{name}-%{version}.tar.bz2
Source1: audioio.h
# Patch0: %{name}-14.2.0-vorbis.patch
-# PATCH-FIX-OPENSUSE %{name}-no_buildstamp.patch cmorve69@yahoo.es -- this patch removes the buildstamp
+# PATCH-FIX-OPENSUSE %{name}-no_buildstamp.patch reddwarf@opensuse.org -- this patch removes the buildstamp
Patch1: %{name}-no_buildstamp.patch
+# PATCH-FIX-UPSTREAM %{name}-14.3.1-undefined.patch sf#3072301 reddwarf@opensuse.org -- fix undefined behavior problems as reported by post-build script
+Patch2: %{name}-14.3.1-undefined.patch
+# PATCH-FIX-UPSTREAM %{name}-14.3.1-aliasing.patch sf#3072320 reddwarf@opensuse.org -- fix an aliasing problem as reported by post-build script
+Patch3: %{name}-14.3.1-aliasing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -60,16 +75,10 @@
it will come in very handy. SOX is really only usable day-to-day if you
hide the wacky options with one-line shell scripts.
-
-
-Authors:
---------
- Chris Bagwell
-
%package devel
-License: BSD3c(or similar) ; GPLv2+
-Group: Development/Libraries/C and C++
+License: LGPLv2.1+ ; GPLv2+
Summary: Sound Conversion Tools and Library
+Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: pkg-config
@@ -79,38 +88,29 @@
it will come in very handy. SOX is really only usable day-to-day if you
hide the wacky options with one-line shell scripts.
-
-
-Authors:
---------
- Chris Bagwell
-
%prep
%setup -q
-# %patch0
%patch1
+%patch2
+%patch3
%build
+# /dev/audio (OSS) support. If it ever breaks just remove it.
if [ ! -f %{_includedir}/sun/audioio.h ]; then
mkdir -p include/sun
cp %{S:1} include/sun/audioio.h
fi
-export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -DEXTERNAL_GSM -DHAVE_SYS_SOUNDCARD_H -fPIC -DPIC"
export CPPFLAGS=-I$PWD/include
-export LDFLAGS=-lltdl
-%configure \
- --disable-static \
- --enable-dl-mad \
- --enable-dl-lame
-make %{?jobs:-j%jobs}
+#
+%configure --disable-static
+make %{?_smp_mflags}
%install
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}/{man1,man3,man7}}
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/sox/*.la
+%makeinstall
+rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/sox/*.la
%clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
@@ -120,7 +120,7 @@
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README src/monkey.*
%{_bindir}/*
-%{_libdir}/lib*.so.*
+%attr(0644,root,root) %{_libdir}/lib*.so.*
# %dir %{_libdir}/sox
# %{_libdir}/sox/*.so
%{_mandir}/man1/*
++++++ sox-14.3.1-aliasing.patch ++++++
Index: src/sox-fmt.c
===================================================================
--- src/sox-fmt.c.orig
+++ src/sox-fmt.c
@@ -77,8 +77,10 @@ static int write_header(sox_format_t * f
size_t comments_len = strlen(comments);
size_t comments_bytes = (comments_len + 7) & ~7u; /* Multiple of 8 bytes */
uint64_t size = ft->olength? ft->olength : ft->signal.length;
+ uint32_t local_magic;
+ memcpy(&local_magic, &magic[MACHINE_IS_BIGENDIAN], sizeof(local_magic));
sox_bool error = sox_false
- ||lsx_writedw(ft, *(uint32_t *)&magic[MACHINE_IS_BIGENDIAN])
+ ||lsx_writedw(ft, local_magic)
||lsx_writedw(ft, FIXED_HDR + (unsigned)comments_bytes)
||lsx_writeqw(ft, size)
||lsx_writedf(ft, ft->signal.rate)
++++++ sox-14.3.1-undefined.patch ++++++
Index: src/bend.c
===================================================================
--- src/bend.c.orig
+++ src/bend.c
@@ -108,7 +108,8 @@ static int create(sox_effect_t * effp, i
}
argc -= lsx_optind, argv += lsx_optind;
- p->bends = lsx_calloc(p->nbends = argc, sizeof(*p->bends));
+ p->nbends = argc;
+ p->bends = lsx_calloc(p->nbends, sizeof(*p->bends));
return parse(effp, argv, 0.); /* No rate yet; parse with dummy */
}
Index: src/delay.c
===================================================================
--- src/delay.c.orig
+++ src/delay.c
@@ -43,7 +43,8 @@ static int create(sox_effect_t * effp, i
unsigned i;
--argc, ++argv;
- p->argv = lsx_calloc(p->argc = argc, sizeof(*p->argv));
+ p->argc = argc;
+ p->argv = lsx_calloc(p->argc, sizeof(*p->argv));
for (i = 0; i < p->argc; ++i) {
char const * next = lsx_parsesamples(1e5, p->argv[i] = lsx_strdup(argv[i]), &delay, 't');
if (!next || *next) {
Index: src/fir.c
===================================================================
--- src/fir.c.orig
+++ src/fir.c
@@ -36,8 +36,10 @@ static int create(sox_effect_t * effp, i
--argc, ++argv;
if (argc == 1)
p->filename = argv[0], --argc;
- else for (; argc && sscanf(*argv, "%lf%c", &d, &c) == 1; --argc, ++argv)
- (p->h = lsx_realloc(p->h, ++p->n * sizeof(*p->h)))[p->n - 1] = d;
+ else for (; argc && sscanf(*argv, "%lf%c", &d, &c) == 1; --argc, ++argv) {
+ (p->h = lsx_realloc(p->h, p->n * sizeof(*p->h)))[p->n - 1] = d;
+ ++p->n;
+ }
return argc? lsx_usage(effp) : SOX_SUCCESS;
}
@@ -55,8 +57,10 @@ static int start(sox_effect_t * effp)
if (!file)
return SOX_EOF;
while (fscanf(file, " #%*[^\n]%c", &c) + (i = fscanf(file, "%lf", &d)) >0)
- if (i > 0)
- (p->h = lsx_realloc(p->h, ++p->n * sizeof(*p->h)))[p->n - 1] = d;
+ if (i > 0) {
+ (p->h = lsx_realloc(p->h, p->n * sizeof(*p->h)))[p->n - 1] = d;
+ ++p->n;
+ }
lsx_report("%i coefficients", p->n);
if (!feof(file)) {
lsx_fail("error reading coefficient file");
Index: src/pad.c
===================================================================
--- src/pad.c.orig
+++ src/pad.c
@@ -59,7 +59,8 @@ static int create(sox_effect_t * effp, i
{
priv_t * p = (priv_t *)effp->priv;
--argc, ++argv;
- p->pads = lsx_calloc(p->npads = argc, sizeof(*p->pads));
+ p->npads = argc;
+ p->pads = lsx_calloc(p->npads, sizeof(*p->pads));
return parse(effp, argv, 1e5); /* No rate yet; parse with dummy */
}
Index: src/remix.c
===================================================================
--- src/remix.c.orig
+++ src/remix.c
@@ -121,7 +121,8 @@ static int create(sox_effect_t * effp, i
lsx_fail("must specify at least one output channel");
return SOX_EOF;
}
- p->out_specs = lsx_calloc(p->num_out_channels = argc, sizeof(*p->out_specs));
+ p->num_out_channels = argc;
+ p->out_specs = lsx_calloc(p->num_out_channels, sizeof(*p->out_specs));
return parse(effp, argv, 1); /* No channels yet; parse with dummy */
}
Index: src/splice.c
===================================================================
--- src/splice.c.orig
+++ src/splice.c
@@ -165,7 +165,8 @@ static int create(sox_effect_t * effp, i
else if (!strcmp(*argv, "-q")) p->fade_type = Cosine_4 , --argc, ++argv;
else if (!strcmp(*argv, "-h")) p->fade_type = Cosine_2 , --argc, ++argv;
}
- p->splices = lsx_calloc(p->nsplices = argc, sizeof(*p->splices));
+ p->nsplices = argc;
+ p->splices = lsx_calloc(p->nsplices, sizeof(*p->splices));
return parse(effp, argv, 1e5); /* No rate yet; parse with dummy */
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
