pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libretro-glsl-shaders: Simplify makefile.



Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Sun May 6 18:40:54 2018 +0100
Changeset:	e6a0ea0e6d2d0d591c4fe1231d629e1bcf02f646

Modified Files:
	libretro-glsl-shaders/Makefile
	libretro-glsl-shaders/PLIST

Log Message:
libretro-glsl-shaders: Simplify makefile.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e6a0ea0e6d2d0d591c4fe1231d629e1bcf02f646

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libretro-glsl-shaders/Makefile | 178 ++---------------------------------------
 libretro-glsl-shaders/PLIST    |  33 ++++++++
 2 files changed, 39 insertions(+), 172 deletions(-)

diffs:
diff --git a/libretro-glsl-shaders/Makefile b/libretro-glsl-shaders/Makefile
index 876843d78d..5518330d0b 100644
--- a/libretro-glsl-shaders/Makefile
+++ b/libretro-glsl-shaders/Makefile
@@ -2,7 +2,7 @@
 
 PKGNAME=	libretro-glsl-shaders-1.7.3
 DISTNAME=	retroarch-assets-${PKGVERSION_NOREV}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	-http://buildbot.libretro.com/stable/${PKGVERSION_NOREV}/windows-msvc2010/x86_64/RetroArch.7z
 EXTRACT_SUFX=	.7z
@@ -11,181 +11,15 @@ MAINTAINER=	nia.alarie%gmail.com@localhost
 COMMENT=	Libretro GLSL shaders
 
 USE_LANGUAGES=	# none
+USE_TOOLS+=	find
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/shaders/shaders_glsl
 
