[SCM] vlc/master: Drop fix-ftbfs-flac-1.3.patch (applied upstream).

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Thu Aug 1 12:16:26 UTC 2013


The following commit has been merged in the master branch:
commit 009f7c0a467722160f7a486bcf59bb8c7c11b872
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Aug 1 14:14:26 2013 +0200

    Drop fix-ftbfs-flac-1.3.patch (applied upstream).

diff --git a/debian/patches/fix-ftbfs-flac-1.3.patch b/debian/patches/fix-ftbfs-flac-1.3.patch
deleted file mode 100644
index b305238..0000000
--- a/debian/patches/fix-ftbfs-flac-1.3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Nicolas Chauvet <kwizart at gmail.com>
-Date: Wed, 2 Jan 2013 21:44:33 +0000 (+0100)
-Subject: Fix build with unreleased FLAC 1.3.x
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=607065b410b4768372c204ccdbbca200230fff25
-
-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 <FLAC/ suffix
-for included headers 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
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
-
---- a/modules/codec/flac.c
-+++ b/modules/codec/flac.c
-@@ -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>
diff --git a/debian/patches/series b/debian/patches/series
index a4beb2e..e5bcba8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 v4l-kfreebsd.patch
 link-binaries-with-c++.patch
-fix-ftbfs-flac-1.3.patch
 dvbpsi.patch
 configure-m4-undefine.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list