Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/graphlcd-base/files/, app-misc/graphlcd-base/
Date: Thu, 07 Jan 2021 21:09:51
Message-Id: 1610053784.d75027a956ee297b5149d809d2f6e04063e25964.conikost@gentoo
1 commit: d75027a956ee297b5149d809d2f6e04063e25964
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 7 21:04:12 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 7 21:09:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75027a9
7
8 app-misc/graphlcd-base: drop old version
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
12
13 app-misc/graphlcd-base/Manifest | 1 -
14 .../files/graphlcd-base-2.0.0-musl.patch | 23 ------
15 app-misc/graphlcd-base/graphlcd-base-2.0.1.ebuild | 91 ----------------------
16 app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild | 2 -
17 4 files changed, 117 deletions(-)
18
19 diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
20 index 4b8a264d7f3..a9bfd045f09 100644
21 --- a/app-misc/graphlcd-base/Manifest
22 +++ b/app-misc/graphlcd-base/Manifest
23 @@ -1,2 +1 @@
24 -DIST graphlcd-base-2.0.1.tar.bz2 523119 BLAKE2B f918b01908f02c829a03938ec0b3c15eba466c850ac5578d123264106293d1a1fb25b8b184ea8f3f3049093cafc44828097273e9b7bde0e25515f981490abbf4 SHA512 1e745234d9f7dc6a34af75a46983fae11ed39a2dd4e0f2a5530380ee4a0e0d3aef137ebb28f28c1134bfe7bfced813783fffa3e4b45e03f4ddf4b3090dcad24f
25 DIST graphlcd-base-2.0.2.tar.bz2 522939 BLAKE2B aa4cb227872602f408bda5c80e0269945ddd985e93d5964da8cc67466edbc4bb14fc9813b7e95715b049c1b51dfe692bb2426a032df55a60d869a41d9869302b SHA512 218d914f0286b5025dc9a8a0c738bc01f5f0218a5d56fb0a3b7cdd4acdd8dfaa7465e6d6e5606f38efc0bcc80c7d1b755b139372288c1910e27c5113aea15359
26
27 diff --git a/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch b/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch
28 deleted file mode 100644
29 index 40f0039613c..00000000000
30 --- a/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch
31 +++ /dev/null
32 @@ -1,23 +0,0 @@
33 -From 3a473e08ab9e0cc00518409c3e1bf4edb68aecac Mon Sep 17 00:00:00 2001
34 -From: Conrad Kostecki <conikost@g.o>
35 -Date: Mon, 4 Jan 2021 14:51:07 +0100
36 -Subject: [PATCH] glcdgraphics/font.c: fix compilation with musl
37 -
38 -Signed-off-by: Conrad Kostecki <conikost@g.o>
39 ----
40 - glcdgraphics/font.c | 2 +-
41 - 1 file changed, 1 insertion(+), 1 deletion(-)
42 -
43 -diff --git a/glcdgraphics/font.c b/glcdgraphics/font.c
44 -index 20f1274..1b33772 100644
45 ---- a/glcdgraphics/font.c
46 -+++ b/glcdgraphics/font.c
47 -@@ -176,7 +176,7 @@ bool cFont::LoadFNT(const std::string & fileName, const std::string & encoding)
48 -
49 - int y; int loop;
50 - int num = 0;
51 -- uint dot; uint b;
52 -+ unsigned int dot; unsigned int b;
53 - cBitmap * charBitmap = new cBitmap(charWidth, fontHeight);
54 - charBitmap->SetMonochrome(true);
55 - charBitmap->Clear();
56
57 diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.1.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.1.ebuild
58 deleted file mode 100644
59 index 1bb09fbd69c..00000000000
60 --- a/app-misc/graphlcd-base/graphlcd-base-2.0.1.ebuild
61 +++ /dev/null
62 @@ -1,91 +0,0 @@
63 -# Copyright 1999-2021 Gentoo Authors
64 -# Distributed under the terms of the GNU General Public License v2
65 -
66 -EAPI=7
67 -
68 -inherit optfeature toolchain-funcs udev
69 -
70 -DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
71 -HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
72 -SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
73 -
74 -KEYWORDS="amd64 x86"
75 -SLOT="0"
76 -LICENSE="GPL-2"
77 -IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
78 -REQUIRED_USE="?? ( graphicsmagick imagemagick )"
79 -
80 -RDEPEND="
81 - dev-libs/libhid
82 - net-libs/libvncserver
83 - freetype? ( media-libs/freetype:2= )
84 - fontconfig? ( media-libs/fontconfig:1.0= )
85 - graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] )
86 - imagemagick? ( <media-gfx/imagemagick-7 )
87 - lcd_devices_ax206dpf? ( virtual/libusb:0 )
88 - lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
89 -"
90 -
91 -DEPEND="${RDEPEND}"
92 -
93 -BDEPEND="virtual/pkgconfig"
94 -
95 -DOCS=( "HISTORY" "README" "TODO" "docs/." )
96 -
97 -PATCHES=( "${FILESDIR}/${PN}-2.0.0-musl.patch" )
98 -
99 -src_prepare() {
100 - default
101 -
102 - # Change '/usr/local/' to '/usr'
103 - # Change '/usr/lib' to '/usr/$(get_libdir)'
104 - sed -e "34s:/usr/local:/usr:" -e "37s:/lib:/$(get_libdir):" -i Make.config || die
105 -
106 - # Fix newer GCC version with the Futaba MDM166A lcd driver
107 - sed -e "s:0xff7f0004:(int) 0xff7f0004:" -i glcddrivers/futabaMDM166A.c || die
108 -
109 - tc-export CC CXX
110 -}
111 -
112 -src_configure() {
113 - # Build optional drivers
114 - if use lcd_devices_ax206dpf; then
115 - sed -e "78s:#::" -i Make.config || die
116 - fi
117 - if use lcd_devices_picolcd_256x64; then
118 - sed -e "81s:#::" -i Make.config || die
119 - fi
120 - if ! use lcd_devices_vnc; then
121 - sed -e "72s:1:0:" -i Make.config || die
122 - fi
123 -
124 - # Build optional features
125 - if ! use freetype; then
126 - sed -e "59s:HAVE:#HAVE:" -i Make.config || die
127 - fi
128 - if ! use fontconfig; then
129 - sed -e "62s:HAVE:#HAVE:" -i Make.config || die
130 - fi
131 - if use graphicsmagick; then
132 - sed -e "69s:#::" -i Make.config || die
133 - fi
134 - if use imagemagick; then
135 - sed -e "68s:#::" -i Make.config || die
136 - fi
137 -}
138 -
139 -src_install() {
140 - emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install
141 -
142 - einstalldocs
143 -}
144 -
145 -pkg_postinst() {
146 - udev_reload
147 -
148 - optfeature "supporting the logitech g15 keyboard lcd." app-misc/g15daemon
149 -}
150 -
151 -pkg_postrm() {
152 - udev_reload
153 -}
154
155 diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild
156 index 1bb09fbd69c..b633c5ca0c0 100644
157 --- a/app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild
158 +++ b/app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild
159 @@ -32,8 +32,6 @@ BDEPEND="virtual/pkgconfig"
160
161 DOCS=( "HISTORY" "README" "TODO" "docs/." )
162
163 -PATCHES=( "${FILESDIR}/${PN}-2.0.0-musl.patch" )
164 -
165 src_prepare() {
166 default