diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-12-07 20:19:43 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-12-07 20:19:43 +0000 |
| commit | 2ac7df695c4a0b7a80de662c31f2ce1f9bd944e4 (patch) | |
| tree | f164462273745657f6c1a0af2a78809354f533a1 /media-video/vlc | |
| parent | Stable for arm, wrt bug #489796 (diff) | |
| download | gentoo-2-2ac7df695c4a0b7a80de662c31f2ce1f9bd944e4.tar.gz gentoo-2-2ac7df695c4a0b7a80de662c31f2ce1f9bd944e4.tar.bz2 gentoo-2-2ac7df695c4a0b7a80de662c31f2ce1f9bd944e4.zip | |
When freetype-2.5.1 or newer is used, we apply a backported patch to vlc-2.1.1 support it; fixes bug #493496, reported by Ben de Groot (yngwin).
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'media-video/vlc')
| -rw-r--r-- | media-video/vlc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/vlc/files/vlc-2.1.1-freetype-2.5.1-support.patch | 19 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.1.1.ebuild | 7 |
3 files changed, 31 insertions, 2 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 1d0a42e8eeb3..ea2e8abcd3ed 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.876 2013/12/06 17:11:28 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.877 2013/12/07 20:19:42 tomwij Exp $ + + 07 Dec 2013; Tom Wijsman <TomWij@gentoo.org> + +files/vlc-2.1.1-freetype-2.5.1-support.patch, vlc-2.1.1.ebuild: + When freetype-2.5.1 or newer is used, we apply a backported patch to vlc-2.1.1 + support it; fixes bug #493496, reported by Ben de Groot (yngwin). 06 Dec 2013; Markus Meier <maekke@gentoo.org> vlc-2.0.8.ebuild, vlc-2.0.8a.ebuild, vlc-2.0.9.ebuild, vlc-2.1.0.ebuild, vlc-2.1.1.ebuild: diff --git a/media-video/vlc/files/vlc-2.1.1-freetype-2.5.1-support.patch b/media-video/vlc/files/vlc-2.1.1-freetype-2.5.1-support.patch new file mode 100644 index 000000000000..242db38d4417 --- /dev/null +++ b/media-video/vlc/files/vlc-2.1.1-freetype-2.5.1-support.patch @@ -0,0 +1,19 @@ +X-Git-Url: http://git.videolan.org/?p=vlc%2Fvlc-2.1.git;a=blobdiff_plain;f=modules%2Ftext_renderer%2Ffreetype.c;h=c27ec4558956f00b1fd2b448fa07d680a2be5c82;hp=25d6b15650d13982fd8c792df92389fd4de8eadd;hb=4eb6d91e94f720bf2dd22dcfee171e4ff4b790df;hpb=9ebead9dfbdcac2da31bc856cec51c058f5ddca8 + +diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c +index 25d6b15..c27ec45 100644 +--- 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/media-video/vlc/vlc-2.1.1.ebuild b/media-video/vlc/vlc-2.1.1.ebuild index 11c91d1ac3a1..fad5a6621a0c 100644 --- a/media-video/vlc/vlc-2.1.1.ebuild +++ b/media-video/vlc/vlc-2.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.1.ebuild,v 1.2 2013/12/06 17:11:28 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.1.ebuild,v 1.3 2013/12/07 20:19:42 tomwij Exp $ EAPI="5" @@ -239,6 +239,11 @@ src_prepare() { # Fix up broken audio; first is a fixed reversed bisected commit, latter two are backported. epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch + # Support for freetype-2.5.1. + if has_version '>=media-libs/freetype-2.5.1' ; then + epatch "${FILESDIR}"/${P}-freetype-2.5.1-support.patch + fi + # Disable avcodec checks when avcodec is not used. sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die |