commit: d75027a956ee297b5149d809d2f6e04063e25964 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Thu Jan 7 21:04:12 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Thu Jan 7 21:09:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75027a9
app-misc/graphlcd-base: drop old version Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> app-misc/graphlcd-base/Manifest | 1 - .../files/graphlcd-base-2.0.0-musl.patch | 23 ------ app-misc/graphlcd-base/graphlcd-base-2.0.1.ebuild | 91 ---------------------- app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild | 2 - 4 files changed, 117 deletions(-) diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest index 4b8a264d7f3..a9bfd045f09 100644 --- a/app-misc/graphlcd-base/Manifest +++ b/app-misc/graphlcd-base/Manifest @@ -1,2 +1 @@ -DIST graphlcd-base-2.0.1.tar.bz2 523119 BLAKE2B f918b01908f02c829a03938ec0b3c15eba466c850ac5578d123264106293d1a1fb25b8b184ea8f3f3049093cafc44828097273e9b7bde0e25515f981490abbf4 SHA512 1e745234d9f7dc6a34af75a46983fae11ed39a2dd4e0f2a5530380ee4a0e0d3aef137ebb28f28c1134bfe7bfced813783fffa3e4b45e03f4ddf4b3090dcad24f DIST graphlcd-base-2.0.2.tar.bz2 522939 BLAKE2B aa4cb227872602f408bda5c80e0269945ddd985e93d5964da8cc67466edbc4bb14fc9813b7e95715b049c1b51dfe692bb2426a032df55a60d869a41d9869302b SHA512 218d914f0286b5025dc9a8a0c738bc01f5f0218a5d56fb0a3b7cdd4acdd8dfaa7465e6d6e5606f38efc0bcc80c7d1b755b139372288c1910e27c5113aea15359 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 deleted file mode 100644 index 40f0039613c..00000000000 --- a/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3a473e08ab9e0cc00518409c3e1bf4edb68aecac Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conik...@gentoo.org> -Date: Mon, 4 Jan 2021 14:51:07 +0100 -Subject: [PATCH] glcdgraphics/font.c: fix compilation with musl - -Signed-off-by: Conrad Kostecki <conik...@gentoo.org> ---- - glcdgraphics/font.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glcdgraphics/font.c b/glcdgraphics/font.c -index 20f1274..1b33772 100644 ---- a/glcdgraphics/font.c -+++ b/glcdgraphics/font.c -@@ -176,7 +176,7 @@ bool cFont::LoadFNT(const std::string & fileName, const std::string & encoding) - - int y; int loop; - int num = 0; -- uint dot; uint b; -+ unsigned int dot; unsigned int b; - cBitmap * charBitmap = new cBitmap(charWidth, fontHeight); - charBitmap->SetMonochrome(true); - charBitmap->Clear(); diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.1.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.1.ebuild deleted file mode 100644 index 1bb09fbd69c..00000000000 --- a/app-misc/graphlcd-base/graphlcd-base-2.0.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit optfeature toolchain-funcs udev - -DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD" -HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base" -SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2" - -KEYWORDS="amd64 x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc" -REQUIRED_USE="?? ( graphicsmagick imagemagick )" - -RDEPEND=" - dev-libs/libhid - net-libs/libvncserver - freetype? ( media-libs/freetype:2= ) - fontconfig? ( media-libs/fontconfig:1.0= ) - graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] ) - imagemagick? ( <media-gfx/imagemagick-7 ) - lcd_devices_ax206dpf? ( virtual/libusb:0 ) - lcd_devices_picolcd_256x64? ( virtual/libusb:0 ) -" - -DEPEND="${RDEPEND}" - -BDEPEND="virtual/pkgconfig" - -DOCS=( "HISTORY" "README" "TODO" "docs/." ) - -PATCHES=( "${FILESDIR}/${PN}-2.0.0-musl.patch" ) - -src_prepare() { - default - - # Change '/usr/local/' to '/usr' - # Change '/usr/lib' to '/usr/$(get_libdir)' - sed -e "34s:/usr/local:/usr:" -e "37s:/lib:/$(get_libdir):" -i Make.config || die - - # Fix newer GCC version with the Futaba MDM166A lcd driver - sed -e "s:0xff7f0004:(int) 0xff7f0004:" -i glcddrivers/futabaMDM166A.c || die - - tc-export CC CXX -} - -src_configure() { - # Build optional drivers - if use lcd_devices_ax206dpf; then - sed -e "78s:#::" -i Make.config || die - fi - if use lcd_devices_picolcd_256x64; then - sed -e "81s:#::" -i Make.config || die - fi - if ! use lcd_devices_vnc; then - sed -e "72s:1:0:" -i Make.config || die - fi - - # Build optional features - if ! use freetype; then - sed -e "59s:HAVE:#HAVE:" -i Make.config || die - fi - if ! use fontconfig; then - sed -e "62s:HAVE:#HAVE:" -i Make.config || die - fi - if use graphicsmagick; then - sed -e "69s:#::" -i Make.config || die - fi - if use imagemagick; then - sed -e "68s:#::" -i Make.config || die - fi -} - -src_install() { - emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install - - einstalldocs -} - -pkg_postinst() { - udev_reload - - optfeature "supporting the logitech g15 keyboard lcd." app-misc/g15daemon -} - -pkg_postrm() { - udev_reload -} diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild index 1bb09fbd69c..b633c5ca0c0 100644 --- a/app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild +++ b/app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild @@ -32,8 +32,6 @@ BDEPEND="virtual/pkgconfig" DOCS=( "HISTORY" "README" "TODO" "docs/." ) -PATCHES=( "${FILESDIR}/${PN}-2.0.0-musl.patch" ) - src_prepare() { default