Accepting request 426272 from home:scarabeus_iv:branches:multimedia:libs

- Drop patch that should be upstreamed first, otherwise we will
  have to keep it ofrever:
  * flac-ocloexec.patch
- Drop wrong patch:
  * flac-fix-pkgconfig.patch
    + If using this change you get assert.h include overriden in your
      project by the one from FLAC/ which is not what upstream desired
      If packages fail to build they should fix their include

OBS-URL: https://build.opensuse.org/request/show/426272
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/flac?expand=0&rev=49

flac-fix-pkgconfig.patch

@@ -1,26 +0,0 @@
-Index: flac-1.3.1/src/libFLAC/flac.pc.in
-===================================================================
---- flac-1.3.1.orig/src/libFLAC/flac.pc.in
-+++ flac-1.3.1/src/libFLAC/flac.pc.in
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/FLAC
- 
- Name: FLAC
- Description: Free Lossless Audio Codec Library
-Index: flac-1.3.1/src/libFLAC++/flac++.pc.in
-===================================================================
---- flac-1.3.1.orig/src/libFLAC++/flac++.pc.in
-+++ flac-1.3.1/src/libFLAC++/flac++.pc.in
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/FLAC++
- 
- Name: FLAC++
- Description: Free Lossless Audio Codec Library (C++ API)

flac-ocloexec.patch

@@ -1,43 +0,0 @@
-Index: flac-1.3.1/src/libFLAC/metadata_iterators.c
-===================================================================
---- flac-1.3.1.orig/src/libFLAC/metadata_iterators.c
-+++ flac-1.3.1/src/libFLAC/metadata_iterators.c
-@@ -421,10 +421,10 @@ static FLAC__bool simple_iterator_prime_
- 
- 	FLAC__ASSERT(0 != iterator);
- 
--	if(read_only || 0 == (iterator->file = flac_fopen(iterator->filename, "r+b"))) {
-+	if(read_only || 0 == (iterator->file = flac_fopen(iterator->filename, "r+be"))) {
- 		iterator->is_writable = false;
- 		if(read_only || errno == EACCES) {
--			if(0 == (iterator->file = flac_fopen(iterator->filename, "rb"))) {
-+			if(0 == (iterator->file = flac_fopen(iterator->filename, "rbe"))) {
- 				iterator->status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE;
- 				return false;
- 			}
-Index: flac-1.3.1/src/libFLAC/stream_decoder.c
-===================================================================
---- flac-1.3.1.orig/src/libFLAC/stream_decoder.c
-+++ flac-1.3.1/src/libFLAC/stream_decoder.c
-@@ -606,7 +606,7 @@ static FLAC__StreamDecoderInitStatus ini
- 	if(0 == write_callback || 0 == error_callback)
- 		return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS;
- 
--	file = filename? flac_fopen(filename, "rb") : stdin;
-+	file = filename? flac_fopen(filename, "rbe") : stdin;
- 
- 	if(0 == file)
- 		return FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE;
-Index: flac-1.3.1/src/libFLAC/stream_encoder.c
-===================================================================
---- flac-1.3.1.orig/src/libFLAC/stream_encoder.c
-+++ flac-1.3.1/src/libFLAC/stream_encoder.c
-@@ -1389,7 +1389,7 @@ static FLAC__StreamEncoderInitStatus ini
- 	if(encoder->protected_->state != FLAC__STREAM_ENCODER_UNINITIALIZED)
- 		return FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED;
- 
--	file = filename? flac_fopen(filename, "w+b") : stdout;
-+	file = filename? flac_fopen(filename, "w+be") : stdout;
- 
- 	if(file == 0) {
- 		encoder->protected_->state = FLAC__STREAM_ENCODER_IO_ERROR;

flac.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Sep 10 07:35:50 UTC 2016 - tchvatal@suse.com
+
+- Drop patch that should be upstreamed first, otherwise we will
+  have to keep it ofrever:
+  * flac-ocloexec.patch
+- Drop wrong patch:
+  * flac-fix-pkgconfig.patch
+    + If using this change you get assert.h include overriden in your
+      project by the one from FLAC/ which is not what upstream desired
+      If packages fail to build they should fix their include
+
 -------------------------------------------------------------------
 Sat Mar 21 07:22:12 UTC 2015 - mpluskal@suse.com
 

flac.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package flac
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,19 +27,17 @@ Url:            https://xiph.org/flac/
 #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
+Patch0:         flac-cflags.patch
-Patch3:         flac-fix-pkgconfig.patch
-Patch6:         flac-cflags.patch
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake >= 1.11
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
-BuildRequires:  libogg-devel
 BuildRequires:  libtool
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  xz
+BuildRequires:  pkgconfig(ogg)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%ifarch %ix86
+%ifarch %{ix86}
 BuildRequires:  nasm
 %endif
 
@@ -86,13 +84,12 @@ FLAC library.
 
 %prep
 %setup -q
-%patch1 -p1
+%patch0 -p1
-%patch3 -p1
-%patch6 -p1
 
 %build
-./autogen.sh
+autoreconf -fvi
 %configure \
+	--disable-silent-rules \
 	--disable-thorough-tests \
 	--disable-xmms-plugin \
 	--disable-static \
@@ -112,11 +109,8 @@ cp -a AUTHORS README COPYING.* %{buildroot}%{_docdir}/%{name}
 make check %{?_smp_mflags}
 
 %post -n libFLAC8 -p /sbin/ldconfig
-
 %postun -n libFLAC8 -p /sbin/ldconfig
-
 %post -n libFLAC++6 -p /sbin/ldconfig
-
 %postun -n libFLAC++6 -p /sbin/ldconfig
 
 %files