Match latest upstream changes

3 files changed, 64 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e025bef4b3f..05d9225c14eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = onevpl-cpu-git
 	pkgdesc = oneVPL runtime implementation for CPU (git version)
-	pkgver = 2021.4.0.r0.g19f2e5a
+	pkgver = 2022.1.4.r0.g83a0537
 	pkgrel = 1
 	url = https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onevpl.html
 	arch = x86_64
@@ -8,6 +8,7 @@ pkgbase = onevpl-cpu-git
 	makedepends = git
 	makedepends = cmake
 	makedepends = onevpl
+	makedepends = openh264
 	makedepends = svt-hevc
 	depends = ffmpeg
 	provides = onevpl-cpu
@@ -18,7 +19,7 @@ pkgbase = onevpl-cpu-git
 	source = 010-onevpl-cpu-fix-libs.patch
 	source = 020-onevpl-cpu-googletest-remove-werror.patch
 	sha256sums = SKIP
-	sha256sums = ab8858a2fd1da6de829c180fdf91e41cbaa7caca71ebcb7dff377816ba42c7b0
+	sha256sums = 3e27f4634dfb3b563dfec9d85082e20abbeb58bf489782e901fab102106ca7c5
 	sha256sums = a0caaa1dd7701b6a13ebe58bc6917c4f10f787f33d4d7e53d52766ddf985b980
 
 pkgname = onevpl-cpu-git
diff --git a/010-onevpl-cpu-fix-libs.patch b/010-onevpl-cpu-fix-libs.patch
index 39c4b56a51ec..58a8c592c21b 100644
--- a/010-onevpl-cpu-fix-libs.patch
+++ b/010-onevpl-cpu-fix-libs.patch
@@ -1,8 +1,8 @@
---- a/cpu/ext/ffmpeg-svt/CMakeLists.txt
-+++ b/cpu/ext/ffmpeg-svt/CMakeLists.txt
-@@ -20,17 +20,17 @@ endif()
- option(BUILD_GPL_X264 "Build X264 with GPL License" OFF)
+--- a/cpu/ext/ffmpeg-codecs/CMakeLists.txt
++++ b/cpu/ext/ffmpeg-codecs/CMakeLists.txt
+@@ -38,9 +38,9 @@ endif()
  
+ # Set basic FFmpeg and codec libs
  if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
 -  set(SVTHEVCENC_LIB ${VPL_DEP_DIR}/lib/libSvtHevcEnc.a)
 -  set(SVTAV1ENC_LIB ${VPL_DEP_DIR}/lib/libSvtAv1Enc.a)
@@ -10,7 +10,13 @@
 +  set(SVTHEVCENC_LIB ${VPL_DEP_DIR}/lib/libSvtHevcEnc.so)
 +  set(SVTAV1ENC_LIB ${VPL_DEP_DIR}/lib/libSvtAv1Enc.so)
 +  set(DAV1D_LIB ${VPL_DEP_DIR}/lib/libdav1d.so)
