Fixes

5 files changed, 63 insertions, 118 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bda0d9b9d5bc..34df3e9fc90c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
 pkgbase = onevpl-cpu
 	pkgdesc = oneVPL runtime implementation for CPU
 	pkgver = 2022.1.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.intel.com/content/www/us/en/developer/tools/oneapi/onevpl.html
 	arch = x86_64
 	license = MIT
+	makedepends = git
 	makedepends = cmake
+	makedepends = meson
+	makedepends = nasm
 	makedepends = onevpl
-	makedepends = openh264
-	makedepends = svt-hevc
-	depends = ffmpeg
+	makedepends = python
+	makedepends = xxhash
+	makedepends = yasm
+	depends = gcc-libs
 	provides = onevpl-runtime
-	options = !emptydirs
 	source = https://github.com/oneapi-src/oneVPL-cpu/archive/v2022.1.4/onevpl-cpu-2022.1.4.tar.gz
-	source = 010-onevpl-cpu-fix-libs.patch
-	source = 020-onevpl-cpu-googletest-remove-werror.patch
+	source = 010-onevpl-cpu-fix-build.patch
 	sha256sums = 88a156ec57016813297c83ea0aa30e3d631aad2e1821c3fc3e5a573d1dc21a80
-	sha256sums = 3e27f4634dfb3b563dfec9d85082e20abbeb58bf489782e901fab102106ca7c5
-	sha256sums = a0caaa1dd7701b6a13ebe58bc6917c4f10f787f33d4d7e53d52766ddf985b980
+	sha256sums = f8a04899239250cd32edde782823cf76be46249a17c3147fc29f3742a21f710c
 
 pkgname = onevpl-cpu
