Compare revisions

jenneron · omni · Celeste · Andy Postnikov · omni · Andy Postnikov
--- a/community/stargazer-gmi/APKBUILD
+++ b/community/stargazer-gmi/APKBUILD
-# Maintainer: Sashanoraa <sasha@noraa.gay>
+# Contributor: Sashanoraa <sasha@noraa.gay>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=stargazer-gmi
 pkgver=1.0.5
-pkgrel=2
+pkgrel=3
-pkgdesc="A fast and easy to use Gemini server"
+pkgdesc="Fast and easy to use Gemini server"
 url="https://sr.ht/~zethra/stargazer/"
 arch="all !s390x !riscv64 !ppc64le" # cargo & ring
 license="AGPL-3.0-or-later"
-makedepends="cargo scdoc"
+makedepends="cargo cargo-auditable scdoc"
-checkdepends="python3 py3-cryptography"
+checkdepends="py3-cryptography"
 subpackages="
 	$pkgname-doc
 	$pkgname-openrc
@@ -21,9 +22,14 @@ source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~zethra/stargazer/archive/$pk
 builddir="$srcdir/stargazer-$pkgver"
 options="!check" # connection refused to localhost
+prepare() {
+	default_prepare
+	cargo fetch --target="$CTARGET" --locked
+}
 build() {
-	./scripts/build
+	CG='cargo auditable' CGFLAGS='--frozen --release' ./scripts/build
 }
 check() {
@@ -31,12 +37,14 @@ check() {
 }
 package() {
-	./scripts/install --prefix="$pkgdir/usr" \
+	DESTDIR="$pkgdir" ./scripts/install \
-		--sysconfdir="$pkgdir/etc" \
+		--prefix=/usr --sysconfdir=/etc \
-		--bashdir="$pkgdir/usr/share/bash-completion/completions" \
+		--bashdir="$pkgdir"/usr/share/bash-completion/completions \
-		--zshdir="$pkgdir/usr/share/zsh/site-functions" \
+		--zshdir="$pkgdir"/usr/share/zsh/site-functions \
-		--fishdir="$pkgdir/usr/share/fish/vendor_completions.d"
+		--fishdir="$pkgdir"/usr/share/fish/vendor_completions.d
-	install -Dm644 ./contrib/init/stargazer.initd "$pkgdir/etc/init.d/stargazer"
+	install -Dvm644 ./contrib/init/stargazer.initd \
+		"$pkgdir"/etc/init.d/stargazer
 }
 sha512sums="

--- a/main/cython/APKBUILD
+++ b/main/cython/APKBUILD
@@ -3,12 +3,12 @@
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=cython
 pkgver=0.29.36
-pkgrel=0
+pkgrel=1
 pkgdesc="Cython is an optimising static compiler for both the Python & the extended Cython programming languages."
 url="https://cython.org/"
 arch="all"
 license="Apache-2.0"
-makedepends="py3-setuptools python3-dev"
+makedepends="py3-gpep517 py3-setuptools py3-wheel python3-dev"
 depends="python3"
 subpackages="cython-pyc cython-doc"
 source="cython-$pkgver.tar.gz::https://github.com/cython/cython/archive/$pkgver.tar.gz"
@@ -21,15 +21,17 @@ arm*)
 esac
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 check() {
-	python3 runtests.py -j${JOBS:-$(nproc)}
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 runtests.py -j${JOBS:-$(nproc)}
 }
 package() {
-	python3 setup.py install --skip-build --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 	install -Dm 644 LICENSE.txt "$pkgdir/usr/share/licenses/cython/license"
 	install -Dm 644 README.rst "$pkgdir/usr/share/doc/cython/readme.rst"

--- a/testing/moonlight-qt/0001-Fix-building-with-directfb.patch
+++ b/testing/moonlight-qt/0001-Fix-building-with-directfb.patch
+From c2b287ea780e4bdb90c97139649bdb1cc6c79d99 Mon Sep 17 00:00:00 2001
+From: Anton Bambura <jenneron@protonmail.com>
+Date: Thu, 19 Oct 2023 09:47:18 +0300
+Subject: [PATCH] Fix building with directfb
+Rename DR_OK from Limelight.h which conflicts with DirectFB's
+DR_OK in the DirectResult enum.
+---
+ moonlight-common-c/moonlight-common-c/src/FakeCallbacks.c     | 2 +-
+ moonlight-common-c/moonlight-common-c/src/Limelight.h         | 4 ++--
+ moonlight-common-c/moonlight-common-c/src/VideoDepacketizer.c | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/moonlight-common-c/moonlight-common-c/src/FakeCallbacks.c b/moonlight-common-c/moonlight-common-c/src/FakeCallbacks.c
+index 62260b8..9dd1798 100644
+--- a/moonlight-common-c/moonlight-common-c/src/FakeCallbacks.c
+++ b/moonlight-common-c/moonlight-common-c/src/FakeCallbacks.c
+@@ -4,7 +4,7 @@ static int fakeDrSetup(int videoFormat, int width, int height, int redrawRate, v
+ static void fakeDrStart(void) {}
+ static void fakeDrStop(void) {}
+ static void fakeDrCleanup(void) {}
+-static int fakeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) { return DR_OK; }
+static int fakeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) { return DR_OK1; }
+ static DECODER_RENDERER_CALLBACKS fakeDrCallbacks = {
+     .setup = fakeDrSetup,
+diff --git a/moonlight-common-c/moonlight-common-c/src/Limelight.h b/moonlight-common-c/moonlight-common-c/src/Limelight.h
+index bc940e7..0af6f97 100644
+--- a/moonlight-common-c/moonlight-common-c/src/Limelight.h
+++ b/moonlight-common-c/moonlight-common-c/src/Limelight.h
+@@ -291,7 +291,7 @@ typedef void(*DecoderRendererCleanup)(void);
+ // This callback provides Annex B formatted elementary stream data to the
+ // decoder. If the decoder is unable to process the submitted data for some reason,
+ // it must return DR_NEED_IDR to generate a keyframe.
+-#define DR_OK 0
+#define DR_OK1 0
+ #define DR_NEED_IDR -1
+ typedef int(*DecoderRendererSubmitDecodeUnit)(PDECODE_UNIT decodeUnit);
+@@ -937,7 +937,7 @@ typedef struct _SS_HDR_METADATA {
+ bool LiGetHdrMetadata(PSS_HDR_METADATA metadata);
+ // This function requests an IDR frame from the host. Typically this is done using DR_NEED_IDR, but clients
+-// processing frames asynchronously may need to reset their decoder state even after returning DR_OK for
+// processing frames asynchronously may need to reset their decoder state even after returning DR_OK1 for
+ // the prior frame. Rather than wait for a new frame and return DR_NEED_IDR for that one, they can just
+ // call this API instead. Note that this function does not guarantee that the *next* frame will be an IDR
+ // frame, just that an IDR frame will arrive soon.
+diff --git a/moonlight-common-c/moonlight-common-c/src/VideoDepacketizer.c b/moonlight-common-c/moonlight-common-c/src/VideoDepacketizer.c
+index 40295e0..bdf62e2 100644
+--- a/moonlight-common-c/moonlight-common-c/src/VideoDepacketizer.c
+++ b/moonlight-common-c/moonlight-common-c/src/VideoDepacketizer.c
+@@ -291,7 +291,7 @@ void LiCompleteVideoFrame(VIDEO_FRAME_HANDLE handle, int drStatus) {
+         Limelog("Requesting IDR frame on behalf of DR\n");
+         requestDecoderRefresh();
+     }
+-    else if (drStatus == DR_OK && qdu->decodeUnit.frameType == FRAME_TYPE_IDR) {
+    else if (drStatus == DR_OK1 && qdu->decodeUnit.frameType == FRAME_TYPE_IDR) {
+         // Remember that the IDR frame was processed. We can now use
+         // reference frame invalidation.
+         idrFrameProcessed = true;
+-- 
+2.41.0
+From a53689a86268bc437fd89dc580ba94f123c3d00e Mon Sep 17 00:00:00 2001
+From: Anton Bambura <jenneron@protonmail.com>
+Date: Thu, 19 Oct 2023 09:59:47 +0300
+Subject: [PATCH] Use DR_OK1 instead of DR_OK in app/*
+---
+ app/streaming/session.cpp      | 6 +++---
+ app/streaming/video/ffmpeg.cpp | 4 ++--
+ app/streaming/video/slvid.cpp  | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
+index 53ab2d04..94c4fad5 100644
+--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
+@@ -345,7 +345,7 @@ int Session::drSubmitDecodeUnit(PDECODE_UNIT du)
+     // We need to destroy the decoder on the main thread to satisfy
+     // some API constraints (like DXVA2). If we can't acquire it,
+     // that means the decoder is about to be destroyed, so we can
+-    // safely return DR_OK and wait for the IDR frame request by
+    // safely return DR_OK1 and wait for the IDR frame request by
+     // the decoder reinitialization code.
+     if (SDL_AtomicTryLock(&s_ActiveSession->m_DecoderLock)) {
+@@ -357,13 +357,13 @@ int Session::drSubmitDecodeUnit(PDECODE_UNIT du)
+         }
+         else {
+             SDL_AtomicUnlock(&s_ActiveSession->m_DecoderLock);
+-            return DR_OK;
+            return DR_OK1;
+         }
+     }
+     else {
+         // Decoder is going away. Ignore anything coming in until
+         // the lock is released.
+-        return DR_OK;
+        return DR_OK1;
+     }
+ }
+diff --git a/app/streaming/video/ffmpeg.cpp b/app/streaming/video/ffmpeg.cpp
+index 0fac812f..093ee301 100644
+--- a/app/streaming/video/ffmpeg.cpp
+++ b/app/streaming/video/ffmpeg.cpp
+@@ -1270,7 +1270,7 @@ void FFmpegVideoDecoder::decoderThreadProc()
+             AVFrame* frame = av_frame_alloc();
+             if (!frame) {
+                 // Failed to allocate a frame but we did submit,
+-                // so we can return DR_OK
+                // so we can return DR_OK1
+                 SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                             "Failed to allocate frame");
+                 continue;
+@@ -1478,7 +1478,7 @@ int FFmpegVideoDecoder::submitDecodeUnit(PDECODE_UNIT du)
+     m_FrameInfoQueue.enqueue(*du);
+     m_FramesIn++;
+-    return DR_OK;
+    return DR_OK1;
+ }
+ void FFmpegVideoDecoder::renderFrameOnMainThread()
+diff --git a/app/streaming/video/slvid.cpp b/app/streaming/video/slvid.cpp
+index 5008847e..9568bbe1 100644
+--- a/app/streaming/video/slvid.cpp
+++ b/app/streaming/video/slvid.cpp
+@@ -166,7 +166,7 @@ SLVideoDecoder::submitDecodeUnit(PDECODE_UNIT du)
+         return DR_NEED_IDR;
+     }
+-    return DR_OK;
+    return DR_OK1;
+ }
+ void SLVideoDecoder::notifyOverlayUpdated(Overlay::OverlayType type)
+-- 
+2.41.0
--- a/testing/moonlight-qt/APKBUILD
+++ b/testing/moonlight-qt/APKBUILD
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=moonlight-qt
+pkgver=5.0.0
+pkgrel=0
+pkgdesc="Open Source PC client for NVIDIA GameStream, as used by the NVIDIA Shield"
+url="https://moonlight-stream.org/"
+# riscv64 blocked by libdav1d
+arch="all !riscv64"
+license="GPL-3.0-or-later"
+depends="ffmpeg"
+makedepends="openssl-dev sdl2-dev sdl2_ttf-dev ffmpeg-dev qt5-qtsvg-dev qt5-qtquickcontrols2-dev libva-dev libvdpau-dev opus-dev pulseaudio-dev alsa-lib-dev"
+_h264bitstream_commit="34f3c58afa3c47b6cf0a49308a68cbf89c5e0bff"
+_moonlight_common_c_commit="c86f49ee7f9d55ee3646ac4ab903268a0222ddbd"
+_enet_commit="bbfe93c248ce198246328d52bda5b4e6dd4cc95e"
+_qmdnsengine_commit="b7a5a9f225d5e14b39f9fd1f905c4f505cf2ee99"
+_libsoundio_commit="34bbab80bd4034ba5080921b6ba6d61314126310"
+_sdl_gamecontrollerdb_commit="dbcf31a6709ec8354b5963b1bb411721e07bd846"
+source="
+	$pkgname-$pkgver.tar.gz::https://github.com/moonlight-stream/moonlight-qt/archive/refs/tags/v$pkgver.tar.gz
+	h264bitstream-$_h264bitstream_commit.tar.gz::https://github.com/aizvorski/h264bitstream/archive/$_h264bitstream_commit.tar.gz
+	moonlight-common-c-$_moonlight_common_c_commit.tar.gz::https://github.com/moonlight-stream/moonlight-common-c/archive/$_moonlight_common_c_commit.tar.gz
+	enet-$_enet_commit.tar.gz::https://github.com/cgutman/enet/archive/$_enet_commit.tar.gz
+	qmdnsengine-$_qmdnsengine_commit.tar.gz::https://github.com/cgutman/qmdnsengine/archive/$_qmdnsengine_commit.tar.gz
+	libsoundio-$_libsoundio_commit.tar.gz::https://github.com/cgutman/libsoundio/archive/$_libsoundio_commit.tar.gz
+	sdl-gamecontrollerdb-$_sdl_gamecontrollerdb_commit.tar.gz::https://github.com/gabomdq/SDL_GameControllerDB/archive/$_sdl_gamecontrollerdb_commit.tar.gz
+	0001-Fix-building-with-directfb.patch
+	"
+options="!check" # no tests in upstream
+prepare() {\
+	cp -r "$srcdir/h264bitstream-$_h264bitstream_commit" \
+		-T h264bitstream/h264bitstream
+	cp -r "$srcdir/moonlight-common-c-$_moonlight_common_c_commit" \
+		-T moonlight-common-c/moonlight-common-c
+	cp -r "$srcdir/enet-$_enet_commit" \
+		-T moonlight-common-c/moonlight-common-c/enet
+	cp -r "$srcdir/qmdnsengine-$_qmdnsengine_commit" \
+		-T qmdnsengine/qmdnsengine
+	cp -r "$srcdir/libsoundio-$_libsoundio_commit" \
+		-T soundio/libsoundio
+	cp -r "$srcdir/SDL_GameControllerDB-$_sdl_gamecontrollerdb_commit" \
+		-T app/SDL_GameControllerDB
+	default_prepare
+}
+build() {
+	qmake-qt5 PREFIX=/usr moonlight-qt.pro
+	make
+}
+package() {
+	make INSTALL_ROOT="$pkgdir" install
+}
+sha512sums="
+e8749d1b291d935692b51cc07a9fba813c2a8abeddc85a1cadd7d51b4f687840c3e00c85390c7550f561bd03425d6b297934a0ddb85a8f1ba1960a6919b07e20  moonlight-qt-5.0.0.tar.gz
+cb467592ef8fb7e45d38e691d9e762111d68c18e89975b3b37bc509373ecb1d382e2a3b6f8aa45774a65ba1bbd08a55adf6123f4428457867c8455544208c82e  h264bitstream-34f3c58afa3c47b6cf0a49308a68cbf89c5e0bff.tar.gz
+b14ae0fa1324853fa46a6d9cfbd66281ae3468bfecf7b18bd91a22c1033ec6de91b9da7d7a2f8a028f4fcff0a78aa66ab538901170f22eadc90f3f15bc0cb8a6  moonlight-common-c-c86f49ee7f9d55ee3646ac4ab903268a0222ddbd.tar.gz
+0c3440982203b4eb71ff750992ec1cd8e56870d9179cc99447699c4a2691a0f656a31e862d89a53858f07041b832841898a35b14c3998d7b50ee825a6f43b4a2  enet-bbfe93c248ce198246328d52bda5b4e6dd4cc95e.tar.gz
+49a857698f44baad8c539a0b889f4c0bf1b3af8f770fba4d6ea41ed145b825a81ed7a7e78813f66e3ccbf887612dba6988ffea2fcf7f016bad0fbebfc29705a4  qmdnsengine-b7a5a9f225d5e14b39f9fd1f905c4f505cf2ee99.tar.gz
+946bd120eed3ffeb016dc6a7d6d29faf4006fb7a07ca7941b18a16fb7428307035a738da191016969287a544be6c98747802bb0b846f1ae03b24303b527ae415  libsoundio-34bbab80bd4034ba5080921b6ba6d61314126310.tar.gz
+bceaf6f2c3c5ba8c6d0c65947056bd451e8dbf1edea0528d6faad8891a9fc37f41deb93fa00dd8b13ae406d6dda132f4e0bf87688f2473e67cb39412e82d1993  sdl-gamecontrollerdb-dbcf31a6709ec8354b5963b1bb411721e07bd846.tar.gz
+1239544bb35fcbc457bf93b2e0a92d5389cea5da528da1dbb67e66e854131db3ff29e432e8e23c1ee3162a7bb84ecb15c34513814dea2a23d3cfd45b594acb20  0001-Fix-building-with-directfb.patch
+"
No results found