* [PR PATCH] New package: libvpl-2.12.0
@ 2024-07-27 14:23 zlice
2024-07-27 14:26 ` zlice
` (58 more replies)
0 siblings, 59 replies; 60+ messages in thread
From: zlice @ 2024-07-27 14:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1002 bytes --]
There is a new pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 23444 bytes --]
From a1dd69312cc7f789bac81e429225d360a062a4be Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/4] 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 | 43 ++++++-------------
6 files changed, 58 insertions(+), 31 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 cd16c67d207c6f..2fd5f0f8f4a37c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4504,7 +4504,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 <maldridge@voidlinux.org>"
+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..c9a5becc45575a 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 <maldridge@voidlinux.org>"
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
+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 dbc14ce024c72fa7d5f78a7366e013b1d7e09aeb Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/4] ffmpeg6: revbump for libvpl
---
...decode-multiple-slice-params-buffers.patch | 159 ++++++++++++++++++
...the-same-slice-buffer-multiple-times.patch | 89 ++++++++++
srcpkgs/ffmpeg6/template | 10 +-
3 files changed, 253 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/ffmpeg6/patches/00001-vaapi_decode-multiple-slice-params-buffers.patch
create mode 100644 srcpkgs/ffmpeg6/patches/00002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch
diff --git a/srcpkgs/ffmpeg6/patches/00001-vaapi_decode-multiple-slice-params-buffers.patch b/srcpkgs/ffmpeg6/patches/00001-vaapi_decode-multiple-slice-params-buffers.patch
new file mode 100644
index 00000000000000..2350577fd6ec58
--- /dev/null
+++ b/srcpkgs/ffmpeg6/patches/00001-vaapi_decode-multiple-slice-params-buffers.patch
@@ -0,0 +1,159 @@
+diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c
+index d0339b2..6f33f03 100644
+--- a/libavcodec/vaapi_av1.c
++++ b/libavcodec/vaapi_av1.c
+@@ -421,7 +421,7 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
+ .tg_end = s->tg_end,
+ };
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param,
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, 1,
+ sizeof(VASliceParameterBufferAV1),
+ buffer,
+ size);
+diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
+index 134f10e..c6d90ac 100644
+--- a/libavcodec/vaapi_decode.c
++++ b/libavcodec/vaapi_decode.c
+@@ -61,6 +61,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx,
+ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+ VAAPIDecodePicture *pic,
+ const void *params_data,
++ int nb_params,
+ size_t params_size,
+ const void *slice_data,
+ size_t slice_size)
+@@ -89,7 +90,7 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+
+ vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
+ VASliceParameterBufferType,
+- params_size, 1, (void*)params_data,
++ params_size, nb_params, (void*)params_data,
+ &pic->slice_buffers[index]);
+ if (vas != VA_STATUS_SUCCESS) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to create slice "
+diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h
+index 6beda14..22c8c54 100644
+--- a/libavcodec/vaapi_decode.h
++++ b/libavcodec/vaapi_decode.h
+@@ -73,6 +73,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx,
+ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+ VAAPIDecodePicture *pic,
+ const void *params_data,
++ int nb_params,
+ size_t params_size,
+ const void *slice_data,
+ size_t slice_size);
+diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
+index 9332aa6..0536ee8 100644
+--- a/libavcodec/vaapi_h264.c
++++ b/libavcodec/vaapi_h264.c
+@@ -375,7 +375,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx,
+ slice_param.chroma_offset_l1);
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c
+index 20fb36a..6f022a7 100644
+--- a/libavcodec/vaapi_hevc.c
++++ b/libavcodec/vaapi_hevc.c
+@@ -305,7 +305,7 @@ static int vaapi_hevc_end_frame(AVCodecContext *avctx)
+ if (pic->last_size) {
+ last_slice_param->LongSliceFlags.fields.LastSliceOfPic = 1;
+ ret = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic,
+- &pic->last_slice_param, slice_param_size,
++ &pic->last_slice_param, 1, slice_param_size,
+ pic->last_buffer, pic->last_size);
+ if (ret < 0)
+ goto fail;
+@@ -423,7 +423,7 @@ static int vaapi_hevc_decode_slice(AVCodecContext *avctx,
+
+ if (!sh->first_slice_in_pic_flag) {
+ err = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic,
+- &pic->last_slice_param, slice_param_size,
++ &pic->last_slice_param, 1, slice_param_size,
+ pic->last_buffer, pic->last_size);
+ pic->last_buffer = NULL;
+ pic->last_size = 0;
+diff --git a/libavcodec/vaapi_mjpeg.c b/libavcodec/vaapi_mjpeg.c
+index 8158211..3ee1663 100644
+--- a/libavcodec/vaapi_mjpeg.c
++++ b/libavcodec/vaapi_mjpeg.c
+@@ -131,7 +131,7 @@ static int vaapi_mjpeg_decode_slice(AVCodecContext *avctx,
+ sp.components[i].ac_table_selector = s->ac_index[i];
+ }
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), buffer, size);
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, 1, sizeof(sp), buffer, size);
+ if (err)
+ goto fail;
+
+diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
+index 5e2b889..8b37239 100644
+--- a/libavcodec/vaapi_mpeg2.c
++++ b/libavcodec/vaapi_mpeg2.c
+@@ -162,7 +162,7 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
+ };
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err < 0) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
+index 4e74e03..d2e1d15 100644
+--- a/libavcodec/vaapi_mpeg4.c
++++ b/libavcodec/vaapi_mpeg4.c
+@@ -169,7 +169,7 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
+ };
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err < 0) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
+index fb2132e..a4933c9 100644
+--- a/libavcodec/vaapi_vc1.c
++++ b/libavcodec/vaapi_vc1.c
+@@ -490,7 +490,7 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer,
+ };
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err < 0) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_vp8.c b/libavcodec/vaapi_vp8.c
+index 5b18bf8..3c16e6d 100644
+--- a/libavcodec/vaapi_vp8.c
++++ b/libavcodec/vaapi_vp8.c
+@@ -209,7 +209,7 @@ static int vaapi_vp8_decode_slice(AVCodecContext *avctx,
+ for (i = 0; i < 8; i++)
+ sp.partition_size[i+1] = s->coeff_partition_size[i];
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), data, data_size);
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, 1, sizeof(sp), data, data_size);
+ if (err)
+ goto fail;
+
+diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c
+index 776382f..237f6c5 100644
+--- a/libavcodec/vaapi_vp9.c
++++ b/libavcodec/vaapi_vp9.c
+@@ -158,7 +158,7 @@ static int vaapi_vp9_decode_slice(AVCodecContext *avctx,
+ }
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err) {
+ ff_vaapi_decode_cancel(avctx, pic);
diff --git a/srcpkgs/ffmpeg6/patches/00002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch b/srcpkgs/ffmpeg6/patches/00002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch
new file mode 100644
index 00000000000000..a9e84d606a4f04
--- /dev/null
+++ b/srcpkgs/ffmpeg6/patches/00002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch
@@ -0,0 +1,89 @@
+diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c
+index d0339b2..c4b55cb 100644
+--- a/libavcodec/vaapi_av1.c
++++ b/libavcodec/vaapi_av1.c
+@@ -19,6 +19,7 @@
+ */
+
+ #include "libavutil/frame.h"
++#include "libavutil/mem.h"
+ #include "libavutil/pixdesc.h"
+ #include "hwconfig.h"
+ #include "vaapi_decode.h"
+@@ -43,6 +44,9 @@ typedef struct VAAPIAV1DecContext {
+ */
+ VAAPIAV1FrameRef ref_tab[AV1_NUM_REF_FRAMES];
+ AVFrame *tmp_frame;
++
++ int nb_slice_params;
++ VASliceParameterBufferAV1 *slice_params;
+ } VAAPIAV1DecContext;
+
+ static VASurfaceID vaapi_av1_surface_id(AV1Frame *vf)
+@@ -109,6 +113,8 @@ static int vaapi_av1_decode_uninit(AVCodecContext *avctx)
+ av_frame_free(&ctx->ref_tab[i].frame);
+ }
+
++ av_freep(&ctx->slice_params);
++
+ return ff_vaapi_decode_uninit(avctx);
+ }
+
+@@ -405,13 +411,24 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
+ {
+ const AV1DecContext *s = avctx->priv_data;
+ VAAPIDecodePicture *pic = s->cur_frame.hwaccel_picture_private;
+- VASliceParameterBufferAV1 slice_param;
+- int err = 0;
++ VAAPIAV1DecContext *ctx = avctx->internal->hwaccel_priv_data;
++ int err, nb_params;
++
++ nb_params = s->tg_end - s->tg_start + 1;
++ if (ctx->nb_slice_params < nb_params) {
++ ctx->slice_params = av_realloc_array(ctx->slice_params,
++ nb_params,
++ sizeof(*ctx->slice_params));
++ if (!ctx->slice_params) {
++ ctx->nb_slice_params = 0;
++ err = AVERROR(ENOMEM);
++ goto fail;
++ }
++ ctx->nb_slice_params = nb_params;
++ }
+
+ for (int i = s->tg_start; i <= s->tg_end; i++) {
+- memset(&slice_param, 0, sizeof(VASliceParameterBufferAV1));
+-
+- slice_param = (VASliceParameterBufferAV1) {
++ ctx->slice_params[i - s->tg_start] = (VASliceParameterBufferAV1) {
+ .slice_data_size = s->tile_group_info[i].tile_size,
+ .slice_data_offset = s->tile_group_info[i].tile_offset,
+ .slice_data_flag = VA_SLICE_DATA_FLAG_ALL,
+@@ -421,17 +438,19 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
+ .tg_end = s->tg_end,
+ };
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, 1,
+- sizeof(VASliceParameterBufferAV1),
+- buffer,
+- size);
+- if (err) {
+- ff_vaapi_decode_cancel(avctx, pic);
+- return err;
+- }
+ }
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, ctx->slice_params, nb_params,
++ sizeof(VASliceParameterBufferAV1),
++ buffer,
++ size);
++ if (err)
++ goto fail;
+
+ return 0;
++
++fail:
++ ff_vaapi_decode_cancel(avctx, pic);
++ return err;
+ }
+
+ const AVHWAccel ff_av1_vaapi_hwaccel = {
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 819f7715bca396..c6dff47a3f1b40 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.0.1
-revision=1
+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
@@ -15,7 +15,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
zimg-devel libmysofa-devel
$(vopt_if svtav1 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 <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
checksum=9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
-build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl"
+build_options="vaapi vdpau fdk_aac nvcodec svtav1 libvpl"
desc_option_sofa="Enable support for AES SOFA"
case "$XBPS_TARGET_MACHINE" in
@@ -35,7 +35,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";;
@@ -107,7 +107,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable svtav1 libsvtav1) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
From 73aca7c1164b046946562069eb57bdc585ad0c67 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/4] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 345425785d435d..7853bf370b40ba 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.4
-revision=2
+revision=3
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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=260bd0a463b4faff9a42f41e5e028f787f10a92b779af8959aec64586f546bd3
-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 375d44cdbe01b51379ef986dca0d4544287b062d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/4] 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
@ 2024-07-27 14:26 ` zlice
2024-07-27 14:26 ` zlice
` (57 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-07-27 14:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-2254163635
Comment:
"Error: license 'MIT', but no use of vlicense"
I'd assume ignore this? Removing it complains license is missing.
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
2024-07-27 14:26 ` zlice
@ 2024-07-27 14:26 ` zlice
2024-07-27 14:30 ` icp1994
` (56 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-07-27 14:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-2254163635
Comment:
oneVPL template - "Error: license 'MIT', but no use of vlicense"
I'd assume ignore this? Removing it complains license is missing.
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
2024-07-27 14:26 ` zlice
2024-07-27 14:26 ` zlice
@ 2024-07-27 14:30 ` icp1994
2024-07-28 13:43 ` icp1994
` (55 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: icp1994 @ 2024-07-27 14:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-2254164651
Comment:
Yes, similar to wlroots
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (2 preceding siblings ...)
2024-07-27 14:30 ` icp1994
@ 2024-07-28 13:43 ` icp1994
2024-07-28 13:45 ` [PR PATCH] [Updated] " zlice
` (54 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: icp1994 @ 2024-07-28 13:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-2254523939
Comment:
I read the Manual today and it says:
> Empty meta-packages that don't include any files
and thus have and require no license should use
`Public Domain`.
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (3 preceding siblings ...)
2024-07-28 13:43 ` icp1994
@ 2024-07-28 13:45 ` zlice
2024-07-31 14:47 ` zlice
` (53 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-07-28 13:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 23469 bytes --]
From 568a1c9c6b958a678d67618c6a87bc712ba3a890 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/4] 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 cd16c67d207c6f..2fd5f0f8f4a37c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4504,7 +4504,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 <maldridge@voidlinux.org>"
+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 <maldridge@voidlinux.org>"
-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 648900c54d244f59f8ec29b45f74d99bc9fa4445 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/4] ffmpeg6: revbump for libvpl
---
...decode-multiple-slice-params-buffers.patch | 159 ++++++++++++++++++
...the-same-slice-buffer-multiple-times.patch | 89 ++++++++++
srcpkgs/ffmpeg6/template | 10 +-
3 files changed, 253 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/ffmpeg6/patches/00001-vaapi_decode-multiple-slice-params-buffers.patch
create mode 100644 srcpkgs/ffmpeg6/patches/00002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch
diff --git a/srcpkgs/ffmpeg6/patches/00001-vaapi_decode-multiple-slice-params-buffers.patch b/srcpkgs/ffmpeg6/patches/00001-vaapi_decode-multiple-slice-params-buffers.patch
new file mode 100644
index 00000000000000..2350577fd6ec58
--- /dev/null
+++ b/srcpkgs/ffmpeg6/patches/00001-vaapi_decode-multiple-slice-params-buffers.patch
@@ -0,0 +1,159 @@
+diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c
+index d0339b2..6f33f03 100644
+--- a/libavcodec/vaapi_av1.c
++++ b/libavcodec/vaapi_av1.c
+@@ -421,7 +421,7 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
+ .tg_end = s->tg_end,
+ };
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param,
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, 1,
+ sizeof(VASliceParameterBufferAV1),
+ buffer,
+ size);
+diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
+index 134f10e..c6d90ac 100644
+--- a/libavcodec/vaapi_decode.c
++++ b/libavcodec/vaapi_decode.c
+@@ -61,6 +61,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx,
+ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+ VAAPIDecodePicture *pic,
+ const void *params_data,
++ int nb_params,
+ size_t params_size,
+ const void *slice_data,
+ size_t slice_size)
+@@ -89,7 +90,7 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+
+ vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
+ VASliceParameterBufferType,
+- params_size, 1, (void*)params_data,
++ params_size, nb_params, (void*)params_data,
+ &pic->slice_buffers[index]);
+ if (vas != VA_STATUS_SUCCESS) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to create slice "
+diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h
+index 6beda14..22c8c54 100644
+--- a/libavcodec/vaapi_decode.h
++++ b/libavcodec/vaapi_decode.h
+@@ -73,6 +73,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx,
+ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+ VAAPIDecodePicture *pic,
+ const void *params_data,
++ int nb_params,
+ size_t params_size,
+ const void *slice_data,
+ size_t slice_size);
+diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
+index 9332aa6..0536ee8 100644
+--- a/libavcodec/vaapi_h264.c
++++ b/libavcodec/vaapi_h264.c
+@@ -375,7 +375,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx,
+ slice_param.chroma_offset_l1);
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c
+index 20fb36a..6f022a7 100644
+--- a/libavcodec/vaapi_hevc.c
++++ b/libavcodec/vaapi_hevc.c
+@@ -305,7 +305,7 @@ static int vaapi_hevc_end_frame(AVCodecContext *avctx)
+ if (pic->last_size) {
+ last_slice_param->LongSliceFlags.fields.LastSliceOfPic = 1;
+ ret = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic,
+- &pic->last_slice_param, slice_param_size,
++ &pic->last_slice_param, 1, slice_param_size,
+ pic->last_buffer, pic->last_size);
+ if (ret < 0)
+ goto fail;
+@@ -423,7 +423,7 @@ static int vaapi_hevc_decode_slice(AVCodecContext *avctx,
+
+ if (!sh->first_slice_in_pic_flag) {
+ err = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic,
+- &pic->last_slice_param, slice_param_size,
++ &pic->last_slice_param, 1, slice_param_size,
+ pic->last_buffer, pic->last_size);
+ pic->last_buffer = NULL;
+ pic->last_size = 0;
+diff --git a/libavcodec/vaapi_mjpeg.c b/libavcodec/vaapi_mjpeg.c
+index 8158211..3ee1663 100644
+--- a/libavcodec/vaapi_mjpeg.c
++++ b/libavcodec/vaapi_mjpeg.c
+@@ -131,7 +131,7 @@ static int vaapi_mjpeg_decode_slice(AVCodecContext *avctx,
+ sp.components[i].ac_table_selector = s->ac_index[i];
+ }
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), buffer, size);
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, 1, sizeof(sp), buffer, size);
+ if (err)
+ goto fail;
+
+diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
+index 5e2b889..8b37239 100644
+--- a/libavcodec/vaapi_mpeg2.c
++++ b/libavcodec/vaapi_mpeg2.c
+@@ -162,7 +162,7 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
+ };
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err < 0) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
+index 4e74e03..d2e1d15 100644
+--- a/libavcodec/vaapi_mpeg4.c
++++ b/libavcodec/vaapi_mpeg4.c
+@@ -169,7 +169,7 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
+ };
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err < 0) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
+index fb2132e..a4933c9 100644
+--- a/libavcodec/vaapi_vc1.c
++++ b/libavcodec/vaapi_vc1.c
+@@ -490,7 +490,7 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer,
+ };
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err < 0) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_vp8.c b/libavcodec/vaapi_vp8.c
+index 5b18bf8..3c16e6d 100644
+--- a/libavcodec/vaapi_vp8.c
++++ b/libavcodec/vaapi_vp8.c
+@@ -209,7 +209,7 @@ static int vaapi_vp8_decode_slice(AVCodecContext *avctx,
+ for (i = 0; i < 8; i++)
+ sp.partition_size[i+1] = s->coeff_partition_size[i];
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), data, data_size);
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, 1, sizeof(sp), data, data_size);
+ if (err)
+ goto fail;
+
+diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c
+index 776382f..237f6c5 100644
+--- a/libavcodec/vaapi_vp9.c
++++ b/libavcodec/vaapi_vp9.c
+@@ -158,7 +158,7 @@ static int vaapi_vp9_decode_slice(AVCodecContext *avctx,
+ }
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err) {
+ ff_vaapi_decode_cancel(avctx, pic);
diff --git a/srcpkgs/ffmpeg6/patches/00002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch b/srcpkgs/ffmpeg6/patches/00002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch
new file mode 100644
index 00000000000000..a9e84d606a4f04
--- /dev/null
+++ b/srcpkgs/ffmpeg6/patches/00002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch
@@ -0,0 +1,89 @@
+diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c
+index d0339b2..c4b55cb 100644
+--- a/libavcodec/vaapi_av1.c
++++ b/libavcodec/vaapi_av1.c
+@@ -19,6 +19,7 @@
+ */
+
+ #include "libavutil/frame.h"
++#include "libavutil/mem.h"
+ #include "libavutil/pixdesc.h"
+ #include "hwconfig.h"
+ #include "vaapi_decode.h"
+@@ -43,6 +44,9 @@ typedef struct VAAPIAV1DecContext {
+ */
+ VAAPIAV1FrameRef ref_tab[AV1_NUM_REF_FRAMES];
+ AVFrame *tmp_frame;
++
++ int nb_slice_params;
++ VASliceParameterBufferAV1 *slice_params;
+ } VAAPIAV1DecContext;
+
+ static VASurfaceID vaapi_av1_surface_id(AV1Frame *vf)
+@@ -109,6 +113,8 @@ static int vaapi_av1_decode_uninit(AVCodecContext *avctx)
+ av_frame_free(&ctx->ref_tab[i].frame);
+ }
+
++ av_freep(&ctx->slice_params);
++
+ return ff_vaapi_decode_uninit(avctx);
+ }
+
+@@ -405,13 +411,24 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
+ {
+ const AV1DecContext *s = avctx->priv_data;
+ VAAPIDecodePicture *pic = s->cur_frame.hwaccel_picture_private;
+- VASliceParameterBufferAV1 slice_param;
+- int err = 0;
++ VAAPIAV1DecContext *ctx = avctx->internal->hwaccel_priv_data;
++ int err, nb_params;
++
++ nb_params = s->tg_end - s->tg_start + 1;
++ if (ctx->nb_slice_params < nb_params) {
++ ctx->slice_params = av_realloc_array(ctx->slice_params,
++ nb_params,
++ sizeof(*ctx->slice_params));
++ if (!ctx->slice_params) {
++ ctx->nb_slice_params = 0;
++ err = AVERROR(ENOMEM);
++ goto fail;
++ }
++ ctx->nb_slice_params = nb_params;
++ }
+
+ for (int i = s->tg_start; i <= s->tg_end; i++) {
+- memset(&slice_param, 0, sizeof(VASliceParameterBufferAV1));
+-
+- slice_param = (VASliceParameterBufferAV1) {
++ ctx->slice_params[i - s->tg_start] = (VASliceParameterBufferAV1) {
+ .slice_data_size = s->tile_group_info[i].tile_size,
+ .slice_data_offset = s->tile_group_info[i].tile_offset,
+ .slice_data_flag = VA_SLICE_DATA_FLAG_ALL,
+@@ -421,17 +438,19 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
+ .tg_end = s->tg_end,
+ };
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, 1,
+- sizeof(VASliceParameterBufferAV1),
+- buffer,
+- size);
+- if (err) {
+- ff_vaapi_decode_cancel(avctx, pic);
+- return err;
+- }
+ }
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, ctx->slice_params, nb_params,
++ sizeof(VASliceParameterBufferAV1),
++ buffer,
++ size);
++ if (err)
++ goto fail;
+
+ return 0;
++
++fail:
++ ff_vaapi_decode_cancel(avctx, pic);
++ return err;
+ }
+
+ const AVHWAccel ff_av1_vaapi_hwaccel = {
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 819f7715bca396..c6dff47a3f1b40 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.0.1
-revision=1
+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
@@ -15,7 +15,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
zimg-devel libmysofa-devel
$(vopt_if svtav1 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 <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
checksum=9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
-build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl"
+build_options="vaapi vdpau fdk_aac nvcodec svtav1 libvpl"
desc_option_sofa="Enable support for AES SOFA"
case "$XBPS_TARGET_MACHINE" in
@@ -35,7 +35,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";;
@@ -107,7 +107,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable svtav1 libsvtav1) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
From d91da1db57484a6c87a66d3e832fb7bd028f7bb6 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/4] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 345425785d435d..7853bf370b40ba 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.4
-revision=2
+revision=3
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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=260bd0a463b4faff9a42f41e5e028f787f10a92b779af8959aec64586f546bd3
-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 925a6716ab5488b4ddac5702bcb87bb49e2a74c9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/4] 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (4 preceding siblings ...)
2024-07-28 13:45 ` [PR PATCH] [Updated] " zlice
@ 2024-07-31 14:47 ` zlice
2024-07-31 16:36 ` zlice
` (52 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-07-31 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 11274 bytes --]
From 277f09ff664a4ea804885776f01af9d54278805a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/4] 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 12436fd372718c..f946987be1cdeb 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 <maldridge@voidlinux.org>"
+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 <maldridge@voidlinux.org>"
-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 30671288082962782e1dcf5bc890bcbf005f9609 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/4] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 1dcdd089c5354c..c6dff47a3f1b40 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.0.1
-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
@@ -15,7 +15,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
zimg-devel libmysofa-devel
$(vopt_if svtav1 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 <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
checksum=9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
-build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl"
+build_options="vaapi vdpau fdk_aac nvcodec svtav1 libvpl"
desc_option_sofa="Enable support for AES SOFA"
case "$XBPS_TARGET_MACHINE" in
@@ -35,7 +35,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";;
@@ -107,7 +107,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable svtav1 libsvtav1) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
From 99fa1f20087cc024a9c08fce5443e06339d1bbe9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/4] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 345425785d435d..7853bf370b40ba 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.4
-revision=2
+revision=3
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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=260bd0a463b4faff9a42f41e5e028f787f10a92b779af8959aec64586f546bd3
-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 f7fe067724e7f9692403862a9cac55e5fa4e9195 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/4] 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (5 preceding siblings ...)
2024-07-31 14:47 ` zlice
@ 2024-07-31 16:36 ` zlice
2024-08-02 22:09 ` zlice
` (51 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-07-31 16:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 11274 bytes --]
From 54f15e1772b1ae9e615af9ee9274baf66a9a9770 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/4] 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 12436fd372718c..f946987be1cdeb 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 <maldridge@voidlinux.org>"
+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 <maldridge@voidlinux.org>"
-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 fa49cffde710206b2ce6b260edcad82343f46af9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/4] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 1dcdd089c5354c..c6dff47a3f1b40 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.0.1
-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
@@ -15,7 +15,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
zimg-devel libmysofa-devel
$(vopt_if svtav1 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 <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
checksum=9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
-build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl"
+build_options="vaapi vdpau fdk_aac nvcodec svtav1 libvpl"
desc_option_sofa="Enable support for AES SOFA"
case "$XBPS_TARGET_MACHINE" in
@@ -35,7 +35,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";;
@@ -107,7 +107,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable svtav1 libsvtav1) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
From 1d95123b0beef8491d82ce24e876233bf4103dd9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/4] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 92d87d7a661cbd..4207fbb65a6994 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.6
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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 de686ce201104790ad1a1c7c017d7b20236f093e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/4] 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (6 preceding siblings ...)
2024-07-31 16:36 ` zlice
@ 2024-08-02 22:09 ` zlice
2024-08-02 22:26 ` zlice
` (50 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-08-02 22:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12022 bytes --]
From 54f15e1772b1ae9e615af9ee9274baf66a9a9770 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 12436fd372718c..f946987be1cdeb 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 <maldridge@voidlinux.org>"
+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 <maldridge@voidlinux.org>"
-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 fa49cffde710206b2ce6b260edcad82343f46af9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 1dcdd089c5354c..c6dff47a3f1b40 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.0.1
-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
@@ -15,7 +15,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
zimg-devel libmysofa-devel
$(vopt_if svtav1 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 <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
checksum=9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
-build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl"
+build_options="vaapi vdpau fdk_aac nvcodec svtav1 libvpl"
desc_option_sofa="Enable support for AES SOFA"
case "$XBPS_TARGET_MACHINE" in
@@ -35,7 +35,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";;
@@ -107,7 +107,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable svtav1 libsvtav1) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
From 1d95123b0beef8491d82ce24e876233bf4103dd9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 92d87d7a661cbd..4207fbb65a6994 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.6
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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 de686ce201104790ad1a1c7c017d7b20236f093e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 773a6b6c948b25adc93188695c096b3883d12e92 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump forlibvpl
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d0e04f3d49111e..3bb9d2ce3f0c32 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (7 preceding siblings ...)
2024-08-02 22:09 ` zlice
@ 2024-08-02 22:26 ` zlice
2024-08-02 22:27 ` zlice
` (49 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-08-02 22:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12573 bytes --]
From b9dcc949b71b25174a3267a3dc27d088362160fa Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 6f378121d0e4f4..d9821dcf0b560f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4497,7 +4497,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 <maldridge@voidlinux.org>"
+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 <maldridge@voidlinux.org>"
-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 9aa28c4f9c31e2621e5b2bd4505f0c528bf01398 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 1dcdd089c5354c..c6dff47a3f1b40 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.0.1
-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
@@ -15,7 +15,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
zimg-devel libmysofa-devel
$(vopt_if svtav1 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 <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
checksum=9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
-build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl"
+build_options="vaapi vdpau fdk_aac nvcodec svtav1 libvpl"
desc_option_sofa="Enable support for AES SOFA"
case "$XBPS_TARGET_MACHINE" in
@@ -35,7 +35,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";;
@@ -107,7 +107,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable svtav1 libsvtav1) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
From 1e0e41a4b96c431e29c70240cb9e19dc2075e2aa Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 92d87d7a661cbd..4207fbb65a6994 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.6
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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 e4c038b714834e86a763aaf8cd308cdcc3657817 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 77f2758c53c2e975be3966b5cf764d7439ca85e7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump forlibvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d0e04f3d49111e..6973f188a99728 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (8 preceding siblings ...)
2024-08-02 22:26 ` zlice
@ 2024-08-02 22:27 ` zlice
2024-08-06 18:52 ` zlice
` (48 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-08-02 22:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12574 bytes --]
From b9dcc949b71b25174a3267a3dc27d088362160fa Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 6f378121d0e4f4..d9821dcf0b560f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4497,7 +4497,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 <maldridge@voidlinux.org>"
+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 <maldridge@voidlinux.org>"
-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 9aa28c4f9c31e2621e5b2bd4505f0c528bf01398 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 1dcdd089c5354c..c6dff47a3f1b40 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.0.1
-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
@@ -15,7 +15,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
zimg-devel libmysofa-devel
$(vopt_if svtav1 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 <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
checksum=9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
-build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl"
+build_options="vaapi vdpau fdk_aac nvcodec svtav1 libvpl"
desc_option_sofa="Enable support for AES SOFA"
case "$XBPS_TARGET_MACHINE" in
@@ -35,7 +35,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";;
@@ -107,7 +107,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable svtav1 libsvtav1) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
From 1e0e41a4b96c431e29c70240cb9e19dc2075e2aa Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 92d87d7a661cbd..4207fbb65a6994 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.6
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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 e4c038b714834e86a763aaf8cd308cdcc3657817 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 47b650f4c046f28daf47ec82dd3937e177c7b15f Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d0e04f3d49111e..6973f188a99728 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (9 preceding siblings ...)
2024-08-02 22:27 ` zlice
@ 2024-08-06 18:52 ` zlice
2024-08-07 0:02 ` zlice
` (47 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-08-06 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 11987 bytes --]
From ad9ce65ea2cf85d9fed3af4213e6f04c36fe57f4 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 a5314955498e24..7669c3c8323b96 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4500,7 +4500,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 <maldridge@voidlinux.org>"
+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 <maldridge@voidlinux.org>"
-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 c2d02a3d8e8140b70cd5ea4f0f9a3a0b22ba094d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index b779e9e2f4bce9..7bd74c5fbeb9fb 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.0.1
-revision=3
+revision=4
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
@@ -15,7 +15,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
zimg-devel libmysofa-devel
$(vopt_if svtav1 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 <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
checksum=9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
-build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl"
+build_options="vaapi vdpau fdk_aac nvcodec svtav1 libvpl"
desc_option_sofa="Enable support for AES SOFA"
case "$XBPS_TARGET_MACHINE" in
@@ -35,7 +35,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";;
@@ -107,7 +107,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable svtav1 libsvtav1) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
From 88b27f1e4dc6515a4c9d672233f2947fd5b937fc Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 <orphan@voidlinux.org>"
@@ -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 397f072d79029a536f60bfcd0596d888a97d8010 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 a5f3f018e9283a4d4fe76033c1ac2258dbc669c6 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 07dee21e6f2823..8a53a1027e086e 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -15,7 +15,7 @@ makedepends="bzip2-devel ffmpeg6-devel gst-plugins-base1-devel gtk+3-devel
opus-devel speex-devel x264-devel x265-devel zimg-devel
$(vopt_if svt_av1 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (10 preceding siblings ...)
2024-08-06 18:52 ` zlice
@ 2024-08-07 0:02 ` zlice
2024-08-07 0:03 ` zlice
` (46 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-08-07 0:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12035 bytes --]
From ad9ce65ea2cf85d9fed3af4213e6f04c36fe57f4 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 a5314955498e24..7669c3c8323b96 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4500,7 +4500,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 <maldridge@voidlinux.org>"
+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 <maldridge@voidlinux.org>"
-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 8905def4929fdc73b040bc4790418a1027bd9fd0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index b779e9e2f4bce9..2dbe23edbd9caf 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg6'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
-version=6.0.1
-revision=3
+version=6.1.2
+revision=2
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
@@ -15,7 +15,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
zimg-devel libmysofa-devel
$(vopt_if svtav1 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 <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
checksum=9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
-build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl"
+build_options="vaapi vdpau fdk_aac nvcodec svtav1 libvpl"
desc_option_sofa="Enable support for AES SOFA"
case "$XBPS_TARGET_MACHINE" in
@@ -35,7 +35,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";;
@@ -107,7 +107,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable svtav1 libsvtav1) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
From 51c0f0cdf135d150f3a08e392f65a527a0b48e83 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 <orphan@voidlinux.org>"
@@ -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 30dcaa5a8105414bbb40fb019f79daf482b99b8d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 6e2d7d16d0bb32f280b25c76aa002eb88f3a74a6 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 07dee21e6f2823..8a53a1027e086e 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -15,7 +15,7 @@ makedepends="bzip2-devel ffmpeg6-devel gst-plugins-base1-devel gtk+3-devel
opus-devel speex-devel x264-devel x265-devel zimg-devel
$(vopt_if svt_av1 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (11 preceding siblings ...)
2024-08-07 0:02 ` zlice
@ 2024-08-07 0:03 ` zlice
2024-08-10 12:38 ` zlice
` (45 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-08-07 0:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 11987 bytes --]
From f240e10c6d96e3583049d5e80da2ab585ff63344 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 a5314955498e24..7669c3c8323b96 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4500,7 +4500,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 <maldridge@voidlinux.org>"
+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 <maldridge@voidlinux.org>"
-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 4da008785567962a51bb3801940e05a28e88ae24 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index d79cf2d3dc0c67..739f2b5b818cec 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=1
+revision=2
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
@@ -15,7 +15,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
zimg-devel libmysofa-devel
$(vopt_if svtav1 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 <orphan@voidlinux.org>"
@@ -25,7 +25,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 svtav1 onevpl"
+build_options="vaapi vdpau fdk_aac nvcodec svtav1 libvpl"
desc_option_sofa="Enable support for AES SOFA"
case "$XBPS_TARGET_MACHINE" in
@@ -35,7 +35,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";;
@@ -107,7 +107,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable svtav1 libsvtav1) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
From 2d8fd4688a13eb1c8cba634280e342d30fd1223d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 <orphan@voidlinux.org>"
@@ -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 033527b5fb4f946bd370aef5f47930b298f77d4d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 b009393c2be14bb388b77a15f1ad09e5c81357fd Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 07dee21e6f2823..8a53a1027e086e 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -15,7 +15,7 @@ makedepends="bzip2-devel ffmpeg6-devel gst-plugins-base1-devel gtk+3-devel
opus-devel speex-devel x264-devel x265-devel zimg-devel
$(vopt_if svt_av1 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (12 preceding siblings ...)
2024-08-07 0:03 ` zlice
@ 2024-08-10 12:38 ` zlice
2024-08-10 13:19 ` [wip]New " zlice
` (44 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-08-10 12:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12055 bytes --]
From 9a494bd23e24f1c22e8db2d38221d4b1f28e988d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 <maldridge@voidlinux.org>"
+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 <maldridge@voidlinux.org>"
-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 <zlice555@gmail.com>
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 <orphan@voidlinux.org>"
@@ -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 <zlice555@gmail.com>
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 <orphan@voidlinux.org>"
@@ -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 <zlice555@gmail.com>
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 <zlice555@gmail.com>
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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [wip]New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (13 preceding siblings ...)
2024-08-10 12:38 ` zlice
@ 2024-08-10 13:19 ` zlice
2024-09-05 18:06 ` [PR PATCH] [Updated] " zlice
` (43 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-08-10 13:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-2281723991
Comment:
revbumps are bad because of other PRs and handbrake https://github.com/void-linux/void-packages/pull/51706
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] [wip]New package: libvpl-2.12.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (14 preceding siblings ...)
2024-08-10 13:19 ` [wip]New " zlice
@ 2024-09-05 18:06 ` zlice
2024-09-26 18:14 ` [PR PATCH] [Updated] [wip]New package: libvpl-2.13.0 zlice
` (42 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-09-05 18:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1080 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
[wip]New package: libvpl-2.12.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12289 bytes --]
From 5c2bf276f82d59712512bb59c34cdf7a3e2fe522 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.13.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 391ecd3eefd0e5..7903964420009b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4497,7 +4497,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 <maldridge@voidlinux.org>"
-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 e1f006bb5baf088b52ca5c547d7a359e2de532a5 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 <orphan@voidlinux.org>"
@@ -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 1178888dc602177b8a6d60232417e7c3987b8b9f Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 13fc9f8fe7f640..627510b9eeb414 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.6
-revision=2
+revision=3
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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 6b9e609cfedc848b6ebedd6092a12cd9301fb699 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 23c0a52663907bb40bc6877a38cb9688eecea2a2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] [wip]New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (15 preceding siblings ...)
2024-09-05 18:06 ` [PR PATCH] [Updated] " zlice
@ 2024-09-26 18:14 ` zlice
2024-09-26 18:33 ` zlice
` (41 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-09-26 18:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
[wip]New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12003 bytes --]
From 177f014838c9fb5db8de35c24b8766ef74e3feba Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.13.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 947cfc64bc7ed9..825c32c8092170 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4500,7 +4500,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 <maldridge@voidlinux.org>"
-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 3dc28e71ac7498977f4831a270afe03e1afe076c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 <orphan@voidlinux.org>"
@@ -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 acc8c7d4d52da951c1f913b4dd0d84cf52e623cf Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 13fc9f8fe7f640..627510b9eeb414 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.6
-revision=2
+revision=3
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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 3081369dde81a872c4003edc925f1ae43fb998a0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 c0a57717744bcb..d0798b67de08c9 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.3
-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 d6d896a7cd4cb2957cfe5656ba488fe2f555adf3 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] [wip]New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (16 preceding siblings ...)
2024-09-26 18:14 ` [PR PATCH] [Updated] [wip]New package: libvpl-2.13.0 zlice
@ 2024-09-26 18:33 ` zlice
2024-11-01 12:10 ` [PR PATCH] [Updated] New " zlice
` (40 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-09-26 18:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
[wip]New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12513 bytes --]
From 177f014838c9fb5db8de35c24b8766ef74e3feba Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.13.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 947cfc64bc7ed9..825c32c8092170 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4500,7 +4500,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 <maldridge@voidlinux.org>"
-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 3dc28e71ac7498977f4831a270afe03e1afe076c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 <orphan@voidlinux.org>"
@@ -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 acc8c7d4d52da951c1f913b4dd0d84cf52e623cf Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 13fc9f8fe7f640..627510b9eeb414 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.6
-revision=2
+revision=3
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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 3081369dde81a872c4003edc925f1ae43fb998a0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 c0a57717744bcb..d0798b67de08c9 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.3
-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 c391563994a8609cde4e1785efe8ad421cb05afd Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..05e73e56009dac 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 oneVPL-devel')
+ $(vopt_if qsv 'libva-devel libvpl-devel')
$(vopt_if nvenc nv-codec-headers)"
depends="desktop-file-utils gst-plugins-good1 hicolor-icon-theme"
short_desc="Multithreaded video transcoder"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (17 preceding siblings ...)
2024-09-26 18:33 ` zlice
@ 2024-11-01 12:10 ` zlice
2024-12-23 15:44 ` zlice
` (39 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-11-01 12:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12261 bytes --]
From ea22fb26d23408e772113de11c609d751594ded0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.13.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 56f4c7d4eef4d0..97fb4c6ad1b519 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4501,7 +4501,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 <maldridge@voidlinux.org>"
-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 2851ae1d369f742575608c8187761856bfbcd480 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 <orphan@voidlinux.org>"
@@ -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 603ee1b0f822985bb0a7320404e9395921bca1b3 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 13fc9f8fe7f640..627510b9eeb414 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.6
-revision=2
+revision=3
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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 13928e9d50444e3eb4b8c4cd377c10d4b5aefef3 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 c0a57717744bcb..d0798b67de08c9 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.3
-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 b3b73f4e190ac6416278bcb5d84055eac6a2e100 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 d32651a0abd02d..555b6a687ce4fe 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (18 preceding siblings ...)
2024-11-01 12:10 ` [PR PATCH] [Updated] New " zlice
@ 2024-12-23 15:44 ` zlice
2025-01-04 19:45 ` zlice
` (38 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2024-12-23 15:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12527 bytes --]
From 0eceba40acdb9b81c96ad02debf3cae028e8e6b8 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.13.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 4c9648fb36190b..bc65a54e9e88f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4506,7 +4506,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 <maldridge@voidlinux.org>"
-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 c5bde4c483b65c1933d49dc8057021ff05dafb59 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 9b66727465200e..ef91b6a83915d0 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=3
+revision=4
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 54c2b255b8417339374265a7b497ddfed0fa2384 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 8cbf2f4f541d51..9444d08f87178a 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.10
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 <orphan@voidlinux.org>"
@@ -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=1707e3103950c9baed364a8af2ba0495d6b113fcd36e1062dda5f582b8f8904d
-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 6a798d205b05ba02a59e61d0a5c778c22b7d1f21 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 47ea36131b3af5..79d01f40feb16f 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.3
-revision=3
+revision=4
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 2d645c06914d23b187c7c8292bb45962031460a9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (19 preceding siblings ...)
2024-12-23 15:44 ` zlice
@ 2025-01-04 19:45 ` zlice
2025-03-02 13:46 ` [PR PATCH] [Updated] " zlice
` (37 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-01-04 19:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-2571394467
Comment:
@the-maldridge just a bump. was going to test ffmpeg7 and that and a few other PRs i keep having to flip stuff around for libvpl switch. wanted to see if this looks fine to you.
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (20 preceding siblings ...)
2025-01-04 19:45 ` zlice
@ 2025-03-02 13:46 ` zlice
2025-03-05 14:13 ` zlice
` (36 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-03-02 13:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12544 bytes --]
From b8071fead5e0364bb5d0cf708b2a617493fc11cc Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.13.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 b9f2a3b4d651a1..355e7019f65a3d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4495,7 +4495,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 <maldridge@voidlinux.org>"
-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 c9b490b52ac9cd8b5fa5bd8e4d94854ef22db047 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 9b66727465200e..ef91b6a83915d0 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=3
+revision=4
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 291b87c133cedf6f6acb0232212c906e0e895060 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6946d49f69da53..3a4262ceb59990 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.10
-revision=3
+revision=4
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=1707e3103950c9baed364a8af2ba0495d6b113fcd36e1062dda5f582b8f8904d
-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 632478d10544221be40700b9e01c6f116ca0ac27 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 713ce5dade6f8b..428b8983757454 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.3
-revision=4
+revision=5
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 0fdd34557170d2b41a53cbecb1c01e20e420bc3a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (21 preceding siblings ...)
2025-03-02 13:46 ` [PR PATCH] [Updated] " zlice
@ 2025-03-05 14:13 ` zlice
2025-03-05 14:18 ` zlice
` (35 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-03-05 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12519 bytes --]
From 2599ad4303b88fa3e245143fd0644e38f1aa96ad Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.13.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 | 43 ++++++-------------
6 files changed, 58 insertions(+), 31 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 eab9adbbf5df7f..d2f559deeb95ee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4495,7 +4495,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 d5ee5ed72ac1c0..a45b3a1544508e 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=4
+build_style=meta
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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 6fcc5b6a79adb18b8a9bfb93d55069ea35bb20f2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 9b66727465200e..ef91b6a83915d0 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=3
+revision=4
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 e05ff505f1009d25fbd3b87622cb5f100904a98b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6946d49f69da53..3a4262ceb59990 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.10
-revision=3
+revision=4
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=1707e3103950c9baed364a8af2ba0495d6b113fcd36e1062dda5f582b8f8904d
-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 703018c9a78588e855f8459b1ca99536cf23a945 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 713ce5dade6f8b..428b8983757454 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.3
-revision=4
+revision=5
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 ab70fa88693676a97cbf7a758897a7d471341d96 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (22 preceding siblings ...)
2025-03-05 14:13 ` zlice
@ 2025-03-05 14:18 ` zlice
2025-03-17 22:48 ` zlice
` (34 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-03-05 14:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12544 bytes --]
From dcf43cdb2da9ac39219fd158cd08ee5c8d534bc2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.13.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 eab9adbbf5df7f..d2f559deeb95ee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4495,7 +4495,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 d5ee5ed72ac1c0..c12a51b27848ea 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=4
+build_style=meta
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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 7f59a44f3a2b9f192a6cc71e280005af113dd57f Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 9b66727465200e..ef91b6a83915d0 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=3
+revision=4
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 39b512c96af7af4a00e33a98003b50c50dbe5394 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6946d49f69da53..3a4262ceb59990 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.10
-revision=3
+revision=4
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=1707e3103950c9baed364a8af2ba0495d6b113fcd36e1062dda5f582b8f8904d
-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 a248d120a0335bcb9135f639e22eb67fe890aae1 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 713ce5dade6f8b..428b8983757454 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.3
-revision=4
+revision=5
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 c89029e0465ca5d93061be56e65df91c3ab4d955 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (23 preceding siblings ...)
2025-03-05 14:18 ` zlice
@ 2025-03-17 22:48 ` zlice
2025-03-18 22:32 ` zlice
` (33 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-03-17 22:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15721 bytes --]
From 427625ebf8415a3065ca25f3233f24dc64245e2e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.13.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 640e3b2b665f51..2cd1b80641ddcc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4497,7 +4497,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 d5ee5ed72ac1c0..c12a51b27848ea 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=4
+build_style=meta
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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 a89013bdd85355caf92e5b4080aa5936fd9acd4d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 9b66727465200e..ef91b6a83915d0 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=3
+revision=4
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 3989d1b0efd620defa100e8a5b420b8d8639dc5d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6946d49f69da53..3a4262ceb59990 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.10
-revision=3
+revision=4
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=1707e3103950c9baed364a8af2ba0495d6b113fcd36e1062dda5f582b8f8904d
-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 03919a1586b0fd81a2c9fdeedb789879c77b6c69 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e7c148602a7933..7b42f6885c7e42 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -17,7 +17,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++"
+ libvpl-devel uthash qt6-base-private-devel json-c++"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
From 625c6b5d65aad5be08b326624c3cedf8d0fc3a92 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (24 preceding siblings ...)
2025-03-17 22:48 ` zlice
@ 2025-03-18 22:32 ` zlice
2025-03-18 23:06 ` zlice
` (32 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-03-18 22:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 16147 bytes --]
From 189278e7a191d4a890f55eee4d29b8319b17bae1 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/6] New package: libvpl-2.13.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 75b02c0a34da38..c4a4f417f640a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4497,7 +4497,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 d5ee5ed72ac1c0..c12a51b27848ea 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=4
+build_style=meta
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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 e07e52a5f992233a1f491f79272239075d02e149 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/6] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 5ca80c5f1b7f8f..ef91b6a83915d0 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 4ed81fa270fb84642f897272f5a03b6f52a95f97 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/6] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6946d49f69da53..3a4262ceb59990 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.10
-revision=3
+revision=4
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=1707e3103950c9baed364a8af2ba0495d6b113fcd36e1062dda5f582b8f8904d
-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 b3f6d07f18e92cd60703267232c0666caa9b39b2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/6] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e7c148602a7933..7b42f6885c7e42 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -17,7 +17,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++"
+ libvpl-devel uthash qt6-base-private-devel json-c++"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
From cf3cf2cd43132b4178f9629cbdcf598249379c79 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/6] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
From 6c0e06fa346641731dda2121ebc47e1acfd24d86 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 18 Mar 2025 18:21:31 -0400
Subject: [PATCH 6/6] ffmpeg6
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index ef91b6a83915d0..7310e6f4d25692 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=4
+revision=5
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
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (25 preceding siblings ...)
2025-03-18 22:32 ` zlice
@ 2025-03-18 23:06 ` zlice
2025-04-16 17:14 ` zlice
` (31 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-03-18 23:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15721 bytes --]
From 189278e7a191d4a890f55eee4d29b8319b17bae1 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.13.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 75b02c0a34da38..c4a4f417f640a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4497,7 +4497,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..7480d0e3218db9
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.13.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 <maldridge@voidlinux.org>"
+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=1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd
+
+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 d5ee5ed72ac1c0..c12a51b27848ea 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=4
+build_style=meta
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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 10397783714a05bd99b95e6df3c4dbcc0ff9dbf0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 5ca80c5f1b7f8f..7310e6f4d25692 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=4
+revision=5
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 7333eadf3c506c35b8468966f3876188c97c7f03 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6946d49f69da53..3a4262ceb59990 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.10
-revision=3
+revision=4
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=1707e3103950c9baed364a8af2ba0495d6b113fcd36e1062dda5f582b8f8904d
-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 323c2f747d6c7fab89ee0e4810f6333d06d6b518 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e7c148602a7933..7b42f6885c7e42 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -17,7 +17,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++"
+ libvpl-devel uthash qt6-base-private-devel json-c++"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
From 1092e9daa38d7aeeb49d6fd1b0405a738f052709 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.13.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (26 preceding siblings ...)
2025-03-18 23:06 ` zlice
@ 2025-04-16 17:14 ` zlice
2025-04-17 0:17 ` New package: libvpl-2.14.0 oreo639
` (30 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-04-16 17:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.13.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15721 bytes --]
From 2e85b0527fa93284da519ca606acf7851e0fc378 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] New package: libvpl-2.14.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 bec2f470613330..637e025a021f32 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4494,7 +4494,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..c12a51b27848ea 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=4
+build_style=meta
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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 63ba5e3512b87f1c92295efdaa1cf90195e5a4b7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 0921a445ccd4a4..19a383917f91a1 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=5
+revision=6
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 1d22c88364159dcc03f1921cbca5885f232d69f7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e1a7dc04689cb4..97807ff359ef87 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.11
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=9126c2b7053a5f059db958f43c6a5230d2e843ff9adff8c8c2477ea2457e3315
-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 94ce4b229d6f3f45265a4f29b645c1b2cc48b4ae Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e7c148602a7933..7b42f6885c7e42 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -17,7 +17,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++"
+ libvpl-devel uthash qt6-base-private-devel json-c++"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
From 7c34d98304cc56c2fde3d59c45ea6fae0c4ea7ad Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: New package: libvpl-2.14.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (27 preceding siblings ...)
2025-04-16 17:14 ` zlice
@ 2025-04-17 0:17 ` oreo639
2025-04-17 0:20 ` [PR PATCH] [Updated] " zlice
` (29 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-04-17 0:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-2811301758
Comment:
The first commit title should be `oneVPL: update to 2.14.0, rename to libvpl`.
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] New package: libvpl-2.14.0
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (28 preceding siblings ...)
2025-04-17 0:17 ` New package: libvpl-2.14.0 oreo639
@ 2025-04-17 0:20 ` zlice
2025-06-09 20:27 ` [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl zlice
` (28 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-04-17 0:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
New package: libvpl-2.14.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15737 bytes --]
From a2835966527fff64bc176fa3710a492f97d2436e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 bec2f470613330..637e025a021f32 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4494,7 +4494,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..c12a51b27848ea 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=4
+build_style=meta
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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 73270a9487af2c8fd89496fc292da63405f6bd38 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 0921a445ccd4a4..19a383917f91a1 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=5
+revision=6
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 a096465f71b8c842b4c935aff73d195dee0b2a3e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e1a7dc04689cb4..97807ff359ef87 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.24.11
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=9126c2b7053a5f059db958f43c6a5230d2e843ff9adff8c8c2477ea2457e3315
-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 bf546246076aba904742e47dc7c04c4fa686250e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e7c148602a7933..7b42f6885c7e42 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -17,7 +17,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++"
+ libvpl-devel uthash qt6-base-private-devel json-c++"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
From 78e6a66390dbcc159abc8dc2514b4280a66fa202 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (29 preceding siblings ...)
2025-04-17 0:20 ` [PR PATCH] [Updated] " zlice
@ 2025-06-09 20:27 ` zlice
2025-06-14 13:55 ` zlice
` (27 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-09 20:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15142 bytes --]
From db900404760503f21a752af05330bedbc709c3d9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 da3ee9b06b8ecf..619bb777a1a996 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4500,7 +4500,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..c12a51b27848ea 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=4
+build_style=meta
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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 d3a5e05bf21fb2118345785769cf64abb7220df5 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index e2c459be2e4f9c..19a383917f91a1 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 34b0cd1b423215172bd2cc9e1e25a210eff59a7f Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 b4df6c402762eb..97807ff359ef87 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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=9126c2b7053a5f059db958f43c6a5230d2e843ff9adff8c8c2477ea2457e3315
-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 97209df9be0197e8201b917d2c7b61087f73d0f9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 39e5e309a469834b043b530bc030a971b8b8dcf0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (30 preceding siblings ...)
2025-06-09 20:27 ` [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl zlice
@ 2025-06-14 13:55 ` zlice
2025-06-14 13:57 ` zlice
` (26 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-14 13:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15729 bytes --]
From 4d3b5f79edd698ac49f808a8f6fb5ea476134761 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 5dfbc6f18e4e39..8cc45e51e31b7a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4500,7 +4500,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..c12a51b27848ea 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=4
+build_style=meta
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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 876cfa2b490538136c578094e42a0abbda96f801 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 a7521337d58aaf..eae75a1932cf81 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=6
+revision=7
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 861e7103267618088ae89644a2987e19b722f134 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 6a129253d8c748f70d0f84f90bbc87e39834c2df Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From a2aeffcc318990f7a094511229c63a6e7e23c005 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (31 preceding siblings ...)
2025-06-14 13:55 ` zlice
@ 2025-06-14 13:57 ` zlice
2025-06-14 14:00 ` zlice
` (25 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-14 13:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15719 bytes --]
From 4a49e5d262b2964da7b4cf5af128e6b3c887add6 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 5dfbc6f18e4e39..8cc45e51e31b7a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4500,7 +4500,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..c7530b019901bc 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=4
+metapackage=yes
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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() {
+ metapackage=yes
+ 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"
- }
+ metapackage=yes
+ 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
- }
+ metapackage=yes
+ short_desc" - examples"
+ depends="libvpl>=0"
}
From 1fede2a923e175315c855eff174aef7dd17c5882 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 a7521337d58aaf..eae75a1932cf81 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=6
+revision=7
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 cd04bffd874d27198e37209f728306302d14113d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 ebe8b0137de427b2fe0c5b65abb467c106c63538 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 665c2c2ee85248ea95414cbfaefe815134955f3b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (32 preceding siblings ...)
2025-06-14 13:57 ` zlice
@ 2025-06-14 14:00 ` zlice
2025-06-17 22:34 ` zlice
` (24 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-14 14:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15719 bytes --]
From 058d13e450a365c449e57bee1692865120f4a217 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 5dfbc6f18e4e39..8cc45e51e31b7a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4500,7 +4500,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..379b429c1fa0f0 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=4
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+license="Public Domain"
+homepage="https://github.com/intel/libvpl"
+changelog="https://github.com/intel/libvpl/blob/master/CHANGELOG.md"
+metapackage=yes
-post_install() {
- vlicense LICENSE
+oneVPL_package() {
+ metapackage=yes
+ 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"
- }
+ metapackage=yes
+ 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
- }
+ metapackage=yes
+ short_desc" - examples"
+ depends="libvpl>=0"
}
From 5913c2a351a1b56aa81fdf6b6d0533e4f7c51d38 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 a7521337d58aaf..eae75a1932cf81 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=6
+revision=7
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 7fbfc6d279cf71fe7e0c38c30b0fc553cfd0bf30 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 c112561ee34ff641c9f7c739c15ae68a9132efb8 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 8c21276bc92785886da2c8f31ee15e5d2d854717 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (33 preceding siblings ...)
2025-06-14 14:00 ` zlice
@ 2025-06-17 22:34 ` zlice
2025-06-18 12:19 ` zlice
` (23 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-17 22:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15719 bytes --]
From b833ec886e47680a83132d4b6b1439625eb0ae8d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 22e09f221236d5..135fb918262c5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4512,7 +4512,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..379b429c1fa0f0 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=4
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+license="Public Domain"
+homepage="https://github.com/intel/libvpl"
+changelog="https://github.com/intel/libvpl/blob/master/CHANGELOG.md"
+metapackage=yes
-post_install() {
- vlicense LICENSE
+oneVPL_package() {
+ metapackage=yes
+ 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"
- }
+ metapackage=yes
+ 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
- }
+ metapackage=yes
+ short_desc" - examples"
+ depends="libvpl>=0"
}
From c9f5ecdafe3fdeda5ff2a8843d98dd9bedd72fa2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 a7521337d58aaf..eae75a1932cf81 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=6
+revision=7
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 082606f897d34c01f44a6e87ccd189d648ec4c9c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 00f2f350c750f46be5257706ec6c32ec2070c35a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From dd39c1394916abae4acd808f459080053738b901 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (34 preceding siblings ...)
2025-06-17 22:34 ` zlice
@ 2025-06-18 12:19 ` zlice
2025-06-19 4:04 ` oreo639
` (22 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-18 12:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15719 bytes --]
From 7f01b00caa1fda4892afa27f5d50a84af43018d1 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 22e09f221236d5..135fb918262c5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4512,7 +4512,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..c7530b019901bc 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=4
+metapackage=yes
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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() {
+ metapackage=yes
+ 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"
- }
+ metapackage=yes
+ 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
- }
+ metapackage=yes
+ short_desc" - examples"
+ depends="libvpl>=0"
}
From 6fac0cce7a9ba56d4b24eb6029dea2326525f4a5 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 a7521337d58aaf..eae75a1932cf81 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=6
+revision=7
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 dd42714d0362fc4dcd0ad6f08eeb48a1998c8f72 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 1e76862a55be39d5e8441096a563ca109a40c4f1 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 46f0c78e6b60ef67d9cf8756f731134ca86da0e2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (35 preceding siblings ...)
2025-06-18 12:19 ` zlice
@ 2025-06-19 4:04 ` oreo639
2025-06-19 18:39 ` zlice
` (21 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-19 4:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15671 bytes --]
From 36ef502838d5f9d354a403e44d155550c8510d79 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 | 44 +++++--------------
6 files changed, 55 insertions(+), 35 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 22e09f221236d5..135fb918262c5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4512,7 +4512,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..d5a93285058a45 100644
--- a/srcpkgs/oneVPL/template
+++ b/srcpkgs/oneVPL/template
@@ -1,43 +1,21 @@
# Template file for 'oneVPL'
pkgname=oneVPL
version=2023.3.1
-revision=2
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libva-devel libX11-devel"
-short_desc="Intel oneAPI Video Processing Library"
+revision=4
+metapackage=yes
+depends="libvpl>=0"
+short_desc="Intel oneAPI Video Processing Library (transitional dummy package)"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
-
-post_install() {
- vlicense LICENSE
-}
+license="Public Domain"
+homepage="https://github.com/intel/libvpl"
+changelog="https://github.com/intel/libvpl/blob/master/CHANGELOG.md"
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"
- }
+ metapackage=yes
+ depends="libvpl-devel>=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
- }
+ metapackage=yes
+ depends="libvpl-examples>=0"
}
From 5fd73ac4610998525f78b87773f244a55db9ccd8 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 a7521337d58aaf..eae75a1932cf81 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=6
+revision=7
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 e97c32b10dc06de0e6554df1a2fa1248ebd008e0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 99208874a6c9e133741aba518ee82c001a145f30 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 7f35eadb99ecf86d644ac9ee8e1b78cda5461895 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..7927dff09cf743 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (36 preceding siblings ...)
2025-06-19 4:04 ` oreo639
@ 2025-06-19 18:39 ` zlice
2025-06-20 11:19 ` zlice
` (20 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-19 18:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15719 bytes --]
From dd3e65fa86545d6ebaa4c21afd7ac69a7ab95041 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 74d8f49f678ffe..439482c2d162d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4512,7 +4512,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..af25b58ce33390 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
+metapackage=yes
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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() {
+ metapackage=yes
+ 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"
- }
+ metapackage=yes
+ 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
- }
+ metapackage=yes
+ short_desc" - examples"
+ depends="libvpl>=0"
}
From 46392c272047dbd73ca4c29b2e9816e0848d6169 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 9b73bd8ae9deed..3c8f42d273ff65 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=7
+revision=8
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 500649970c2c37000084b94590a0f62ca2a30a19 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 f521c7ef7f0c0da4a4427f33fabfe98fcd728ad7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 60e379bd3c98efeadc2eb04e4fac90cf213c6702 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 22fb9b6f4eb7d7..df891efbce77f4 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (37 preceding siblings ...)
2025-06-19 18:39 ` zlice
@ 2025-06-20 11:19 ` zlice
2025-06-20 17:40 ` zlice
` (19 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-20 11:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15719 bytes --]
From f64c0ded910a8940b7127ba199405b831abad50a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 74d8f49f678ffe..439482c2d162d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4512,7 +4512,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..af25b58ce33390 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
+metapackage=yes
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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() {
+ metapackage=yes
+ 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"
- }
+ metapackage=yes
+ 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
- }
+ metapackage=yes
+ short_desc" - examples"
+ depends="libvpl>=0"
}
From 39fcc33c5f250ecb92e34935165e4c6b61cf2df2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 9b73bd8ae9deed..3c8f42d273ff65 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=7
+revision=8
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 a013efb6ee210a27e183cd38ae03148859e708b5 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 2eb3b9b9cd15774fd935b1d6ba5b4fec20527e25 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 3d5cd54a7da79d437ccbaf70973ae10571cb16f2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 22fb9b6f4eb7d7..df891efbce77f4 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (38 preceding siblings ...)
2025-06-20 11:19 ` zlice
@ 2025-06-20 17:40 ` zlice
2025-06-20 19:18 ` zlice
` (18 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-20 17:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 15719 bytes --]
From 569ba6ecd2720ca16f6237b6e02fd5eceb5aa904 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 74d8f49f678ffe..439482c2d162d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4512,7 +4512,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..af25b58ce33390 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
+metapackage=yes
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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() {
+ metapackage=yes
+ 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"
- }
+ metapackage=yes
+ 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
- }
+ metapackage=yes
+ short_desc" - examples"
+ depends="libvpl>=0"
}
From 1b3ccda939be6d473de2584bfbee9267f9453f83 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 9b73bd8ae9deed..3c8f42d273ff65 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=7
+revision=8
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 ea1ed5301080bef3cf86a234448540b754c5f8f3 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 d39aedd24192ab39ae74a1cdbdbea01851dfce67 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:20:06 -0400
Subject: [PATCH 4/5] obs: revbump for libvpl
---
srcpkgs/obs/patches/fix-double-free.patch | 84 +++++++++++++++++------
srcpkgs/obs/template | 4 +-
2 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch
index 34ba8688b17e4a..2f6dbc2c98a4a9 100644
--- a/srcpkgs/obs/patches/fix-double-free.patch
+++ b/srcpkgs/obs/patches/fix-double-free.patch
@@ -1,26 +1,68 @@
-https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
+--- a/libobs/obs-module.c
++++ b/libobs/obs-module.c
+@@ -22,6 +22,8 @@
+ #include "obs-internal.h"
+ #include "obs-module.h"
+
++#include <sys/stat.h>
++
+ extern const char *get_module_extension(void);
+
+ static inline int req_func_not_found(const char *name, const char *path)
+@@ -269,6 +271,34 @@
+ if (!obs || !bin || !data)
+ return;
+
++ char tmp_data[255] = {0}; // shouldn't hit paths 255 big?
++ for (size_t i = 0; i < obs->module_paths.num; i++) {
++ struct obs_module_path *old_omp = obs->module_paths.array + i;
++ char *mod_loc = 0;
++ struct stat old_bin, new_bin, old_data, new_data;
++ size_t maxlen = strlen(old_omp->data);
++ if (maxlen > 254) {
++ maxlen = 254;
++ blog(LOG_WARNING, "Max length of module path is over void-hackery 254 character length");
++ }
++ memcpy(tmp_data, old_omp->data, maxlen);
++ mod_loc = strstr(tmp_data, "%module%");
++ if (mod_loc) *mod_loc = 0;
++ stat(old_omp->bin, &old_bin);
++ stat(bin, &new_bin);
++ stat(tmp_data, &old_data);
++ stat(data, &new_data);
++ if ((old_bin.st_dev == new_bin.st_dev
++ && old_bin.st_ino == new_bin.st_ino)
++ || (old_data.st_dev == new_data.st_dev
++ && old_data.st_ino == new_data.st_ino) )
++ {
++ blog(LOG_WARNING, "Skipping duplicate module path: bin: '%s', data: '%s'"
++ ,bin, data);
++ return;
++ }
++ }
++
+ omp.bin = bstrdup(bin);
+ omp.data = bstrdup(data);
+ da_push_back(obs->module_paths, &omp);
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
-@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
-
- void add_default_module_paths(void)
- {
-- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
-- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
--
-- if (module_bin_path && module_data_path) {
-- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
--
-- if (abs_module_bin_path &&
-- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
-- obs_add_module_path(module_bin_path, module_data_path);
-- }
-- bfree(abs_module_bin_path);
-- }
--
-- bfree(module_bin_path);
-- bfree(module_data_path);
--
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ #endif
+@@ -83,7 +84,11 @@
+ bfree(module_bin_path);
+ bfree(module_data_path);
+
++ struct stat stat_info;
++
for (int i = 0; i < module_patterns_size; i++) {
++ if ((stat(module_bin[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) )
++ && (stat(module_data[i], &stat_info) == 0 && !!S_ISDIR(stat_info.st_mode) ) )
obs_add_module_path(module_bin[i], module_data[i]);
}
+ }
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 8c6f0be89a6f1b9193951dadb3edecac2251beb2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 22fb9b6f4eb7d7..df891efbce77f4 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (39 preceding siblings ...)
2025-06-20 17:40 ` zlice
@ 2025-06-20 19:18 ` zlice
2025-06-20 19:31 ` [PR REVIEW] " oreo639
` (17 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-20 19:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12501 bytes --]
From 569ba6ecd2720ca16f6237b6e02fd5eceb5aa904 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 74d8f49f678ffe..439482c2d162d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4512,7 +4512,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..af25b58ce33390 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
+metapackage=yes
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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() {
+ metapackage=yes
+ 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"
- }
+ metapackage=yes
+ 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
- }
+ metapackage=yes
+ short_desc" - examples"
+ depends="libvpl>=0"
}
From 1b3ccda939be6d473de2584bfbee9267f9453f83 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 9b73bd8ae9deed..3c8f42d273ff65 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=7
+revision=8
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,8 +103,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 ea1ed5301080bef3cf86a234448540b754c5f8f3 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 087b333c6cdbbb4952fe6c69f5d27b93d922fcff Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 0dd19e074bf83f2c792c2f1b69314affc116619f Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 22fb9b6f4eb7d7..df891efbce77f4 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR REVIEW] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (40 preceding siblings ...)
2025-06-20 19:18 ` zlice
@ 2025-06-20 19:31 ` oreo639
2025-06-20 19:33 ` oreo639
` (16 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-20 19:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#discussion_r2159562052
Comment:
I assume this removal is unintentional?
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (41 preceding siblings ...)
2025-06-20 19:31 ` [PR REVIEW] " oreo639
@ 2025-06-20 19:33 ` oreo639
2025-06-20 19:40 ` [PR PATCH] [Updated] " zlice
` (15 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-20 19:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-2992611784
Comment:
Also, the latest version of libvpl is 2.15.0.
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (42 preceding siblings ...)
2025-06-20 19:33 ` oreo639
@ 2025-06-20 19:40 ` zlice
2025-06-20 19:40 ` [PR REVIEW] " zlice
` (14 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-20 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12498 bytes --]
From 569ba6ecd2720ca16f6237b6e02fd5eceb5aa904 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 74d8f49f678ffe..439482c2d162d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4512,7 +4512,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..af25b58ce33390 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
+metapackage=yes
short_desc="Intel oneAPI Video Processing Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
+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() {
+ metapackage=yes
+ 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"
- }
+ metapackage=yes
+ 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
- }
+ metapackage=yes
+ short_desc" - examples"
+ depends="libvpl>=0"
}
From 0f319ba2e999453886dfd339ac575889226dc050 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b73bd8ae9deed..037ffc547b306b 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=7
+revision=8
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,7 +103,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
}
From 0afafdcd4264724578d42c38216dfb8d1257386c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 35d0db75d2a013a0d9a6cafa0d9183f249209e8c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From b7defd1da003b1baa3a12dc48d594a5fb182c716 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 22fb9b6f4eb7d7..df891efbce77f4 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR REVIEW] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (43 preceding siblings ...)
2025-06-20 19:40 ` [PR PATCH] [Updated] " zlice
@ 2025-06-20 19:40 ` zlice
2025-06-20 19:41 ` zlice
` (13 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-20 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New review comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#discussion_r2159571216
Comment:
yep, thanks
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (44 preceding siblings ...)
2025-06-20 19:40 ` [PR REVIEW] " zlice
@ 2025-06-20 19:41 ` zlice
2025-06-20 22:27 ` [PR REVIEW] " oreo639
` (12 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-20 19:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-2992624618
Comment:
> Also, the latest version of libvpl is 2.15.0.
it is but i had green screening with it. not sure if it was something between that or other factors but since i've been on 2.14 forever and it's stable and it's been almost a year on this pr let alone the other few years of trying to get libmfx on 4 and onevpl i kinda just wanted to get in
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR REVIEW] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (47 preceding siblings ...)
2025-06-20 22:27 ` oreo639
@ 2025-06-20 22:27 ` oreo639
2025-06-20 22:27 ` oreo639
` (9 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-20 22:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#discussion_r2159725425
Comment:
Btw, this isn't an assignment and it doesn't do anything. (e.g. the `short_desc` would still be `Intel oneAPI Video Processing Library`)
```suggestion
```
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR REVIEW] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (48 preceding siblings ...)
2025-06-20 22:27 ` oreo639
@ 2025-06-20 22:27 ` oreo639
2025-06-20 23:06 ` zlice
` (8 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-20 22:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#discussion_r2159725471
Comment:
```suggestion
```
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR REVIEW] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (46 preceding siblings ...)
2025-06-20 22:27 ` [PR REVIEW] " oreo639
@ 2025-06-20 22:27 ` oreo639
2025-06-20 22:27 ` oreo639
` (10 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-20 22:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#discussion_r2159725215
Comment:
```suggestion
```
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR REVIEW] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (45 preceding siblings ...)
2025-06-20 19:41 ` zlice
@ 2025-06-20 22:27 ` oreo639
2025-06-20 22:27 ` oreo639
` (11 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-20 22:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#discussion_r2159727291
Comment:
```suggestion
short_desc="Intel oneAPI Video Processing Library (transitional dummy package)"
```
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR REVIEW] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (49 preceding siblings ...)
2025-06-20 22:27 ` oreo639
@ 2025-06-20 23:06 ` zlice
2025-06-20 23:17 ` [PR PATCH] [Updated] " zlice
` (7 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-20 23:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#discussion_r2159749178
Comment:
oops, `+=` fine ? or just remove?
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (50 preceding siblings ...)
2025-06-20 23:06 ` zlice
@ 2025-06-20 23:17 ` zlice
2025-06-20 23:18 ` [PR REVIEW] " zlice
` (6 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-20 23:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12414 bytes --]
From 90830ff1d6efbf15dabaf9686fcdc479d9e6afb5 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 | 43 +++++--------------
6 files changed, 54 insertions(+), 35 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 74d8f49f678ffe..439482c2d162d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4512,7 +4512,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..16753ef82f64de 100644
--- a/srcpkgs/oneVPL/template
+++ b/srcpkgs/oneVPL/template
@@ -1,43 +1,20 @@
# Template file for 'oneVPL'
pkgname=oneVPL
version=2023.3.1
-revision=2
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libva-devel libX11-devel"
-short_desc="Intel oneAPI Video Processing Library"
+revision=3
+metapackage=yes
+short_desc="Intel oneAPI Video Processing Library (transitional dummy package)"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
-
-post_install() {
- vlicense LICENSE
-}
+license="Public Domain"
+homepage="https://github.com/intel/libvpl"
+changelog="https://github.com/intel/libvpl/blob/master/CHANGELOG.md"
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"
- }
+ metapackage=yes
+ 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
- }
+ metapackage=yes
+ depends="libvpl>=0"
}
From 4a3ba0aeb7fa453622076c9aa13811b9bf7a8c99 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b73bd8ae9deed..037ffc547b306b 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=7
+revision=8
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,7 +103,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
}
From b8fd4aedf823ed0e2711317a73f14878ecc1125c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 60d28b43f6e35c2269a0cbae8a335d0a6eb73ff9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 1f6936b92c0fccddbbf31a7317e1209caa169ebf Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 22fb9b6f4eb7d7..df891efbce77f4 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR REVIEW] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (51 preceding siblings ...)
2025-06-20 23:17 ` [PR PATCH] [Updated] " zlice
@ 2025-06-20 23:18 ` zlice
2025-06-21 6:26 ` oreo639
` (5 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-20 23:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#discussion_r2159755034
Comment:
went w/ none since that's your suggest line and it's transitional
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR REVIEW] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (52 preceding siblings ...)
2025-06-20 23:18 ` [PR REVIEW] " zlice
@ 2025-06-21 6:26 ` oreo639
2025-06-21 6:26 ` oreo639
` (4 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-21 6:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#discussion_r2159886647
Comment:
Just remove it.
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR REVIEW] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (53 preceding siblings ...)
2025-06-21 6:26 ` oreo639
@ 2025-06-21 6:26 ` oreo639
2025-06-21 6:46 ` [PR PATCH] [Updated] " oreo639
` (3 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-21 6:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#discussion_r2159886647
Comment:
Yeah.
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (54 preceding siblings ...)
2025-06-21 6:26 ` oreo639
@ 2025-06-21 6:46 ` oreo639
2025-06-21 7:48 ` [PR PATCH] [Merged]: " oreo639
` (2 subsequent siblings)
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-21 6:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/zlice/void-packages libvpl
https://github.com/void-linux/void-packages/pull/51496
oneVPL: update to 2.14.0, rename to libvpl
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
A patch file from https://github.com/void-linux/void-packages/pull/51496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvpl-51496.patch --]
[-- Type: text/x-diff, Size: 12429 bytes --]
From e8b1f11d883eb4ee24ce538c0808445f39b3c3c0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:18:14 -0400
Subject: [PATCH 1/5] oneVPL: update to 2.14.0, rename to libvpl
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 | 43 +++++--------------
6 files changed, 54 insertions(+), 35 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 74d8f49f678ffe..439482c2d162d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4512,7 +4512,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.14.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..eac67542dad0b3
--- /dev/null
+++ b/srcpkgs/libvpl/template
@@ -0,0 +1,40 @@
+# Template file for 'libvpl'
+pkgname=libvpl
+version=2.14.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 <maldridge@voidlinux.org>"
+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=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
+
+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 d5ee5ed72ac1c0..33100f5a51110d 100644
--- a/srcpkgs/oneVPL/template
+++ b/srcpkgs/oneVPL/template
@@ -1,43 +1,20 @@
# Template file for 'oneVPL'
pkgname=oneVPL
version=2023.3.1
-revision=2
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libva-devel libX11-devel"
-short_desc="Intel oneAPI Video Processing Library"
+revision=3
+metapackage=yes
+short_desc="Intel oneAPI Video Processing Library (transitional dummy package)"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-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=914530a80bdb155d3a4d50916ff34451da48584269e37075a48bd74a74e3d847
-
-post_install() {
- vlicense LICENSE
-}
+license="Public Domain"
+homepage="https://github.com/intel/libvpl"
+changelog="https://github.com/intel/libvpl/blob/master/CHANGELOG.md"
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"
- }
+ metapackage=yes
+ depends="libvpl-devel>=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
- }
+ metapackage=yes
+ depends="libvpl-examples>=0"
}
From 8ff8e4906e8492b2dc44a4fcd39e0d54f0bae466 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:46 -0400
Subject: [PATCH 2/5] ffmpeg6: revbump for libvpl
---
srcpkgs/ffmpeg6/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b73bd8ae9deed..037ffc547b306b 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=7
+revision=8
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 <orphan@voidlinux.org>"
@@ -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";;
@@ -103,7 +103,7 @@ do_configure() {
$(vopt_enable vaapi) $(vopt_enable vdpau) \
$(vopt_enable zimg libzimg) \
$(vopt_enable sofa libmysofa) \
- $(vopt_enable onevpl libvpl) \
+ $(vopt_enable libvpl libvpl) \
$(vopt_enable nvcodec nvenc) \
$(vopt_enable nvcodec nvdec)
}
From 4d1b755bf56d440c34bc73a2436dacd688160a35 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 27 Jul 2024 10:19:58 -0400
Subject: [PATCH 3/5] gst-plugins-bad1: revbump for libvpl
---
srcpkgs/gst-plugins-bad1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 471a59fa53aa6a..bb058e4f003de2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.26.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -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 nv-codec-headers
- 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 <orphan@voidlinux.org>"
@@ -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=cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844
-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 14e3f1a778a83774a3aa230cb358f31ae21858dd Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
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 24c3c50eb00771..26ffbf23f2e544 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=31.0.2
-revision=5
+revision=6
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-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 qt6-base-private-devel json-c++
+ libvpl-devel uthash qt6-base-private-devel json-c++
$(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
From 4f4363006c4139ea8fda835fbcb129e79d67b54f Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 2 Aug 2024 18:08:53 -0400
Subject: [PATCH 5/5] handbrake: revbump for libvpl
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 22fb9b6f4eb7d7..df891efbce77f4 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
@@ -14,7 +14,7 @@ makedepends="bzip2-devel gst-plugins-base1-devel gtk4-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 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"
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PR PATCH] [Merged]: oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (55 preceding siblings ...)
2025-06-21 6:46 ` [PR PATCH] [Updated] " oreo639
@ 2025-06-21 7:48 ` oreo639
2025-06-27 17:49 ` the-maldridge
2025-06-27 17:54 ` zlice
58 siblings, 0 replies; 60+ messages in thread
From: oreo639 @ 2025-06-21 7:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]
There's a merged pull request on the void-packages repository
oneVPL: update to 2.14.0, rename to libvpl
https://github.com/void-linux/void-packages/pull/51496
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
#### Comments
- libvpl name has replaced oneVPL
- versioning has switched to major.minor.bug instead of yyyy.x.z
Can move the mesa+ffmpeg6 patches into here if that makes more sense
@the-maldridge Pinging since it's yours, kept you as maintainer.
#### Affects PRs
- mesa - https://github.com/void-linux/void-packages/pull/51334
- intel opencl - https://github.com/void-linux/void-packages/pull/43084
- intel vpl runtime - https://github.com/void-linux/void-packages/pull/51133
- handbrake https://github.com/void-linux/void-packages/pull/51706
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (56 preceding siblings ...)
2025-06-21 7:48 ` [PR PATCH] [Merged]: " oreo639
@ 2025-06-27 17:49 ` the-maldridge
2025-06-27 17:54 ` zlice
58 siblings, 0 replies; 60+ messages in thread
From: the-maldridge @ 2025-06-27 17:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New comment by the-maldridge on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-3013921018
Comment:
@zlice excellent work. I've been busier than usual lately and this fell by the wayside. If you'd prefer to take on some of these media related packages under your own name, feel free to claim maintainership during the next update cycle.
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: oneVPL: update to 2.14.0, rename to libvpl
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
` (57 preceding siblings ...)
2025-06-27 17:49 ` the-maldridge
@ 2025-06-27 17:54 ` zlice
58 siblings, 0 replies; 60+ messages in thread
From: zlice @ 2025-06-27 17:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/51496#issuecomment-3013939114
Comment:
> @zlice excellent work.
thanks. ive actually been trying 2.15 that oreo pointed out, so far so good. i can make a pr and add the maintainer change.
^ permalink raw reply [flat|nested] 60+ messages in thread
end of thread, other threads:[~2025-06-27 17:54 UTC | newest]
Thread overview: 60+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-27 14:23 [PR PATCH] New package: libvpl-2.12.0 zlice
2024-07-27 14:26 ` zlice
2024-07-27 14:26 ` zlice
2024-07-27 14:30 ` icp1994
2024-07-28 13:43 ` icp1994
2024-07-28 13:45 ` [PR PATCH] [Updated] " zlice
2024-07-31 14:47 ` zlice
2024-07-31 16:36 ` zlice
2024-08-02 22:09 ` zlice
2024-08-02 22:26 ` zlice
2024-08-02 22:27 ` zlice
2024-08-06 18:52 ` zlice
2024-08-07 0:02 ` zlice
2024-08-07 0:03 ` zlice
2024-08-10 12:38 ` zlice
2024-08-10 13:19 ` [wip]New " zlice
2024-09-05 18:06 ` [PR PATCH] [Updated] " zlice
2024-09-26 18:14 ` [PR PATCH] [Updated] [wip]New package: libvpl-2.13.0 zlice
2024-09-26 18:33 ` zlice
2024-11-01 12:10 ` [PR PATCH] [Updated] New " zlice
2024-12-23 15:44 ` zlice
2025-01-04 19:45 ` zlice
2025-03-02 13:46 ` [PR PATCH] [Updated] " zlice
2025-03-05 14:13 ` zlice
2025-03-05 14:18 ` zlice
2025-03-17 22:48 ` zlice
2025-03-18 22:32 ` zlice
2025-03-18 23:06 ` zlice
2025-04-16 17:14 ` zlice
2025-04-17 0:17 ` New package: libvpl-2.14.0 oreo639
2025-04-17 0:20 ` [PR PATCH] [Updated] " zlice
2025-06-09 20:27 ` [PR PATCH] [Updated] oneVPL: update to 2.14.0, rename to libvpl zlice
2025-06-14 13:55 ` zlice
2025-06-14 13:57 ` zlice
2025-06-14 14:00 ` zlice
2025-06-17 22:34 ` zlice
2025-06-18 12:19 ` zlice
2025-06-19 4:04 ` oreo639
2025-06-19 18:39 ` zlice
2025-06-20 11:19 ` zlice
2025-06-20 17:40 ` zlice
2025-06-20 19:18 ` zlice
2025-06-20 19:31 ` [PR REVIEW] " oreo639
2025-06-20 19:33 ` oreo639
2025-06-20 19:40 ` [PR PATCH] [Updated] " zlice
2025-06-20 19:40 ` [PR REVIEW] " zlice
2025-06-20 19:41 ` zlice
2025-06-20 22:27 ` [PR REVIEW] " oreo639
2025-06-20 22:27 ` oreo639
2025-06-20 22:27 ` oreo639
2025-06-20 22:27 ` oreo639
2025-06-20 23:06 ` zlice
2025-06-20 23:17 ` [PR PATCH] [Updated] " zlice
2025-06-20 23:18 ` [PR REVIEW] " zlice
2025-06-21 6:26 ` oreo639
2025-06-21 6:26 ` oreo639
2025-06-21 6:46 ` [PR PATCH] [Updated] " oreo639
2025-06-21 7:48 ` [PR PATCH] [Merged]: " oreo639
2025-06-27 17:49 ` the-maldridge
2025-06-27 17:54 ` zlice
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).