[SCM] vlc/master: Drop ftbfs_freetype.patch (applied upstream).
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Sat Dec 21 21:38:28 UTC 2013
The following commit has been merged in the master branch:
commit e61e9e0b75227778e5bb84b6a1deca02236a7dc4
Author: Benjamin Drung <bdrung at debian.org>
Date: Sat Dec 21 18:05:14 2013 +0100
Drop ftbfs_freetype.patch (applied upstream).
diff --git a/debian/patches/ftbfs_freetype.patch b/debian/patches/ftbfs_freetype.patch
deleted file mode 100644
index c38e606..0000000
--- a/debian/patches/ftbfs_freetype.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix FTBFS with freetype 2.5.1
-Author: Mateusz Łukasik <mati75 at linuxmint.pl>
-Bug-Debian: http://bugs.debian.org/731513
-
---- a/modules/text_renderer/freetype.c
-+++ b/modules/text_renderer/freetype.c
-@@ -90,10 +90,11 @@
- #endif
-
- /* Freetype */
--#include <freetype/ftsynth.h>
-+#include <ft2build.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #include FT_STROKER_H
-+#include FT_SYNTHESIS_H
-
- #define FT_FLOOR(X) ((X & -64) >> 6)
- #define FT_CEIL(X) (((X + 63) & -64) >> 6)
diff --git a/debian/patches/series b/debian/patches/series
index da829bf..420def5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
pnap-grammar.patch
-ftbfs_freetype.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list