-SHADER_DIRS+=	3dfx
-SHADER_DIRS+=	3dfx/shaders
-SHADER_DIRS+=	anti-aliasing
-SHADER_DIRS+=	anti-aliasing/shaders
-SHADER_DIRS+=	anti-aliasing/shaders/aa-shader-4.0-level2
-SHADER_DIRS+=	auto-box
-SHADER_DIRS+=	blurs
-SHADER_DIRS+=	borders
-SHADER_DIRS+=	borders/gameboy-player
-SHADER_DIRS+=	borders/gameboy-player/sample-borders
-SHADER_DIRS+=	borders/imgborder
-SHADER_DIRS+=	borders/resources
-SHADER_DIRS+=	borders/sgb
-SHADER_DIRS+=	borders/sgb/sample-borders
-SHADER_DIRS+=	borders/sgba
-SHADER_DIRS+=	borders/sgba/sample-borders
-SHADER_DIRS+=	cel
-SHADER_DIRS+=	cel/presets
-SHADER_DIRS+=	cel/shaders
-SHADER_DIRS+=	crt
-SHADER_DIRS+=	crt/shaders
-SHADER_DIRS+=	crt/shaders/crt-easymode-halation
-SHADER_DIRS+=	crt/shaders/crt-hyllian-glow
-SHADER_DIRS+=	crt/shaders/crt-hyllian-multipass
-SHADER_DIRS+=	crt/shaders/crt-interlaced-halation
-SHADER_DIRS+=	crt/shaders/crt-lottes-multipass
-SHADER_DIRS+=	crt/shaders/crt-potato
-SHADER_DIRS+=	crt/shaders/crt-potato/resources
-SHADER_DIRS+=	crt/shaders/crt-potato/shader-files
-SHADER_DIRS+=	crt/shaders/crt-royale
-SHADER_DIRS+=	crt/shaders/crt-royale/port-helpers
-SHADER_DIRS+=	crt/shaders/crt-royale/src
-SHADER_DIRS+=	crt/shaders/crtsim
-SHADER_DIRS+=	crt/shaders/glow
-SHADER_DIRS+=	crt/shaders/gtu-famicom
-SHADER_DIRS+=	crt/shaders/gtu-v050
-SHADER_DIRS+=	crt/shaders/metacrt
-SHADER_DIRS+=	crt/shaders/phosphorlut
-SHADER_DIRS+=	crt/shaders/phosphorlut/luts
-SHADER_DIRS+=	cubic
-SHADER_DIRS+=	cubic/shaders
-SHADER_DIRS+=	ddt
-SHADER_DIRS+=	ddt/shaders
-SHADER_DIRS+=	deblur
-SHADER_DIRS+=	deblur/shaders
-SHADER_DIRS+=	denoisers
-SHADER_DIRS+=	denoisers/shaders
-SHADER_DIRS+=	dithering
-SHADER_DIRS+=	dithering/shaders
-SHADER_DIRS+=	dithering/shaders/cbod-v1
-SHADER_DIRS+=	dithering/shaders/gdapt
-SHADER_DIRS+=	dithering/shaders/mdapt
-SHADER_DIRS+=	dithering/shaders/mdapt/passes
-SHADER_DIRS+=	eagle
-SHADER_DIRS+=	eagle/shaders
-SHADER_DIRS+=	film
-SHADER_DIRS+=	film/resources
-SHADER_DIRS+=	film/shaders
-SHADER_DIRS+=	handheld
-SHADER_DIRS+=	handheld/console-border
-SHADER_DIRS+=	handheld/console-border/resources
-SHADER_DIRS+=	handheld/console-border/shader-files
-SHADER_DIRS+=	handheld/shaders
-SHADER_DIRS+=	handheld/shaders/color
-SHADER_DIRS+=	handheld/shaders/gameboy
-SHADER_DIRS+=	handheld/shaders/gameboy/resources
-SHADER_DIRS+=	handheld/shaders/gameboy/resources/sample-bgs
-SHADER_DIRS+=	handheld/shaders/gameboy/resources/sample-palettes
-SHADER_DIRS+=	handheld/shaders/gameboy/shader-files
-SHADER_DIRS+=	handheld/shaders/gb-palette
-SHADER_DIRS+=	handheld/shaders/gb-palette/resources
-SHADER_DIRS+=	handheld/shaders/lcd-cgwg
-SHADER_DIRS+=	handheld/shaders/lcd-shader
-SHADER_DIRS+=	handheld/shaders/lcd-shader/backup
-SHADER_DIRS+=	handheld/shaders/lcd-shader/backup-2
-SHADER_DIRS+=	handheld/shaders/lcd-shader/backup-3
-SHADER_DIRS+=	handheld/shaders/mgba
-SHADER_DIRS+=	handheld/shaders/simpletex_lcd
-SHADER_DIRS+=	handheld/shaders/simpletex_lcd/png
-SHADER_DIRS+=	handheld/shaders/simpletex_lcd/png/2k
-SHADER_DIRS+=	handheld/shaders/simpletex_lcd/png/4k
-SHADER_DIRS+=	hqx
-SHADER_DIRS+=	hqx/resources
-SHADER_DIRS+=	hqx/shader-files
-SHADER_DIRS+=	hqx/single-pass
-SHADER_DIRS+=	hqx/single-pass/shader-files
-SHADER_DIRS+=	misc
-SHADER_DIRS+=	motionblur
-SHADER_DIRS+=	motionblur/shaders
-SHADER_DIRS+=	nedi
-SHADER_DIRS+=	nedi/shaders
-SHADER_DIRS+=	nnedi3
-SHADER_DIRS+=	nnedi3/shaders
-SHADER_DIRS+=	ntsc
-SHADER_DIRS+=	ntsc/shaders
-SHADER_DIRS+=	ntsc/shaders/artifact-colors
-SHADER_DIRS+=	omniscale
-SHADER_DIRS+=	omniscale/shaders
-SHADER_DIRS+=	pal
-SHADER_DIRS+=	pal/resources
-SHADER_DIRS+=	pal/shaders
-SHADER_DIRS+=	presets
-SHADER_DIRS+=	presets/tvout
-SHADER_DIRS+=	presets/tvout+interlacing
-SHADER_DIRS+=	procedural
-SHADER_DIRS+=	procedural/dakrunch-manta-ray
-SHADER_DIRS+=	procedural/iq-canyon
-SHADER_DIRS+=	procedural/iq-repelling
-SHADER_DIRS+=	procedural/iq-warping-texture
-SHADER_DIRS+=	procedural/kali-space-race
-SHADER_DIRS+=	procedural/kali-space-race-hd
-SHADER_DIRS+=	procedural/nimitz-cloud-ten
-SHADER_DIRS+=	procedural/pmalin-waterfalls
-SHADER_DIRS+=	procedural/pmalin-waterfalls-hd
-SHADER_DIRS+=	procedural/shane-abstract-corridor
-SHADER_DIRS+=	procedural/sudonhim-cloudy-voxel-world
-SHADER_DIRS+=	procedural/sudonhim-cloudy-voxel-world-2
-SHADER_DIRS+=	reshade
-SHADER_DIRS+=	reshade/shaders
-SHADER_DIRS+=	reshade/shaders/LUT
-SHADER_DIRS+=	retro
-SHADER_DIRS+=	retro/shaders
-SHADER_DIRS+=	sabr
-SHADER_DIRS+=	sabr/shaders
-SHADER_DIRS+=	scalefx
-SHADER_DIRS+=	scalefx/shaders
-SHADER_DIRS+=	scalehq
-SHADER_DIRS+=	scalehq/shaders
-SHADER_DIRS+=	scalenx
-SHADER_DIRS+=	scalenx/shaders
-SHADER_DIRS+=	sharpen
-SHADER_DIRS+=	sharpen/shaders
-SHADER_DIRS+=	vhs
-SHADER_DIRS+=	vhs/resources
-SHADER_DIRS+=	vhs/shaders
-SHADER_DIRS+=	windowed
-SHADER_DIRS+=	windowed/shaders
-SHADER_DIRS+=	xbr
-SHADER_DIRS+=	xbr/shaders
-SHADER_DIRS+=	xbr/shaders/2xBR-multipass
-SHADER_DIRS+=	xbr/shaders/super-xbr
-SHADER_DIRS+=	xbr/shaders/xbr-hybrid
-SHADER_DIRS+=	xbr/shaders/xbr-lv3-multipass
-SHADER_DIRS+=	xbr/shaders/xbr-mlv4-multipass
-SHADER_DIRS+=	xbrz
-SHADER_DIRS+=	xbrz/shaders
-SHADER_DIRS+=	xbrz/shaders/xbrz-freescale-multipass
-SHADER_DIRS+=	xsal
-SHADER_DIRS+=	xsal/shaders
-SHADER_DIRS+=	xsoft
-SHADER_DIRS+=	xsoft/shaders
-
-INSTALLATION_DIRS+=	share/libretro/shaders
-.for i in ${SHADER_DIRS}
-INSTALLATION_DIRS+=	share/libretro/shaders/${i}
-.endfor
-
 do-install:
