diff --git a/0001-Fix-build-with-unreleased-FLAC-1.3.x.patch b/0001-Fix-build-with-unreleased-FLAC-1.3.x.patch new file mode 100644 index 0000000..fc4a026 --- /dev/null +++ b/0001-Fix-build-with-unreleased-FLAC-1.3.x.patch @@ -0,0 +1,36 @@ +From 606908a31b2dae46899601fe88b6443d024c8d09 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +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 + #include + +-#include +-#include ++#include ++#include + + #include + #include +-- +1.7.11.7 + diff --git a/vlc.spec b/vlc.spec index f093267..186de35 100644 --- a/vlc.spec +++ b/vlc.spec @@ -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 @@ JACK audio plugin for the VLC media player. %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 @@ fi || : %changelog +* Wed Jan 02 2013 Nicolas Chauvet - 2.0.5-2 +- Fix build with FLAC-1.3.x + * Fri Dec 14 2012 Nicolas Chauvet - 2.0.5-1 - Update to 2.0.5