Hello community, here is the log from the commit of package flac for openSUSE:Factory checked in at 2013-07-01 15:53:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flac (Old) and /work/SRC/openSUSE:Factory/.flac.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flac" Changes: -------- --- /work/SRC/openSUSE:Factory/flac/flac.changes 2013-06-05 11:51:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.flac.new/flac.changes 2013-07-01 15:53:57.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 1 02:13:39 UTC 2013 - [email protected] + +- Update to final upstream release 1.3.0 +* No user-visible changes +- More robust make install call + +------------------------------------------------------------------- Old: ---- flac-1.2.99_git201305252226.tar.xz New: ---- flac-1.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flac.spec ++++++ --- /var/tmp/diff_new_pack.Zd7qKj/_old 2013-07-01 15:53:57.000000000 +0200 +++ /var/tmp/diff_new_pack.Zd7qKj/_new 2013-07-01 15:53:57.000000000 +0200 @@ -17,6 +17,24 @@ Name: flac +Version: 1.3.0 +Release: 0 +Summary: Free Lossless Audio Codec +License: BSD-3-Clause and GPL-2.0+ and GFDL-1.2 +Group: Productivity/Multimedia/Sound/Utilities +Url: http://flac.sourceforge.net/ + +#Git-Web: https://git.xiph.org/?p=flac.git +#Git-Clone: git://git.xiph.org/flac +Source: http://downloads.xiph.org/releases/flac/%name-%version.tar.xz +Source2: baselibs.conf +Patch1: flac-ocloexec.patch +Patch2: 0001-Allow-use-of-openSSL.patch +Patch3: flac-fix-pkgconfig.patch +Patch5: 0001-getopt_long-not-broken-here.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf >= 2.60 +BuildRequires: automake >= 1.11 BuildRequires: gcc-c++ BuildRequires: libogg-devel BuildRequires: libtool @@ -26,24 +44,10 @@ %ifarch %{ix86} BuildRequires: nasm %endif -# bug437293 %ifarch ppc64 +# bug437293 Obsoletes: flac-64bit %endif -Version: 1.2.99_git201305252226 -Release: 0 -# -Summary: Free Lossless Audio Codec -License: BSD-3-Clause and GPL-2.0+ and GFDL-1.2 -Group: Productivity/Multimedia/Sound/Utilities -Url: http://flac.sourceforge.net/ -Source: %{name}-%{version}.tar.xz -Source2: baselibs.conf -Patch1: flac-ocloexec.patch -Patch2: 0001-Allow-use-of-openSSL.patch -Patch3: flac-fix-pkgconfig.patch -Patch5: 0001-getopt_long-not-broken-here.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description FLAC is an open source lossless audio codec developed by Josh Coalson. @@ -84,6 +88,7 @@ %patch2 -p1 %patch3 -p1 %patch5 -p1 + %build touch config.rpath autoreconf --force --install @@ -100,14 +105,13 @@ make %{?_smp_mflags} V=1 %install -%make_install +make install DESTDIR="%buildroot" docdir="%_docdir/%name" +rm -f "%buildroot/%_libdir"/*.la # documents -mkdir -p %{buildroot}%{_docdir} -mv %{buildroot}%{_datadir}/doc/%{name}-1.3.0pre4 %{buildroot}%{_docdir}/%{name} cp -a AUTHORS README COPYING.* %{buildroot}%{_docdir}/%{name} %check -make check +make check %{?_smp_mflags} %post -n libFLAC8 -p /sbin/ldconfig @@ -137,6 +141,5 @@ %{_includedir}/* %{_libdir}/pkgconfig/*.pc %{_datadir}/aclocal/*.m4 -%exclude %{_libdir}/lib*.la %changelog ++++++ 0001-Allow-use-of-openSSL.patch ++++++ --- /var/tmp/diff_new_pack.Zd7qKj/_old 2013-07-01 15:53:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Zd7qKj/_new 2013-07-01 15:53:58.000000000 +0200 @@ -4,20 +4,29 @@ Subject: [PATCH] Allow use of openSSL -diff --git a/configure.ac b/configure.ac -index c03e36b..9742638 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,7 +58,7 @@ AM_PROG_CC_C_O - AC_C_INLINE +--- + configure.ac | 3 + m4/ax_check_openssl.m4 | 124 ++++++++++++++++++++++++++++++++++++++ + src/libFLAC/Makefile.am | 4 - + src/libFLAC/include/private/md5.h | 8 ++ + src/libFLAC/md5.c | 38 +++++++++++ + src/libFLAC/stream_decoder.c | 30 +++++++-- + src/libFLAC/stream_encoder.c | 30 +++++++-- + 7 files changed, 221 insertions(+), 16 deletions(-) + +Index: flac-1.3.0/configure.ac +=================================================================== +--- flac-1.3.0.orig/configure.ac ++++ flac-1.3.0/configure.ac +@@ -59,6 +59,7 @@ AC_C_INLINE AC_C_VARARRAYS AC_C_TYPEOF -- + +AC_FUNC_ALLOCA - AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h]) + AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h termios.h]) - XIPH_C_BSWAP32 -@@ -86,6 +86,8 @@ dnl check for getopt in standard library + AC_HEADER_TIOCGWINSZ +@@ -88,6 +89,8 @@ dnl check for getopt in standard library dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) AC_CHECK_FUNCS(getopt_long, [], []) @@ -26,11 +35,10 @@ case "$host_cpu" in i*86) cpu_ia32=true -diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4 -new file mode 100644 -index 0000000..a87c5a6 +Index: flac-1.3.0/m4/ax_check_openssl.m4 +=================================================================== --- /dev/null -+++ b/m4/ax_check_openssl.m4 ++++ flac-1.3.0/m4/ax_check_openssl.m4 @@ -0,0 +1,124 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_openssl.html @@ -156,11 +164,11 @@ + AC_SUBST([OPENSSL_LIBS]) + AC_SUBST([OPENSSL_LDFLAGS]) +]) -diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am -index 84eadb9..10f067d 100644 ---- a/src/libFLAC/Makefile.am -+++ b/src/libFLAC/Makefile.am -@@ -86,7 +86,7 @@ if OS_IS_WINDOWS +Index: flac-1.3.0/src/libFLAC/Makefile.am +=================================================================== +--- flac-1.3.0.orig/src/libFLAC/Makefile.am ++++ flac-1.3.0/src/libFLAC/Makefile.am +@@ -87,7 +87,7 @@ if OS_IS_WINDOWS win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la endif @@ -169,17 +177,17 @@ SUBDIRS = $(ARCH_SUBDIRS) include . -@@ -137,5 +137,5 @@ libFLAC_sources = \ +@@ -138,5 +138,5 @@ libFLAC_sources = \ libFLAC_la_SOURCES = $(libFLAC_sources) # needed for test_libFLAC -libFLAC_static_la_LIBADD = $(LOCAL_EXTRA_LIBADD) +libFLAC_static_la_LIBADD = $(LOCAL_EXTRA_LIBADD) $(OPENSSL_LIBS) libFLAC_static_la_SOURCES = $(libFLAC_sources) -diff --git a/src/libFLAC/include/private/md5.h b/src/libFLAC/include/private/md5.h -index e5f675a..5b42a27 100644 ---- a/src/libFLAC/include/private/md5.h -+++ b/src/libFLAC/include/private/md5.h +Index: flac-1.3.0/src/libFLAC/include/private/md5.h +=================================================================== +--- flac-1.3.0.orig/src/libFLAC/include/private/md5.h ++++ flac-1.3.0/src/libFLAC/include/private/md5.h @@ -28,6 +28,11 @@ #include "FLAC/ordinals.h" @@ -202,10 +210,10 @@ FLAC__bool FLAC__MD5Accumulate(FLAC__MD5Context *ctx, const FLAC__int32 * const signal[], unsigned channels, unsigned samples, unsigned bytes_per_sample); -diff --git a/src/libFLAC/md5.c b/src/libFLAC/md5.c -index e251d50..81439d5 100644 ---- a/src/libFLAC/md5.c -+++ b/src/libFLAC/md5.c +Index: flac-1.3.0/src/libFLAC/md5.c +=================================================================== +--- flac-1.3.0.orig/src/libFLAC/md5.c ++++ flac-1.3.0/src/libFLAC/md5.c @@ -5,6 +5,19 @@ #include <stdlib.h> /* for malloc() */ #include <string.h> /* for memcpy() */ @@ -234,7 +242,7 @@ /* #define F1(x, y, z) (x & y | ~x & z) */ #define F1(x, y, z) (z ^ (x & (y ^ z))) #define F2(x, y, z) F1(z, x, y) -@@ -267,6 +281,8 @@ void FLAC__MD5Final(FLAC__byte digest[16], FLAC__MD5Context *ctx) +@@ -267,6 +281,8 @@ void FLAC__MD5Final(FLAC__byte digest[16 memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } @@ -243,7 +251,7 @@ /* * Convert the incoming audio signal to a byte stream */ -@@ -401,6 +417,26 @@ FLAC__bool FLAC__MD5Accumulate(FLAC__MD5Context *ctx, const FLAC__int32 * const +@@ -401,6 +417,26 @@ FLAC__bool FLAC__MD5Accumulate(FLAC__MD5 if((size_t)channels * (size_t)bytes_per_sample > SIZE_MAX / (size_t)samples) return false; @@ -262,7 +270,7 @@ + const FLAC__bool retval = (EVP_DigestUpdate(ctx, tmp , bytes_needed) == 1); +#if defined(_MSC_VER) + _freea(tmp) -+#else ++#else + if(!usealloca) free(tmp); +#endif + return retval; @@ -270,18 +278,18 @@ if(ctx->capacity < bytes_needed) { FLAC__byte *tmp = realloc(ctx->internal_buf, bytes_needed); if(0 == tmp) { -@@ -418,4 +454,6 @@ FLAC__bool FLAC__MD5Accumulate(FLAC__MD5Context *ctx, const FLAC__int32 * const +@@ -418,4 +454,6 @@ FLAC__bool FLAC__MD5Accumulate(FLAC__MD5 FLAC__MD5Update(ctx, ctx->internal_buf, bytes_needed); return true; +#endif + } -diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c -index f4d2d39..1b8cbec 100644 ---- a/src/libFLAC/stream_decoder.c -+++ b/src/libFLAC/stream_decoder.c -@@ -170,7 +170,7 @@ typedef struct FLAC__StreamDecoderPrivate { +Index: flac-1.3.0/src/libFLAC/stream_decoder.c +=================================================================== +--- flac-1.3.0.orig/src/libFLAC/stream_decoder.c ++++ flac-1.3.0/src/libFLAC/stream_decoder.c +@@ -171,7 +171,7 @@ typedef struct FLAC__StreamDecoderPrivat FLAC__bool internal_reset_hack; /* used only during init() so we can call reset to set up the decoder without rewinding the input */ FLAC__bool is_seeking; FLAC__MD5Context md5context; @@ -290,7 +298,7 @@ /* (the rest of these are only used for seeking) */ FLAC__Frame last_frame; /* holds the info of the last frame we seeked to */ FLAC__uint64 first_frame_offset; /* hint to the seek routine of where in the stream the first audio frame starts */ -@@ -307,7 +307,9 @@ FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void) +@@ -308,7 +308,9 @@ FLAC_API FLAC__StreamDecoder *FLAC__stre decoder->private_->file = 0; set_defaults_(decoder); @@ -301,7 +309,7 @@ decoder->protected_->state = FLAC__STREAM_DECODER_UNINITIALIZED; return decoder; -@@ -333,7 +335,9 @@ FLAC_API void FLAC__stream_decoder_delete(FLAC__StreamDecoder *decoder) +@@ -334,7 +336,9 @@ FLAC_API void FLAC__stream_decoder_delet for(i = 0; i < FLAC__MAX_CHANNELS; i++) FLAC__format_entropy_coding_method_partitioned_rice_contents_clear(&decoder->private_->partitioned_rice_contents[i]); @@ -312,7 +320,7 @@ free(decoder->private_); free(decoder->protected_); free(decoder); -@@ -653,8 +657,16 @@ FLAC_API FLAC__bool FLAC__stream_decoder_finish(FLAC__StreamDecoder *decoder) +@@ -654,8 +658,16 @@ FLAC_API FLAC__bool FLAC__stream_decoder /* see the comment in FLAC__seekable_stream_decoder_reset() as to why we * always call FLAC__MD5Final() */ @@ -330,7 +338,7 @@ if(decoder->private_->has_seek_table && 0 != decoder->private_->seek_table.data.seek_table.points) { free(decoder->private_->seek_table.data.seek_table.points); decoder->private_->seek_table.data.seek_table.points = 0; -@@ -1005,11 +1017,15 @@ FLAC_API FLAC__bool FLAC__stream_decoder_reset(FLAC__StreamDecoder *decoder) +@@ -1006,11 +1018,15 @@ FLAC_API FLAC__bool FLAC__stream_decoder * FLAC__stream_decoder_finish() to make sure things are always cleaned up * properly. */ @@ -349,11 +357,11 @@ return true; } -diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c -index bc30dca..4b226c5 100644 ---- a/src/libFLAC/stream_encoder.c -+++ b/src/libFLAC/stream_encoder.c -@@ -563,7 +563,9 @@ FLAC_API FLAC__StreamEncoder *FLAC__stream_encoder_new(void) +Index: flac-1.3.0/src/libFLAC/stream_encoder.c +=================================================================== +--- flac-1.3.0.orig/src/libFLAC/stream_encoder.c ++++ flac-1.3.0/src/libFLAC/stream_encoder.c +@@ -564,7 +564,9 @@ FLAC_API FLAC__StreamEncoder *FLAC__stre FLAC__format_entropy_coding_method_partitioned_rice_contents_init(&encoder->private_->partitioned_rice_contents_extra[i]); encoder->protected_->state = FLAC__STREAM_ENCODER_UNINITIALIZED; @@ -364,7 +372,7 @@ return encoder; } -@@ -597,6 +599,11 @@ FLAC_API void FLAC__stream_encoder_delete(FLAC__StreamEncoder *encoder) +@@ -598,6 +600,11 @@ FLAC_API void FLAC__stream_encoder_delet FLAC__format_entropy_coding_method_partitioned_rice_contents_clear(&encoder->private_->partitioned_rice_contents_extra[i]); FLAC__bitwriter_delete(encoder->private_->frame); @@ -376,7 +384,7 @@ free(encoder->private_); free(encoder->protected_); free(encoder); -@@ -1030,8 +1037,15 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_( +@@ -1031,8 +1038,15 @@ static FLAC__StreamEncoderInitStatus ini encoder->private_->streaminfo.data.stream_info.bits_per_sample = encoder->protected_->bits_per_sample; encoder->private_->streaminfo.data.stream_info.total_samples = encoder->protected_->total_samples_estimate; /* we will replace this later with the real total */ memset(encoder->private_->streaminfo.data.stream_info.md5sum, 0, 16); /* we don't know this yet; have to fill it in later */ @@ -394,7 +402,7 @@ if(!FLAC__add_metadata_block(&encoder->private_->streaminfo, encoder->private_->frame)) { encoder->protected_->state = FLAC__STREAM_ENCODER_FRAMING_ERROR; return FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR; -@@ -1300,9 +1314,13 @@ FLAC_API FLAC__bool FLAC__stream_encoder_finish(FLAC__StreamEncoder *encoder) +@@ -1301,9 +1315,13 @@ FLAC_API FLAC__bool FLAC__stream_encoder } } @@ -411,6 +419,3 @@ if(!encoder->private_->is_being_deleted) { if(encoder->protected_->state == FLAC__STREAM_ENCODER_OK) { if(encoder->private_->seek_callback) { --- -1.8.1.4 - ++++++ flac-1.2.99_git201305252226.tar.xz -> flac-1.3.0.tar.xz ++++++ ++++ 97450 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
