rpms/vlc/devel 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch, NONE, 1.1 vlc.spec, 1.168, 1.169

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17366/devel

Modified Files:
	vlc.spec 
Added Files:
	0001-Fix-build-with-unreleased-FLAC-1.3.x.patch 
Log Message:
Fix build with recent FLAC


0001-Fix-build-with-unreleased-FLAC-1.3.x.patch:
 flac.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch ---
>From 606908a31b2dae46899601fe88b6443d024c8d09 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart at gmail.com>
Date: Wed, 2 Jan 2013 19:05:27 +0100
Subject: [PATCH] Fix build with unreleased FLAC 1.3.x

The issue was initialy reported here:
http://bugzilla.redhat.com/891123

FLAC upstream has always expected to include headers as
as shown in examples/c/decode/file/main.c

The FLAC suffix will not be be made available in the flac.pc
for the next release:
http://lists.xiph.org/pipermail/flac-dev/2012-April/003355.html
---
 modules/codec/flac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 4cfbfa9..543e8bb 100644
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -37,8 +37,8 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 
-#include <stream_decoder.h>
-#include <stream_encoder.h>
+#include <FLAC/stream_decoder.h>
+#include <FLAC/stream_encoder.h>
 
 #include <vlc_block_helper.h>
 #include <vlc_bits.h>
-- 
1.7.11.7



Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- vlc.spec	1 Jan 2013 21:59:56 -0000	1.168
+++ vlc.spec	2 Jan 2013 18:27:06 -0000	1.169
@@ -31,12 +31,13 @@
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
 Version:	2.0.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
 Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz
 Patch0:         vlc-2.0.2-xcb_discard.patch
+Patch1:         0001-Fix-build-with-unreleased-FLAC-1.3.x.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -220,7 +221,8 @@
 %setup -q -n %{name}-%{version}%{?vlc_rc}
 
 %if 0%{?rhel}
-%patch0 -p1 -b .xcb_discard 
+%patch0 -p1 -b .xcb_discard
+%patch1 -p1 -b .FLAC13
 %{?_with_xcb:
 sed -i -e "s|xcb >= 1.6|xcb >= 1.5|" configure configure.ac
 touch -r config.h.in configure configure.ac
@@ -512,6 +514,9 @@
 
 
 %changelog
+* Wed Jan 02 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.5-2
+- Fix build with FLAC-1.3.x
+
 * Fri Dec 14 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.0.5-1
 - Update to 2.0.5