From nobody Mon Jan 10 15:03:13 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6764F194E3C8; Mon, 10 Jan 2022 15:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JXcX20Klcz3jJT; Mon, 10 Jan 2022 15:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E0B7427613; Mon, 10 Jan 2022 15:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20AF3DwP020930; Mon, 10 Jan 2022 15:03:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20AF3DmI020929; Mon, 10 Jan 2022 15:03:13 GMT (envelope-from git) Date: Mon, 10 Jan 2022 15:03:13 GMT Message-Id: <202201101503.20AF3DmI020929@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: fa24020b477a - main - graphics/airsaned: update to 0.3.2.54 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa24020b477a2a37a01dedf11bfd83e744f81cd1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641826994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2tDf+EIq+YUtMTEfCQUZSEJsp4fh6Hrddkn5RwX/Dt8=; b=Mp6XH4TZ1Hc7TA7trueS6YCqpVltadRvPh17Z48sP1ZDBEUc1JUetXcNZTvNYgqps2n+5L Y4/5aN3woHs3uFX3UhLTvFZ6uaTZsCaEur1JvaTscYzKsi0yY0XC7qZUq33yW5WC2oBUSO OzGWPrfBEKYvxAhSGY0SqENvzUVP+3LnUVAAYnI4mwG3wUXMW1SqhrmEwrvY6JDldy4/0A 7wehL68dMRr4I7+3vGDDzStn4HkgSmssy2qx1xrQeQkv4xHuyZaTo+oteG7R7UD2uA07Wx UHmDyI+LvyaSqaCpy3ZZkm+Isg8csQK2PUzM7S85e2QQGXOhVGsZsXcnUHSz0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641826994; a=rsa-sha256; cv=none; b=ZKT/4KLzfIMD9nTj19s0qZMcE2ndMSXdUC69mxA9K2RoaoILEjdof8KOtATxlKRDnG6t+9 CrWZG1RgvFwVIaQ1j4k56UWhVPz82qIR/FjhNKNwM8oN76I6hwOfvRlHGDRbErid54x4pN hfZhEJWhBZbNmUGift46djYH3gyuXLEY2XibBzPMcodjfWGDl5feX7Gj5baWPkgweE9i55 JfVW15edfCx87j9F5ttnJQkdn0occPbSmCWUGAew8ynnO0eq5OzI0rEhu6KPuIngf22L0V evvyKLzpzi2quexq6z/Z/waAqpDr7wYsdvJCUBN+KWY5n8dAw07OW5NEvhSs/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa24020b477a2a37a01dedf11bfd83e744f81cd1 commit fa24020b477a2a37a01dedf11bfd83e744f81cd1 Author: J.R. Oldroyd AuthorDate: 2022-01-10 12:51:02 +0000 Commit: Fernando Apesteguía CommitDate: 2022-01-10 15:01:35 +0000 graphics/airsaned: update to 0.3.2.54 PR: 261068 Reported by: fbsd@opal.com (maintainer) --- graphics/airsaned/Makefile | 11 +-- graphics/airsaned/distinfo | 6 +- graphics/airsaned/files/patch-CMakeLists.txt | 80 +++++++++------------- .../files/patch-imageformats-pngencoder.cpp | 4 +- ...rver-server.cpp => patch-server-mainserver.cpp} | 8 +-- graphics/airsaned/files/patch-web-httpserver.cpp | 4 +- graphics/airsaned/pkg-plist | 2 +- 7 files changed, 52 insertions(+), 63 deletions(-) diff --git a/graphics/airsaned/Makefile b/graphics/airsaned/Makefile index 0806d824d9aa..b5b93f4df58c 100644 --- a/graphics/airsaned/Makefile +++ b/graphics/airsaned/Makefile @@ -1,7 +1,7 @@ PORTNAME= airsaned DISTVERSIONPREFIX= v -DISTVERSION= 0.3.2-50 -DISTVERSIONSUFFIX= -gdeab313 +DISTVERSION= 0.3.2-54 +DISTVERSIONSUFFIX= -g53909a5 CATEGORIES= graphics MAINTAINER= fbsd@opal.com @@ -16,14 +16,17 @@ LIB_DEPENDS= libavahi-client.so:net/avahi-app \ USES= cmake compiler:c++11-lib jpeg localbase:ldflags USE_GITHUB= yes -USE_RC_SUBR= ${PORTNAME} GH_ACCOUNT= SimulPiscator GH_PROJECT= AirSane +USE_RC_SUBR= ${PORTNAME} + post-patch: + @${REINPLACE_CMD} -e 's|%%STAGEDIR%%|${STAGEDIR}|g' \ + ${PATCH_WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${PATCH_WRKSRC}/server/server.cpp + ${PATCH_WRKSRC}/server/mainserver.cpp post-install: @${MV} ${STAGEDIR}${PREFIX}/etc/airsane/ignore.conf ${STAGEDIR}${PREFIX}/etc/airsane/ignore.conf.sample diff --git a/graphics/airsaned/distinfo b/graphics/airsaned/distinfo index ff969aa19d17..6e327c6195e6 100644 --- a/graphics/airsaned/distinfo +++ b/graphics/airsaned/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633432825 -SHA256 (SimulPiscator-AirSane-v0.3.2-50-gdeab313_GH0.tar.gz) = a9df4ed9de8f59f07fe9d491bf9eb96c8168001ba0025b96bf97c39ac49e35e9 -SIZE (SimulPiscator-AirSane-v0.3.2-50-gdeab313_GH0.tar.gz) = 115706 +TIMESTAMP = 1641754683 +SHA256 (SimulPiscator-AirSane-v0.3.2-54-g53909a5_GH0.tar.gz) = 64b4b81bb65b0a69dead944a063b0bf4276d8772749b24c4c7fa87134c819e80 +SIZE (SimulPiscator-AirSane-v0.3.2-54-g53909a5_GH0.tar.gz) = 114019 diff --git a/graphics/airsaned/files/patch-CMakeLists.txt b/graphics/airsaned/files/patch-CMakeLists.txt index 34f75f731952..72fce98f6e20 100644 --- a/graphics/airsaned/files/patch-CMakeLists.txt +++ b/graphics/airsaned/files/patch-CMakeLists.txt @@ -1,19 +1,11 @@ ---- CMakeLists.txt.orig 2021-09-18 16:22:32 UTC +--- CMakeLists.txt.orig 2021-02-01 18:41:51 UTC +++ CMakeLists.txt -@@ -20,6 +20,7 @@ endif() - - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) -+include(GNUInstallDirs) - - include_directories(.) - if(APPLE) -@@ -66,6 +67,13 @@ add_executable(${PROJECT_NAME} +@@ -67,6 +67,13 @@ add_executable(${PROJECT_NAME} zeroconf/hotplugnotifier.cpp ${ZEROCONF_FILES} ) + -+if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) ++if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + set(USB_LIBRARY usb) +else() + set(USB_LIBRARY usb-1.0) @@ -22,7 +14,7 @@ target_link_libraries( ${PROJECT_NAME} Threads::Threads -@@ -73,7 +81,7 @@ target_link_libraries( +@@ -74,7 +79,7 @@ target_link_libraries( jpeg png ${ZEROCONF_LIBS} @@ -31,41 +23,35 @@ ) if(APPLE) -@@ -105,8 +113,10 @@ install(CODE " - else() +@@ -102,8 +107,31 @@ install(CODE " + endif() + ") - install(TARGETS ${PROJECT_NAME} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${BINDIR} - ) -+ -+if(CMAKE_SYSTEM_NAME STREQUAL Linux) - install(FILES systemd/airsaned.service - DESTINATION /lib/systemd/system - ) -@@ -114,21 +124,9 @@ install(FILES systemd/airsaned.default - DESTINATION /etc/default - RENAME airsane - ) -+endif() ++elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") --install(CODE " -- if(NOT EXISTS /etc/airsane/ignore.conf) -- file(INSTALL ${CMAKE_SOURCE_DIR}/etc/ignore.conf DESTINATION /etc/airsane) -- endif() --") --install(CODE " -- if(NOT EXISTS /etc/airsane/options.conf) -- file(INSTALL ${CMAKE_SOURCE_DIR}/etc/options.conf DESTINATION /etc/airsane) -- endif() --") --install(CODE " -- if(NOT EXISTS /etc/airsane/Gnome-scanner.png) -- file(INSTALL ${CMAKE_SOURCE_DIR}/etc/Gnome-scanner.png DESTINATION /etc/airsane) -- endif() --") -- -+install(FILES etc/ignore.conf etc/options.conf etc/Gnome-scanner.png -+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/airsane ++set(STAGEDIR "%%STAGEDIR%%") ++ ++install(TARGETS ${PROJECT_NAME} ++ RUNTIME DESTINATION sbin +) - endif() ++ ++install(CODE " ++ if(NOT EXISTS ${STAGEDIR}/usr/local/etc/airsane/ignore.conf) ++ file(INSTALL ${CMAKE_SOURCE_DIR}/etc/ignore.conf DESTINATION /usr/local/etc/airsane) ++ endif() ++") ++install(CODE " ++ if(NOT EXISTS ${STAGEDIR}/usr/local/etc/airsane/options.conf) ++ file(INSTALL ${CMAKE_SOURCE_DIR}/etc/options.conf DESTINATION /usr/local/etc/airsane) ++ endif() ++") ++install(CODE " ++ if(NOT EXISTS ${STAGEDIR}/usr/local/etc/airsane/Gnome-scanner.png) ++ file(INSTALL ${CMAKE_SOURCE_DIR}/etc/Gnome-scanner.png DESTINATION /usr/local/etc/airsane) ++ endif() ++") ++ + else() + + install(TARGETS ${PROJECT_NAME} + RUNTIME DESTINATION bin diff --git a/graphics/airsaned/files/patch-imageformats-pngencoder.cpp b/graphics/airsaned/files/patch-imageformats-pngencoder.cpp index cb604abf0c26..14d8e66c4d75 100644 --- a/graphics/airsaned/files/patch-imageformats-pngencoder.cpp +++ b/graphics/airsaned/files/patch-imageformats-pngencoder.cpp @@ -1,4 +1,4 @@ ---- imageformats/pngencoder.cpp.orig 2021-10-05 12:35:03 UTC +--- imageformats/pngencoder.cpp.orig 2021-02-01 18:41:51 UTC +++ imageformats/pngencoder.cpp @@ -17,11 +17,17 @@ along with this program. If not, see +#else - #include + #include +#endif #include #include diff --git a/graphics/airsaned/files/patch-server-server.cpp b/graphics/airsaned/files/patch-server-mainserver.cpp similarity index 65% rename from graphics/airsaned/files/patch-server-server.cpp rename to graphics/airsaned/files/patch-server-mainserver.cpp index e54242f6f2b1..5eb30b1a912f 100644 --- a/graphics/airsaned/files/patch-server-server.cpp +++ b/graphics/airsaned/files/patch-server-mainserver.cpp @@ -1,6 +1,6 @@ ---- server/server.cpp.orig 2021-10-05 17:07:11 UTC -+++ server/server.cpp -@@ -103,11 +103,11 @@ Server::Server(int argc, char** argv) +--- server/mainserver.cpp.orig 2021-02-01 18:41:51 UTC ++++ server/mainserver.cpp +@@ -83,11 +83,11 @@ MainServer::MainServer(int argc, char** argv) "ignore SANE network scanners", localonly }, { "options-file", @@ -13,4 +13,4 @@ + "%%PREFIX%%/etc/airsane/ignore.conf", "location of device ignore list", ignorelist }, - { "debug", "false", "log debug information to stderr", debug }, + { "random-uuids", diff --git a/graphics/airsaned/files/patch-web-httpserver.cpp b/graphics/airsaned/files/patch-web-httpserver.cpp index 0f120845e0d7..cae26d5639a5 100644 --- a/graphics/airsaned/files/patch-web-httpserver.cpp +++ b/graphics/airsaned/files/patch-web-httpserver.cpp @@ -1,6 +1,6 @@ ---- web/httpserver.cpp.orig 2021-10-05 12:35:03 UTC +--- web/httpserver.cpp.orig 2021-02-01 18:41:51 UTC +++ web/httpserver.cpp -@@ -25,6 +25,9 @@ along with this program. If not, see #include diff --git a/graphics/airsaned/pkg-plist b/graphics/airsaned/pkg-plist index beed33b17baa..6d01b36085bb 100644 --- a/graphics/airsaned/pkg-plist +++ b/graphics/airsaned/pkg-plist @@ -1,4 +1,4 @@ -bin/airsaned +sbin/airsaned etc/airsane/Gnome-scanner.png @sample etc/airsane/ignore.conf.sample @sample etc/airsane/options.conf.sample