-.for type in glsl glslp
-	if ${LS} -1 ${WRKSRC} | ${GREP} -q .${type}$$ ; then \
-	    ${INSTALL_DATA} ${WRKSRC}/*.${type} \
-	    ${DESTDIR}${PREFIX}/share/libretro/shaders ; \
-	fi
-.endfor
-.for dir in ${SHADER_DIRS}
-.  for type in glsl glslp md png
-	if ${LS} -1 ${WRKSRC}/${dir} | ${GREP} -q .${type}$$ ; then \
-	    ${INSTALL_DATA} ${WRKSRC}/${dir}/*.${type} \
-	    ${DESTDIR}${PREFIX}/share/libretro/shaders/${dir} ; \
-	fi
-.  endfor
-.endfor
+	cd ${WRKSRC} && ${FIND} * -type d -exec ${INSTALL_DATA_DIR} \
+	    ${DESTDIR}${PREFIX}/share/libretro/shaders/{} \;
+	cd ${WRKSRC} && ${FIND} * -type f -exec ${INSTALL_DATA} {} \
+	    ${DESTDIR}${PREFIX}/share/libretro/shaders/{} \;
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/libretro-glsl-shaders/PLIST b/libretro-glsl-shaders/PLIST
index 675911f366..cdcdf0ea00 100644
--- a/libretro-glsl-shaders/PLIST
+++ b/libretro-glsl-shaders/PLIST
@@ -3,6 +3,7 @@ share/libretro/shaders/3dfx/3dfx_4x1.glslp
 share/libretro/shaders/3dfx/shaders/3dfx_pass_0.glsl
 share/libretro/shaders/3dfx/shaders/3dfx_pass_1.glsl
 share/libretro/shaders/3dfx/shaders/3dfx_pass_2.glsl
+share/libretro/shaders/Makefile
 share/libretro/shaders/anti-aliasing/aa-shader-4.0-level2.glslp
 share/libretro/shaders/anti-aliasing/aa-shader-4.0.glslp
 share/libretro/shaders/anti-aliasing/advanced-aa.glslp
@@ -131,6 +132,7 @@ share/libretro/shaders/cel/shaders/MMJ_Cel_Shader_MP_Blur_H.glsl
 share/libretro/shaders/cel/shaders/MMJ_Cel_Shader_MP_Blur_V.glsl
 share/libretro/shaders/cel/shaders/MMJ_Cel_Shader_MP_Color.glsl
 share/libretro/shaders/cel/shaders/MMJ_Cel_Shader_MP_Outline.glsl
+share/libretro/shaders/configure
 share/libretro/shaders/crt/crt-aperture.glslp
 share/libretro/shaders/crt/crt-caligari.glslp
 share/libretro/shaders/crt/crt-cgwg-fast.glslp
@@ -194,6 +196,9 @@ share/libretro/shaders/crt/shaders/crt-pi.glsl
 share/libretro/shaders/crt/shaders/crt-potato/resources/crt-potato-thick.png
 share/libretro/shaders/crt/shaders/crt-potato/resources/crt-potato-thin.png
 share/libretro/shaders/crt/shaders/crt-potato/shader-files/crt-potato.glsl
+share/libretro/shaders/crt/shaders/crt-royale/LICENSE.TXT
+share/libretro/shaders/crt/shaders/crt-royale/README.TXT
+share/libretro/shaders/crt/shaders/crt-royale/THANKS.TXT
 share/libretro/shaders/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png
 share/libretro/shaders/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png
 share/libretro/shaders/crt/shaders/crt-royale/TileableLinearShadowMask.png
@@ -202,7 +207,18 @@ share/libretro/shaders/crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeT
 share/libretro/shaders/crt/shaders/crt-royale/TileableLinearShadowMaskResizeTo64.png
 share/libretro/shaders/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png
 share/libretro/shaders/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/bind-shader-params.h
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/bloom-functions.h
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/blur-functions.h
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/derived-settings-and-constants.h
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/gamma-management.h
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/geometry-functions.h
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/phosphor-mask-resizing.h
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/quad-pixel-communication.h
 share/libretro/shaders/crt/shaders/crt-royale/port-helpers/royale-template.glsl
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/scanline-functions.h
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/special-functions.h
+share/libretro/shaders/crt/shaders/crt-royale/port-helpers/tex2Dantialias.h
 share/libretro/shaders/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom-intel.glsl
 share/libretro/shaders/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom.glsl
 share/libretro/shaders/crt/shaders/crt-royale/src/crt-royale-bloom-approx.glsl
@@ -506,6 +522,7 @@ share/libretro/shaders/handheld/shaders/mgba/ags001.glsl
 share/libretro/shaders/handheld/shaders/sameboy-lcd.glsl
 share/libretro/shaders/handheld/shaders/simpletex_lcd/png/2k/textured_paper.png
 share/libretro/shaders/handheld/shaders/simpletex_lcd/png/4k/textured_paper.png
+share/libretro/shaders/handheld/shaders/simpletex_lcd/png/readme.txt
 share/libretro/shaders/handheld/shaders/simpletex_lcd/simpletex_lcd+gba-color-4k.glsl
 share/libretro/shaders/handheld/shaders/simpletex_lcd/simpletex_lcd+gba-color.glsl
 share/libretro/shaders/handheld/shaders/simpletex_lcd/simpletex_lcd+gbc-color-4k.glsl
@@ -571,6 +588,7 @@ share/libretro/shaders/nedi/shaders/nedi-jinc.glsl
 share/libretro/shaders/nedi/shaders/nedi-pass0.glsl
 share/libretro/shaders/nedi/shaders/nedi-pass1.glsl
 share/libretro/shaders/nedi/shaders/nedi-pass2.glsl
+share/libretro/shaders/nnedi3/LICENSE
 share/libretro/shaders/nnedi3/README.md
 share/libretro/shaders/nnedi3/nnedi3-nns16-2x-luma.glslp
 share/libretro/shaders/nnedi3/nnedi3-nns16-2x-rgb.glslp
@@ -695,6 +713,8 @@ share/libretro/shaders/procedural/ciberxtrem-portal.glsl
 share/libretro/shaders/procedural/dakrunch-manta-ray/dakrunch-manta-ray.glsl
 share/libretro/shaders/procedural/dakrunch-manta-ray/dakrunch-manta-ray.glslp
 share/libretro/shaders/procedural/dakrunch-manta-ray/iChannel0.png
+share/libretro/shaders/procedural/dakrunch-manta-ray/iChannel1.jpg
+share/libretro/shaders/procedural/dakrunch-manta-ray/iChannel3.jpg
 share/libretro/shaders/procedural/dave_hoskins-frozen-wasteland.glsl
 share/libretro/shaders/procedural/dave_hoskins-galaxy-of-universes.glsl
 share/libretro/shaders/procedural/dave_hoskins-ray-q-bert.glsl
@@ -731,7 +751,10 @@ share/libretro/shaders/procedural/iocc-fan-bounce.glsl
 share/libretro/shaders/procedural/iq-analytical-normals-3d.glsl
 share/libretro/shaders/procedural/iq-apple.glsl
 share/libretro/shaders/procedural/iq-batman.glsl
+share/libretro/shaders/procedural/iq-canyon/iChannel0.jpg
+share/libretro/shaders/procedural/iq-canyon/iChannel1.jpg
 share/libretro/shaders/procedural/iq-canyon/iChannel2.png
+share/libretro/shaders/procedural/iq-canyon/iChannel3.jpg
 share/libretro/shaders/procedural/iq-canyon/iq-canyon.glsl
 share/libretro/shaders/procedural/iq-canyon/iq-canyon.glslp
 share/libretro/shaders/procedural/iq-clover.glsl
@@ -742,8 +765,10 @@ share/libretro/shaders/procedural/iq-julia-quaternion.glsl
 share/libretro/shaders/procedural/iq-mandelbulb-derivative.glsl
 share/libretro/shaders/procedural/iq-oscilomushroom.glsl
 share/libretro/shaders/procedural/iq-raymarching-primitives.glsl
+share/libretro/shaders/procedural/iq-repelling/iChannel0.jpg
 share/libretro/shaders/procedural/iq-repelling/iq-repelling.glsl
 share/libretro/shaders/procedural/iq-repelling/iq-repelling.glslp
+share/libretro/shaders/procedural/iq-warping-texture/iChannel0.jpg
 share/libretro/shaders/procedural/iq-warping-texture/iq-warping-texture.glsl
 share/libretro/shaders/procedural/iq-warping-texture/iq-warping-texture.glslp
 share/libretro/shaders/procedural/jasminpatry-are-gee-be.glsl
@@ -776,8 +801,12 @@ share/libretro/shaders/procedural/nrx-voxel-pacman.glsl
 share/libretro/shaders/procedural/otaviogood-alien-beacon.glsl
 share/libretro/shaders/procedural/otaviogood-iceberg.glsl
 share/libretro/shaders/procedural/otaviogood-skyline.glsl
+share/libretro/shaders/procedural/pmalin-waterfalls-hd/iChannel0.jpg
+share/libretro/shaders/procedural/pmalin-waterfalls-hd/iChannel1.jpg
 share/libretro/shaders/procedural/pmalin-waterfalls-hd/pmalin-waterfalls-hd.glsl
 share/libretro/shaders/procedural/pmalin-waterfalls-hd/pmalin-waterfalls-hd.glslp
+share/libretro/shaders/procedural/pmalin-waterfalls/iChannel0.jpg
+share/libretro/shaders/procedural/pmalin-waterfalls/iChannel1.jpg
 share/libretro/shaders/procedural/pmalin-waterfalls/pmalin-waterfalls.glsl
 share/libretro/shaders/procedural/pmalin-waterfalls/pmalin-waterfalls.glslp
 share/libretro/shaders/procedural/pmalin-where-the-river-goes-textureless-hd.glsl
@@ -788,6 +817,8 @@ share/libretro/shaders/procedural/reinder-tokyo.glsl
 share/libretro/shaders/procedural/reinder-wolfenstein3d.glsl
 share/libretro/shaders/procedural/romainguy-physically-based-sdf.glsl
 share/libretro/shaders/procedural/sdf-platform.glsl
+share/libretro/shaders/procedural/shane-abstract-corridor/iChannel0.jpg
+share/libretro/shaders/procedural/shane-abstract-corridor/iChannel1.jpg
 share/libretro/shaders/procedural/shane-abstract-corridor/shane-abstract-corridor.glsl
 share/libretro/shaders/procedural/shane-abstract-corridor/shane-abstract-corridor.glslp
 share/libretro/shaders/procedural/shane-latticetutorial.glsl
@@ -802,9 +833,11 @@ share/libretro/shaders/procedural/srtuss-star-swirl.glsl
 share/libretro/shaders/procedural/srtuss-the-eye.glsl
 share/libretro/shaders/procedural/stellabialek-moonlight-sillyness.glsl
 share/libretro/shaders/procedural/sudonhim-cloudy-voxel-world-2/iChannel0.png
+share/libretro/shaders/procedural/sudonhim-cloudy-voxel-world-2/iChannel1.jpg
 share/libretro/shaders/procedural/sudonhim-cloudy-voxel-world-2/sudonhim-cloudy-voxel-world.glsl
 share/libretro/shaders/procedural/sudonhim-cloudy-voxel-world-2/sudonhim-cloudy-voxel-world.glslp
 share/libretro/shaders/procedural/sudonhim-cloudy-voxel-world/iChannel0.png
+share/libretro/shaders/procedural/sudonhim-cloudy-voxel-world/iChannel1.jpg
 share/libretro/shaders/procedural/sudonhim-cloudy-voxel-world/sudonhim-cloudy-voxel-world.glsl
 share/libretro/shaders/procedural/sudonhim-cloudy-voxel-world/sudonhim-cloudy-voxel-world.glslp
 share/libretro/shaders/procedural/sw-cloud-2d.glsl


Home | Main Index | Thread Index | Old Index