diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2013-12-10 12:39:25 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-12-10 12:39:25 +0000 |
| commit | b317174fc4aa4befbba3b43132fbe4ea309de489 (patch) | |
| tree | 9d6d126f41c80a137110a5153610b149865350e9 /media-video | |
| parent | vanilla-3.12.4 + genpatches-3.12-4 + grsecurity-3.0-3.12.4-201312081754 (diff) | |
| download | gentoo-2-b317174fc4aa4befbba3b43132fbe4ea309de489.tar.gz gentoo-2-b317174fc4aa4befbba3b43132fbe4ea309de489.tar.bz2 gentoo-2-b317174fc4aa4befbba3b43132fbe4ea309de489.zip | |
Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493598)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/transcode/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/transcode/files/transcode-1.1.7-freetype251.patch | 12 | ||||
| -rw-r--r-- | media-video/transcode/transcode-1.1.7-r3.ebuild | 5 |
3 files changed, 20 insertions, 3 deletions
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog index 1f1cbcbdaf27..2277420a8f0c 100644 --- a/media-video/transcode/ChangeLog +++ b/media-video/transcode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/transcode # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.314 2013/07/20 15:58:52 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.315 2013/12/10 12:39:25 polynomial-c Exp $ + + 10 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> + transcode-1.1.7-r3.ebuild, +files/transcode-1.1.7-freetype251.patch: + Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493598). *transcode-1.1.7-r3 (20 Jul 2013) diff --git a/media-video/transcode/files/transcode-1.1.7-freetype251.patch b/media-video/transcode/files/transcode-1.1.7-freetype251.patch new file mode 100644 index 000000000000..59c6ab35a514 --- /dev/null +++ b/media-video/transcode/files/transcode-1.1.7-freetype251.patch @@ -0,0 +1,12 @@ +--- transcode-1.1.7/filter/subtitler/load_font.c ++++ transcode-1.1.7/filter/subtitler/load_font.c +@@ -47,8 +47,8 @@ + // FreeType specific includes + #include <ft2build.h> + #include FT_FREETYPE_H ++#include FT_GLYPH_H + +-#include <freetype/ftglyph.h> + + /** + * @file bswap.h diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild index 8991eec9ba11..7b95216f0cb9 100644 --- a/media-video/transcode/transcode-1.1.7-r3.ebuild +++ b/media-video/transcode/transcode-1.1.7-r3.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/transcode/transcode-1.1.7-r3.ebuild,v 1.1 2013/07/20 15:58:52 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7-r3.ebuild,v 1.2 2013/12/10 12:39:25 polynomial-c Exp $ EAPI=5 inherit eutils libtool multilib @@ -63,7 +63,8 @@ src_prepare() { "${FILESDIR}"/${P}-preset-free.patch \ "${FILESDIR}"/${P}-libav-9.patch \ "${FILESDIR}"/${P}-preset-force.patch \ - "${FILESDIR}"/${P}-ffmpeg2.patch + "${FILESDIR}"/${P}-ffmpeg2.patch \ + "${FILESDIR}"/${P}-freetype251.patch elibtoolize } |