From 43a3efc00b890b0a2585ef32b039c3e3d0c5aeff Mon Sep 17 00:00:00 2001 From: Jeremy Hansen Date: Fri, 8 Sep 2023 12:29:47 -0700 Subject: libraries/onevpl: Version bump to 2023.3.1 Signed-off-by: Willy Sudiarto Raharjo --- libraries/onevpl/dont-force-doc-dir.patch | 20 ++++++++++++++++++++ libraries/onevpl/onevpl.SlackBuild | 20 +++++++++++--------- libraries/onevpl/onevpl.info | 8 ++++---- 3 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 libraries/onevpl/dont-force-doc-dir.patch (limited to 'libraries/onevpl') diff --git a/libraries/onevpl/dont-force-doc-dir.patch b/libraries/onevpl/dont-force-doc-dir.patch new file mode 100644 index 0000000000000..45e50aacc91ae --- /dev/null +++ b/libraries/onevpl/dont-force-doc-dir.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/InstallDirs.cmake b/cmake/InstallDirs.cmake +index 8af22c7..3a0152b 100644 +--- a/cmake/InstallDirs.cmake ++++ b/cmake/InstallDirs.cmake +@@ -25,9 +25,12 @@ endif() + # CMAKE_INSTALL_LIBDIR + include(GNUInstallDirs) + +-set(CMAKE_INSTALL_DOCDIR ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}) +-gnuinstalldirs_get_absolute_install_dir(CMAKE_INSTALL_FULL_DOCDIR +- CMAKE_INSTALL_DOCDIR DOCDIR) ++if (NOT CMAKE_INSTALL_DIR) ++ set(CMAKE_INSTALL_DOCDIR ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}) ++else() ++ gnuinstalldirs_get_absolute_install_dir(CMAKE_INSTALL_FULL_DOCDIR ++ CMAKE_INSTALL_DOCDIR DOCDIR) ++endif() + + if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4) + set(CMAKE_INSTALL_BINDIR diff --git a/libraries/onevpl/onevpl.SlackBuild b/libraries/onevpl/onevpl.SlackBuild index 98880e988d68c..74510b5ffe298 100644 --- a/libraries/onevpl/onevpl.SlackBuild +++ b/libraries/onevpl/onevpl.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for onevpl -# Copyright 2022 Jeremy Hansen +# Copyright 2022-2023 Jeremy Hansen # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -34,8 +34,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=onevpl SRCNAM=oneVPL -VERSION=${VERSION:-2022.0.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2023.3.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -92,13 +92,19 @@ else BUILDEXAMPLES="-DBUILD_EXAMPLES=OFF -DINSTALL_EXAMPLE_CODE=OFF" fi +# Don't force the doc directory location +patch -p1 < $CWD/dont-force-doc-dir.patch + mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_PYTHON_BINDING=ON \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DVPL_INSTALL_LICENSEDIR=/usr/doc/$PRGNAM-$VERSION/licensing \ + -DVPL_INSTALL_EXAMPLEDIR=/usr/doc/$PRGNAM-$VERSION/examples \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ $BUILDEXAMPLES \ -DCMAKE_BUILD_TYPE=Release .. make @@ -107,13 +113,9 @@ cd .. rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la -# 20220421 bkw: all that's in here is LICENSE and third-party-programs.txt, -# so it's redundant anyway. -rm -rf $PKG/usr/share/doc - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - CONTRIBUTING.md LICENSE README.md third-party-programs.txt \ + CONTRIBUTING.md README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/onevpl/onevpl.info b/libraries/onevpl/onevpl.info index f6a26864512fa..58c58fc163373 100644 --- a/libraries/onevpl/onevpl.info +++ b/libraries/onevpl/onevpl.info @@ -1,10 +1,10 @@ PRGNAM="onevpl" -VERSION="2022.0.0" +VERSION="2023.3.1" HOMEPAGE="https://www.intel.com/content/www/us/en/developer/tools/oneapi/onevpl.html" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v2022.0.0/oneVPL-2022.0.0.tar.gz" -MD5SUM_x86_64="f812597060cfca4462071dc10fa37aa2" -REQUIRES="pybind11" +DOWNLOAD_x86_64="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v2023.3.1/oneVPL-2023.3.1.tar.gz" +MD5SUM_x86_64="a82c72078ccd16c91b816052497b3080" +REQUIRES="" MAINTAINER="Jeremy Hansen" EMAIL="jebrhansen+SBo@gmail.com" -- cgit v1.2.3