Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] Build libva with glx (remove libva-glx)
@ 2020-10-17  7:12 st3r4g
  2020-10-17  8:53 ` [PR PATCH] [Updated] " st3r4g
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: st3r4g @ 2020-10-17  7:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

There is a new 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

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: 8284 bytes --]

From f1723d2d1888e9085098bce1320f80057f6e1a82 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Sat, 17 Oct 2020 09:09:05 +0200
Subject: [PATCH] WIP

---
 srcpkgs/QMPlay2/template            |  4 +--
 srcpkgs/bomi/template               |  4 +--
 srcpkgs/libva-glx/template          | 39 ++++-------------------------
 srcpkgs/libva-glx/update            |  1 -
 srcpkgs/libva-intel-driver/template |  4 +--
 srcpkgs/libva/template              |  6 ++---
 srcpkgs/mpv/template                |  4 +--
 srcpkgs/qtav/template               |  4 +--
 srcpkgs/xine-lib/template           |  4 +--
 9 files changed, 20 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/libva-glx/update

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 4fdb278054d..3afde9c44a7 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,12 +1,12 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
 version=20.07.04
-revision=1
+revision=2
 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"
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"
diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template
index 19ff3ba7980..c105828dcab 100644
--- a/srcpkgs/libva-glx/template
+++ b/srcpkgs/libva-glx/template
@@ -1,44 +1,15 @@
 # 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"
+revision=2
+build_style=meta
+depends=libva
+short_desc="Video Acceleration (VA) API - GLX backend (removed package)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
+license="none"
 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
diff --git a/srcpkgs/libva-intel-driver/template b/srcpkgs/libva-intel-driver/template
index 3cae1ab25b2..63662b4215c 100644
--- a/srcpkgs/libva-intel-driver/template
+++ b/srcpkgs/libva-intel-driver/template
@@ -1,13 +1,13 @@
 # Template file for 'libva-intel-driver'
 pkgname=libva-intel-driver
 version=2.4.1
-revision=1
+revision=2
 archs="i686* x86_64*"
 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"
diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index d681e84c848..ef6003a8a42 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>"
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index c45a163d0b3..127af87de52 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
 # Template file for 'mpv'
 pkgname=mpv
 version=0.32.0
-revision=4
+revision=5
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
  --enable-dvdnav --enable-cdda --enable-libmpv-shared
@@ -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)
diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template
index c823f7972b8..fbd8d9b35dc 100644
--- a/srcpkgs/qtav/template
+++ b/srcpkgs/qtav/template
@@ -1,11 +1,11 @@
 # Template file for 'qtav'
 pkgname=qtav
 version=1.13.0
-revision=1
+revision=2
 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"
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"

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2022-05-06  2:08 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-17  7:12 [PR PATCH] [WIP] Build libva with glx (remove libva-glx) 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 ` [PR PATCH] [Updated] " st3r4g
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

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).