From: st3r4g <st3r4g@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] Build libva with glx (remove libva-glx)
Date: Mon, 19 Oct 2020 17:50:47 +0200 [thread overview]
Message-ID: <20201019155047.7pZPF2MjLHwB6kOMEApFzuh10iH3eT1KK7kTSJQzq4Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25674@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
There is an updated pull request by st3r4g against master on the void-packages repository
https://github.com/st3r4g/void-packages libva-with-glx
https://github.com/void-linux/void-packages/pull/25674
[WIP] Build libva with glx (remove libva-glx)
Since we have `libglvnd` now, it should be possible to build libva with glx support without introducing build cycles.
Untested for now
Hmm maybe the transition can be done by replace= and removing libva-glx completely
A patch file from https://github.com/void-linux/void-packages/pull/25674.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libva-with-glx-25674.patch --]
[-- Type: text/x-diff, Size: 10892 bytes --]
From b670eeeb6af48c760134fa1b5db5888db18ae931 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 19 Oct 2020 17:43:12 +0200
Subject: [PATCH 1/8] libva-glx: remove
---
srcpkgs/libva-glx/template | 44 --------------------------------------
srcpkgs/libva-glx/update | 1 -
2 files changed, 45 deletions(-)
delete mode 100644 srcpkgs/libva-glx/template
delete mode 100644 srcpkgs/libva-glx/update
diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template
deleted file mode 100644
index 19ff3ba7980..00000000000
--- a/srcpkgs/libva-glx/template
+++ /dev/null
@@ -1,44 +0,0 @@
-# Template file for 'libva-glx'
-#
-# THIS PACKAGE IS SPLITTED FROM "libva" TO AVOID A CYCLIC DEPENDENCY:
-#
-# libva -> mesa -> libva
-#
-# KEEP THIS PACKAGE SYNCHRONIZED WITH "libva".
-#
-pkgname=libva-glx
-version=2.9.0
-revision=1
-wrksrc="libva-${version}"
-build_style=meson
-configure_args="-Dwith_glx=yes -Dwith_wayland=yes"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="libva-devel libXfixes-devel MesaLib-devel wayland-devel"
-short_desc="Video Acceleration (VA) API - GLX backend"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://01.org/linuxmedia/vaapi"
-changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
-distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=f31549dd476e01504ba6ff62f69862eb78555a9809ebe737056543a189d619dc
-
-post_install() {
- # We are only interested in the glx component, remove everything else.
- mkdir -p ${wrksrc}/temp/usr/lib/pkgconfig ${wrksrc}/temp/usr/include/va
- mv ${DESTDIR}/usr/lib/libva-glx* ${wrksrc}/temp/usr/lib
- mv ${DESTDIR}/usr/include/va/va_glx.h ${wrksrc}/temp/usr/include/va
- mv ${DESTDIR}/usr/lib/pkgconfig/libva-glx.pc ${wrksrc}/temp/usr/lib/pkgconfig
- rm -rf ${DESTDIR}/*
- mv ${wrksrc}/temp/* ${DESTDIR}
- vlicense COPYING
-}
-
-libva-glx-devel_package() {
- depends="libva-devel ${sourcepkg}-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/*.so
- }
-}
diff --git a/srcpkgs/libva-glx/update b/srcpkgs/libva-glx/update
deleted file mode 100644
index 93fa059287c..00000000000
--- a/srcpkgs/libva-glx/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=libva
From db344e0fc53be4b9cac191d70635dd8a1f2e0f9f Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 19 Oct 2020 17:43:49 +0200
Subject: [PATCH 2/8] libva: build with glx
---
common/shlibs | 2 +-
srcpkgs/libva/template | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 35f08f5f099..838630d0763 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -881,7 +881,7 @@ libwebpdemux.so.2 libwebp-0.5.0_1
libwebpdecoder.so.3 libwebp-0.6.0_1
libva-x11.so.2 libva-2.2.0_1
libva.so.2 libva-2.2.0_1
-libva-glx.so.2 libva-glx-2.2.0_1
+libva-glx.so.2 libva-2.9.0_2
libva-drm.so.2 libva-2.2.0_1
libva-wayland.so.2 libva-2.2.0_1
libv4l2.so.0 v4l-utils-0.8.5_1
diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index d681e84c848..4a65f08dd19 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -1,11 +1,11 @@
# Template file for 'libva'
pkgname=libva
version=2.9.0
-revision=1
+revision=2
build_style=meson
-configure_args="-Dwith_glx=no $(vopt_if wayland -Dwith_wayland=yes)"
+configure_args="-Dwith_glx=yes $(vopt_if wayland -Dwith_wayland=yes)"
hostmakedepends="pkg-config $(vopt_if wayland wayland-devel)"
-makedepends="libXfixes-devel libXext-devel libdrm-devel
+makedepends="libXfixes-devel libXext-devel libdrm-devel libglvnd-devel
$(vopt_if wayland 'libffi-devel wayland-devel')"
short_desc="Video Acceleration (VA) API"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,6 +15,8 @@ changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
checksum=f31549dd476e01504ba6ff62f69862eb78555a9809ebe737056543a189d619dc
+replaces="libva-glx>=0"
+
build_options="wayland"
build_options_default="wayland"
@@ -28,6 +30,7 @@ post_install() {
libva-devel_package() {
depends="$(vopt_if wayland wayland-devel) ${sourcepkg}>=${version}_${revision}"
+ replaces="libva-glx-devel>=0"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 4991515784bd57e363860caa3eb928a0796f8c4e Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 19 Oct 2020 17:46:04 +0200
Subject: [PATCH 3/8] QMPlay2: libva-glx -> libva
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 4fdb278054d..3b26c882191 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname}-src-${version}"
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg-devel libass-devel libcdio-devel libgme-devel
- libsidplayfp-devel libva-glx-devel libXv-devel pulseaudio-devel
+ libsidplayfp-devel libva-devel libXv-devel pulseaudio-devel
qt5-svg-devel qt5-tools-devel qt5-x11extras-devel taglib-devel
libcdio-paranoia-devel qt5-declarative-devel"
short_desc="Video and audio player which can play most formats and codecs"
From b3a23472da8a82110b19f46f4f4704fe80ccb92e Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 19 Oct 2020 17:46:21 +0200
Subject: [PATCH 4/8] bomi: libva-glx -> libva
---
srcpkgs/bomi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
index eb6558441ff..5fcec8d66bf 100644
--- a/srcpkgs/bomi/template
+++ b/srcpkgs/bomi/template
@@ -1,14 +1,14 @@
# Template file for 'bomi'
pkgname=bomi
version=0.9.11
-revision=16
+revision=17
build_style=configure
configure_args="--disable-systemd --release --prefix=/usr"
# does not build using py3.8 because of waf issues
hostmakedepends="python pkg-config curl perl which"
makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ xcb-util-wm-devel libva-devel alsa-lib-devel libvdpau-devel
qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
samba-devel libchardet-devel"
From 63c9b01e79d49b8f74a3eb3f5cc7345f48649efc Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 19 Oct 2020 17:46:50 +0200
Subject: [PATCH 5/8] libva-intel-driver: libva-glx -> libva
---
srcpkgs/libva-intel-driver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libva-intel-driver/template b/srcpkgs/libva-intel-driver/template
index 3cae1ab25b2..95a54c0fc17 100644
--- a/srcpkgs/libva-intel-driver/template
+++ b/srcpkgs/libva-intel-driver/template
@@ -7,7 +7,7 @@ wrksrc="intel-vaapi-driver-${version}"
build_style=meson
configure_args="-Dwith_wayland=yes -Dwith_x11=yes"
hostmakedepends="pkg-config"
-makedepends="libX11-devel libva-glx-devel libdrm-devel wayland-devel MesaLib-devel"
+makedepends="libX11-devel libva-devel libdrm-devel wayland-devel MesaLib-devel"
short_desc="Video Acceleration (VA) API - Intel Graphics backend"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From a1b47168ef7d3818bd1396fc54bf9f65fe1c49d2 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 19 Oct 2020 17:47:21 +0200
Subject: [PATCH 6/8] mpv: libva-glx -> libva
---
srcpkgs/mpv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index c45a163d0b3..28c083ca597 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -14,7 +14,7 @@ configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
hostmakedepends="pkg-config python3-docutils perl $(vopt_if wayland wayland-devel)"
makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel lcms2-devel libXv-devel
libass-devel libbluray-devel libcdio-paranoia-devel libdvdnav-devel
- libguess-devel libuuid-devel libva-glx-devel rubberband-devel uchardet-devel
+ libguess-devel libuuid-devel libva-devel rubberband-devel uchardet-devel
libarchive-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if caca libcaca-devel)
$(vopt_if jack jack-devel) $(vopt_if lua lua52-devel)
$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel)
From 1dbf5aade92a89e5463a256eb1d066e5cdf9a5d4 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 19 Oct 2020 17:48:17 +0200
Subject: [PATCH 7/8] qtav: libva-glx -> libva
---
srcpkgs/qtav/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template
index c823f7972b8..dcc43c97bf6 100644
--- a/srcpkgs/qtav/template
+++ b/srcpkgs/qtav/template
@@ -5,12 +5,12 @@ revision=1
wrksrc="QtAV-${version}"
build_style=qmake
makedepends="ffmpeg-devel libass-devel libopenal-devel
- libva-glx-devel libXv-devel pulseaudio-devel
+ libva-devel libXv-devel pulseaudio-devel
qt5-declarative-devel qt5-svg-devel
qt5-quickcontrols"
depends="desktop-file-utils hicolor-icon-theme qt5-svg"
-maintainer="Orphaned <orphan@voidlinux.org>"
short_desc="Cross-platform multimedia playback framework based on Qt and FFmpeg"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later"
homepage="http://www.qtav.org"
changelog="https://raw.githubusercontent.com/wang-bin/QtAV/master/Changelog"
@@ -23,4 +23,3 @@ post_install() {
ln -s /usr/lib/qt5/bin/Player ${DESTDIR}/usr/bin/Player
ln -s /usr/lib/qt5/bin/QMLPlayer ${DESTDIR}/usr/bin/QMLPlayer
}
-
From 333a7d7f0ee92081bcf7388443043e87a61db76f Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 19 Oct 2020 17:48:34 +0200
Subject: [PATCH 8/8] xine-lib: libva-glx -> libva
---
srcpkgs/xine-lib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index ee612b34a23..5a456b13c3d 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,7 +1,7 @@
# Template file for 'xine-lib'
pkgname=xine-lib
version=1.2.10
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3
--disable-oss"
@@ -29,7 +29,7 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*) makedepends+=" libva-glx-devel libvdpau-devel glu-devel";;
+ i686*|x86_64*|ppc64*) makedepends+=" libva-devel libvdpau-devel glu-devel";;
esac
CFLAGS="-fcommon"
next prev parent reply other threads:[~2020-10-19 15:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-17 7:12 [PR PATCH] " st3r4g
2020-10-17 8:53 ` [PR PATCH] [Updated] " st3r4g
2020-10-17 16:08 ` ericonr
2020-10-17 16:09 ` ericonr
2020-10-19 8:50 ` st3r4g
2020-10-19 8:51 ` st3r4g
2020-10-19 8:53 ` st3r4g
2020-10-19 15:17 ` travankor
2020-10-19 15:50 ` st3r4g [this message]
2020-10-19 15:54 ` st3r4g
2020-10-21 15:11 ` st3r4g
2020-10-21 16:36 ` ericonr
2020-10-21 16:42 ` ahesford
2020-10-22 8:25 ` [PR PATCH] [Updated] " st3r4g
2020-10-22 8:25 ` st3r4g
2020-11-01 2:44 ` ericonr
2022-04-21 2:12 ` [WIP] " github-actions
2022-05-06 2:08 ` [PR PATCH] [Closed]: " github-actions
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=20201019155047.7pZPF2MjLHwB6kOMEApFzuh10iH3eT1KK7kTSJQzq4Q@z \
--to=st3r4g@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).