diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:17:25 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:17:25 +0100 |
| commit | 62f82c107c3904ac6917ece47301d2999c7dd90e (patch) | |
| tree | 48ddfc2291e77d0e3ad80f6d7c5f403d84ae8414 /app-misc/graphlcd-base | |
| parent | 7fe80ac8764ccbf354f82029a6bce4f96dbb8d5d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-misc/graphlcd-base')
| -rw-r--r-- | app-misc/graphlcd-base/Manifest | 3 | ||||
| -rw-r--r-- | app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch | 30 | ||||
| -rw-r--r-- | app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild | 20 |
3 files changed, 45 insertions, 8 deletions
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest index 425ffe45ed27..4352e7a9f525 100644 --- a/app-misc/graphlcd-base/Manifest +++ b/app-misc/graphlcd-base/Manifest @@ -1,4 +1,5 @@ AUX graphlcd-base-0.1.5-nostrip.patch 3062 BLAKE2B ebcb8bf96457871e9cea6a5f8bff6e4458ff8c5f1868216645b1b5fca062904adbd3865784cf3fa260a7653e757f8e9cc534a411ed3b92cbe9f4e76ef7fccf84 SHA512 10af50a5c223cfde3248e448ec02f1160bef6b2b66e11e6fc24d3f2a5e6c40d82e9808b9c2ddf3865cd8a15223ebb7acbed4c1e4f247eaed977a18595cf9b3a0 +AUX graphlcd-base-0.1.9-freetype_pkgconfig.patch 906 BLAKE2B 5df340c5e11055ca45ee4f739d44eef28ec861040ca90b105cc8fa05ca1602d984c8ec9e08bcc8007825a3f87110f18371d530d65828b1a0d163fa9a98c2832a SHA512 7665e290b4e5e46fd62186ac1ab97b8245af8d96fa73e274e07c1660dc65c51c9b8048e4e5c0e316aa8c01233e758ef84c9202cf9142b1e92b9f172559081776 DIST graphlcd-base-0.1.9.tgz 130390 BLAKE2B e25180c3679f9625efce94de77842ca296ef3155278727e3c74a657b36b45d0d3c70ceae5eb4b452c5b86ba4f0869a9c80a559fc89cd767423fe8041b2c47334 SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834 -EBUILD graphlcd-base-0.1.9.ebuild 969 BLAKE2B d4b3ffcd7fe2c719a1b50b538fe39f1640792795f3a38b032931b1c4f819a3dcfaa045881779416a343dede27d349c59f4d354730bc733b304282ec00d76aba5 SHA512 8e4ecbde261c813e64e1707992af8c59a22cfa2105ddb7c6265b496ea7ec61d11aaffa3bc2f31ce5a062a667a48dfbfb0ecfc3b8fb5dafd44967338a171a53cf +EBUILD graphlcd-base-0.1.9.ebuild 1057 BLAKE2B 2d1925c6859ad5e99bb183ae9faaa0c3ed7b2d08ef5ae710b017b4af0912c7c5d2790f34b18cac36d00607c1eb0b81b2f72f4816b3dfc09c67dd68317b384872 SHA512 63d3ac21c5980b49fd5c86fcfad5fd26323ea483c560bc987af574fd09d2edaab6767591b5b9afea3896f90233fd54e94741e0596947ce04a5b4a4cc64dbe9a9 MISC metadata.xml 464 BLAKE2B 2f69a92ffc1ac13154404024dade395001526ee2a787526034fa68857b01d41cf278ac4b13814e8f116ba16fa7f9e576d6dc09be8dafd8e4804199dc6194d3ca SHA512 a1c66dfad0b364ba3f03d42701c22f7e67c81fcbd03e8e5228f5072aa78d05ad0b09554173131456d789771cd53d3f77898c46ed853216407ace1786870fbcf9 diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch new file mode 100644 index 000000000000..cbdaf1ceb59a --- /dev/null +++ b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch @@ -0,0 +1,30 @@ +--- graphlcd-base-0.1.9/glcdgraphics/Makefile ++++ graphlcd-base-0.1.9/glcdgraphics/Makefile +@@ -33,9 +33,9 @@ + -include $(DEPFILE) + + ifdef HAVE_FREETYPE2 +- ifneq ($(shell which freetype-config),) +- INCLUDES += $(shell freetype-config --cflags) +- LIBS += $(shell freetype-config --libs) ++ ifneq ($(shell which pkg-config),) ++ INCLUDES += $(shell pkg-config --cflags freetype2) ++ LIBS += $(shell pkg-config --libs freetype2) + else + INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype + LIBS += -lfreetype +--- graphlcd-base-0.1.9/tools/genfont/Makefile ++++ graphlcd-base-0.1.9/tools/genfont/Makefile +@@ -9,10 +9,10 @@ + OBJS = genfont.o + + INCLUDES += -I../../ +-INCLUDES += `freetype-config --cflags` ++INCLUDES += `pkg-config --cflags freetype2` + + LIBDIRS += -L../../glcdgraphics/ +-LIBS += `freetype-config --libs` ++LIBS += `pkg-config --libs freetype2` + + all: $(PRGNAME) + .PHONY: all diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild index 8a5684039573..7c3f216d9771 100644 --- a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild +++ b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,20 +16,26 @@ SLOT="0" LICENSE="GPL-2" IUSE="g15" -DEPEND="media-libs/freetype" -RDEPEND="g15? ( app-misc/g15daemon ) - media-libs/freetype" +CDEPEND="media-libs/freetype" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + g15? ( app-misc/g15daemon )" + +PATCHES=( + "${FILESDIR}/${PN}-0.1.5-nostrip.patch" + "${FILESDIR}/${PN}-0.1.9-freetype_pkgconfig.patch" +) src_prepare() { sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:" - eapply "${FILESDIR}/${PN}-0.1.5-nostrip.patch" + + default sed -i glcdskin/Makefile -e "s:-shared:\$(LDFLAGS) -shared:" #gcc-6 fix sed -i glcddrivers/futabaMDM166A.c -e "s:0xff7f0004:(int) 0xff7f0004:" - - default } src_install() { |