+ 
+   if(NOT EXISTS ${SVTHEVCENC_LIB}
+      OR NOT EXISTS ${SVTAV1ENC_LIB}
+@@ -49,10 +49,10 @@ if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8"
+   endif()
  endif()
+ 
 -set(AVCODEC_LIB ${VPL_DEP_DIR}/lib/libavcodec.a)
 -set(AVUTIL_LIB ${VPL_DEP_DIR}/lib/libavutil.a)
 -set(AVFILTER_LIB ${VPL_DEP_DIR}/lib/libavfilter.a)
@@ -20,30 +26,52 @@
 +set(AVFILTER_LIB ${VPL_DEP_DIR}/lib/libavfilter.so)
 +set(SWSCALE_LIB ${VPL_DEP_DIR}/lib/libswscale.so)
  
+ if(NOT EXISTS ${AVCODEC_LIB}
+    OR NOT EXISTS ${AVUTIL_LIB}
+@@ -135,14 +135,14 @@ endif()
+ 
+ # Set AVC encoder lib name
  if(BUILD_GPL_X264)
--  set(X264_LIB ${VPL_DEP_DIR}/lib/libx264.a)
-+  set(X264_LIB ${VPL_DEP_DIR}/lib/libx264.so)
-   if(NOT EXISTS ${X264_LIB})
-     message(FATAL_ERROR "Could not find expected FFmpeg libraries")
+-  set(H264_ENC_LIB ${VPL_DEP_DIR}/lib/libx264.a)
++  set(H264_ENC_LIB ${VPL_DEP_DIR}/lib/libx264.so)
+   if(NOT EXISTS ${H264_ENC_LIB})
+     message(FATAL_ERROR "Could not find x264 libraries")
+   else()
+     message(STATUS "Building with GPL x264 for AVC implementation")
    endif()
-@@ -75,14 +75,14 @@ if(MSVC)
-   string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" gcc_version ${gcc_version_text})
- 
-   set(GCC_LIB
--      ${MSYS_ROOT}/${mingw_name}/lib/gcc/${gcc_name}/${gcc_version}/libgcc.a)
-+      ${MSYS_ROOT}/${mingw_name}/lib/gcc/${gcc_name}/${gcc_version}/libgcc.so)
-   set(GCC_EH_LIB
--      ${MSYS_ROOT}/${mingw_name}/lib/gcc/${gcc_name}/${gcc_version}/libgcc_eh.a)
--  set(BCRYPT_LIB ${MSYS_ROOT}/${mingw_name}/${gcc_name}/lib/libbcrypt.a)
--  set(MINGW32_LIB ${MSYS_ROOT}/${mingw_name}/${gcc_name}/lib/libmingw32.a)
--  set(MINGWEX_LIB ${MSYS_ROOT}/${mingw_name}/${gcc_name}/lib/libmingwex.a)
-+      ${MSYS_ROOT}/${mingw_name}/lib/gcc/${gcc_name}/${gcc_version}/libgcc_eh.so)
-+  set(BCRYPT_LIB ${MSYS_ROOT}/${mingw_name}/${gcc_name}/lib/libbcrypt.so)
-+  set(MINGW32_LIB ${MSYS_ROOT}/${mingw_name}/${gcc_name}/lib/libmingw32.so)
-+  set(MINGWEX_LIB ${MSYS_ROOT}/${mingw_name}/${gcc_name}/lib/libmingwex.so)
-   set(PTHREAD_IMPLIB
--      ${MSYS_ROOT}/${mingw_name}/${gcc_name}/lib/libpthread.dll.a)
-+      ${MSYS_ROOT}/${mingw_name}/${gcc_name}/lib/libpthread.dll.so)
-   set(PTHREAD_DLL ${MSYS_ROOT}/${mingw_name}/bin/libwinpthread-1.dll)
+ elseif(BUILD_OPENH264)
+-  set(H264_ENC_LIB ${VPL_DEP_DIR}/lib/libopenh264.a)
++  set(H264_ENC_LIB ${VPL_DEP_DIR}/lib/libopenh264.so)
+   if(NOT EXISTS ${H264_ENC_LIB})
+     message(FATAL_ERROR "Could not find openh264 libraries")
+   else()
+@@ -157,7 +157,7 @@ if(WIN32)
+   # openH264 lib dependencies
+   if(BUILD_OPENH264)
+     findmingwlib(STDCPP_LIB ${MINGW_PATH} lib/gcc/${gcc_name}/${gcc_version}
+-                 libstdc++.a)
++                 libstdc++.so)
+     if(NOT EXISTS ${STDCPP_LIB})
+       message(
+         FATAL_ERROR "Could not find expected MinGW stdc++ runtime libraries")
+@@ -169,14 +169,14 @@ if(WIN32)
+ 
+   # Common libs from mingw
+   findmingwlib(GCC_LIB ${MINGW_PATH} lib/gcc/${gcc_name}/${gcc_version}
+-               libgcc.a)
++               libgcc.so)
+   findmingwlib(GCC_EH_LIB ${MINGW_PATH} lib/gcc/${gcc_name}/${gcc_version}
+-               libgcc_eh.a)
++               libgcc_eh.so)
+ 
+-  findmingwlib(BCRYPT_LIB ${MINGW_PATH} ${gcc_name}/lib libbcrypt.a)
+-  findmingwlib(MINGW32_LIB ${MINGW_PATH} ${gcc_name}/lib libmingw32.a)
+-  findmingwlib(MINGWEX_LIB ${MINGW_PATH} ${gcc_name}/lib libmingwex.a)
+-  findmingwlib(PTHREAD_IMPLIB ${MINGW_PATH} ${gcc_name}/lib libpthread.dll.a)
++  findmingwlib(BCRYPT_LIB ${MINGW_PATH} ${gcc_name}/lib libbcrypt.so)
++  findmingwlib(MINGW32_LIB ${MINGW_PATH} ${gcc_name}/lib libmingw32.so)
++  findmingwlib(MINGWEX_LIB ${MINGW_PATH} ${gcc_name}/lib libmingwex.so)
++  findmingwlib(PTHREAD_IMPLIB ${MINGW_PATH} ${gcc_name}/lib libpthread.dll.so)
  
    if(NOT EXISTS ${GCC_LIB})
