freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

graphics/epsonscan2: Fix build error on 16-current: "if (a <= b <= c)"

Browse Source 
Fix compilation error for "if (a <= b <= c)".

While here:
- Replace PORTVERSION with DISTVERSION.
- Move dependency from boost to BUILD_DEPENDS - the port is not linked
  with boost libs, but uses includes during build.
- Remove unnecessary "CFLAGS+=".

PR:		294951
Sponsored by:	UNIS Labs
Co-authored-by:	Vladimir Druzenko <vvd@FreeBSD.org>
MFH:		2026Q2
This commit is contained in:
J.R. Oldroyd
2026-05-03 11:26:50 +03:00
committed by Vladimir Druzenko
parent 558fdf070c
commit 5337e3e6d8
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/epsonscan2/Makefile
+6 -8
View File
@@ -1,9 +1,9 @@
PORTNAME= epsonscan2
DISTVERSION= 6.7.70.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/16/14/37/7577ee65efdad48ee2d2f38d9eda75418e490552/
DISTNAME= ${PORTNAME}-${PORTVERSION}-1.src
DISTNAME= ${PORTNAME}-${DISTVERSION}-1.src
MAINTAINER= fbsd@opal.com
COMMENT= Epson Scan 2 scanner driver
@@ -12,9 +12,9 @@ WWW= https://download.ebz.epson.net/man/linux/epsonscan2_e.html
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= sane-config:graphics/sane-backends
LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \
libpng.so:graphics/png \
BUILD_DEPENDS= sane-config:graphics/sane-backends \
boost-libs>=1.36.0:devel/boost-libs
LIB_DEPENDS= libpng.so:graphics/png \
libtiff.so:graphics/tiff
USES= cmake jpeg localbase qt:5 xorg
@@ -26,12 +26,10 @@ EPSON_VERSION= 1.0.0.0
CONFIGURE_ENV+= STAGEDIR=${STAGEDIR}
CFLAGS+= -I${PREFIX}/include
SUB_FILES= pkg-message \
Read_me.FreeBSD
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-1
OPTIONS_DEFINE= AVAHI
OPTIONS_DEFAULT= AVAHI
graphics/epsonscan2/files/patch-src_ScanSDK_Src_SDK_ScanMgr.cpp
+20
View File
@@ -0,0 +1,20 @@
--- src/ScanSDK/Src/SDK/ScanMgr.cpp.orig 2024-09-12 07:10:37 UTC
+++ src/ScanSDK/Src/SDK/ScanMgr.cpp
@@ -298,7 +298,7 @@ BOOL CScanMgr::setSettingParameter(const eSpecifiedPar
switch (SpecifiedParameter)
{
case SP_SLEEP_TIMER:
- if (m_sv->device_data.SleepTime.capability.minValue <= setparam <= m_sv->device_data.SleepTime.capability.maxValue){
+ if (m_sv->device_data.SleepTime.capability.minValue <= setparam && setparam <= m_sv->device_data.SleepTime.capability.maxValue){
m_sv->device_data.SleepTime.select = setparam;
parameter_exist = TRUE;
SDI_TRACE_LOG("[INFO]setSettingParameter SleepTime set: %d", m_sv->device_data.SleepTime.select);
@@ -316,7 +316,7 @@ BOOL CScanMgr::setSettingParameter(const eSpecifiedPar
}
}
}else{
- if (m_sv->device_data.AutoPowerOffTime.capability.minValue <= setparam <= m_sv->device_data.AutoPowerOffTime.capability.maxValue){
+ if (m_sv->device_data.AutoPowerOffTime.capability.minValue <= setparam && setparam <= m_sv->device_data.AutoPowerOffTime.capability.maxValue){
m_sv->device_data.AutoPowerOffTime.select = setparam;
parameter_exist = TRUE;
SDI_TRACE_LOG("[INFO]setSettingParameter AutoPowerOffTime set: %d", m_sv->device_data.AutoPowerOffTime.select);