From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
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
Content-Type: multipart/mixed; boundary="===============6789398237558144206=="
List-Id: <development.lists.ipfire.org>

--===============6789398237558144206==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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 IPFi=
re 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 reposito=
ry at commit
   0e2ce9b. This zip archive was then converted into a tar.gx archive. The lf=
s 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 b=
ug.
- This patch brings lcdproc upto date with the 149 commits that have been mad=
e 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 <adolf.belka(a)ipfire.org>
---
 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/lc=
dproc
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
=20
 SUMMARY    =3D Daemon capable of showing info on LCD displays
=20
-VER        =3D 0.5.9
+VER        =3D 0e2ce9b
=20
 THISAPP    =3D lcdproc-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D lcdproc
-PAK_VER    =3D 3
+PAK_VER    =3D 4
=20
 DEPS       =3D
=20
@@ -50,7 +50,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb47=
82da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17
+$(DL_FILE)_BLAKE2 =3D e35471d3f77eeeaa90a87881a85163e8f551de1f198ce8d3821da1=
5bdc3489149b0a6a5d40c7ad4412d50204d5009c7863613d80851f67bb28933c5bdb603fe4
=20
 install : $(TARGET)
=20
@@ -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=3D/usr \
 			--sysconfdir=3D/etc/lcdproc \
 			--enable-libusb \
+			--enable-libusb-1-0 \
 			--enable-drivers=3Dall \
-			--enable-permissive-menu-goto \
 			--enable-lcdproc-menus \
 			--enable-stat-nfs \
 			--enable-stat-smbfs \
-			--with-lcdport=3D13666 \
-			--enable-seamless-hbars
+			--with-lcdport=3D13666
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	-mkdir -pv /etc/lcdproc
--=20
2.37.3


--===============6789398237558144206==--