summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch (renamed from gst-plugins-intel-msdk-git-fix-intel-media-sdk-directories.patch)5
-rw-r--r--020-gst-plugins-intel-msdk-fix-link-and-install.patch (renamed from gst-plugins-intel-msdk-git-fix-link-and-install.patch)5
-rw-r--r--PKGBUILD60
4 files changed, 36 insertions, 52 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d293ae33db05..8dd93dee4879 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gst-plugins-intel-msdk-git
pkgdesc = GStreamer plugins for Intel Media SDK (MSDK) (git version)
- pkgver = 1.3.3.rc9.r44.g1aae2ee
- pkgrel = 2
+ pkgver = 1.3.3.rc9.r78.g6ab2418
+ pkgrel = 1
url = https://github.com/intel/gstreamer-media-SDK/
arch = x86_64
license = LGPL2.1
@@ -13,6 +13,7 @@ pkgbase = gst-plugins-intel-msdk-git
depends = gst-plugins-base-libs
depends = gst-plugins-bad
depends = glib2
+ depends = intel-media-sdk
depends = libdrm
depends = libva
depends = libgl
@@ -20,15 +21,16 @@ pkgbase = gst-plugins-intel-msdk-git
depends = libxrandr
depends = libxcb
depends = libxkbcommon
- depends = intel-media-sdk
provides = gst-plugins-intel-msdk
conflicts = gst-plugins-intel-msdk
+ options = !lto
source = git+https://github.com/intel/gstreamer-media-SDK.git
- source = gst-plugins-intel-msdk-git-fix-intel-media-sdk-directories.patch
- source = gst-plugins-intel-msdk-git-fix-link-and-install.patch
+ source = 010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch
+ source = 020-gst-plugins-intel-msdk-fix-link-and-install.patch
+ source = 030-gst-plugins-intel-msdk-fix-for-gst-plugins-bad-1.18.patch::https://github.com/intel/gstreamer-media-SDK/commit/56a6e15db043f98c40366f01adf1f4b3f0fba2eb.patch
sha256sums = SKIP
- sha256sums = 9fd317b93395faa95eae10bb9bf77e1828d942b83f5b4ba768144c8a23f3cbec
- sha256sums = fc410ebcb456894e084b3705ddb5deceede0cb7977206e89cc7b86c29d011fe0
+ sha256sums = 3481788e701b77c1abb3d2106ebc67756d50fbb0125a2a76645ffc9eb062d296
+ sha256sums = b585d73d0cdb6ebef14a5353dcef81fa011373972ea86fcf980c05f353d06d70
+ sha256sums = ec25afeb0008989e04cba225bad67a8db5d0e034b97257c0e0a85813867ad23d
pkgname = gst-plugins-intel-msdk-git
-
diff --git a/gst-plugins-intel-msdk-git-fix-intel-media-sdk-directories.patch b/010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch
index 564cdf05e1cb..7e4e53e1dba2 100644
--- a/gst-plugins-intel-msdk-git-fix-intel-media-sdk-directories.patch
+++ b/010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch
@@ -1,6 +1,5 @@
-diff -Naurp a/cmake/FindMediaSDK.cmake b/cmake/FindMediaSDK.cmake
---- a/cmake/FindMediaSDK.cmake 2018-07-23 18:57:29.000000000 +0000
-+++ b/cmake/FindMediaSDK.cmake 2018-07-23 19:00:23.049123164 +0000
+--- a/cmake/FindMediaSDK.cmake
++++ b/cmake/FindMediaSDK.cmake
@@ -16,8 +16,8 @@ function(FindMediaSDK)
else()
message(FATAL_ERROR "No MediaSDK distribution is found.")
diff --git a/gst-plugins-intel-msdk-git-fix-link-and-install.patch b/020-gst-plugins-intel-msdk-fix-link-and-install.patch
index 711bcd62f75a..24f1455d6550 100644
--- a/gst-plugins-intel-msdk-git-fix-link-and-install.patch
+++ b/020-gst-plugins-intel-msdk-fix-link-and-install.patch
@@ -1,6 +1,5 @@
-diff -Naurp a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2018-07-23 19:32:27.000000000 +0000
-+++ b/CMakeLists.txt 2018-07-23 19:32:50.661638164 +0000
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -109,6 +109,7 @@ target_link_libraries(gstmfx
${SINK_BACKEND}
${PARSER}
diff --git a/PKGBUILD b/PKGBUILD
index 92f871fffe3c..60975006460b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,41 @@
-# Maintainer: Daniel Bermond < gmail-com: danielbermond >
+# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=gst-plugins-intel-msdk-git
-_srcname=gstreamer-media-SDK
-pkgver=1.3.3.rc9.r44.g1aae2ee
-pkgrel=2
+pkgver=1.3.3.rc9.r78.g6ab2418
+pkgrel=1
pkgdesc='GStreamer plugins for Intel Media SDK (MSDK) (git version)'
arch=('x86_64')
url='https://github.com/intel/gstreamer-media-SDK/'
license=('LGPL2.1')
-depends=(
- # official repositories:
- 'gcc-libs' 'libsystemd' 'gstreamer' 'gst-plugins-base-libs'
- 'gst-plugins-bad' 'glib2' 'libdrm' 'libva' 'libgl' 'wayland'
- 'libxrandr' 'libxcb' 'libxkbcommon'
- # AUR:
- 'intel-media-sdk'
-)
+depends=('gcc-libs' 'libsystemd' 'gstreamer' 'gst-plugins-base-libs'
+ 'gst-plugins-bad' 'glib2' 'intel-media-sdk' 'libdrm' 'libva'
+ 'libgl' 'wayland' 'libxrandr' 'libxcb' 'libxkbcommon')
makedepends=('git' 'cmake')
provides=('gst-plugins-intel-msdk')
conflicts=('gst-plugins-intel-msdk')
+options=('!lto')
source=('git+https://github.com/intel/gstreamer-media-SDK.git'
- 'gst-plugins-intel-msdk-git-fix-intel-media-sdk-directories.patch'
- 'gst-plugins-intel-msdk-git-fix-link-and-install.patch')
+ '010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch'
+ '020-gst-plugins-intel-msdk-fix-link-and-install.patch'
+ '030-gst-plugins-intel-msdk-fix-for-gst-plugins-bad-1.18.patch'::'https://github.com/intel/gstreamer-media-SDK/commit/56a6e15db043f98c40366f01adf1f4b3f0fba2eb.patch')
sha256sums=('SKIP'
- '9fd317b93395faa95eae10bb9bf77e1828d942b83f5b4ba768144c8a23f3cbec'
- 'fc410ebcb456894e084b3705ddb5deceede0cb7977206e89cc7b86c29d011fe0')
+ '3481788e701b77c1abb3d2106ebc67756d50fbb0125a2a76645ffc9eb062d296'
+ 'b585d73d0cdb6ebef14a5353dcef81fa011373972ea86fcf980c05f353d06d70'
+ 'ec25afeb0008989e04cba225bad67a8db5d0e034b97257c0e0a85813867ad23d')
prepare() {
- cd "$_srcname"
-
- mkdir -p build
-
- patch -Np1 -i "${srcdir}/gst-plugins-intel-msdk-git-fix-intel-media-sdk-directories.patch"
- patch -Np1 -i "${srcdir}/gst-plugins-intel-msdk-git-fix-link-and-install.patch"
+ patch -d gstreamer-media-SDK -Np1 -i "${srcdir}/010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch"
+ patch -d gstreamer-media-SDK -Np1 -i "${srcdir}/020-gst-plugins-intel-msdk-fix-link-and-install.patch"
+ patch -d gstreamer-media-SDK -Np1 -i "${srcdir}/030-gst-plugins-intel-msdk-fix-for-gst-plugins-bad-1.18.patch"
}
pkgver() {
- cd "$_srcname"
-
- # git, tags available
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/_/\./'
+ git -C gstreamer-media-SDK describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/_/\./'
}
build() {
- cd "$_srcname"
-
- cd build
-
- cmake \
+ cmake -B build -S gstreamer-media-SDK \
+ -DCMAKE_BUILD_TYPE:STRING='None' \
-DCMAKE_INSTALL_PREFIX:PATH='/usr' \
-DMFX_DECODER='ON' \
-DUSE_HEVC_DECODER='ON' \
@@ -69,14 +57,10 @@ build() {
-DMFX_SINK_BIN='ON' \
-DWITH_MSS_2016='OFF' \
-DMFX_VC1_PARSER='ON' \
- -Wno-dev \
- ..
-
- make
+ -Wno-dev
+ make -C build
}
package() {
- cd "${_srcname}/build"
-
- make DESTDIR="$pkgdir" install
+ make -C build DESTDIR="$pkgdir" install
}