Fix build with gst-plugins-bad 1.18

Also disabled lto to fix relocation error when building.

6 files changed, 60 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7adb5eed772..6e1351ecddf1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gst-plugins-intel-msdk
 	pkgdesc = GStreamer plugins for Intel Media SDK (MSDK)
 	pkgver = 1.3.3.rc9
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/intel/gstreamer-media-SDK/
 	arch = x86_64
 	license = LGPL2.1
@@ -12,6 +12,7 @@ pkgbase = gst-plugins-intel-msdk
 	depends = gst-plugins-base-libs
 	depends = gst-plugins-bad
 	depends = glib2
+	depends = intel-media-sdk
 	depends = libdrm
 	depends = libva
 	depends = libgl
@@ -19,15 +20,16 @@ pkgbase = gst-plugins-intel-msdk
 	depends = libxrandr
 	depends = libxcb
 	depends = libxkbcommon
-	depends = intel-media-sdk
-	source = gst-plugins-intel-msdk-1.3.3.rc9.tar.gz::https://github.com/intel/gstreamer-media-SDK/archive/v1.3.3-rc9.tar.gz
-	source = gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch
-	source = gst-plugins-intel-msdk-fix-libdrm-include-directory.patch
-	source = gst-plugins-intel-msdk-fix-link-and-install.patch
+	options = !lto
+	source = https://github.com/intel/gstreamer-media-SDK/archive/v1.3.3-rc9/gst-plugins-intel-msdk-1.3.3.rc9.tar.gz
+	source = 010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch
+	source = 020-gst-plugins-intel-msdk-fix-libdrm-include-directory.patch
+	source = 030-gst-plugins-intel-msdk-fix-link-and-install.patch
+	source = 040-gst-plugins-intel-msdk-fix-for-gst-plugins-bad-1.18.patch::https://github.com/intel/gstreamer-media-SDK/commit/56a6e15db043f98c40366f01adf1f4b3f0fba2eb.patch
 	sha256sums = a83351dbd62f3dd1621b2013a11b3e7e52d0d98dc0c1ac9a191ac92819071fe3
-	sha256sums = 9fd317b93395faa95eae10bb9bf77e1828d942b83f5b4ba768144c8a23f3cbec
-	sha256sums = b55a8a8785ce2292c2792ffc814f004e8bd05b8d70e4e14a2fd93924901c020e
-	sha256sums = 01101e5c68e8b199004d23550b59f6481286d4f4660739098f4a389eaca8734b
+	sha256sums = 084dc93746b5a861540e72af6d5d02ee23f08480859e5231f6d6080e556014d5
+	sha256sums = cf2adc3643e7ada0d0c0f096cc303daa131eb75a272b16a36b95c4753fa293ef
+	sha256sums = 09756c986dda896a58ac0438531dd22686298a10ff450703830a79396197fd3b
+	sha256sums = ec25afeb0008989e04cba225bad67a8db5d0e034b97257c0e0a85813867ad23d
 
 pkgname = gst-plugins-intel-msdk
-
diff --git a/gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch b/010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch
index 564cdf05e1cb..ed771f30de88 100644
--- a/gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch
+++ b/010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch
@@ -1,6 +1,14 @@
-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
+@@ -5,7 +5,7 @@ function(FindMediaSDK)
+      message(STATUS "MFX_LIBRARY_DIRS: ${MFX_LIBDIR}")
+      include_directories (${MFX_INCLUDE_DIRS})
+      #set (${libs} ${MFX_LIBS} PARENT_SCOPE)
+-     set(MFX_LIBRARY  "${MFX_LIBDIR}/libmfx.a")
++     set(MFX_LIBRARY  "${MFX_LIBDIR}/libmfx.so")
+   else()
+     if(DEFINED ENV{MFX_HOME})
+       message(STATUS "MediaSDK distribution found in $ENV{MFX_HOME}")
 @@ -16,8 +16,8 @@ function(FindMediaSDK)
      else()
        message(FATAL_ERROR "No MediaSDK distribution is found.")
