summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConrad Kostecki <conikost@gentoo.org>2022-07-16 21:02:05 +0200
committerConrad Kostecki <conikost@gentoo.org>2022-07-16 21:05:11 +0200
commit0b133d317e68d3b31760a6955619808d5c14fcd0 (patch)
treec7488ea0d7ea30818411540f67aada9d1e3d066c /app-misc/graphlcd-base
parentprofiles: amd64/x86: Add missing kio-misc/kio-gdrive[share] mask (diff)
downloadgentoo-0b133d317e68d3b31760a6955619808d5c14fcd0.tar.gz
gentoo-0b133d317e68d3b31760a6955619808d5c14fcd0.tar.bz2
gentoo-0b133d317e68d3b31760a6955619808d5c14fcd0.zip
app-misc/graphlcd-base: drop support for imagemagick
Dropping support for imagemagick, as only imagemagick-6 is supported, but not imagemagick-7. Code is old and does not support imagemagick-7. Adding support is not trival, as code needs to be rewritten. Since GraphicsMagick is supported as an alternative, we will now use this as default, hence dropping graphicsmagick use flag too. Closes: https://bugs.gentoo.org/858437 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'app-misc/graphlcd-base')
-rw-r--r--app-misc/graphlcd-base/graphlcd-base-2.0.3-r1.ebuild (renamed from app-misc/graphlcd-base/graphlcd-base-2.0.3.ebuild)15
-rw-r--r--app-misc/graphlcd-base/metadata.xml2
2 files changed, 5 insertions, 12 deletions
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.3.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.3-r1.ebuild
index 428b379d979a..be25edf67fd8 100644
--- a/app-misc/graphlcd-base/graphlcd-base-2.0.3.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.3-r1.ebuild
@@ -12,16 +12,14 @@ 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 )"
+IUSE="fontconfig freetype lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
RDEPEND="
dev-libs/libhid
+ media-gfx/graphicsmagick:0/1.3[cxx]
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 )
"
@@ -46,6 +44,9 @@ src_prepare() {
}
src_configure() {
+ # Use always GraphicsMagick
+ sed -e "69s:#::" -i Make.config || die
+
# Build optional drivers
if use lcd_devices_ax206dpf; then
sed -e "78s:#::" -i Make.config || die
@@ -64,12 +65,6 @@ src_configure() {
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() {
diff --git a/app-misc/graphlcd-base/metadata.xml b/app-misc/graphlcd-base/metadata.xml
index 9d640b6cfa37..6d4dd80259e1 100644
--- a/app-misc/graphlcd-base/metadata.xml
+++ b/app-misc/graphlcd-base/metadata.xml
@@ -20,7 +20,5 @@
<use>
<flag name="fontconfig">Add support for <pkg>media-libs/fontconfig</pkg> font names.</flag>
<flag name="freetype">Add support for <pkg>media-libs/freetype</pkg>.</flag>
- <flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg>.</flag>
- <flag name="imagemagick">Add support for <pkg>media-gfx/imagemagick</pkg>.</flag>
</use>
</pkgmetadata>