Hello community,
here is the log from the commit of package sox for openSUSE:Factory checked in
at 2013-02-14 21:15:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sox (Old)
and /work/SRC/openSUSE:Factory/.sox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sox", Maintainer is "orpha...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sox/sox.changes 2012-11-26 20:01:18.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.sox.new/sox.changes 2013-02-14
21:15:04.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Feb 7 18:53:29 UTC 2013 - crrodrig...@opensuse.org
+
+- sox-14.4.0-ocloexec.patch: edited, config.h must be included
+ _everywhere_ and GNU_SOURCE defined so O_CLOEXEC is available
+ for all targets.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sox.spec ++++++
--- /var/tmp/diff_new_pack.U1iSrR/_old 2013-02-14 21:15:05.000000000 +0100
+++ /var/tmp/diff_new_pack.U1iSrR/_new 2013-02-14 21:15:05.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sox
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -65,6 +65,7 @@
%if %{with twolame}
BuildRequires: pkgconfig(twolame)
%endif
+BuildRequires: libtool
Version: 14.4.0
Release: 0
Summary: Sound Conversion Tools
@@ -105,15 +106,14 @@
%prep
%setup -q
-%if 0%{?suse_version} > 1140
%patch0
-%endif
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e
%%Y')
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/sox.h src/libsox.c
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes
'+%%H:%%M:%%S')
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/sox.h src/libsox.c
%build
+autoreconf -fiv
%configure --without-oss --disable-static --with-distro=openSUSE
make %{?_smp_mflags}
++++++ sox-14.4.0-ocloexec.patch ++++++
--- /var/tmp/diff_new_pack.U1iSrR/_old 2013-02-14 21:15:05.000000000 +0100
+++ /var/tmp/diff_new_pack.U1iSrR/_new 2013-02-14 21:15:05.000000000 +0100
@@ -1,5 +1,3 @@
-Index: src/8svx.c
-===================================================================
--- src/8svx.c.orig
+++ src/8svx.c
@@ -161,7 +161,7 @@ static int startread(sox_format_t * ft)
@@ -11,8 +9,6 @@
{
lsx_fail_errno(ft,errno,"Can't open channel file
'%s'",
ft->filename);
-Index: src/effects_i.c
-===================================================================
--- src/effects_i.c.orig
+++ src/effects_i.c
@@ -355,7 +355,7 @@ FILE * lsx_open_input_file(sox_effect_t
@@ -24,8 +20,6 @@
lsx_fail("couldn't open file %s: %s", filename, strerror(errno));
return NULL;
}
-Index: src/formats.c
-===================================================================
--- src/formats.c.orig
+++ src/formats.c
@@ -373,7 +373,7 @@ static FILE * xfopen(char const * identi
@@ -72,8 +66,6 @@
char * filename;
int c, result = SOX_SUCCESS;
-Index: src/libsox_i.c
-===================================================================
--- src/libsox_i.c.orig
+++ src/libsox_i.c
@@ -34,7 +34,7 @@
@@ -103,8 +95,6 @@
}
/* Use standard tmpfile (delete on close); tmp dir is undefined: */
-Index: src/noiseprof.c
-===================================================================
--- src/noiseprof.c.orig
+++ src/noiseprof.c
@@ -75,7 +75,7 @@ static int sox_noiseprof_start(sox_effec
@@ -116,8 +106,6 @@
lsx_fail("Couldn't open profile file %s: %s", data->output_filename,
strerror(errno));
return SOX_EOF;
}
-Index: src/sox.c
-===================================================================
--- src/sox.c.orig
+++ src/sox.c
@@ -906,7 +906,7 @@ static char * * strtoargv(char * s, int
@@ -147,8 +135,6 @@
if (file == NULL) {
lsx_fail("Cannot open comment file `%s'", filename);
-Index: src/spectrogram.c
-===================================================================
--- src/spectrogram.c.orig
+++ src/spectrogram.c
@@ -492,7 +492,7 @@ static int axis(double to, int max_steps
@@ -160,8 +146,6 @@
uLong font_len = 96 * font_y;
int chans = effp->in_signal.channels;
int c_rows = p->rows * chans + chans - 1;
-Index: src/util.h
-===================================================================
--- src/util.h.orig
+++ src/util.h
@@ -120,7 +120,7 @@
@@ -173,3 +157,77 @@
#define setmode _setmode
#define snprintf _snprintf
+--- configure.ac.orig
++++ configure.ac
+@@ -16,7 +16,9 @@ dnl Check we have the right srcdir
+ AC_CONFIG_SRCDIR(sox.1)
+
+ dnl Checks for programs.
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+@@ -155,7 +157,6 @@ if test "$ac_cv_func_pow" = no; then
+ fi
+
+ dnl Large File Support
+-AC_SYS_LARGEFILE
+ AC_FUNC_FSEEKO
+ if test "$ac_cv_sys_file_offset_bits" = "64"; then
+ dnl This is either a 64-bit platform or a 32-bit platform
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -2,7 +2,7 @@
+
+ RM = rm -f
+
+-AM_CPPFLAGS = -DLADSPA_PATH="\"@LADSPA_PATH@\""
++AM_CPPFLAGS = -include $(top_builddir)/src/soxconfig.h
-DLADSPA_PATH="\"@LADSPA_PATH@\""
+ AM_CFLAGS = @WARN_CFLAGS@ #-Werror
+
+ if HAVE_LIBLTDL
+@@ -12,7 +12,7 @@ if HAVE_LIBLTDL
+ # is ignored when you specify a more specific one.
+ # We want to version libsox and we are OK because they
+ # have a more specific LDFLAGS that includes -version-info.
+-AM_LDFLAGS = -avoid-version -module
++AM_LDFLAGS = -avoid-version -module -shared -export-dynamic
+ AM_CPPFLAGS += -DPKGLIBDIR="\"$(pkglibdir)\""
+ endif
+ if HAVE_WIN32_LTDL
+@@ -95,7 +95,7 @@ libsox_la_LIBADD += @GOMP_LIBS@
+ endif
+
+ libsox_la_CFLAGS = @WARN_CFLAGS@
+-libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@
++libsox_la_LDFLAGS = @APP_LDFLAGS@ -no-undefined -version-info @SHLIB_VERSION@
+
+ if HAVE_WIN32_LTDL
+ libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h
+--- src/sox_i.h.orig
++++ src/sox_i.h
+@@ -17,8 +17,10 @@
+ #include "sox.h"
+
+ #if defined HAVE_FMEMOPEN
++#ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
++#endif
+
+ #include <errno.h>
+ #include <stdio.h>
+--- lpc10/Makefile.am.orig
++++ lpc10/Makefile.am
+@@ -12,7 +12,7 @@ liblpc10_la_SOURCES = analys.c bsynz.c c
+ ham84.c hp100.c invert.c irc2pc.c ivfilt.c lpcdec.c lpcenc.c lpcini.c \
+ lpfilt.c median.c mload.c onset.c pitsyn.c placea.c placev.c preemp.c \
+ prepro.c random.c rcchk.c synths.c tbdm.c voicin.c vparms.c
+-AM_CPPFLAGS=-I../src
++AM_CPPFLAGS= -include $(top_builddir)/src/soxconfig.h -I../src
+ if HAVE_LIBLTDL
+ AM_LDFLAGS=-avoid-version -module
+ endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