diff --git a/020-gst-plugins-intel-msdk-fix-libdrm-include-directory.patch b/020-gst-plugins-intel-msdk-fix-libdrm-include-directory.patch
new file mode 100644
index 000000000000..4299a7906163
--- /dev/null
+++ b/020-gst-plugins-intel-msdk-fix-libdrm-include-directory.patch
@@ -0,0 +1,11 @@
+--- a/gst-libs/mfx/egl/gstmfxtexture_egl.c
++++ b/gst-libs/mfx/egl/gstmfxtexture_egl.c
+@@ -22,7 +22,7 @@
+ 
+ #include "sysdeps.h"
+ 
+-#include <drm/drm_fourcc.h>
++#include <libdrm/drm_fourcc.h>
+ #include "gstmfxtexture_egl.h"
+ #include "gstmfxutils_egl.h"
+ #include "gstmfxsurface_vaapi.h"
diff --git a/gst-plugins-intel-msdk-fix-link-and-install.patch b/030-gst-plugins-intel-msdk-fix-link-and-install.patch
index 19b182f0faee..d3d850254eae 100644
--- a/gst-plugins-intel-msdk-fix-link-and-install.patch
+++ b/030-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-04-10 02:38:08.000000000 +0000
-+++ b/CMakeLists.txt	2018-07-23 20:12:11.893282064 +0000
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -102,6 +102,7 @@ target_link_libraries(gstmfx
      ${SINK_BACKEND}
      ${PARSER}
diff --git a/PKGBUILD b/PKGBUILD
index 9b47c6451698..4b56a3d9ebb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,38 @@
-# Maintainer: Daniel Bermond < gmail-com: danielbermond >
+# Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=gst-plugins-intel-msdk
-_srcname=gstreamer-media-SDK
 pkgver=1.3.3.rc9
-_rc="${pkgver##*.}"
-_srcver="${pkgver/.${_rc}/-${_rc}}"
-pkgrel=2
+pkgrel=3
 pkgdesc='GStreamer plugins for Intel Media SDK (MSDK)'
 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=('cmake')
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/intel/gstreamer-media-SDK/archive/v${pkgver%.${_rc}*}-${_rc}.tar.gz"
-        'gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch'
-        'gst-plugins-intel-msdk-fix-libdrm-include-directory.patch'
-        'gst-plugins-intel-msdk-fix-link-and-install.patch')
+options=('!lto')
+source=("https://github.com/intel/gstreamer-media-SDK/archive/v${pkgver/.rc/-rc}/${pkgname}-${pkgver}.tar.gz"
+        '010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch'
+        '020-gst-plugins-intel-msdk-fix-libdrm-include-directory.patch'
+        '030-gst-plugins-intel-msdk-fix-link-and-install.patch'
+        '040-gst-plugins-intel-msdk-fix-for-gst-plugins-bad-1.18.patch'::'https://github.com/intel/gstreamer-media-SDK/commit/56a6e15db043f98c40366f01adf1f4b3f0fba2eb.patch')
 sha256sums=('a83351dbd62f3dd1621b2013a11b3e7e52d0d98dc0c1ac9a191ac92819071fe3'
-            '9fd317b93395faa95eae10bb9bf77e1828d942b83f5b4ba768144c8a23f3cbec'
-            'b55a8a8785ce2292c2792ffc814f004e8bd05b8d70e4e14a2fd93924901c020e'
-            '01101e5c68e8b199004d23550b59f6481286d4f4660739098f4a389eaca8734b')
+            '084dc93746b5a861540e72af6d5d02ee23f08480859e5231f6d6080e556014d5'
+            'cf2adc3643e7ada0d0c0f096cc303daa131eb75a272b16a36b95c4753fa293ef'
+            '09756c986dda896a58ac0438531dd22686298a10ff450703830a79396197fd3b'
+            'ec25afeb0008989e04cba225bad67a8db5d0e034b97257c0e0a85813867ad23d')
 
 prepare() {
-    cd "${_srcname}-${_srcver}"
-    
-    mkdir -p build
-    
-    patch -Np1 -i "${srcdir}/gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch"
-    patch -Np1 -i "${srcdir}/gst-plugins-intel-msdk-fix-libdrm-include-directory.patch"
-    patch -Np1 -i "${srcdir}/gst-plugins-intel-msdk-fix-link-and-install.patch"
+    patch -d "gstreamer-media-SDK-${pkgver/.rc/-rc}" -Np1 -i "${srcdir}/010-gst-plugins-intel-msdk-fix-intel-media-sdk-directories.patch"
+    patch -d "gstreamer-media-SDK-${pkgver/.rc/-rc}" -Np1 -i "${srcdir}/020-gst-plugins-intel-msdk-fix-libdrm-include-directory.patch"
+    patch -d "gstreamer-media-SDK-${pkgver/.rc/-rc}" -Np1 -i "${srcdir}/030-gst-plugins-intel-msdk-fix-link-and-install.patch"
+    patch -d "gstreamer-media-SDK-${pkgver/.rc/-rc}" -Np1 -i "${srcdir}/040-gst-plugins-intel-msdk-fix-for-gst-plugins-bad-1.18.patch"
 }
 
 build() {
-    cd "${_srcname}-${_srcver}"
-    
-    cd build
-    
-    cmake \
-        -DCMAKE_COLOR_MAKEFILE:BOOL='ON' \
+    cmake -B build -S "gstreamer-media-SDK-${pkgver/.rc/-rc}" \
+        -DCMAKE_BUILD_TYPE:STRING='None' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DMFX_DECODER='ON' \
         -DUSE_HEVC_DECODER='ON' \
@@ -66,14 +54,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}-${_srcver}/build"
-    
-    make DESTDIR="$pkgdir" install
+    make -C build DESTDIR="$pkgdir" install
 }
diff --git a/gst-plugins-intel-msdk-fix-libdrm-include-directory.patch b/gst-plugins-intel-msdk-fix-libdrm-include-directory.patch
deleted file mode 100644
index e99e081def91..000000000000
--- a/gst-plugins-intel-msdk-fix-libdrm-include-directory.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp a/gst-libs/mfx/egl/gstmfxtexture_egl.c b/gst-libs/mfx/egl/gstmfxtexture_egl.c
---- a/gst-libs/mfx/egl/gstmfxtexture_egl.c	2018-07-23 18:57:29.000000000 +0000
-+++ b/gst-libs/mfx/egl/gstmfxtexture_egl.c	2018-07-23 19:07:48.225665840 +0000
-@@ -22,7 +22,7 @@
- 
- #include "sysdeps.h"
- 
--#include <drm/drm_fourcc.h>
-+#include <libdrm/drm_fourcc.h>
- #include "gstmfxtexture_egl.h"
- #include "gstmfxutils_egl.h"
- #include "gstmfxsurface_vaapi.h"