diff --git a/010-onevpl-cpu-fix-build.patch b/010-onevpl-cpu-fix-build.patch
new file mode 100644
index 000000000000..39a05c1fe589
--- /dev/null
+++ b/010-onevpl-cpu-fix-build.patch
@@ -0,0 +1,28 @@
+--- a/script/bootstrap.py
++++ b/script/bootstrap.py
+@@ -546,7 +546,8 @@ def build_dav1d_decoder(install_dir):
+         cmd('meson', 'build', '--prefix', os.path.join(install_dir,
+                                                        ''), '--libdir',
+             os.path.join(install_dir, 'lib'), '--buildtype', 'release',
+-            '--default-library=static', '-Denable_avx512=false')
++            '--default-library=static', '-Denable_avx512=false',
++            '-Dc_args=${CFLAGS} -fno-lto', '-Dcpp_args=${CXXFLAGS} -fno-lto')
+         cmd('ninja', '-C', 'build')
+         with pushd('build'):
+             cmd('ninja', 'install')
+@@ -662,6 +663,7 @@ def build_gpl_x264_encoder(install_dir):
+             f'--prefix={posix_install_dir}',
+             '--enable-static',
+             '--enable-pic',
++            '--disable-lavf',
+             shell='bash')
+         cmd('make', '-j', CPU_COUNT)
+         cmd('make', 'install')
+@@ -785,6 +787,7 @@ def ffmpeg_configure_opts(install_dir, a
+         '--enable-filter=select',
+         '--enable-filter=concat',
+         '--enable-filter=ssim',
++        '--extra-cflags=-fno-lto',
+     ]
+     if os.name == 'nt':
+         result.extend([
diff --git a/010-onevpl-cpu-fix-libs.patch b/010-onevpl-cpu-fix-libs.patch
deleted file mode 100644
index 58a8c592c21b..000000000000
--- a/010-onevpl-cpu-fix-libs.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- 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)
--  set(DAV1D_LIB ${VPL_DEP_DIR}/lib/libdav1d.a)
-+  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)
--set(SWSCALE_LIB ${VPL_DEP_DIR}/lib/libswscale.a)
-+set(AVCODEC_LIB ${VPL_DEP_DIR}/lib/libavcodec.so)
-+set(AVUTIL_LIB ${VPL_DEP_DIR}/lib/libavutil.so)
-+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(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()
- 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/020-onevpl-cpu-googletest-remove-werror.patch b/020-onevpl-cpu-googletest-remove-werror.patch
deleted file mode 100644
index ec27df214972..000000000000
--- a/020-onevpl-cpu-googletest-remove-werror.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/test/unit/googletest/googletest/cmake/internal_utils.cmake
-+++ b/test/unit/googletest/googletest/cmake/internal_utils.cmake
-@@ -82,13 +82,13 @@ macro(config_compiler_and_linker)
-     # http://stackoverflow.com/questions/3232669 explains the issue.
-     set(cxx_base_flags "${cxx_base_flags} -wd4702")
-   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
--    set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
-+    set(cxx_base_flags "-Wall -Wshadow -Wconversion")
-     set(cxx_exception_flags "-fexceptions")
-     set(cxx_no_exception_flags "-fno-exceptions")
-     set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
-     set(cxx_no_rtti_flags "-fno-rtti")
-   elseif (CMAKE_COMPILER_IS_GNUCXX)
--    set(cxx_base_flags "-Wall -Wshadow -Werror")
-+    set(cxx_base_flags "-Wall -Wshadow")
-     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
-       set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
-     endif()
diff --git a/PKGBUILD b/PKGBUILD
index ea7a8cbf8870..bb7705a27115 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,40 +2,51 @@
 
 pkgname=onevpl-cpu
 pkgver=2022.1.4
-pkgrel=2
+pkgrel=3
 pkgdesc='oneVPL runtime implementation for CPU'
 arch=('x86_64')
 url='https://www.intel.com/content/www/us/en/developer/tools/oneapi/onevpl.html'
 license=('MIT')
-depends=('ffmpeg')
-makedepends=('cmake' 'onevpl' 'openh264' 'svt-hevc')
-options=('!emptydirs')
+depends=('gcc-libs')
+makedepends=('git' 'cmake' 'meson' 'nasm' 'onevpl' 'python' 'xxhash' 'yasm')
 provides=('onevpl-runtime')
 source=("https://github.com/oneapi-src/oneVPL-cpu/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        '010-onevpl-cpu-fix-libs.patch'
-        '020-onevpl-cpu-googletest-remove-werror.patch')
+        '010-onevpl-cpu-fix-build.patch')
 sha256sums=('88a156ec57016813297c83ea0aa30e3d631aad2e1821c3fc3e5a573d1dc21a80'
-            '3e27f4634dfb3b563dfec9d85082e20abbeb58bf489782e901fab102106ca7c5'
-            'a0caaa1dd7701b6a13ebe58bc6917c4f10f787f33d4d7e53d52766ddf985b980')
+            'f8a04899239250cd32edde782823cf76be46249a17c3147fc29f3742a21f710c')
 
 prepare() {
-    patch -d "oneVPL-cpu-${pkgver}" -Np1 -i "${srcdir}/010-onevpl-cpu-fix-libs.patch"
-    patch -d "oneVPL-cpu-${pkgver}" -Np1 -i "${srcdir}/020-onevpl-cpu-googletest-remove-werror.patch"
+    patch -d "oneVPL-cpu-${pkgver}" -Np1 -i "${srcdir}/010-onevpl-cpu-fix-build.patch"
 }
 
 build() {
-    local -x VPL_BUILD_DEPENDENCIES='/usr'
+    export CFLAGS+=' -ffat-lto-objects'
+    export CXXFLAGS+=' -ffat-lto-objects'
+    local -x PKG_CONFIG_LIBDIR="${srcdir}/install-deps/lib"
+    local -x VPL_BUILD_DEPENDENCIES="${srcdir}/install-deps"
+    
+    . "oneVPL-cpu-${pkgver}/script/bootstrap" gpl
+    
+    local _pyver
+    _pyver="$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')"
+    
     cmake -B build -S "oneVPL-cpu-${pkgver}" \
         -DCMAKE_BUILD_TYPE:STRING='None' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DCMAKE_INSTALL_SYSCONFDIR:PATH='/etc' \
-        -DBUILD_TESTS:BOOL='OFF' \
+        -DCMAKE_PREFIX_PATH:PATH="${srcdir}/install-deps" \
+        -DBUILD_GPL_X264:BOOL='ON' \
+        -DBUILD_TESTS:BOOL='ON' \
+        -DONEAPI_INSTALL_LICENSEDIR:STRING="share/licenses/${pkgname}" \
+        -DONEAPI_INSTALL_PYTHONDIR:STRING="lib/python${_pyver}" \
         -Wno-dev
     make -C build
 }
 
+check() {
+    make -C build test
+}
+
 package() {
     make -C build DESTDIR="$pkgdir" install
-    install -d -m755 "${pkgdir}/usr/share/licenses"
-    mv "${pkgdir}/usr/share/oneVPL-cpu/licensing" "${pkgdir}/usr/share/licenses/${pkgname}"
 }