summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-12-10 12:39:26 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-12-10 12:39:26 +0000
commit257e472cda0a10a3987dddd584acea5a780971f9 (patch)
tree3d1053ed7ee71f62e2b2af4f92c225be6a42b4b9 /media-video
parentvanilla-3.12.4 + genpatches-3.12-4 + grsecurity-3.0-3.12.4-201312081754 (diff)
downloadhistorical-257e472cda0a10a3987dddd584acea5a780971f9.tar.gz
historical-257e472cda0a10a3987dddd584acea5a780971f9.tar.bz2
historical-257e472cda0a10a3987dddd584acea5a780971f9.zip
Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493598)
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'media-video')
-rw-r--r--media-video/transcode/ChangeLog6
-rw-r--r--media-video/transcode/Manifest23
-rw-r--r--media-video/transcode/files/transcode-1.1.7-freetype251.patch12
-rw-r--r--media-video/transcode/transcode-1.1.7-r3.ebuild5
4 files changed, 37 insertions, 9 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/Manifest b/media-video/transcode/Manifest
index 6028b349ef70..d0917c6a5f8a 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -5,19 +5,30 @@ AUX transcode-1.1.7-ffmpeg-0.10.patch 402 SHA256 5df30ce0bdaee1d61a5dd94d242ce01
AUX transcode-1.1.7-ffmpeg-0.11.patch 12718 SHA256 52f62257ad3abcaf72b306549f66b3aee2a38d2b84713b42be26b7fdcd5f203d SHA512 9b39f15d20830fb57f86750a54a5a7c6025ad69733d668df45a06fd1134e0a6ee76a495a883797b41870b156b4b8895a4dcedbd5e28712d69a98baa7b5934663 WHIRLPOOL 11905b35e3b4b24e8e779945d81743520c554c0c8653d466db095d0d02510c2f6a00ce8d632f8993d829607d37ec8887e79401f6da230f1e8352bad7e55b0fe1
AUX transcode-1.1.7-ffmpeg.patch 2274 SHA256 443776bbc3497e1f256eb74c19bcda293cfd751776817bafc1ca89ff510e3b61 SHA512 d238b645b27bb83e2a1753b9dc99909084292579b757831d560f9535f1eb4a4892bd89047f0b23625f66e72fe8d373002abf8a6a03334c720b065af4220f5a9a WHIRLPOOL edbec136aa7a53a8119f42c9a2f8f000a743e9045892f160dfa4e513137c9e10c16c0316894874bfeb9026f5f10345fb9b920ff1e5111eedec84f85ae9f680ae
AUX transcode-1.1.7-ffmpeg2.patch 14318 SHA256 7c07b03d11e1ca0fd377637b8d42d439a8e9350523d6f25adad095b6c01afc0d SHA512 82be56ebbff431514fa86819f00cd9ac8dbdeeab3d7549ca775ace7da5f08c957548afdf996e8781d73fae7b4b9412f8b3b940ce5c261ab599cfa3fd0d2b0d82 WHIRLPOOL 0dac8df2d1ca1a3072e3c8763d433c8c2be7ff436de7d19a2b760493b8ecd9d6f74026f696e933f7533285420dd59f833a1457e2784c7f66a167a4da45d8763e
+AUX transcode-1.1.7-freetype251.patch 273 SHA256 0dd6baea9fc401a59fab3f848f256015ccf4e420224969647f2a79fb208621f1 SHA512 40b672e15de03d2f9f9150a3edb61de65f2d37f6fa9c8b0fc5f47d5a8c8dc6feb714163689947e8997ff4d6c243aa5a5ec860ef8c50bf4648166aa64a7396285 WHIRLPOOL 8f03d793695cb9d3e7e5d7c54c70a21dab2367cd472730b898ef758116a1c14951348333a8c1fcde5ec6d2330242c55c8d08cdd0821deee147b133604b438128
AUX transcode-1.1.7-libav-9.patch 1413 SHA256 9a53c93b1efa1a6ee6fbe30acbcce4416024d8aa857771d258ddb444f30b48ce SHA512 0868e1b8f440ef8d9314851e02211edc77c3c410b2ec9e860b74cb159d0ea7a77590a933e6ad29b4df5bf8b8ea78f13dae8aa79f361c5437a89b1ba02c7b6e36 WHIRLPOOL 38557b8c2c286bb5a3982c02c229c319114aa6914eb20745127a83a3eb679c7d4d5c989e3661343bba68ad56717842f05da2ea2269ed53e764b708b736b7af29
AUX transcode-1.1.7-preset-force.patch 1199 SHA256 fe95e83093761924ba0fa5b3214e169812f7740c6c3c434845b1b563d4a37241 SHA512 b2406841674b0d021b1a116e3ef1d16a7206db0930d10d98f3a86923040fbe306296acbac1e14020557c0e9b7e9b28bd0de1f9e1ce20c7fb2c190d15adc6decc WHIRLPOOL e7742ba9dd8a9355f64d640d1005f8713dde5d0ec896583792e73ef0143087d0bbd09673df97c7b65bfe637dbc9ddd2afa1c9786725061440de93b94f7500781
AUX transcode-1.1.7-preset-free.patch 1370 SHA256 2219fe618be2b2c3fbd6e3545cdbd8db8d1c268a0b37bfe867514f871d7d91ef SHA512 46514728ea0970bf69ef0341ea64dae495a1a571a0416cf20cfaa7c922ded0ae8dcfd717c720c53e457a16585722973266e5cc0b509034ed2549338dc9bac912 WHIRLPOOL d7247d7e506bc5fd2ed579d934ceb121a54c93683de143b7c4ffbdd4b33799acc9c1b4e93e90db4788c84bc4320be05ae90d2760a86a979ae1f57fd4e3bf3750
DIST transcode-1.1.7.tar.bz2 2183627 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f WHIRLPOOL ccd085b3a2638de92c2d589ff93038fed3d1a760d3513fde2946a805f7efed87813850f5e9eee306ed8efd3608ad9492d16f4c41bd6278379995deb22f92354e
EBUILD transcode-1.1.7-r1.ebuild 3221 SHA256 75d087776934d71ac99943146093ee545d19f34dd02972827357cca05a8340ae SHA512 6fe01dc17791fa70e3bb633b0551e0ee9ba49e3beae83830963a7327e34776a5d84fb9e4b2403f3442a4babe014d620075a065aa0dcd172725ef96ff22fd5970 WHIRLPOOL de1b0f7f395dc6c73d0cf92651de19b530844aabba551c6c307d4056192b9f1265cfdc00acd5a2f6b6e9e6ef42a2c26247b6111cd3c4fa12de8a979d056f957c
EBUILD transcode-1.1.7-r2.ebuild 3269 SHA256 b94a8ba8adcc84f982f7d718f7ee3b2cc4e5686f76dfa40c43fb6057715e05c8 SHA512 708b4e7d28dc2ec0697cf74e628054b4c71408dee61f21890345f94da50274fa8f368f04babb25485f4c408d54fade312bc74fdd52fae287386a76543fe29cb3 WHIRLPOOL e4d28ddf51e0d8df8341309504ad07244b1096a3031a97acb26134099192e1bbfb24aab058ed43fd3ca6e59a7fc4dd883210c5a07b876d32ba4ce99542061893
-EBUILD transcode-1.1.7-r3.ebuild 3347 SHA256 c2ced641a9a75a05d8c2c601b889a1d0ebdc3328cde4a26ee337561dd7e35024 SHA512 766441c670e3061bd6120d906982b978534bfcdf8a5a84022d72ba95fc2ebff3228d4ee74e2ea87fc923b052315a93465ebd6a20e6698092d4283f1ef50dd267 WHIRLPOOL a4b1efbbc8fff290e5311b0710405f3303571d173a72ab2a460e1d519cd3f4a6faa310836c94a397220575c4a14403d4db62da0987c5409ee91ac0a45e4823b4
-MISC ChangeLog 52107 SHA256 bbbc7ab7a544e5528c37acd2621ad3ca9d7870fa62ef567014ee366f753c057e SHA512 fc1faba48a285a5847d69fb006ea7f7137609adfcc72bf43702e0080e4b884883dedfc2b72118f24b9fe072565ee80aadd8e813672f7423132be08a1cb759b02 WHIRLPOOL d3d42c32b859a600a96b9371563f00b04696297125250f5ea497ed4487c790dacaa4d930cf26db9f24ea5221723f760ad6390a8411c519c14d791318df74277d
+EBUILD transcode-1.1.7-r3.ebuild 3392 SHA256 de85f232285dc28d264eebd09b3c83a3f0b5f27b213c4b2a11bc9e7f092ce65e SHA512 18d5f9112f721cfaa45b7e1e062e7f1aab2d7d49ee84b91c2a435779aca1694114115e22e58a55c76f75e9c2ef50e3ddb18615ef1e3919c98f72af0ac2d6113b WHIRLPOOL 9ca31efa2e7095bc7f0757e18495791ba78106e1e793e44695d58bef009956a9c60f4d73a3cf91553faba3d7ba213574a3ff0c662281fdc3982bc6fedadd61d9
+MISC ChangeLog 52305 SHA256 d0d9b4cd5c3923953a581ad32d01f15b769982c16b7127e2db7eee5f19d9e547 SHA512 ddc3fb6c4dba1ca8fcb137f886bc3ce5cac8cf8410367c2f2f1a39c33872007e458226c33c5999a84e89e924c47353fa539de519865a120027d12ceb4a6debbf WHIRLPOOL ca6604ce2e0b46c7df5e19f92d51e3798ac9b8203b4aabdb1cf2f85f1ea02430cf9fcac023b22664e0bbe29c72b3c1b1f1070bc41fbaf83e648a02bfaeae9326
MISC metadata.xml 529 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209 SHA512 6c5a6dd9ef9407f0c05f42cdfeaf4d3c2e2e6a4c91028331b6dd905acf1174e7bb937b780d12043f030a6afd344aef0df1a2a3d13cbda5a71724bd1f7a8b8302 WHIRLPOOL c27354b3de6c7cb67a30adac4c66e4b72726ecf3e1a1b05fa2e759ce174cfc51154dcfeb0c1b48754702e304fc95753c42ac626b0d6338021737b84bdb074385
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlHqs74ACgkQvFcC4BYPU0qr+ACcCiyaJX9Zi+PhjUUqp3vormGe
-39kAn0CSaAxh8kWwHXfolc5xQ1HREj/9
-=0QLq
+iQIcBAEBCAAGBQJSpwt+AAoJEPiazRVxLXTFf+gP/iDlJAj/FOil4i32S5WjYA6B
+/kYJpmRcqmn1mLTrWi6vjdsB2/DOCtdzYDp6ZD0cqBmoJ48Ks5a/JEp9JtIAXKHo
+v55D0ZDnNQAjg/pqYN9e9yeRxLnd7ys6Szs3m4xTU0hv3OAp/buq5E1Gr1xNNns7
+cQkDg7VzGY2Xg/YvaW8re/NHSLSg8rvzYOirzwIdbf5F8olRqgWJH8YzoUc1GaQa
+I8RpJoBMWTF7CTYw9TilECdKppa0+B3dKS2WV1L3ON3QYUEzwGJG7uAp7Bp6ZsHK
+vZkOmuGYQo/Sd/80dr45hZZLjAtG8vKn5q4W4ENUmGfhZRxrBR5eUE9h7Waw7W9/
+jAZjBBF4oLtUybD+YcmK3VZdKRT0EAzOjFVH9ncvfJxTCPkvQIyY2Y+pDBV1XToT
+h/f1zQVrDydPGLAwcrvsaSDWLwUpEEb4vQ0tjdEGYmFWgCrqFt+UwyHxLJ7LV/2r
+QfhF2p2+W0EWyAhYSLDEGlINswJnXtl6XWyPUwQ2vdf7/4hhcpYRJl1Gm/NGP1IO
+z4wFUrtG3FH6A+byQRS8v639Wk3tZDN7PyEbFG469jT/MAZSft/xIkbMx46aIfWM
+oJzy1MmQ6GvcpbOdqfDOET4wsgfMw+bTpaYcL4RPIslKnK7F7jtQXMu7qV8Ccnpb
+rgoVWY0LT3xJrms++sfy
+=Ovo7
-----END PGP SIGNATURE-----
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
}