[packages/vlc] - added flac patch (adjust includes to compile with flac 1.3.0)

qboosh qboosh at pld-linux.org
Sun Jul 14 16:39:02 CEST 2013


commit abd9d161cba63b50cafa5f19d13d54f8af9d8deb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 14 16:38:56 2013 +0200

    - added flac patch (adjust includes to compile with flac 1.3.0)

 vlc-flac.patch | 13 +++++++++++++
 vlc.spec       |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 6a5679d..5b4f458 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -72,6 +72,7 @@ Patch2:		%{name}-system-minizip.patch
 Patch3:		xmas-sucks.patch
 Patch4:		%{name}-opencv.patch
 Patch5:		libva.patch
+Patch6:		%{name}-flac.patch
 URL:		http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	OpenGL-devel
@@ -321,6 +322,7 @@ Akcje klienta VLC dla Solid.
 %endif
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -411,7 +413,7 @@ ln -sf %{_libdir}/vlc $RPM_BUILD_ROOT%{_prefix}/lib
 %endif
 
 # rm -f *.{a,la}
-find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.?a$' | xargs %{__rm}
+find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.l?a$' | xargs %{__rm}
 
 mv -f $RPM_BUILD_ROOT%{_localedir}/{pt_PT,pt}
 # unsupported:
diff --git a/vlc-flac.patch b/vlc-flac.patch
new file mode 100644
index 0000000..303417f
--- /dev/null
+++ b/vlc-flac.patch
@@ -0,0 +1,13 @@
+--- vlc-2.0.6/modules/codec/flac.c.orig	2013-01-25 13:30:14.000000000 +0100
++++ vlc-2.0.6/modules/codec/flac.c	2013-06-06 22:26:47.176022021 +0200
+@@ -38,8 +38,8 @@
+ #include <vlc_codec.h>
+ #include <vlc_aout.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>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vlc.git/commitdiff/abd9d161cba63b50cafa5f19d13d54f8af9d8deb



More information about the pld-cvs-commit mailing list