From e33ad5f78dbeda7fccf9099201b39f5ec2bdccaf Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 30 Nov 2023 08:24:00 +0100 Subject: [PATCH] libwebm: Update to 1.0.0.31 It's not clear to me what this patch is trying to achieve by excluding some headers, so drop it. There is no such patching happening in Debian for example. --- mingw-w64-libwebm/PKGBUILD | 8 ++------ mingw-w64-libwebm/cmake_install.patch | 26 -------------------------- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 mingw-w64-libwebm/cmake_install.patch diff --git a/mingw-w64-libwebm/PKGBUILD b/mingw-w64-libwebm/PKGBUILD index adc4000f2b..351cd2b468 100644 --- a/mingw-w64-libwebm/PKGBUILD +++ b/mingw-w64-libwebm/PKGBUILD @@ -3,7 +3,7 @@ _realname=libwebm pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.0.0.30 +pkgver=1.0.0.31 pkgrel=1 pkgdesc="WebM video file parser (mingw-w64)" arch=('any') @@ -16,16 +16,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-python") source=(https://github.com/webmproject/${_realname}/archive/refs/tags/${_realname}-${pkgver}.tar.gz - cmake_install.patch libwebm.pc) -sha256sums=('6c1381fd1a66e86e095b76028ede696724e198ea0e39957c9649af5f0718b96a' - '3cb2b2a2e8bba4fcdf496e1981c927742dd86dcc25c3112a9faa45e711736e5f' +sha256sums=('616cfdca1c869222dc60d5a49d112c1464040390e3876afca4d385347c6ce55e' '082aea8e45bf42faba18e00d00561d4b5aba307261df74c18238fcecc792cc1f') prepare() { cd ${srcdir}/${_realname}-${_realname}-${pkgver} - # modified from AUR https://aur.archlinux.org/cgit/aur.git/plain/cmake_install.patch?h=libwebm - patch -p1 -i ${srcdir}/cmake_install.patch } build() { diff --git a/mingw-w64-libwebm/cmake_install.patch b/mingw-w64-libwebm/cmake_install.patch deleted file mode 100644 index e5af9167eb..0000000000 --- a/mingw-w64-libwebm/cmake_install.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -rupN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2023-07-07 10:38:25.015023050 -0700 -+++ b/CMakeLists.txt 2023-07-07 11:03:46.667536200 -0700 -@@ -459,13 +459,20 @@ if(ENABLE_IWYU) - endif() - endif() - --set_target_properties(webm PROPERTIES PUBLIC_HEADER "${webm_public_headers}") - install( - TARGETS webm - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm) -+ ) -+ -+install( -+ FILES ${mkvmuxer_public_headers} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm/mkvmuxer) -+ -+install( -+ FILES ${mkvparser_public_headers} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm/mkvparser) - - # Install common headers into a subdirectory to avoid breaking nested includes. - install(FILES ${libwebm_common_public_headers}