From nobody Tue Dec 31 01:35:33 2024 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 4YMbBs3SL9z5jL4J; Tue, 31 Dec 2024 01:35:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMbBs2khxz4hdd; Tue, 31 Dec 2024 01:35:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735608933; 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=6CdzdTBw4ZDDs3lUxQMcF8NXZb+2tXgDOmKU2eJ3WOM=; b=TwwvxRRki4/EIchLQ9dft0JyncegbJmEqt5NH5okZw+u5bK5+GhzfYB9LgmrrSGXUFtcJ+ jSuxj8SYAKktwBuejJH1BHQovksxA9Q+zpLkfuWrscWiTTLoYqzXG/J/YOAxNIdT2hRubl Xc183lroDeNKk80s5g2L0CysJJ2WTLmt9ev321TUpT8KOd8hiDtXnrXXHZascqkdOxKkyR AIJGFN3OzB9cKsAiKix4p9C3hntWICdRCURbgR/9uLAKeOsfcQd16rzAxvxeG8QRDBqbpa Fa8Z+PS/naMGHKErxdW4uXSLymc89BkiZOWYR15E3XbiXSCpmIwG4wtR3JSp9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735608933; 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=6CdzdTBw4ZDDs3lUxQMcF8NXZb+2tXgDOmKU2eJ3WOM=; b=W5hhdrzqFYU++hjgMXsWwMJRRu956xS8amVome21jwHCux5ol0mNmiIY/41Sqax8R32TjH 7rUTvWWN2zcqg2lObdrW/JntVgE3RmPBSIXnjgefJ1GJMk808ieQbz8aCA+G8FbXiqoxPE 5DFS3s5V1tKVIN384NSMx0v745sL0rVAz/Q9MGiwKm7LnotrBJb7D7dfyhrhLVIyvfqDLg 6tORR9dQpf1wGu0Aw7Wfrw4yDEnFQwcJBAsycbDt+srNEQiWtIZBHucnr6HoECq2wRFiVr 7/hMV/0kIo/8G65FxcXJWVjk3M0HJarW42+CMQAyzpGZ4MsGkLb8CNMA0Vimdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735608933; a=rsa-sha256; cv=none; b=TkykI3gicLCjkc2spr1noqpiYrBKqNcNkw3KSA8DJJ7vUW3Mn8CUUV7lsHuKorw7shXe1d DUzfs6Mq+RVL0JkLbwFnE+v/I1ZZSCYVf8IH1EnICGwDJ+Z3fk3aoPOrd+65f5u5CariVm ctLzJ1eZucA5IGJZVS12j1kWw1lwmdXXG+WIXh1PH9CE9NamdYi3Y+xi6PZIKX0kF34YVQ vFWzt3GRmHV+RFHHig1I6QCYK/RMlzmuXcn9Bli/dm9IeXpfq78DG8lht59cNkay06Ro1U GxNwT6vCONLqeKlCkt69heCNAL6xWPallagS5g96v4j/8EEddyntatNG/Znc/Q== 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 4YMbBs2L3rzJdb; Tue, 31 Dec 2024 01:35:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BV1ZXvn060419; Tue, 31 Dec 2024 01:35:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV1ZXFL060416; Tue, 31 Dec 2024 01:35:33 GMT (envelope-from git) Date: Tue, 31 Dec 2024 01:35:33 GMT Message-Id: <202412310135.4BV1ZXFL060416@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 6392477b572e - main - devel/rgbds: Fix tests 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6392477b572ecfc5c13c1434348f1a0be804c87b Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=6392477b572ecfc5c13c1434348f1a0be804c87b commit 6392477b572ecfc5c13c1434348f1a0be804c87b Author: Nuno Teixeira AuthorDate: 2024-12-31 01:30:56 +0000 Commit: Nuno Teixeira CommitDate: 2024-12-31 01:30:56 +0000 devel/rgbds: Fix tests - Remove build dependency on bash - Remove unneeded dos2unix conversion also known to break part of tests - Prepare to 0.9.1 and apply merged patches --- devel/rgbds/Makefile | 13 ++++++---- devel/rgbds/files/extra-patch-fix_rgbfix | 29 +++++++++++++++++++++++ devel/rgbds/files/extra-patch-inc_signal | 21 ++++++++++++++++ devel/rgbds/files/patch-test_gfx_rgbgfx__test.cpp | 10 -------- devel/rgbds/files/patch-test_run-tests.sh | 14 +++++++++++ 5 files changed, 72 insertions(+), 15 deletions(-) diff --git a/devel/rgbds/Makefile b/devel/rgbds/Makefile index 4a6d71637c9b..87438a6a3e83 100644 --- a/devel/rgbds/Makefile +++ b/devel/rgbds/Makefile @@ -1,5 +1,6 @@ PORTNAME= rgbds DISTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= devel games MASTER_SITES= https://github.com/gbdev/rgbds/releases/download/v${DISTVERSION}/ @@ -10,17 +11,19 @@ WWW= https://rgbds.gbdev.io/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= bash>0:shells/bash LIB_DEPENDS= libpng16.so:graphics/png TEST_DEPENDS= bash>0:shells/bash \ git>0:devel/git \ xxd>0:sysutils/xxd -USES= bison cmake:testing dos2unix pkgconfig shebangfix - +USES= bison cmake:testing pkgconfig shebangfix SHEBANG_FILES= contrib/view_palettes.sh src/bison.sh test/*.sh test/*/*.sh -WRKSRC= ${WRKDIR}/rgbds -TESTING_UNSAFE= https://github.com/gbdev/rgbds/issues/1580 +CMAKE_OFF= USE_NONFREE_TESTS + +EXTRA_PATCHES= ${FILESDIR}/extra-patch-fix_rgbfix:-p1 \ + ${FILESDIR}/extra-patch-inc_signal:-p1 + +WRKSRC= ${WRKDIR}/rgbds .include diff --git a/devel/rgbds/files/extra-patch-fix_rgbfix b/devel/rgbds/files/extra-patch-fix_rgbfix new file mode 100644 index 000000000000..6edf93f10c42 --- /dev/null +++ b/devel/rgbds/files/extra-patch-fix_rgbfix @@ -0,0 +1,29 @@ +From b99ce3845e863894e918b483f80ffbb1e9f91252 Mon Sep 17 00:00:00 2001 +From: Rangi42 +Date: Sun, 29 Dec 2024 13:09:37 -0500 +Subject: [PATCH] Fix RGBFIX writing bytes when one syscall is not sufficient + +--- + src/fix/main.cpp | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/fix/main.cpp b/src/fix/main.cpp +index ce9a1d8d8..06a3a88a2 100644 +--- a/src/fix/main.cpp ++++ b/src/fix/main.cpp +@@ -805,13 +805,11 @@ static ssize_t writeBytes(int fd, uint8_t *buf, size_t len) { + + if (ret == -1 && errno != EINTR) // Return errors, unless we only were interrupted + return -1; +- // EOF reached +- if (ret == 0) +- return total; +- // If anything was read, accumulate it, and continue ++ // If anything was written, accumulate it, and continue + if (ret != -1) { + total += ret; + len -= ret; ++ buf += ret; + } + } + diff --git a/devel/rgbds/files/extra-patch-inc_signal b/devel/rgbds/files/extra-patch-inc_signal new file mode 100644 index 000000000000..ddd2537a2288 --- /dev/null +++ b/devel/rgbds/files/extra-patch-inc_signal @@ -0,0 +1,21 @@ +From 06daf2a9b59595cc1f5df6213921e25dd35824ce Mon Sep 17 00:00:00 2001 +From: Rangi <35663410+Rangi42@users.noreply.github.com> +Date: Mon, 30 Dec 2024 17:22:14 -0500 +Subject: [PATCH] Include in rgbgfx_test.cpp (#1589) + +--- + test/gfx/rgbgfx_test.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/gfx/rgbgfx_test.cpp b/test/gfx/rgbgfx_test.cpp +index e2bcd7a10..68b4d266d 100644 +--- a/test/gfx/rgbgfx_test.cpp ++++ b/test/gfx/rgbgfx_test.cpp +@@ -5,6 +5,7 @@ + #include + #include + ++ #include + #include + #include + #else diff --git a/devel/rgbds/files/patch-test_gfx_rgbgfx__test.cpp b/devel/rgbds/files/patch-test_gfx_rgbgfx__test.cpp deleted file mode 100644 index e3f42d092f5f..000000000000 --- a/devel/rgbds/files/patch-test_gfx_rgbgfx__test.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- test/gfx/rgbgfx_test.cpp.orig 2024-12-25 20:36:32 UTC -+++ test/gfx/rgbgfx_test.cpp -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/devel/rgbds/files/patch-test_run-tests.sh b/devel/rgbds/files/patch-test_run-tests.sh new file mode 100644 index 000000000000..9ccae4b54623 --- /dev/null +++ b/devel/rgbds/files/patch-test_run-tests.sh @@ -0,0 +1,14 @@ +Do not run extra tests that require build + +--- test/run-tests.sh.orig 2024-12-31 01:19:31 UTC ++++ test/run-tests.sh +@@ -74,6 +74,6 @@ fi + test_downstream pret pokered compare pokered.gbc ea9bcae617fdf159b045185467ae58b2e4a48b9a + test_downstream zladx LADX-Disassembly default azle.gbc d90ac17e9bf17b6c61624ad9f05447bdb5efc01a + fi +-test_downstream AntonioND ucity all ucity.gbc 67e67a4eaefb12ddc98d3caa8959102b885c0405 +-test_downstream pinobatch libbet all libbet.gb 7001af0f0664ba4e941310cde2c4c8392423abd2 +-test_downstream LIJI32 SameBoy bootroms build/bin/BootROMs/cgb_boot.bin 113903775a9d34b798c2f8076672da6626815a91 ++#test_downstream AntonioND ucity all ucity.gbc 67e67a4eaefb12ddc98d3caa8959102b885c0405 ++#test_downstream pinobatch libbet all libbet.gb 7001af0f0664ba4e941310cde2c4c8392423abd2 ++#test_downstream LIJI32 SameBoy bootroms build/bin/BootROMs/cgb_boot.bin 113903775a9d34b798c2f8076672da6626815a91