From f161d0fbcf72d1db18795c49227ea032afabc941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Tue, 28 Mar 2023 09:28:08 +0200 Subject: [PATCH] libyuv: update to 1864.r2426.464c51a0 --- mingw-w64-libyuv/PKGBUILD | 7 ++----- mingw-w64-libyuv/libyuv-jpeg.patch | 12 ------------ 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 mingw-w64-libyuv/libyuv-jpeg.patch diff --git a/mingw-w64-libyuv/PKGBUILD b/mingw-w64-libyuv/PKGBUILD index a0955af45f..1950ab8b00 100644 --- a/mingw-w64-libyuv/PKGBUILD +++ b/mingw-w64-libyuv/PKGBUILD @@ -7,7 +7,7 @@ pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}) provides=(${MINGW_PACKAGE_PREFIX}-${_realname}-git) conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname}-git) replaces=(${MINGW_PACKAGE_PREFIX}-${_realname}-git) -pkgver=1844.r2374.f9fda6e7 +pkgver=1864.r2426.464c51a0 pkgrel=1 pkgdesc="YUV conversion and scaling library (mingw-w64)" arch=('any') @@ -20,15 +20,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" 'git') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libjpeg") -_commit="f9fda6e7d819c07a684ba6bc97cbf0e257bbcb37" +_commit="464c51a0353c71f08fe45f683d6a97a638d47833" source=("${_realname}::git+https://chromium.googlesource.com/${_realname}/${_realname}#commit=${_commit}" "libyuv.pc.in" - "libyuv-jpeg.patch" "cmake-mingw.patch" "pkgconfig-cmake.patch") sha256sums=('SKIP' '86aaa22252e033e62931e7c3fe3a6be4143a8ca532f95c1346b1e6b278c1947f' - '7ad4df4a33ce7623bbea336ade74b4fbfb6a750973dba359e287b6bfcbfa7f09' '3897bfb1be028bacf065906a5032811bca0203527dd0348e8a7d264e43999957' 'b7fc89b8a8da6b3dd2165b9be3408545b3e6ec6e7cae34a50843c5a24f8313c0') @@ -42,7 +40,6 @@ pkgver() { prepare() { cd "${srcdir}"/${_realname} cp "${srcdir}"/libyuv.pc.in "${srcdir}"/${_realname} - patch -p1 -i "${srcdir}"/libyuv-jpeg.patch patch -p1 -i "${srcdir}"/cmake-mingw.patch patch -p1 -i "${srcdir}"/pkgconfig-cmake.patch } diff --git a/mingw-w64-libyuv/libyuv-jpeg.patch b/mingw-w64-libyuv/libyuv-jpeg.patch deleted file mode 100644 index 58365eca7a..0000000000 --- a/mingw-w64-libyuv/libyuv-jpeg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 636531ee..c2a387a0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,6 +39,7 @@ TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} ) - if (JPEG_FOUND) - include_directories( ${JPEG_INCLUDE_DIR} ) - target_link_libraries( yuvconvert ${JPEG_LIBRARY} ) -+ target_link_libraries( ${ly_lib_shared} ${JPEG_LIBRARY} ) - add_definitions( -DHAVE_JPEG ) - endif() -