Attachment 255398 Details for Bug 282929 – update to g20241122

[patch] update to g20241122

0001-games-libretro-shaders-slang-update-to-g20241122.patch (text/plain), 13.17 KB, created by Stefan Schlosser on 2024-11-23 09:58:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Schlosser

Created: 2024-11-23 09:58:45 UTC

Size: 13.17 KB

patch

obsolete

>From bda82ae2dc0cb52ccab5b72556f6b3b0d6c5f3da Mon Sep 17 00:00:00 2001
>From: Stefan Schlosser <bsdcode@disroot.org>
>Date: Wed, 20 Nov 2024 11:14:24 +0100
>Subject: [PATCH] games/libretro-shaders-slang: update to g20241122
>
>Commitlog:
>https://github.com/libretro/slang-shaders/compare/4f3d214b314d84c6a3e25b27c77bd1d0ee3a1697..8731861b22946faf71bb94ce25147484db61eb6f
>
>Upstream's Makefile has become usable without patches and deletes the unwanted
>files now. This allows us to simplify the port by removing EXTRACT_AFTER_ARGS
>and the custom do-install target.
>
>There are documentation files installed into the DATADIR tree, which we do not
>delete or move away. This would be an unneeded and fruitless burden maintaining
>the port, so it was never done. In order to keep the port simple, the top-level's
>README.md is now also treated this way again and the DOCS port option is removed.
>Otherwise, custom pre-install-DOCS-on/-off targets would be required to handle
>this file appropriatly, which complicates the port without real benefit.
>---
> games/libretro-shaders-slang/Makefile  | 20 ++-----
> games/libretro-shaders-slang/distinfo  |  6 +--
> games/libretro-shaders-slang/pkg-plist | 75 +++++++++++++++-----------
> 3 files changed, 52 insertions(+), 49 deletions(-)
>
>diff --git a/games/libretro-shaders-slang/Makefile b/games/libretro-shaders-slang/Makefile
>index cb6aa880032c..90356bdb85e5 100644
>--- a/games/libretro-shaders-slang/Makefile
>+++ b/games/libretro-shaders-slang/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	libretro-shaders-slang
>-DISTVERSION=	g20241022
>+DISTVERSION=	g20241122
> CATEGORIES=	games
> 
> MAINTAINER=	bsdcode@disroot.org
>@@ -13,24 +13,12 @@ LICENSE_COMB=	multi
> USE_GITHUB=	yes
> GH_ACCOUNT=	libretro
> GH_PROJECT=	slang-shaders
>-GH_TAGNAME=	4f3d214b314d84c6a3e25b27c77bd1d0ee3a1697
>+GH_TAGNAME=	8731861b22946faf71bb94ce25147484db61eb6f
>+
>+MAKE_ARGS=	PREFIX=${PREFIX}
> 
> DATADIR=	${PREFIX}/share/libretro/shaders/shaders_slang
>-EXTRACT_AFTER_ARGS=	--exclude ".gitlab-ci.yml" --exclude "configure" \
>-			--exclude "Makefile" --no-same-owner \
>-			--no-same-permissions
> NO_ARCH=	yes
> NO_BUILD=	yes
> 
>-OPTIONS_DEFINE=	DOCS
>-
>-do-install:
>-	${MKDIR} ${STAGEDIR}${DATADIR}
>-	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \
>-		"! -regex ^./README.md")
>-
>-post-install-DOCS-on:
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
>-
> .include <bsd.port.mk>
>diff --git a/games/libretro-shaders-slang/distinfo b/games/libretro-shaders-slang/distinfo
>index 96df1f96d37f..28a831192387 100644
>--- a/games/libretro-shaders-slang/distinfo
>+++ b/games/libretro-shaders-slang/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1729672199
>-SHA256 (libretro-slang-shaders-g20241022-4f3d214b314d84c6a3e25b27c77bd1d0ee3a1697_GH0.tar.gz) = 215ba9a18b9c435d209ef895c1147f557dfd3f08e1d4fabb2823055d8acd473c
>-SIZE (libretro-slang-shaders-g20241022-4f3d214b314d84c6a3e25b27c77bd1d0ee3a1697_GH0.tar.gz) = 44942103
>+TIMESTAMP = 1732289370
>+SHA256 (libretro-slang-shaders-g20241122-8731861b22946faf71bb94ce25147484db61eb6f_GH0.tar.gz) = 5a8530fdf0c71094a14c0a7d740a332870d503672e80c37faf52e660a22731b1
>+SIZE (libretro-slang-shaders-g20241122-8731861b22946faf71bb94ce25147484db61eb6f_GH0.tar.gz) = 43651723
>diff --git a/games/libretro-shaders-slang/pkg-plist b/games/libretro-shaders-slang/pkg-plist
>index dbd625b01e54..59dabfd16e6b 100644
>--- a/games/libretro-shaders-slang/pkg-plist
>+++ b/games/libretro-shaders-slang/pkg-plist
>@@ -1,4 +1,4 @@
>-%%PORTDOCS%%%%DOCSDIR%%/README.md
>+%%DATADIR%%/README.md
> %%DATADIR%%/anamorphic/anamorphic.slangp
> %%DATADIR%%/anamorphic/shaders/anamorphic.slang
> %%DATADIR%%/annotated_passthru.slang
>@@ -1101,6 +1101,7 @@
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-Screen_Hmask-Screen_SlotMask.slangp
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-Screen_Hmask-Screen_SlotMask_Taller.slangp
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-Screen_Hmask-Screen_SlotMask_Taller_Brighter.slangp
>+%%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-Screen_Hmask-Screen_SlotMask_Taller_MaxMask.slangp
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-Screen_Hmask-ShadowMask.slangp
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-Screen_Hmask_Overlapped-oldpainless.slangp
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-Screen_Hmask_Wide-Aperturegrille.slangp
>@@ -1111,7 +1112,6 @@
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-VGA-DoubleScan-ShadowMask.slangp
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-VGA-DoubleScan.slangp
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-for_1440pMin_HiNits.slangp
>-%%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-for_HiNits.slangp
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Monitor-for_HigherNits.slangp
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Tv-NTSC_Generic-FXAA_sharp-Selective.slangp
> %%DATADIR%%/bezel/koko-aio/Presets-ng/Tv-NTSC_Megadrive-FXAA_sharp-Selective.slangp
>@@ -1187,6 +1187,7 @@
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-Screen_Hmask-Screen_SlotMask.slangp
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-Screen_Hmask-Screen_SlotMask_Taller.slangp
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-Screen_Hmask-Screen_SlotMask_Taller_Brighter.slangp
>+%%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-Screen_Hmask-Screen_SlotMask_Taller_MaxMask.slangp
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-Screen_Hmask-ShadowMask.slangp
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-Screen_Hmask_Overlapped-oldpainless.slangp
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-Screen_Hmask_Wide-Aperturegrille.slangp
>@@ -1197,7 +1198,6 @@
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-VGA-DoubleScan-ShadowMask.slangp
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-VGA-DoubleScan.slangp
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-for_1440pMin_HiNits.slangp
>-%%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-for_HiNits.slangp
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Monitor-for_HigherNits.slangp
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Tv-NTSC_Generic-FXAA_sharp-Selective.slangp
> %%DATADIR%%/bezel/koko-aio/Presets_HiresGames_Fast/Presets-ng/Tv-NTSC_Megadrive-FXAA_sharp-Selective.slangp
>@@ -1220,35 +1220,16 @@
> %%DATADIR%%/bezel/koko-aio/shaders-ng/config.globals.inc
> %%DATADIR%%/bezel/koko-aio/shaders-ng/config.inc
> %%DATADIR%%/bezel/koko-aio/shaders-ng/final_pass.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/flick_and_noise.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/fxaa.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/halo.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/halo_pre_gamma.slang
>+%%DATADIR%%/bezel/koko-aio/shaders-ng/helper_pass.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/in_glow_x.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/in_glow_y.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/includes/blooms.include.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/includes/functions.include.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/includes/pack_unpack.include.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/includes/pixel_glows.include.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/ambi_displace.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/ambi_mix_pass.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/ambi_passthrough_conditional.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/ambi_push_pass.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/bloom_passthrough_conditional.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/blurs.include.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/curvature.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/final_pass.old.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/halo.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/in_glow.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/isrotated.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/main_pass.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/passthrough.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/passthrough_original.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/pows.include.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/reflection_blur_x.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/reflection_blur_y.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/scanline-flickering.slang
>-%%DATADIR%%/bezel/koko-aio/shaders-ng/old_unused/vignette_and_spot.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/reflection_blur.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/reflection_blur_pre.slang
> %%DATADIR%%/bezel/koko-aio/shaders-ng/shift_and_bleed.slang
>@@ -1257,8 +1238,6 @@
> %%DATADIR%%/bezel/koko-aio/textures/boothill.jpg
> %%DATADIR%%/bezel/koko-aio/textures/monitor_body_curved.png
> %%DATADIR%%/bezel/koko-aio/textures/monitor_body_straight.png
>-%%DATADIR%%/bezel/koko-aio/textures/other_backgrounds_under/background2.png
>-%%DATADIR%%/bezel/koko-aio/textures/other_backgrounds_under/background3.png
> %%DATADIR%%/bezel/koko-aio/textures/overlays/gamegear.jpg
> %%DATADIR%%/bezel/koko-aio/textures/overlays/gba.jpg
> %%DATADIR%%/bezel/koko-aio/textures/overlays/gbc.jpg
>@@ -1268,12 +1247,25 @@
> %%DATADIR%%/bezel/koko-aio/textures/overlays/note.android.txt
> %%DATADIR%%/bezel/koko-aio/textures/overlays/psp-e1000.LICENSE.txt
> %%DATADIR%%/bezel/koko-aio/textures/overlays/psp-e1000.jpg
>+%%DATADIR%%/bezel/koko-aio/textures/side_shade-helper-flip-y.png
>+%%DATADIR%%/bezel/koko-aio/textures/side_shade-helper-sharp.png
>+%%DATADIR%%/bezel/koko-aio/textures/side_shade-helper.png
> %%DATADIR%%/bezel/koko-aio/xbox_d3d_readme.txt
>-%%DATADIR%%/bfi/120hz-safe-BFI.slangp
>-%%DATADIR%%/bfi/120hz-smart-BFI.slangp
>-%%DATADIR%%/bfi/shaders/120hz-safe-BFI.slang
>-%%DATADIR%%/bfi/shaders/120hz-smart-BFI/bfi_flicker.slang
>-%%DATADIR%%/bfi/shaders/120hz-smart-BFI/calculations.slang
>+%%DATADIR%%/bezel/uborder/README.md
>+%%DATADIR%%/bezel/uborder/ambient-light-crt.slangp
>+%%DATADIR%%/bezel/uborder/base_presets/ambient-light/ambient-light-crt-nobody.slangp
>+%%DATADIR%%/bezel/uborder/base_presets/uborder-reflections/uborder-reflections-crt-nobody.slangp
>+%%DATADIR%%/bezel/uborder/base_presets/uborder/uborder-crt-nobody.slangp
>+%%DATADIR%%/bezel/uborder/shaders/content_shaders/crt-nobody.slang
>+%%DATADIR%%/bezel/uborder/shaders/support_shaders/ambient-light.slang
>+%%DATADIR%%/bezel/uborder/shaders/support_shaders/feedback.slang
>+%%DATADIR%%/bezel/uborder/shaders/support_shaders/noshame-blur.slang
>+%%DATADIR%%/bezel/uborder/shaders/support_shaders/original.slang
>+%%DATADIR%%/bezel/uborder/shaders/uborder-reflections.slang
>+%%DATADIR%%/bezel/uborder/shaders/uborder.slang
>+%%DATADIR%%/bezel/uborder/textures/borders/default.jpg
>+%%DATADIR%%/bezel/uborder/uborder-reflections.slangp
>+%%DATADIR%%/bezel/uborder/uborder.slangp
> %%DATADIR%%/bilinear.slangp
> %%DATADIR%%/blurs/dual_filter_2_pass.slangp
> %%DATADIR%%/blurs/dual_filter_4_pass.slangp
>@@ -2886,6 +2878,7 @@
> %%DATADIR%%/nes_raw_palette/shaders/gtu-famicom/scaleY.slang
> %%DATADIR%%/nes_raw_palette/shaders/nes-color-decoder.slang
> %%DATADIR%%/ntsc/artifact-colors.slangp
>+%%DATADIR%%/ntsc/blargg.slangp
> %%DATADIR%%/ntsc/mame-ntsc.slangp
> %%DATADIR%%/ntsc/ntsc-256px-composite-scanline.slangp
> %%DATADIR%%/ntsc/ntsc-256px-composite.slangp
>@@ -2911,6 +2904,9 @@
> %%DATADIR%%/ntsc/shaders/artifact-colors/artifact-colors0.slang
> %%DATADIR%%/ntsc/shaders/artifact-colors/artifact-colors1.slang
> %%DATADIR%%/ntsc/shaders/artifact-colors/artifact-colors2.slang
>+%%DATADIR%%/ntsc/shaders/blargg/blargg-0.slang
>+%%DATADIR%%/ntsc/shaders/blargg/blargg-1.slang
>+%%DATADIR%%/ntsc/shaders/blargg/blargg_params.inc
> %%DATADIR%%/ntsc/shaders/maister/ntsc-decode-filter-2phase.inc
> %%DATADIR%%/ntsc/shaders/maister/ntsc-decode-filter-3phase.inc
> %%DATADIR%%/ntsc/shaders/maister/ntsc-gauss-pass.slang
>@@ -3405,6 +3401,25 @@
> %%DATADIR%%/stereoscopic-3d/side-by-side-to-interlaced.slangp
> %%DATADIR%%/stereoscopic-3d/side-by-side-to-shutter.slangp
> %%DATADIR%%/stock.slang
>+%%DATADIR%%/subframe-bfi/120hz-safe-BFI.slangp
>+%%DATADIR%%/subframe-bfi/120hz-smart-BFI.slangp
>+%%DATADIR%%/subframe-bfi/bfi-simple.slangp
>+%%DATADIR%%/subframe-bfi/edge-blended-240hz-bfi.slangp
>+%%DATADIR%%/subframe-bfi/motionblur_test.slangp
>+%%DATADIR%%/subframe-bfi/shaders/120hz-safe-BFI.slang
>+%%DATADIR%%/subframe-bfi/shaders/120hz-smart-BFI/bfi_flicker.slang
>+%%DATADIR%%/subframe-bfi/shaders/120hz-smart-BFI/calculations.slang
>+%%DATADIR%%/subframe-bfi/shaders/bfi-simple.slang
>+%%DATADIR%%/subframe-bfi/shaders/edge-blended/edge-blended-240hz-bfi.slang
>+%%DATADIR%%/subframe-bfi/shaders/edge-blended/resources/240hzBot.png
>+%%DATADIR%%/subframe-bfi/shaders/edge-blended/resources/240hzMidBot.png
>+%%DATADIR%%/subframe-bfi/shaders/edge-blended/resources/240hzMidTop.png
>+%%DATADIR%%/subframe-bfi/shaders/edge-blended/resources/240hzTop.png
>+%%DATADIR%%/subframe-bfi/shaders/motionblur_test/resources/120.png
>+%%DATADIR%%/subframe-bfi/shaders/motionblur_test/resources/180.png
>+%%DATADIR%%/subframe-bfi/shaders/motionblur_test/resources/240.png
>+%%DATADIR%%/subframe-bfi/shaders/motionblur_test/resources/60.png
>+%%DATADIR%%/subframe-bfi/shaders/motionblur_test/shaders/motionblur_test.slang
> %%DATADIR%%/test/decode-format.slang
> %%DATADIR%%/test/feedback-noncausal.slang
> %%DATADIR%%/test/feedback-noncausal.slangp
>-- 
>2.47.0
>

Flags:

bsdcode: maintainer-approval+

Actions: View | Diff

Attachments on bug 282929: 255398