summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-03-17 13:06:22 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-03-17 13:06:22 +0000
commite634e28df3c232d1c5fb9c6a530e11c2bb4c5a90 (patch)
treef1add01f6941025f793fea6ad9f6c9c051fcd15f /media-libs/lasi
parentVersion bump (diff)
downloadhistorical-e634e28df3c232d1c5fb9c6a530e11c2bb4c5a90.tar.gz
historical-e634e28df3c232d1c5fb9c6a530e11c2bb4c5a90.tar.bz2
historical-e634e28df3c232d1c5fb9c6a530e11c2bb4c5a90.zip
Added compatibility fix for >=media-libs/freetype-2.5.1 (bug #504888)
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'media-libs/lasi')
-rw-r--r--media-libs/lasi/ChangeLog6
-rw-r--r--media-libs/lasi/Manifest25
-rw-r--r--media-libs/lasi/files/lasi-1.1.1-freetype251.patch63
-rw-r--r--media-libs/lasi/lasi-1.1.1.ebuild3
4 files changed, 86 insertions, 11 deletions
diff --git a/media-libs/lasi/ChangeLog b/media-libs/lasi/ChangeLog
index b72ee6657e2a..5b5e8f2e6813 100644
--- a/media-libs/lasi/ChangeLog
+++ b/media-libs/lasi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/lasi
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.35 2014/02/02 16:51:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.36 2014/03/17 13:06:21 polynomial-c Exp $
+
+ 17 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> lasi-1.1.1.ebuild,
+ +files/lasi-1.1.1-freetype251.patch:
+ Added compatibility fix for >=media-libs/freetype-2.5.1 (bug #504888).
02 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> lasi-1.1.1.ebuild:
Add ~mips, wrt bug #499866
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index cfeeb874f222..f27bb7d8674f 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -3,18 +3,25 @@ Hash: SHA256
AUX lasi-1.1.0-cmake.patch 417 SHA256 9247c947eeeb02de666d9ae43f8d6681a192626a05e59100b58e0c2b9f9d281a SHA512 ee2a137ec259daa5075dd13e6fa2221a0d1895a162d92887e671cc0e0bd5c925c2f7aa3dd393aef5c8339a3b094acfa4dc537cda6c0c5711d7e71e6354ed1ea5 WHIRLPOOL 409ddba26eb511fd1b99a1f542832277665d82e4abd9c389ea9e978544c4d54d4c7ab090bf69806468118450e3a6f9aeb7769cad085638a923f60a43f79d2489
AUX lasi-1.1.0-pkgconfig.patch 701 SHA256 de255e31df073127a2c75941a31bc41119a9b4271767b72a446f8533df43d0c5 SHA512 81b62d5491e19b6602bc622c5d1ed856a0950e209033de31773812815d221d741c78548edfc3fdc32230dca97de6e02ede79414aba1e803019299278d8c4e7da WHIRLPOOL 21418b6fef0a5c1af24b828850978516ea21c0b35896352d0fa295d7cc9c4cd717ded8b870137b7e40acb197bd18098c27a396295062bff212c35201e0564b64
+AUX lasi-1.1.1-freetype251.patch 1407 SHA256 66c9ef6aa64205eaae90b79ca06d6d3da5842abd8da1e97acde671a56e69264e SHA512 3cf69263b85172e941947fef1c6cf3a89664b29b3dba7566715897dd600f66214ca286e8a96890dad7e32b0f54d50ed4ace17c941a26ee02918447c382fc8fec WHIRLPOOL ead66180e1c0102b8748dbbc8449c8ae93aca5c175cee8eea2337f9117e0b03e0cd75017739cce6a559396b28e4f1210aa19c2c85029b728d0b6297f534cf7c0
DIST libLASi-1.1.1.tar.gz 223589 SHA256 175964cb4fec347737899f9fa0b8d7441864ae20f439e013432d9b9072ab3723
-EBUILD lasi-1.1.1.ebuild 1410 SHA256 688c440a5a97496b89aab7f878288a818b20910bbc6cbc7e5f55458dd39b858c SHA512 acfda55e12f0cd345af57bf5c8798f23dbf41dd1431e23823b27747029f42c7e4cbb1e60eac6b4fa41c98bfb78c6f08f28b2ddccb01864eeb8a7fa4f7fc576ca WHIRLPOOL cf8dd69aae86bcfa04620591bf2bbe06f8d64cf0ff232cd852da1e277d2b79d670cd323ba14b278ae0dccf4400af533ad435dbc5b34ad765f80a29db4cfad65c
-MISC ChangeLog 4583 SHA256 09923a8507e2e5831d4a5113c71e623f251411d40e5ecc00d7ce805ec7e33af7 SHA512 656e3dbeae1d703c65f9a77d731053b47ebe0586d958edcc57d00557fc33e529a8171b8ac3dc4b55c70209e4587fc0d68b223f18234c161205cda8fd7e99ea73 WHIRLPOOL e79fbbc2969a9385aa7c79e770ba07a8a77eeb8a3885dd8ee1bd66e4d4dd3dd64d846a4d5c70415cbef53844f3ee8aee9acd2ebb870ef462585c33b17ef880d1
+EBUILD lasi-1.1.1.ebuild 1459 SHA256 e20d9863c482b1cd78294ca35cd7ecf6e04c97ff75cbdc4dc9c70f5170313c15 SHA512 d8bacbee3734b9f759209d1c53c95e47b6c9d3c976ee85bdd787f99b8a852007da9bc9d301d9d6493e46b7e3d498cf5d8c5ca6653d99980805fe5458a830e919 WHIRLPOOL 922f6706bd935390f0e3ffcc606d062643e7c1d945c1948edcbeb41ec03a6d6ca38aa9cc1b99e1c82eb00e095a6ea8a412872b9114963d84032fc62e95a6a546
+MISC ChangeLog 4773 SHA256 3f7fb788dc04ca99f4bdc92200232af0417f4ead252891aea72cb86bb861ec8d SHA512 a64619759af789eb06d3f5980bfc4d3f07cf78747eb5e86c4031cc8b5394a834013283238d24b0ca1a07ed14e0304d7810f54d7b157821bb19e6a9c6655aa304 WHIRLPOOL 355ce9330eb3dee41b09dfbb39c54c941e07376178440d8896be3be0afb0096bce3f173751ac9c98f7c6197188a9f9fc3b259d3ce1c0bad947dc6fdba20a7ae8
MISC metadata.xml 1063 SHA256 7ae60dbad663f26bdc990d005dffaab3a41cc8895fe0a03b5445a5df0a7e067d SHA512 1a86b19f1ea2f790e59207a5b596fc93982941436e9ba538d441ee6b891344b121760c8e412cd0b08d22bffc7b4056648e1e9e404957ac59931e89d345110b8a WHIRLPOOL ff73c044003ee8adead5495b0c5fa9a564f748d630f7e1b03e576775171eebc187828361896054f8c5d9dce1af306f741a115486c21789ae737783d9eaf0dba0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJS7nehAAoJECo/aRed9267aAwIALGXr5L8uHM6y9jdPjLYEWMJ
-+YhCdny3J9KaK7iH4imJfU/Nk77OtFx+9KtNI6RU0o96nD/1Hwa58MZk5W1pxUlc
-zbTuDBAtrHTzrUvQrWnPQnT59maNhiD/3Z2WoZLcTPb25QqzIV3ySeSCxpBpCuTE
-XTFnXoEaPCZ/8P7SoQD/omPtkeoQlqJCBirG1EwN+mHaprUjVtomOua9ZaapcG5l
-Tk27MRDdkSxpY11HflyACdaJqiaAfMgyRhUdneyf+iP5K5IPyH/QciS8gSdhvX0I
-DRHNO5iX9VbK2m4el8v2gilVOsrWAQmpGtYJ6muHQrOyLW2Jm820AzHoHWrvfx0=
-=R6gN
+iQIcBAEBCAAGBQJTJvNOAAoJEPiazRVxLXTFR3cQAKwfmyMIldyfMjaAxqtsv5aQ
+xe9oDDiWAfX5yHlseNOOPK2DUTi1oXxE19ep9uPcKzfiQ0G7TB9HR6RcAQC3FQ43
+leRm1eNWesU/oDslVrZhSjevCWtFRL2sS1QQgE0VTZL4IRTRS712F0LVn6XNj3eI
+m+zfaGcmV1VRB7WvXJlD+KDYeZSuGAjZ0zIOoBmYobV6hGtcSyjkO8fLgJC+9huE
+Kp360KSwMXILjoo4pvYlleTGLjwAsYEMkVCf25py4fJ/KnHa3eztSH6Eo8O0buot
+jB35oOCzQcMJK9zAfkjNylfOBcaC7f7pHh6NjUGVtUlIquixiaAhZ7meoSiJH+Lo
+KE4D03AMMl2YZnn7xw89ru1nQWx8qmyW394SBpOR10z68rHol0yx5i21JAZPySt0
+7jYHJhuOKT8lu6szWQQYBbQD4qZIDipPPASGXNCAaho5KICdCVwhfYjrVMDBwnfF
+SxIIVLHZrL4NjY2ynpFiIHuJkCMnG7dAZdSOX4en9AH9rdQ63jReS/qJr+d3LH8Q
+waGRK6WS6E4qn4myWt71DeX5GUmkS/GphZzkvonV5489oQ2+EZaJTgXEEQuamsoY
+yBbMBz7joVQL30ZQfWrXgbuE82K35TcaB7GICUb2/RgcQnnO+rMZ0mlCSuDfsUyE
+EZma28XR/DIj3mJxiIxN
+=jc3/
-----END PGP SIGNATURE-----
diff --git a/media-libs/lasi/files/lasi-1.1.1-freetype251.patch b/media-libs/lasi/files/lasi-1.1.1-freetype251.patch
new file mode 100644
index 000000000000..515b159208ff
--- /dev/null
+++ b/media-libs/lasi/files/lasi-1.1.1-freetype251.patch
@@ -0,0 +1,63 @@
+Add compatibility for >=freetype-2.5.1
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+--- libLASi-1.1.1/include/LASi.h
++++ libLASi-1.1.1/include/LASi.h
+@@ -11,7 +11,8 @@
+ #include <sstream>
+ #include <map>
+ #include <pango/pango.h>
+-#include <freetype/ftglyph.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
+
+ class FreetypeGlyphMgr;
+ class ContextMgr;
+--- libLASi-1.1.1/src/drawGlyph.cpp
++++ libLASi-1.1.1/src/drawGlyph.cpp
+@@ -6,7 +6,8 @@
+ */
+
+ #include <ostream>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
+ #include <algorithm>
+ #include <LASi.h>
+ #include <config.h>
+--- libLASi-1.1.1/src/glyphMgr.cpp
++++ libLASi-1.1.1/src/glyphMgr.cpp
+@@ -10,8 +10,7 @@
+
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-
+-#include <freetype/ftglyph.h>
++#include FT_GLYPH_H
+
+ #include <cassert>
+ #include "util.h"
+--- libLASi-1.1.1/src/glyphMgr.h
++++ libLASi-1.1.1/src/glyphMgr.h
+@@ -15,8 +15,8 @@
+
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
++#include FT_GLYPH_H
+
+-#include <freetype/ftglyph.h>
+
+ /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
+ */
+--- libLASi-1.1.1/src/util.h
++++ libLASi-1.1.1/src/util.h
+@@ -18,7 +18,7 @@
+
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/ftglyph.h>
++#include FT_GLYPH_H
+
+ std::ostream& operator<<(std::ostream&, const FT_Library);
+ std::ostream& operator<<(std::ostream&, const FT_Face);
diff --git a/media-libs/lasi/lasi-1.1.1.ebuild b/media-libs/lasi/lasi-1.1.1.ebuild
index 53c0c61fccb2..fcc0d94e31d0 100644
--- a/media-libs/lasi/lasi-1.1.1.ebuild
+++ b/media-libs/lasi/lasi-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.1.ebuild,v 1.13 2014/02/02 16:51:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.1.ebuild,v 1.14 2014/03/17 13:06:21 polynomial-c Exp $
EAPI=4
@@ -30,6 +30,7 @@ S=${WORKDIR}/${MY_P}
PATCHES=(
"${FILESDIR}"/${PN}-1.1.0-cmake.patch
"${FILESDIR}"/${PN}-1.1.0-pkgconfig.patch
+ "${FILESDIR}"/${PN}-1.1.1-freetype251.patch
)
src_prepare() {