From eec41ff7b0f5c48a8babd5b0e99a2f4e4d73d0bd Mon Sep 17 00:00:00 2001 From: "Issam E. Maghni" Date: Tue, 24 Nov 2020 12:23:49 -0500 Subject: [PATCH 1/3] lcms2: update to 2.11 --- srcpkgs/lcms2/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template index d4025ee4963..766613fbc64 100644 --- a/srcpkgs/lcms2/template +++ b/srcpkgs/lcms2/template @@ -1,22 +1,22 @@ -# Template build file for 'lcms2'. +# Template file for 'lcms2' pkgname=lcms2 -version=2.9 -revision=2 +version=2.11 +revision=1 build_style=gnu-configure makedepends="tiff-devel" short_desc="Small-footprint color management engine, version 2" maintainer="Orphaned " -homepage="http://www.littlecms.com" license="MIT" -distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-$version.tar.gz" -checksum=48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20 +homepage="https://littlecms.com" +distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-${version}.tar.gz" +checksum=dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e post_install() { vlicense COPYING } lcms2-devel_package() { - depends="${makedepends} ${sourcepkg}-${version}_${revision}" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From d890dd0a3d19247ee824b798ff17fbcc0ad9924a Mon Sep 17 00:00:00 2001 From: "Issam E. Maghni" Date: Mon, 23 Nov 2020 22:47:41 -0500 Subject: [PATCH 2/3] libplacebo: update to 2.27.2 --- srcpkgs/libplacebo/template | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template index c764566718e..9d843e26af1 100644 --- a/srcpkgs/libplacebo/template +++ b/srcpkgs/libplacebo/template @@ -1,22 +1,29 @@ # Template file for 'libplacebo' pkgname=libplacebo -version=2.72.0 +version=2.72.2 revision=1 +wrksrc="${pkgname}-v${version}" build_style=meson -configure_args="-Dvulkan=enabled -Dglslang=disabled -Dshaderc=enabled" +configure_args="-Dshaderc=enabled -Dvulkan=enabled + -Dlcms=$(vopt_if lcms en dis)abled -Dopengl=$(vopt_if opengl en dis)abled" hostmakedepends="pkg-config python3-Mako Vulkan-Headers" -makedepends="vulkan-loader glslang-devel shaderc Vulkan-Headers lcms2-devel - libepoxy-devel" +makedepends="shaderc Vulkan-Headers vulkan-loader $(vopt_if lcms lcms2-devel) + $(vopt_if opengl libepoxy-devel)" short_desc="Reusable library for GPU-accelerated video/image rendering" maintainer="Orphaned " license="LGPL-2.1-or-later" -homepage="https://github.com/haasn/libplacebo" -distfiles="https://github.com/haasn/libplacebo/archive/v${version}.tar.gz" -checksum=41f83de4271c00d01facce683af798035707874c21113dcf0b00e74b6fce713b +homepage="https://code.videolan.org/videolan/libplacebo" +distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz" +checksum=5d3c51bb98d9727a255234a522f631f00d62a9e87115fb14251d991fc5076979 + +build_options="lcms opengl" +build_options_default="lcms opengl" +desc_option_lcms="Enable support for LittleCMS 2 engine" +desc_option_opengl="Enable support for OpenGL-based renderer" libplacebo-devel_package() { - depends="libplacebo-${version}_${revision} vulkan-loader lcms2-devel - libepoxy-devel" + depends="${sourcepkg}>=${version}_${revision} vulkan-loader + $(vopt_if lcms lcms2-devel) $(vopt_if opengl libepoxy-devel)" short_desc+=" - development files" pkg_install() { vmove usr/include From 73b852e9a9a69cc718808df28bc4a1a17810d97a Mon Sep 17 00:00:00 2001 From: "Issam E. Maghni" Date: Mon, 23 Nov 2020 21:58:56 -0500 Subject: [PATCH 3/3] mpv: update to 0.33.0 * oss support was removed by mpv#bca917f * libsmbclient support was removed by mpv#3b8b7cb * sndio support was removed by mpv#71d218e --- srcpkgs/mpv/template | 47 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index c45a163d0b3..4a14dd2ca40 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,29 +1,27 @@ # Template file for 'mpv' pkgname=mpv -version=0.32.0 -revision=4 +version=0.33.0 +revision=1 build_style=waf3 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv - --enable-dvdnav --enable-cdda --enable-libmpv-shared - --enable-dvbin --enable-libarchive $(vopt_enable alsa) $(vopt_enable caca) - $(vopt_enable jack) $(vopt_enable lua) $(vopt_enable oss oss-audio) - $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) - $(vopt_enable smb libsmbclient) $(vopt_enable sndio) - $(vopt_enable vapoursynth) $(vopt_enable vdpau) $(vopt_enable wayland) - $(vopt_enable x11) $(vopt_enable vulkan) $(vopt_enable vulkan shaderc)" + --enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive + --enable-libmpv-shared $(vopt_enable alsa) $(vopt_enable caca) + $(vopt_enable jack) $(vopt_enable lcms lcms2) $(vopt_enable lua) + $(vopt_enable openal) $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) + $(vopt_enable vapoursynth) $(vopt_enable vdpau) $(vopt_enable vulkan) + $(vopt_enable vulkan shaderc) $(vopt_enable wayland) $(vopt_enable x11)" hostmakedepends="pkg-config python3-docutils perl $(vopt_if wayland wayland-devel)" -makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel lcms2-devel libXv-devel +makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-devel libass-devel libbluray-devel libcdio-paranoia-devel libdvdnav-devel libguess-devel libuuid-devel libva-glx-devel rubberband-devel uchardet-devel libarchive-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if caca libcaca-devel) - $(vopt_if jack jack-devel) $(vopt_if lua lua52-devel) + $(vopt_if jack jack-devel) $(vopt_if lcms lcms2-devel) + $(vopt_if lua lua52-devel) $(vopt_if openal libopenal-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel) - $(vopt_if smb samba-devel) $(vopt_if sndio sndio-devel) - $(vopt_if vapoursynth vapoursynth-devel) - $(vopt_if vdpau libvdpau-devel) $(vopt_if wayland "wayland-devel - wayland-protocols libxkbcommon-devel") - $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel") - $(vopt_if vulkan "Vulkan-Headers vulkan-loader shaderc libplacebo-devel")" + $(vopt_if vapoursynth vapoursynth-devel) $(vopt_if vdpau libvdpau-devel) + $(vopt_if vulkan "Vulkan-Headers vulkan-loader shaderc libplacebo-devel") + $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel") + $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel")" depends="desktop-file-utils hicolor-icon-theme $(vopt_if vapoursynth vapoursynth-mvtools)" short_desc="Video player based on MPlayer/mplayer2" maintainer="travankor " @@ -31,13 +29,18 @@ license="GPL-2.0-or-later" homepage="https://mpv.io" changelog="https://github.com/mpv-player/mpv/releases" distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz" -checksum=9163f64832226d22e24bbc4874ebd6ac02372cd717bef15c28a0aa858c5fe592 +checksum=f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4 -build_options="alsa caca jack lua oss pulseaudio sdl2 smb sndio vapoursynth - vdpau wayland x11 vulkan" -build_options_default="alsa jack lua pulseaudio sndio vdpau wayland x11 vulkan" +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" +fi + +build_options="alsa caca jack lcms lua openal pulseaudio sdl2 vapoursynth vdpau + vulkan wayland x11" +build_options_default="alsa jack lcms lua pulseaudio vdpau vulkan wayland x11" desc_option_caca="Enable support for libcaca video output" -desc_option_oss="Enable support for OSS audio output" +desc_option_lcms="Enable support for LittleCMS 2 engine" +desc_option_openal="Enable support for OpenAL audio output" vopt_conflict sdl2 wayland if [ -z "$CROSS_BUILD" ]; then