Date: Sun, 3 Feb 2019 19:04:23 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492060 - in head: graphics graphics/libplacebo graphics/shaderc multimedia/mpv Message-ID: <201902031904.x13J4NRL051632@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Feb 3 19:04:22 2019 New Revision: 492060 URL: https://svnweb.freebsd.org/changeset/ports/492060 Log: multimedia/mpv: expose Vulkan support after r469515 PR: 227994 (tracking) Obtained from: Greg V <greg@unrelenting.technology> (via GitHub) Added: head/graphics/shaderc/ head/graphics/shaderc/Makefile (contents, props changed) head/graphics/shaderc/distinfo (contents, props changed) head/graphics/shaderc/pkg-descr (contents, props changed) head/graphics/shaderc/pkg-plist (contents, props changed) Modified: head/graphics/Makefile (contents, props changed) head/graphics/libplacebo/Makefile (contents, props changed) head/multimedia/mpv/Makefile (contents, props changed) Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Sun Feb 3 18:49:23 2019 (r492059) +++ head/graphics/Makefile Sun Feb 3 19:04:22 2019 (r492060) @@ -993,6 +993,7 @@ SUBDIR += seom SUBDIR += separate SUBDIR += seq2gif + SUBDIR += shaderc SUBDIR += shared-color-profiles SUBDIR += sharpconstruct SUBDIR += shotwell Modified: head/graphics/libplacebo/Makefile ============================================================================== --- head/graphics/libplacebo/Makefile Sun Feb 3 18:49:23 2019 (r492059) +++ head/graphics/libplacebo/Makefile Sun Feb 3 19:04:22 2019 (r492060) @@ -3,6 +3,7 @@ PORTNAME= libplacebo DISTVERSIONPREFIX= v DISTVERSION= 1.7.0 +PORTREVISION= 1 CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -23,11 +24,6 @@ OPTIONS_DEFINE= LCMS2 TEST VULKAN OPTIONS_DEFAULT=LCMS2 SHADERC OPTIONS_SINGLE= VULKAN OPTIONS_SINGLE_VULKAN= GLSLANG SHADERC - -.if !exists(${.CURDIR:H:H}/graphics/shaderc) -OPTIONS_DEFAULT:= ${OPTIONS_DEFAULT:S/SHADERC/GLSLANG/} -OPTIONS_EXCLUDE+= SHADERC -.endif GLSLANG_DESC= glslang SPIR-V compiler GLSLANG_BUILD_DEPENDS= glslang>0:devel/glslang Added: head/graphics/shaderc/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/shaderc/Makefile Sun Feb 3 19:04:22 2019 (r492060) @@ -0,0 +1,37 @@ +# $FreeBSD$ + +PORTNAME= shaderc +DISTVERSIONPREFIX=v +DISTVERSION= 2018.0 +CATEGORIES= graphics devel + +PATCH_SITES= https://github.com/haasn/${GH_PROJECT}/commit/ +PATCHFILES= 21c8be385b3f.patch:-p1 + +MAINTAINER= greg@unrelenting.technology +COMMENT= GLSL/HLSL to SPIR-V shader compiler + +LICENSE= APACHE20 + +BUILD_DEPENDS= ${LOCALBASE}/lib/libSPIRV-Tools-opt.a:devel/spirv-tools \ + ${LOCALBASE}/lib/libHLSL.a:devel/glslang + +USES= cmake compiler:c++11-lib pkgconfig localbase:ldflags python:build +USE_LDCONFIG= yes + +USE_GITHUB= yes +GH_ACCOUNT= google + +CMAKE_ON+= SHADERC_SKIP_TESTS +CMAKE_OFF+= SHADERC_ENABLE_NV_EXTENSIONS +CMAKE_ARGS+= -DPYTHON_EXE:STRING="${PYTHON_CMD}" +CFLAGS+= -Wno-ignored-attributes -Wno-c++11-narrowing + +# https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/shaderc + +post-patch: + ${REINPLACE_CMD} '/examples/d;/third_party/d' ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} '/build-version/d' ${WRKSRC}/glslc/CMakeLists.txt + ${ECHO} "\"${DISTVERSIONFULL}\"" > ${WRKSRC}/glslc/src/build-version.inc + +.include <bsd.port.mk> Added: head/graphics/shaderc/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/shaderc/distinfo Sun Feb 3 19:04:22 2019 (r492060) @@ -0,0 +1,5 @@ +TIMESTAMP = 1538421668 +SHA256 (google-shaderc-v2018.0_GH0.tar.gz) = b96f27e7375a6df08732ebd47c18febf82bd0a87e541fd7814fd8c3aa6c8913a +SIZE (google-shaderc-v2018.0_GH0.tar.gz) = 206013 +SHA256 (21c8be385b3f.patch) = 986a972d8b8fbfa750e92b750673108c4ae77af47acdc4dbb684358e2600a4ea +SIZE (21c8be385b3f.patch) = 1744 Added: head/graphics/shaderc/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/shaderc/pkg-descr Sun Feb 3 19:04:22 2019 (r492060) @@ -0,0 +1,8 @@ +A library and command line tool for compiling GLSL/HLSL to SPIR-V, +Vulkan's shader language. + +Based on the reference glslang compiler, Shaderc aims to provide a more +convenient command-line compiler with GCC/clang-like usage and a library +with a more stable API. + +WWW: https://github.com/google/shaderc Added: head/graphics/shaderc/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/shaderc/pkg-plist Sun Feb 3 19:04:22 2019 (r492060) @@ -0,0 +1,8 @@ +bin/glslc +include/shaderc/shaderc.h +include/shaderc/shaderc.hpp +lib/libshaderc.a +lib/libshaderc_combined.a +lib/libshaderc_shared.so +lib/libshaderc_shared.so.1 +lib/libshaderc_util.a Modified: head/multimedia/mpv/Makefile ============================================================================== --- head/multimedia/mpv/Makefile Sun Feb 3 18:49:23 2019 (r492059) +++ head/multimedia/mpv/Makefile Sun Feb 3 19:04:22 2019 (r492060) @@ -47,7 +47,7 @@ OPTIONS_DEFAULT= ARCHIVE ASS DVDREAD DVDNAV MANPAGES O V4L VAAPI VDPAU WAYLAND X11 YTDL OPTIONS_GROUP= IN VO AO OPTIONS_GROUP_IN= CDIO DVDREAD DVDNAV LIBBLURAY V4L YTDL SMB -OPTIONS_GROUP_VO= CACA OPENGL VAAPI VDPAU WAYLAND X11 +OPTIONS_GROUP_VO= CACA OPENGL VAAPI VDPAU VULKAN WAYLAND X11 OPTIONS_GROUP_AO= ALSA JACK OPENAL PULSEAUDIO SDL SNDIO OPTIONS_SUB= yes @@ -56,6 +56,7 @@ DVDREAD_DESC= DVD Playback support DVDNAV_DESC= DVD menu navigation LUAJIT_DESC= Use LuaJIT instead of Lua scripting language support UCHARDET_DESC= Guess subtitle encoding via uchardet +VULKAN_DESC= Vulkan output support WAYLAND_DESC= Wayland (graphics) support YTDL_DESC= Install youtube-dl IN_DESC= Input @@ -142,6 +143,12 @@ VAAPI_CONFIGURE_OFF= --disable-vaapi VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_OFF= --disable-vdpau + +VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers +VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \ + libshaderc_shared.so:graphics/shaderc +VULKAN_CONFIGURE_OFF= --disable-vulkan --disable-shaderc +VULKAN_IMPLIES= X11 WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.14:graphics/wayland-protocols \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902031904.x13J4NRL051632>