diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 28 | ||||
| -rw-r--r-- | gcc10-fix.patch | 11 | ||||
| -rw-r--r-- | intel-hybrid-codec-driver.install | 12 | ||||
| -rw-r--r-- | vadriverinit-fix.patch | 13 |
5 files changed, 62 insertions, 12 deletions
@@ -1,16 +1,20 @@ pkgbase = intel-hybrid-codec-driver pkgdesc = Libva support for partially hardware accelerated encode and decode on Haswell and newer - pkgver = 2.0.0.r169.edead0c + pkgver = 2.0.0.r170.7961945 pkgrel = 1 url = https://01.org/linuxmedia/vaapi - arch = i686 + install = intel-hybrid-codec-driver.install arch = x86_64 license = MIT + makedepends = git depends = libva depends = libcmrt optdepends = libva-intel-driver-hybrid: To be able to use the full hw codecs with hybrid codecs source = intel-hybrid-driver::git+https://github.com/01org/intel-hybrid-driver.git + source = gcc10-fix.patch + source = vadriverinit-fix.patch sha256sums = SKIP + sha256sums = 90c01a1771f90007b001057edd4ada66751e54ccc380b3d87672694ab7ea92cb + sha256sums = 5359cfa322403bad1a20dc55de290c5f5c2f8d56afeba9c4a84dfc35cc89ec8b pkgname = intel-hybrid-codec-driver - @@ -2,10 +2,11 @@ # Contributer: uth 2.0.0 update # # Supported Platforms Features -# Haswell (HSW) vp8enc -# Bay Trail M (BYT) vp8enc -# Broadwell (BRW) vp9dec vp9enc -# Braswell (BSW) vp8enc vp9dec +# Haswell (HSW) vp8enc +# Bay Trail M (BYT) vp8enc +# Broadwell (BRW) vp9dec vp9enc +# Braswell (BSW) vp8enc vp9dec +# # # The libva-intel-driver package isn't compiled with support for loading this driver # so in order to use this driver's features with non hybrid codecs either @@ -17,15 +18,21 @@ _gitroot="git+https://github.com/01org/intel-hybrid-driver.git" _gitname=intel-hybrid-driver _pkgver=2.0.0 pkgver=$_pkgver.r169.edead0c -pkgrel=1 +pkgrel=4 pkgdesc='Libva support for partially hardware accelerated encode and decode on Haswell and newer' -arch=('i686' 'x86_64') +arch=('x86_64') +install=${pkgname}.install url='https://01.org/linuxmedia/vaapi' license=('MIT') depends=('libva' 'libcmrt') optdepends=('libva-intel-driver-hybrid: To be able to use the full hw codecs with hybrid codecs') -source=("$_gitname::$_gitroot") -sha256sums=('SKIP') +makedepends=('git') +source=("$_gitname::$_gitroot" + 'gcc10-fix.patch' + 'vadriverinit-fix.patch') +sha256sums=('SKIP' + '90c01a1771f90007b001057edd4ada66751e54ccc380b3d87672694ab7ea92cb' + '5359cfa322403bad1a20dc55de290c5f5c2f8d56afeba9c4a84dfc35cc89ec8b') pkgver() { cd ${srcdir}/$_gitname @@ -34,12 +41,15 @@ pkgver() { prepare() { cd ${srcdir}/${_gitname} + patch -p1 -i ${srcdir}/gcc10-fix.patch + patch -p1 -i ${srcdir}/vadriverinit-fix.patch autoreconf -v --install } build() { cd ${srcdir}/${_gitname} - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --disable-x11 make } diff --git a/gcc10-fix.patch b/gcc10-fix.patch new file mode 100644 index 000000000000..0c170579857f --- /dev/null +++ b/gcc10-fix.patch @@ -0,0 +1,11 @@ +--- intel-hybrid-driver/src/media_drv_common.h 2020-05-26 23:18:02.279795861 +0100 ++++ intel-hybrid-driver-new/src/media_drv_common.h 2020-05-26 23:19:11.316101524 +0100 +@@ -39,6 +39,6 @@ + #define BRC_INIT_IGNORE_PICTURE_HEADER_SIZE 0x2000 + #define BRC_INIT_DISABLE_MBBRC 0x8000 + +-UINT SEARCH_PATH_TABLE[2][8][16]; +-UINT ME_CURBE_INIT_DATA[30]; ++extern UINT SEARCH_PATH_TABLE[2][8][16]; ++extern UINT ME_CURBE_INIT_DATA[30]; + #endif diff --git a/intel-hybrid-codec-driver.install b/intel-hybrid-codec-driver.install new file mode 100644 index 000000000000..3fabbc8ce54c --- /dev/null +++ b/intel-hybrid-codec-driver.install @@ -0,0 +1,12 @@ +post_upgrade() { + if [ $(vercmp $2 '2.0.0.r169.edead0c-1') -le 0 ] + then + cat<<'EOF' +## NOTE ## +Due to a bug this package no longer provides support for using vaapi via X11. +Apps configured to use vaapi in this way (e.g. VLC, MPV) should be changed to +use vaapi via DRM. + +EOF + fi +} diff --git a/vadriverinit-fix.patch b/vadriverinit-fix.patch new file mode 100644 index 000000000000..5177e1448539 --- /dev/null +++ b/vadriverinit-fix.patch @@ -0,0 +1,13 @@ +--- intel-hybrid-driver/src/media_drv_init.c ++++ intel-hybrid-driver-new/src/media_drv_init.c +@@ -2764,9 +2764,9 @@ va_driver_init (VADriverContextP ctx) + return ret; + } + +-VAStatus DLL_EXPORT __vaDriverInit_0_34 (VADriverContextP ctx); ++VAStatus DLL_EXPORT VA_DRIVER_INIT_FUNC (VADriverContextP ctx); + VAStatus +-__vaDriverInit_0_34 (VADriverContextP ctx) ++VA_DRIVER_INIT_FUNC (VADriverContextP ctx) + { + VAStatus ret = VA_STATUS_ERROR_UNKNOWN; |