From ee1f4bf7c82f34fe64a69f30cb5ce303a8685afd Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sun, 23 Jan 2022 23:05:37 +0530 Subject: [PATCH] svt-av1: update to 0.9.0 Add a patch file from upstream merge request --- .../0001-cmake-fix-install-dir.patch | 49 +++++++++++++++++++ mingw-w64-svt-av1/PKGBUILD | 12 +++-- 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 mingw-w64-svt-av1/0001-cmake-fix-install-dir.patch diff --git a/mingw-w64-svt-av1/0001-cmake-fix-install-dir.patch b/mingw-w64-svt-av1/0001-cmake-fix-install-dir.patch new file mode 100644 index 0000000000..00cb92c504 --- /dev/null +++ b/mingw-w64-svt-av1/0001-cmake-fix-install-dir.patch @@ -0,0 +1,49 @@ +From ed6d8e6d0aee5c6750e93b54c80f318999fe6a7c Mon Sep 17 00:00:00 2001 +From: Christopher Degawa +Date: Fri, 21 Jan 2022 11:23:49 -0600 +Subject: [PATCH] cmake: install .dll to bin dir + +Mainly affects Windows where .dll files are considered runtime files +rather than .so files which are just library files + +Signed-off-by: Christopher Degawa +--- + Source/Lib/Decoder/CMakeLists.txt | 5 ++++- + Source/Lib/Encoder/CMakeLists.txt | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/Source/Lib/Decoder/CMakeLists.txt b/Source/Lib/Decoder/CMakeLists.txt +index 1c94eb3e..ca7e51f2 100644 +--- a/Source/Lib/Decoder/CMakeLists.txt ++++ b/Source/Lib/Decoder/CMakeLists.txt +@@ -111,7 +111,10 @@ if (BUILD_SHARED_LIBS) + PRIVATE EB_BUILDING_SHARED_LIBS) + set(DEC_PKG_CONFIG_EXTRA_CFLAGS " -DEB_DLL") + endif() +-install(TARGETS SvtAv1Dec DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++install(TARGETS SvtAv1Dec ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Dec.pc @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/SvtAv1Dec.pc DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") +diff --git a/Source/Lib/Encoder/CMakeLists.txt b/Source/Lib/Encoder/CMakeLists.txt +index e3c059e5..9e618858 100644 +--- a/Source/Lib/Encoder/CMakeLists.txt ++++ b/Source/Lib/Encoder/CMakeLists.txt +@@ -142,7 +142,10 @@ if (BUILD_SHARED_LIBS) + PRIVATE EB_BUILDING_SHARED_LIBS) + set(ENC_PKG_CONFIG_EXTRA_CFLAGS " -DEB_DLL") + endif() +-install(TARGETS SvtAv1Enc DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++install(TARGETS SvtAv1Enc ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Enc.pc @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/SvtAv1Enc.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +-- +GitLab + diff --git a/mingw-w64-svt-av1/PKGBUILD b/mingw-w64-svt-av1/PKGBUILD index dbe0bb8818..1d14943482 100644 --- a/mingw-w64-svt-av1/PKGBUILD +++ b/mingw-w64-svt-av1/PKGBUILD @@ -3,23 +3,27 @@ _realname=SVT-AV1 pkgbase=mingw-w64-svt-av1 pkgname=("${MINGW_PACKAGE_PREFIX}-svt-av1") -pkgver=0.8.7 +pkgver=0.9.0 pkgrel=1 pkgdesc="Scalable Video Technology AV1 encoder and decoder (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') url='https://gitlab.com/AOMediaCodec/SVT-AV1' license=('AOM') -depends=("${MINGW_PACKAGE_PREFIX}-crt") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-yasm" "${MINGW_PACKAGE_PREFIX}-cc") -source=("${url}/-/archive/v${pkgver}/${_realname}-v${pkgver}.tar.gz") -sha256sums=('de24e4a6c557498b2e8caf9cca438411db5f837d232b9390dc3899d974fec16f') +source=("${url}/-/archive/v${pkgver}/${_realname}-v${pkgver}.tar.gz" + "0001-cmake-fix-install-dir.patch") +sha256sums=('51a41fc38ced0e9a56aa4300b1d872f3b43e2421644110852dfdb67440080c63' + 'b8a32605983003cc2a2380265154095cdb12d62978c63b24e60ee8cee9847762') prepare() { cd "${srcdir}"/${_realname}-v${pkgver} + + # https://gitlab.com/AOMediaCodec/SVT-AV1/-/merge_requests/1812 + patch -p1 -i "${srcdir}/0001-cmake-fix-install-dir.patch" } build() {