From 9a494bd23e24f1c22e8db2d38221d4b1f28e988d Mon Sep 17 00:00:00 2001 From: zlice Date: Sat, 27 Jul 2024 10:18:14 -0400 Subject: [PATCH 1/5] New package: libvpl-2.12.0 Intel's oneVPL repo has been named to libvpl and referenced as such for a bit. The newest release is libvpl with the version scheme changing to a minor.major.bug numbering instead of the previous yyyy.x.z versioning. --- common/shlibs | 2 +- srcpkgs/libvpl-devel | 1 + srcpkgs/libvpl-examples | 1 + .../{oneVPL => libvpl}/patches/cross-pc.patch | 2 +- srcpkgs/libvpl/template | 40 +++++++++++++++++ srcpkgs/oneVPL/template | 45 +++++++------------ 6 files changed, 59 insertions(+), 32 deletions(-) create mode 120000 srcpkgs/libvpl-devel create mode 120000 srcpkgs/libvpl-examples rename srcpkgs/{oneVPL => libvpl}/patches/cross-pc.patch (79%) create mode 100644 srcpkgs/libvpl/template diff --git a/common/shlibs b/common/shlibs index 23b6a476e92561..1186c171993256 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4499,7 +4499,7 @@ libgrass_gproj.8.3.so grass-8.3.0_1 libgrass_imagery.8.3.so grass-8.3.0_1 libgrass_raster.8.3.so grass-8.3.0_1 libgrass_vector.8.3.so grass-8.3.0_1 -libvpl.so.2 oneVPL-2023.3.1_1 +libvpl.so.2 libvpl-2.12.0_1 libusrsctp.so.2 usrsctp-0.9.5.0_1 libdatachannel.so.0.20 libdatachannel-0.20.2_1 libgeotiff.so.5 libgeotiff-1.7.1_1 diff --git a/srcpkgs/libvpl-devel b/srcpkgs/libvpl-devel new file mode 120000 index 00000000000000..bfde25d9df683b --- /dev/null +++ b/srcpkgs/libvpl-devel @@ -0,0 +1 @@ +libvpl \ No newline at end of file diff --git a/srcpkgs/libvpl-examples b/srcpkgs/libvpl-examples new file mode 120000 index 00000000000000..bfde25d9df683b --- /dev/null +++ b/srcpkgs/libvpl-examples @@ -0,0 +1 @@ +libvpl \ No newline at end of file diff --git a/srcpkgs/oneVPL/patches/cross-pc.patch b/srcpkgs/libvpl/patches/cross-pc.patch similarity index 79% rename from srcpkgs/oneVPL/patches/cross-pc.patch rename to srcpkgs/libvpl/patches/cross-pc.patch index 0b24a2124c9b2f..0c4e18f63729cb 100644 --- a/srcpkgs/oneVPL/patches/cross-pc.patch +++ b/srcpkgs/libvpl/patches/cross-pc.patch @@ -1,4 +1,4 @@ ---- a/dispatcher/pkgconfig/vpl.pc.in 2023-07-21 23:28:38.000000000 +0200 +--- a/libvpl/pkgconfig/vpl.pc.in 2023-07-21 23:28:38.000000000 +0200 +++ - 2023-11-14 10:16:46.665168740 +0100 @@ -1,6 +1,6 @@ -prefix=@pc_rel_prefix@ diff --git a/srcpkgs/libvpl/template b/srcpkgs/libvpl/template new file mode 100644 index 00000000000000..9ba84df8a571d8 --- /dev/null +++ b/srcpkgs/libvpl/template @@ -0,0 +1,40 @@ +# Template file for 'libvpl' +pkgname=libvpl +version=2.12.0 +revision=1 +build_style=cmake +configure_args="-DBUILD_EXAMPLES=ON" +hostmakedepends="pkg-config" +makedepends="libva-devel libX11-devel" +short_desc="Intel oneAPI Video Processing Library" +maintainer="Michael Aldridge " +license="MIT" +homepage="https://github.com/intel/libvpl" +changelog="https://github.com/intel/libvpl/blob/master/CHANGELOG.md" +distfiles="https://github.com/intel/libvpl/archive/refs/tags/v${version}.tar.gz" +checksum=efc19e5a8544704100f814753eb5e09e85a68e3386508b164042c1f1f761bae8 + +post_install() { + vlicense LICENSE +} + +libvpl-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove etc/vpl/vars.sh + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/cmake + vmove usr/lib/*.so + } +} + +libvpl-examples_package() { + short_desc+=" - examples" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/bin + vmove usr/share/vpl/examples + } +} diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template index 20dcd04f5f4976..316da8d59b7633 100644 --- a/srcpkgs/oneVPL/template +++ b/srcpkgs/oneVPL/template @@ -1,43 +1,28 @@ # Template file for 'oneVPL' pkgname=oneVPL version=2023.3.1 -revision=2 -build_style=cmake -hostmakedepends="pkg-config" -makedepends="libva-devel libX11-devel" +revision=3 +build_style=meta short_desc="Intel oneAPI Video Processing Library" maintainer="Michael Aldridge " -license="MIT" -homepage="https://github.com/oneapi-src/oneVPL" -changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md" -distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz" -checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5 +license="Public Domain" +homepage="https://github.com/intel/libvpl" +changelog="https://github.com/intel/libvpl/blob/master/CHANGELOG.md" -post_install() { - vlicense LICENSE +oneVPL_package() { + build_style="meta" + short_desc" (transitional dummy package)" + depends="libvpl>=0" } oneVPL-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove etc/vpl/vars.sh - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } + build_style="meta" + short_desc" - development files" + depends="libvpl>=0" } oneVPL-examples_package() { - short_desc+=" - examples" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/bin/sample_decode - vmove usr/bin/sample_encode - vmove usr/bin/sample_multi_transcode - vmove usr/bin/sample_vpp - vmove usr/bin/vpl-inspect - vmove usr/share/vpl/examples - } + build_style="meta" + short_desc" - examples" + depends="libvpl>=0" } From 65c6fa595f3a5b71fa8db19f19b0df1a69c1912b Mon Sep 17 00:00:00 2001 From: zlice Date: Sat, 27 Jul 2024 10:19:46 -0400 Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl --- srcpkgs/ffmpeg6/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template index 6b12c0b446b1d8..b24a24ee1253f7 100644 --- a/srcpkgs/ffmpeg6/template +++ b/srcpkgs/ffmpeg6/template @@ -2,7 +2,7 @@ # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg6 version=6.1.2 -revision=2 +revision=3 hostmakedepends="pkg-config perl" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel @@ -14,7 +14,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel) - $(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)" + $(vopt_if libvpl libvpl-devel) $(vopt_if nvcodec nv-codec-headers)" depends="ffplay6>=${version}_${revision}" short_desc="Decoding, encoding and streaming software" maintainer="Orphaned " @@ -24,7 +24,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog" distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz" checksum=3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38 -build_options="vaapi vdpau fdk_aac nvcodec onevpl" +build_options="vaapi vdpau fdk_aac nvcodec libvpl" desc_option_sofa="Enable support for AES SOFA" case "$XBPS_TARGET_MACHINE" in @@ -34,7 +34,7 @@ case "$XBPS_TARGET_MACHINE" in ;; x86_64*) hostmakedepends+=" nasm" - build_options_default+=" vaapi vdpau nvcodec onevpl" + build_options_default+=" vaapi vdpau nvcodec libvpl" ;; ppc64*) build_options_default+=" vaapi vdpau";; mips*) CFLAGS="-mnan=legacy";; @@ -102,8 +102,7 @@ do_configure() { $(vopt_enable vaapi) $(vopt_enable vdpau) \ $(vopt_enable zimg libzimg) \ $(vopt_enable sofa libmysofa) \ - $(vopt_enable onevpl libvpl) \ - $(vopt_enable nvcodec nvenc) \ + $(vopt_enable libvpl libvpl) \ $(vopt_enable nvcodec nvdec) } From 04cdf1a779cccb3da7a58bf1d2c179ebdba1237b Mon Sep 17 00:00:00 2001 From: zlice Date: Sat, 27 Jul 2024 10:19:58 -0400 Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl --- srcpkgs/gst-plugins-bad1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 13fc9f8fe7f640..4207fbb65a6994 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -27,7 +27,7 @@ makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel fdk-aac-devel flite-devel fluidsynth-devel liblrdf-devel ladspa-sdk lilv-devel lv2 libopenjpeg2-devel sbc-devel spandsp-devel vulkan-loader-devel webrtc-audio-processing-devel libzbar-devel ffmpeg6-devel - srt-devel libva-devel $(vopt_if onevpl oneVPL-devel) $(vopt_if gme libgme-devel)" + srt-devel libva-devel $(vopt_if libvpl libvpl-devel) $(vopt_if gme libgme-devel)" depends="gst-plugins-base1>=${version}" short_desc="GStreamer plugins from the bad set (v1.x)" maintainer="Orphaned " @@ -37,13 +37,13 @@ changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" checksum=8f4d965513e7827c1f547c1e749e4ef2812b371974fe64857fe5029a19c5b64c -build_options="gir gme onevpl wayland" +build_options="gir gme libvpl wayland" build_options_default="gir wayland" desc_option_gme="Build with Game Music Emulator support" case "$XBPS_TARGET_MACHINE" in mips*) ;; # libgme cannot be built for mips* - x86_64*) build_options_default+=" gme onevpl" ;; # onevpl only supports 64bit + x86_64*) build_options_default+=" gme libvpl" ;; # libvpl only supports 64bit *) build_options_default+=" gme" ;; esac From 8dbff92fb533e299d53ab1ee77f4d4e40979dd98 Mon Sep 17 00:00:00 2001 From: zlice Date: Sat, 27 Jul 2024 10:20:06 -0400 Subject: [PATCH 4/5] obs: revbump for libvpl --- srcpkgs/obs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index 4860878805e0cc..c59a8aefd16e14 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,7 +1,7 @@ # Template file for 'obs' pkgname=obs version=30.2.1 -revision=2 +revision=3 archs="i686* x86_64* ppc64le* aarch64* riscv64*" build_style=cmake configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON @@ -15,7 +15,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-devel ffmpeg6-devel glu-deve pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel - librist-devel srt-devel libdatachannel-devel oneVPL-devel uthash + librist-devel srt-devel libdatachannel-devel libvpl-devel uthash qt6-base-private-devel json-c++" depends="xset xdg-desktop-portal" short_desc="Open Broadcaster Software" From e77d0463998860c3e461b97f1ad168283c6d8c19 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 2 Aug 2024 18:08:53 -0400 Subject: [PATCH 5/5] handbrake: revbump for libvpl --- srcpkgs/handbrake/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template index a99181d87a2eb9..1d6394c89b5657 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -14,7 +14,7 @@ makedepends="bzip2-devel ffmpeg6-devel gst-plugins-base1-devel gtk+3-devel libsamplerate-devel libtheora-devel libvorbis-devel libvpx-devel libxml2-devel opus-devel speex-devel x264-devel x265-devel zimg-devel libsvt-av1-devel $(vopt_if fdk_aac fdk-aac-devel) - $(vopt_if qsv 'libva-devel libdrm-devel oneVPL-devel') + $(vopt_if qsv 'libva-devel libdrm-devel libvpl-devel') $(vopt_if nvenc nv-codec-headers)" depends="desktop-file-utils gst-plugins-good1 hicolor-icon-theme" short_desc="Multithreaded video transcoder"