From nobody Tue May 24 17:36:28 2022 X-Original-To: dev-commits-ports-main@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 981ED1B4A10A; Tue, 24 May 2022 17:36:28 +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 4L71b03blpz3jFc; Tue, 24 May 2022 17:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653413788; 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=GcDD7C3RfvY2hmJFaccsMFlzjPd1+Y/r+cXScZ84Zg0=; b=aSQN7Fq+xlF7ivFZ0R3+zyzqaTjMf29/wjwmgGCZFnVZCNxpHn3hqyK3LcouP8tKjLWOzn 3TLtvMUg00cQdEBlWo4EYaHZBx9y5s/NS3IbO5zLG4ZOnwyX9D043fpnvmgrlT/tSktIH/ atOKlsBbQEIqT3m0BIs9ffvkM032qFfzc3N8mV9TPH78sbDBX9gTY1htJRKd8ZpTYU5CTq vuUO0OXsIX24Lkl/ERF7zHNuGCE+lCMlYzJjf1kU0Zn6N/FNzq3hc+4Sy1QEZ1Y2hbD8gX r/0MMtZnbmDjbkJXuBh6tGQCy5nlIHruFUMEhAaja9j3rRWqEX9ebWW3CRefAA== 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 5C223BB8; Tue, 24 May 2022 17:36:28 +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 24OHaSt0064419; Tue, 24 May 2022 17:36:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OHaSXc064418; Tue, 24 May 2022 17:36:28 GMT (envelope-from git) Date: Tue, 24 May 2022 17:36:28 GMT Message-Id: <202205241736.24OHaSXc064418@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 543d8888c956 - main - comms/qsstv: fix build with graphics/openjpeg 2.5 by removing unnecessary patches List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 543d8888c9561ba6e0960a3bb9cc8e9289fb6d11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653413788; 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=GcDD7C3RfvY2hmJFaccsMFlzjPd1+Y/r+cXScZ84Zg0=; b=UjhuzGnllcl/GUB4+lz2zZ4mAKB1kpoIn9QjYJa3cApNLBLrWdRFnv8l3+cpkeJdZuYCJc lW/vnbXGo2kVk3lHPfUR1BHQ+y5cgOmud4iUksMyw5a422RD1G2RrzHQtg+UM6FLA18cbS jLyDePfpqsYlrIqBK9CdHo03Eb+gPXYxanvwKhkrGs1QLwaVOXsTjFBqsDjb3Fafam1j8I Vd7voWHFMzQy4b1aTLAeMFdLErP+jJldqtk/kXidNSWQdx1r+pe9jlOm0+hdc2/0CcU3oD 8JTjAjZACC+GDKE1HWPItA4CF6gQq99ERHqrZrnLT/wWYOaLe/XwAQKiXpA9Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653413788; a=rsa-sha256; cv=none; b=eaezwJ2mZyBYJEvcJF6gLRPR/KFDsopNTT8tgimDHYDaM2qbbfXTM4mH5ynkpUDtTQ5Jne oLp7hWCEdNe7wHYSMne0hhWEWo3xaho6lxNfITjemJRVLkL2IKAF+nrmeYjXF1KJQAvDHT m+837BAdKDZ30Fqqwuw68FrTElU5+vD7R5hEvOqxCcPHnCjZSzNbQiumyPgk4k4osP9HaZ y78wlDP6irhxzgaMMZIJ9FjTDxGHk3gBFbtrxZyaaMYy0aIArfB4QKHoPNUdPD3rEcQPT9 3wEwYYi2/p/yZr4MCjxteZHV9DQZ9tdUB8xMSp5tJH7UY6oPzuYvQBEuArPFrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=543d8888c9561ba6e0960a3bb9cc8e9289fb6d11 commit 543d8888c9561ba6e0960a3bb9cc8e9289fb6d11 Author: Charlie Li AuthorDate: 2022-05-24 16:32:21 +0000 Commit: Charlie Li CommitDate: 2022-05-24 17:33:41 +0000 comms/qsstv: fix build with graphics/openjpeg 2.5 by removing unnecessary patches While here, have ourselves a working DEBUG build Encoding/saving JPEG2000 crashes due to graphics/jasper interaction. Not sure if it has ever worked. Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D35308 --- comms/qsstv/Makefile | 12 ++++++++++++ comms/qsstv/files/patch-qsstv.pro | 18 +++++++++++++++++- comms/qsstv/files/patch-utils_color.cpp | 11 ----------- comms/qsstv/files/patch-utils_jp2io.h | 10 ---------- comms/qsstv/pkg-plist | 3 --- 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile index 5ede32283ad4..358f83971725 100644 --- a/comms/qsstv/Makefile +++ b/comms/qsstv/Makefile @@ -24,6 +24,18 @@ USE_GL= gl WRKSRC= ${WRKDIR}/${PORTNAME} +PLIST_FILES= bin/qsstv \ + share/applications/qsstv.desktop \ + share/pixmaps/qsstv.png + +.include + +.if defined(WITH_DEBUG) +BUILD_DEPENDS+= doxygen:devel/doxygen +LIB_DEPENDS+= libqwt6.so:x11-toolkits/qwt6 +PLIST_FILES+= bin/qsstv.debug +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ diff --git a/comms/qsstv/files/patch-qsstv.pro b/comms/qsstv/files/patch-qsstv.pro index 13c56086bec8..d3852f275732 100644 --- a/comms/qsstv/files/patch-qsstv.pro +++ b/comms/qsstv/files/patch-qsstv.pro @@ -1,6 +1,13 @@ --- qsstv.pro.orig 2021-07-31 20:57:03 UTC +++ qsstv.pro -@@ -523,7 +523,7 @@ QMAKE_EXTRA_TARGETS += dox +@@ -517,13 +517,13 @@ contains(QMAKE_HOST.arch, arm.*):{ + + + +-dox.path=/usr/share/doc/$$TARGET ++dox.path=%%PREFIX%%/share/doc/$$TARGET + dox.files= $$PWD/manual/* + QMAKE_EXTRA_TARGETS += dox isEmpty(PREFIX) { @@ -9,3 +16,12 @@ } target.path = $$PREFIX/bin +@@ -605,6 +605,6 @@ FORMS += scope/scopeoffset.ui \ + + FORMS += scope/scopeoffset.ui \ + scope/plotform.ui +-INCLUDEPATH += /usr/include/qwt /usr/include/qt5/qwt +-LIBS += -lqwt-qt5 ++INCLUDEPATH += %%PREFIX%%/include/qt5/qwt6 ++LIBS += -L%%PREFIX%%/lib/qt5 -lqwt6 + } diff --git a/comms/qsstv/files/patch-utils_color.cpp b/comms/qsstv/files/patch-utils_color.cpp deleted file mode 100644 index 8174690cee0b..000000000000 --- a/comms/qsstv/files/patch-utils_color.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- utils/color.cpp.orig 2017-11-16 17:14:48 UTC -+++ utils/color.cpp -@@ -41,7 +41,7 @@ - #include - #include - --#include "openjpeg.h" -+#include "openjpeg-2.4/openjpeg.h" - #include "color.h" - - diff --git a/comms/qsstv/files/patch-utils_jp2io.h b/comms/qsstv/files/patch-utils_jp2io.h deleted file mode 100644 index f0619483feab..000000000000 --- a/comms/qsstv/files/patch-utils_jp2io.h +++ /dev/null @@ -1,10 +0,0 @@ ---- utils/jp2io.h.orig 2016-08-23 19:39:12 UTC -+++ utils/jp2io.h -@@ -1,6 +1,6 @@ - #ifndef JP2READER_H - #define JP2READER_H --#include "openjpeg.h" -+#include "openjpeg-2.4/openjpeg.h" - - #include - #include diff --git a/comms/qsstv/pkg-plist b/comms/qsstv/pkg-plist deleted file mode 100644 index 043d1cb4ad58..000000000000 --- a/comms/qsstv/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/qsstv -share/applications/qsstv.desktop -share/pixmaps/qsstv.png