+     message(FATAL_ERROR "Could not find expected MinGW GCC runtime libraries")
diff --git a/PKGBUILD b/PKGBUILD
index c091583d34ca..cbc124f6e1b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=onevpl-cpu-git
-pkgver=2021.4.0.r0.g19f2e5a
+pkgver=2022.1.4.r0.g83a0537
 pkgrel=1
 pkgdesc='oneVPL runtime implementation for CPU (git version)'
 arch=('x86_64')
 url='https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onevpl.html'
 license=('MIT')
 depends=('ffmpeg')
-makedepends=('git' 'cmake' 'onevpl' 'svt-hevc')
+makedepends=('git' 'cmake' 'onevpl' 'openh264' 'svt-hevc')
 provides=('onevpl-cpu' 'onevpl-runtime')
 conflicts=('onevpl-cpu')
 options=('!emptydirs')
@@ -16,7 +16,7 @@ source=('git+https://github.com/oneapi-src/oneVPL-cpu.git'
         '010-onevpl-cpu-fix-libs.patch'
         '020-onevpl-cpu-googletest-remove-werror.patch')
 sha256sums=('SKIP'
-            'ab8858a2fd1da6de829c180fdf91e41cbaa7caca71ebcb7dff377816ba42c7b0'
+            '3e27f4634dfb3b563dfec9d85082e20abbeb58bf489782e901fab102106ca7c5'
             'a0caaa1dd7701b6a13ebe58bc6917c4f10f787f33d4d7e53d52766ddf985b980')
 
 prepare() {
@@ -29,10 +29,11 @@ pkgver() {
 }
 
 build() {
-    export VPL_BUILD_DEPENDENCIES='/usr'
+    local -x VPL_BUILD_DEPENDENCIES='/usr'
     cmake -B build -S oneVPL-cpu \
         -DCMAKE_BUILD_TYPE:STRING='None' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+        -DCMAKE_INSTALL_SYSCONFDIR:PATH='/etc' \
         -DBUILD_TESTS:BOOL='OFF' \
         -Wno-dev
     make -C build
@@ -41,5 +42,5 @@ build() {
 package() {
     make -C build DESTDIR="$pkgdir" install
     install -d -m755 "${pkgdir}/usr/share/licenses"
-    mv "${pkgdir}/usr/share/doc/oneVPL-cpu" "${pkgdir}/usr/share/licenses/${pkgname}"
+    mv "${pkgdir}/usr/share/oneVPL-cpu/licensing" "${pkgdir}/usr/share/licenses/${pkgname}"
 }