commit: 6063c4dab77c3dd46e92cd39e6e9d90fbbeab956 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Tue Jun 21 00:59:35 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 21 01:20:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6063c4da
app-misc/lcd4linux: Fix the build with rlibtool Closes: https://bugs.gentoo.org/783492 Upstream-PR: https://github.com/jmccrohan/lcd4linux/pull/3 Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/26013 Signed-off-by: Sam James <sam <AT> gentoo.org> .../lcd4linux-0.11.0_pre20170527-libtool.patch | 40 ++++ .../lcd4linux-0.11.0_pre20170527-r7.ebuild | 202 +++++++++++++++++++++ 2 files changed, 242 insertions(+) diff --git a/app-misc/lcd4linux/files/lcd4linux-0.11.0_pre20170527-libtool.patch b/app-misc/lcd4linux/files/lcd4linux-0.11.0_pre20170527-libtool.patch new file mode 100644 index 000000000000..3ba98fdc1503 --- /dev/null +++ b/app-misc/lcd4linux/files/lcd4linux-0.11.0_pre20170527-libtool.patch @@ -0,0 +1,40 @@ +Upstream-PR: https://github.com/jmccrohan/lcd4linux/pull/3 + +From cffb509a8471b26177de0887e5461a408fdb8e35 Mon Sep 17 00:00:00 2001 +From: orbea <[email protected]> +Date: Mon, 20 Jun 2022 17:43:23 -0700 +Subject: [PATCH] configure: Use macros earlier + +When building with slibtool using the rlibtool symlink the build will +fail because it doesn't find the generated libtool. This is required so +rlibtool can determine if its a shared or static build. + +This can be fixed easily by using LT_INIT earlier before AC_OUTPUT. +Generally these should be used near the top of configure.ac. + +Gentoo Bug: https://bugs.gentoo.org/783492 +--- a/configure.ac ++++ b/configure.ac +@@ -29,6 +29,7 @@ + + AC_PREREQ(2.59) + AC_INIT([LCD4Linux],[0.11.0-SVN],[[email protected]]) ++AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([lcd4linux.c]) + AM_INIT_AUTOMAKE + AM_CONFIG_HEADER(config.h) +@@ -40,6 +41,7 @@ AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET + PKG_PROG_PKG_CONFIG ++LT_INIT + + # dmalloc + AM_WITH_DMALLOC +@@ -171,6 +173,3 @@ AC_MSG_RESULT( + [ $PLUGINS] + [-----------------------------------------] + ) +- +-AC_CONFIG_MACRO_DIR([m4]) +-LT_INIT diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r7.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r7.ebuild new file mode 100644 index 000000000000..2f2874567136 --- /dev/null +++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r7.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools flag-o-matic python-single-r1 + +DESCRIPTION="A small program that grabs information and displays it on an external LCD" +HOMEPAGE="https://github.com/jmccrohan/lcd4linux/"; +SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.bz2"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dmalloc outb" +REQUIRED_USE=" + ?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +# Define the list of valid lcd devices. +# Some drivers were removed from this list: +# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree. +# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel. +# - st2205: It's needs dev-libs/libst2205, which made it never to the portage tree and is quite outdated. +IUSE_LCD_DEVICES=( + ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD + FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530 + MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson + PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD + SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11 +) + +# Define the list of valid lcd4linux plugins. +# Some plugins were removed from this list: +# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server. +# - ppp: It has been replaced by the netdev plugin. +# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible. +# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible. +IUSE_LCD4LINUX_PLUGINS=( + apm asterisk button-exec cpuinfo dbus diskstats dvb exec event + fifo file gps hddtemp huawei i2c-sensors iconv isdn kvv + loadavg meminfo mpd mpris-dbus mysql netdev netinfo pop3 + proc-stat python qnaplog raspi sample statfs uname uptime + w1retap wireless +) + +# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE' +REQUIRED_USE+=" || ( " +for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do + LCD_DEVICE=${LCD_DEVICE,,} + IUSE+=" lcd_devices_${LCD_DEVICE} " + REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} " +done +REQUIRED_USE+=" ) " +unset LCD_DEVICE + +# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE' +IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} " +REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) " + +# Define dependencies for all drivers in 'IUSE_LCD_DEVICES' +DEPEND_LCD_DEVICES=" + lcd_devices_astusb? ( virtual/libusb:0= ) + lcd_devices_bwct? ( virtual/libusb:0= ) + lcd_devices_curses? ( sys-libs/ncurses:0= ) + lcd_devices_dpf? ( virtual/libusb:0= ) + lcd_devices_g15? ( virtual/libusb:0= ) + lcd_devices_glcd2usb? ( virtual/libusb:0= ) + lcd_devices_irlcd? ( virtual/libusb:0= ) + lcd_devices_lcd2usb? ( virtual/libusb:0= ) + lcd_devices_ledmatrix? ( virtual/libusb:0= ) + lcd_devices_luise? ( + dev-libs/luise + virtual/libusb:0= + ) + lcd_devices_matrixorbitalgx? ( virtual/libusb:0= ) + lcd_devices_mdm166a? ( virtual/libusb:0= ) + lcd_devices_picolcd? ( virtual/libusb:0= ) + lcd_devices_picolcdgraphic? ( virtual/libusb:0= ) + lcd_devices_png? ( + media-libs/gd[png] + media-libs/libpng:0= + ) + lcd_devices_ppm? ( media-libs/gd ) + lcd_devices_samsungspf? ( virtual/libusb:0= ) + lcd_devices_serdisplib? ( dev-libs/serdisplib ) + lcd_devices_shuttlevfd? ( virtual/libusb:0= ) + lcd_devices_trefon? ( virtual/libusb:0= ) + lcd_devices_ula200? ( + dev-embedded/libftdi:1= + virtual/libusb:0= + ) + lcd_devices_usbhub? ( virtual/libusb:0= ) + lcd_devices_usblcd? ( virtual/libusb:0= ) + lcd_devices_vnc? ( net-libs/libvncserver ) + lcd_devices_x11? ( x11-libs/libX11 ) +" + +# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS' +DEPEND_LCD4LINUX_PLUGINS=" + asterisk? ( net-misc/asterisk ) + dbus? ( sys-apps/dbus ) + gps? ( dev-libs/nmeap ) + hddtemp? ( app-admin/hddtemp ) + iconv? ( virtual/libiconv ) + mpd? ( media-libs/libmpd ) + mpris-dbus? ( sys-apps/dbus ) + mysql? ( dev-db/mysql-connector-c:0= ) + python? ( ${PYTHON_DEPS} ) + wireless? ( + || ( + net-wireless/iw + net-wireless/wireless-tools + ) + ) +" + +RDEPEND=" + dmalloc? ( dev-libs/dmalloc ) + ${DEPEND_LCD_DEVICES} + ${DEPEND_LCD4LINUX_PLUGINS} +" + +DEPEND="${RDEPEND}" + +BDEPEND="sys-devel/autoconf-archive" + +PATCHES=( + "${FILESDIR}/${P}-libtool.patch" # 783492 + "${FILESDIR}/${P}-python3.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + if use python; then + # Shipped one is outdated and doesn't know python3, use system's instead. + rm ax_python_devel.m4 + + # Use correct python version. + # (See: bug #793869) + append-libs $(python_get_LIBS) + fi + + eautoreconf +} + +src_configure() { + # Enable all users enabled lcd devices + local myeconfargs_lcd_devices + for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do + if use "lcd_devices_${lcd_device,,}"; then + myeconfargs_lcd_devices+=",${lcd_device}" + fi + done + + # Enable all users enabled lcd4linux plugins + local myeconfargs_lcd4linux_plugins + for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do + if use "${lcd4linux_plugin}"; then + myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin/-/_}" + fi + done + + local myeconfargs=( + --disable-rpath + $(use_with dmalloc) + $(use_with outb) + $(use_with python) + $(use_with lcd_devices_x11 x) + --with-drivers="${myeconfargs_lcd_devices#,}" + --with-plugins="${myeconfargs_lcd4linux_plugins#,}" + --x-include="/usr/include" + --x-libraries="/usr/$(get_libdir)" + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Install sample config, and must have 600, as lcd4linux checks this. + insinto /etc/lcd4linux + insopts -m 0600 + doins lcd4linux.conf.sample + + newinitd "${FILESDIR}/lcd4linux-r2.initd" lcd4linux +} + +pkg_postinst() { + if [[ ! -z ${REPLACING_VERSIONS} ]]; then + use python && einfo "Starting with this version, the python plugins now uses python3 instead of python2!" + fi +}
