From patchwork Thu Sep 15 13:52:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 5993 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4MSzDk2s1Vz3wbV for ; Thu, 15 Sep 2022 13:53:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4MSzDh0GMQzBv; Thu, 15 Sep 2022 13:53:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4MSzDg65Sgz2ySb; Thu, 15 Sep 2022 13:53:07 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4MSzDf4fNNz2xHs for ; Thu, 15 Sep 2022 13:53:06 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4MSzDd65MMzBv; Thu, 15 Sep 2022 13:53:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1663249985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rpy70nnsIMzuqwoyfBaW6mytj6qT8F195k5uTX0xN9E=; b=N2hJhNjWwEgueOWyjhGt1C7RVrKx2QduJbQZxByHeejSkOB3wcESaX3J5zyHITa2OQ5R+q 4lAogP/wPIz8+dDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1663249985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rpy70nnsIMzuqwoyfBaW6mytj6qT8F195k5uTX0xN9E=; b=SD+WY33ZXZ9JKhUnShp+Inf+tUekN/Ia5R8oBhuXzm2yuls+GOzTD2lTo0otX+bYTTf+6B jnjKcqOFRKO4LB25nqVhtFksNl6lQFfr6Vvwt7NfF+QFgPCFbD+j1QgeZdHR9a+ozI7mDL V6ca3eEWXW+ny/Ugg0yYsKDARytMzIJa07H4+oxs4xyQYQcAb/aBehX7EzX8aIqFof/rwq VnHyrEftKD1zp0ZteuoqdF+/d92Og98pLaLTjRRoG+1Fd3YGNLrhg8fFY8Y4oFBHPXISXs pqRFi+2bsoXxHuJEUNSrDDMNLn0t4xl9ReL1bxfoVU5xVLZFG66gDKjE4wtKqw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] lcdproc: Update to commit 0e2ce9b version - fixes bug#12920 Date: Thu, 15 Sep 2022 15:52:55 +0200 Message-Id: <20220915135255.10966-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - The lcd2usb portion of the hd44780 driver in in the latest release version of lcdproc (0.5.9) are only coded for libusb-0.1, which was removed from IPFire in recent times. - Commits have been merged into the lcdproc repository that enable lcd2usb to work with the libusb-1.0 series but no release has been made since 2017. - This patch downloaded a zip archive from the status of the lcdproc repository at commit 0e2ce9b. This zip archive was then converted into a tar.gx archive. The lfs and rootfile have been updated in line with this. - The lcdproc-0e2ce9b-4.ipfire file created by this build has been tested by the bug reporter, Rolf Schreiber, and confirmed to fix the issue raised with the bug. - This patch brings lcdproc upto date with the 149 commits that have been made between 2017 and Dec 2021, the date of the last commit. - The version number has been defined as the last commit number. - The -enable-libusb option has to be left in place as it turned out that -enable-libusb-1-0 only works if -enable-libusb is also set. It looks like this was identified in the lcdproc issues list but has not yet been fixed. Fixes: Bug#12920 Signed-off-by: Adolf Belka Reviewed-by: Peter Müller --- config/rootfiles/packages/lcdproc | 3 +-- lfs/lcdproc | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/packages/lcdproc b/config/rootfiles/packages/lcdproc index ba5894dc4..092533c72 100644 --- a/config/rootfiles/packages/lcdproc +++ b/config/rootfiles/packages/lcdproc @@ -21,7 +21,6 @@ usr/lib/lcdproc #usr/lib/lcdproc/CFontzPacket.so #usr/lib/lcdproc/CwLnx.so #usr/lib/lcdproc/EyeboxOne.so -#usr/lib/lcdproc/IOWarrior.so #usr/lib/lcdproc/MD8800.so #usr/lib/lcdproc/MtxOrb.so #usr/lib/lcdproc/NoritakeVFD.so @@ -39,6 +38,7 @@ usr/lib/lcdproc #usr/lib/lcdproc/imonlcd.so #usr/lib/lcdproc/irtrans.so #usr/lib/lcdproc/joy.so +#usr/lib/lcdproc/jw002.so #usr/lib/lcdproc/lb216.so #usr/lib/lcdproc/lcdm001.so #usr/lib/lcdproc/lcterm.so @@ -53,7 +53,6 @@ usr/lib/lcdproc #usr/lib/lcdproc/sed1520.so #usr/lib/lcdproc/serialPOS.so #usr/lib/lcdproc/serialVFD.so -#usr/lib/lcdproc/shuttleVFD.so #usr/lib/lcdproc/sli.so #usr/lib/lcdproc/stv5730.so #usr/lib/lcdproc/t6963.so diff --git a/lfs/lcdproc b/lfs/lcdproc index 2b47e40f3..6977c8708 100644 --- a/lfs/lcdproc +++ b/lfs/lcdproc @@ -26,7 +26,7 @@ include Config SUMMARY = Daemon capable of showing info on LCD displays -VER = 0.5.9 +VER = 0e2ce9b THISAPP = lcdproc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lcdproc -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 +$(DL_FILE)_BLAKE2 = e35471d3f77eeeaa90a87881a85163e8f551de1f198ce8d3821da15bdc3489149b0a6a5d40c7ad4412d50204d5009c7863613d80851f67bb28933c5bdb603fe4 install : $(TARGET) @@ -84,18 +84,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && \ ./configure \ --prefix=/usr \ --sysconfdir=/etc/lcdproc \ --enable-libusb \ + --enable-libusb-1-0 \ --enable-drivers=all \ - --enable-permissive-menu-goto \ --enable-lcdproc-menus \ --enable-stat-nfs \ --enable-stat-smbfs \ - --with-lcdport=13666 \ - --enable-seamless-hbars + --with-lcdport=13666 cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -mkdir -pv /etc/lcdproc