| 1 |
commit: a55a7a76e2f26f9d0ba4379134dd6c8a9d4a14c0 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 4 10:34:09 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 4 10:34:09 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55a7a76 |
| 7 |
|
| 8 |
app-misc/g15composer: Don't use freetype-config |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.35, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../files/g15composer-3.2-freetype_pkgconfig.patch | 44 ++++++++++++++++++++++ |
| 13 |
app-misc/g15composer/g15composer-3.2.ebuild | 26 +++++++++---- |
| 14 |
2 files changed, 62 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch b/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..9251e139322 |
| 19 |
--- /dev/null |
| 20 |
+++ b/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch |
| 21 |
@@ -0,0 +1,44 @@ |
| 22 |
+--- g15composer-3.2/configure.in |
| 23 |
++++ g15composer-3.2/configure.in |
| 24 |
+@@ -14,24 +14,24 @@ |
| 25 |
+ AC_PROG_YACC |
| 26 |
+ |
| 27 |
+ # Checks for --enable args |
| 28 |
+-AC_MSG_CHECKING(whether to enable FreeType2 support) |
| 29 |
+-AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support], |
| 30 |
+- if [[[ "$enableval" = "yes" ]]]; then |
| 31 |
+- AC_CHECK_LIB([g15render], [g15r_ttfLoad], |
| 32 |
+- AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]) |
| 33 |
+- CFLAGS="$CFLAGS `freetype-config --cflags`" |
| 34 |
+- CXXFLAGS="$CXXFLAGS `freetype-config --cflags`" |
| 35 |
+- FTLIB="-lfreetype" |
| 36 |
+- ttf_support="yes", |
| 37 |
+- AC_MSG_ERROR(["libg15render does not support ttf functions. please reconfigure with --enable-ttf"]) |
| 38 |
+- ttf_support="no" |
| 39 |
+- ) |
| 40 |
+- else |
| 41 |
+- ttf_support="no" |
| 42 |
+- fi, |
| 43 |
+- ttf_support="no" |
| 44 |
++AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support],,enable_ttf="no") |
| 45 |
++AS_IF([test "x$enable_ttf" = "xyes"], [ |
| 46 |
++ PKG_PROG_PKG_CONFIG |
| 47 |
++ PKG_CHECK_MODULES(FREETYPE, freetype2, |
| 48 |
++ [ |
| 49 |
++ CFLAGS="$CFLAGS $FREETYPE_CFLAGS" |
| 50 |
++ CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" |
| 51 |
++ FTLIB="$FREETYPE_LIBS" |
| 52 |
++ ], |
| 53 |
++ AC_MSG_ERROR([Cannot find freetype2]) |
| 54 |
++ ) |
| 55 |
++ AC_CHECK_LIB([g15render], [g15r_ttfLoad], |
| 56 |
++ AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]), |
| 57 |
++ AC_MSG_ERROR(["libg15render does not support ttf functions. please reconfigure with --enable-ttf"]) |
| 58 |
++ ) |
| 59 |
++], |
| 60 |
++ AC_MSG_RESULT(No Freetype is being used) |
| 61 |
+ ) |
| 62 |
+-AC_MSG_RESULT($ttf_support) |
| 63 |
+ |
| 64 |
+ # Checks for libraries. |
| 65 |
+ AC_CHECK_LIB([g15daemon_client], [g15_send], ,AC_MSG_ERROR(["libg15daemon_client not found. please install it"])) |
| 66 |
|
| 67 |
diff --git a/app-misc/g15composer/g15composer-3.2.ebuild b/app-misc/g15composer/g15composer-3.2.ebuild |
| 68 |
index 0ff4c93f649..8614765071c 100644 |
| 69 |
--- a/app-misc/g15composer/g15composer-3.2.ebuild |
| 70 |
+++ b/app-misc/g15composer/g15composer-3.2.ebuild |
| 71 |
@@ -1,8 +1,9 @@ |
| 72 |
-# Copyright 1999-2017 Gentoo Foundation |
| 73 |
+# Copyright 1999-2018 Gentoo Foundation |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
|
| 76 |
-EAPI=2 |
| 77 |
-inherit eutils |
| 78 |
+EAPI=6 |
| 79 |
+ |
| 80 |
+inherit autotools |
| 81 |
|
| 82 |
DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15" |
| 83 |
HOMEPAGE="https://sourceforge.net/projects/g15tools/" |
| 84 |
@@ -15,21 +16,30 @@ IUSE="truetype examples" |
| 85 |
|
| 86 |
DEPEND="app-misc/g15daemon |
| 87 |
>=dev-libs/libg15render-1.2[truetype?] |
| 88 |
+ virtual/pkgconfig |
| 89 |
truetype? ( media-libs/freetype )" |
| 90 |
|
| 91 |
+PATCHES=( |
| 92 |
+ "${FILESDIR}"/${PN}-3.2-freetype_pkgconfig.patch |
| 93 |
+) |
| 94 |
+ |
| 95 |
+src_prepare() { |
| 96 |
+ default |
| 97 |
+ mv configure.{in,ac} || die |
| 98 |
+ eautoreconf |
| 99 |
+} |
| 100 |
+ |
| 101 |
src_configure() { |
| 102 |
- econf \ |
| 103 |
- $(use_enable truetype ttf) |
| 104 |
+ econf $(use_enable truetype ttf) |
| 105 |
} |
| 106 |
|
| 107 |
src_install() { |
| 108 |
- emake DESTDIR="${D}" install || die "emake install failed" |
| 109 |
+ local DOCS=( AUTHORS README ChangeLog ) |
| 110 |
+ default |
| 111 |
|
| 112 |
newinitd "${FILESDIR}/${P}.initd" ${PN} |
| 113 |
newconfd "${FILESDIR}/${P}.confd" ${PN} |
| 114 |
|
| 115 |
- dodoc AUTHORS README ChangeLog |
| 116 |
- |
| 117 |
if use examples ; then |
| 118 |
exeinto "/usr/share/${PN}" |
| 119 |
doexe examples/* |
Archives