From: zlice <zlice@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: libvpl-2.12.0
Date: Sat, 03 Aug 2024 00:26:14 +0200 [thread overview]
Message-ID: <20240802222614.4FC3820241@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-51496@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2024-08-02 22:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-27 14:23 [PR PATCH] " 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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240802222614.4FC3820241@inbox.vuxu.org \
--to=zlice@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).