summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkfg2020-06-04 22:58:04 +0200
committerkfg2020-06-04 23:31:08 +0200
commit81a1fe8b38320aac4bf2e5f2c9fea744d1a6afc6 (patch)
tree987e124e430ed3a3d91c2083976e05b690c6c9ca
parentec9ef7bbe77956937ff66d2209c4e2e71eae4521 (diff)
downloadaur-81a1fe8b38320aac4bf2e5f2c9fea744d1a6afc6.tar.gz
upgpkg: mingw-w64-x265 3.4-1
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD29
2 files changed, 21 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50f88f46283..847071b4b8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-x265
pkgdesc = Open Source H265/HEVC video encoder (mingw-w64)
- pkgver = 3.3
+ pkgver = 3.4
pkgrel = 1
url = https://bitbucket.org/multicoreware/x265
arch = any
@@ -8,11 +8,12 @@ pkgbase = mingw-w64-x265
makedepends = mingw-w64-cmake
makedepends = mercurial
makedepends = nasm
+ makedepends = ninja
depends = mingw-w64-crt
options = !strip
options = !buildflags
options = staticlibs
- source = hg+https://bitbucket.org/multicoreware/x265#tag=057215961bc4b51b6260a584ff3d506e6d65cfd6
+ source = hg+https://hg.videolan.org/x265#tag=2a65b720985096bcb1664f7cb05c3d04aeb576f5
source = mingw.patch
sha256sums = SKIP
sha256sums = b1953c70b734b91e7916448c4636b70305c1d5bfaf86f17f94b769499635a191
diff --git a/PKGBUILD b/PKGBUILD
index c04d5850682..6471ecdf642 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
pkgname=mingw-w64-x265
-pkgver=3.3
+pkgver=3.4
pkgrel=1
pkgdesc='Open Source H265/HEVC video encoder (mingw-w64)'
arch=('any')
@@ -9,8 +9,8 @@ url='https://bitbucket.org/multicoreware/x265'
license=('GPL')
depends=('mingw-w64-crt')
options=(!strip !buildflags staticlibs)
-makedepends=('mingw-w64-cmake' 'mercurial' 'nasm')
-source=(hg+https://bitbucket.org/multicoreware/x265#tag=057215961bc4b51b6260a584ff3d506e6d65cfd6
+makedepends=('mingw-w64-cmake' 'mercurial' 'nasm' 'ninja')
+source=(hg+https://hg.videolan.org/x265#tag=2a65b720985096bcb1664f7cb05c3d04aeb576f5
mingw.patch)
sha256sums=('SKIP'
'b1953c70b734b91e7916448c4636b70305c1d5bfaf86f17f94b769499635a191')
@@ -35,32 +35,34 @@ build() {
mkdir -p "${srcdir}"/build-12-${_arch} && cd "${srcdir}"/build-12-${_arch}
${_arch}-cmake \
+ -G Ninja \
-DLIB_INSTALL_DIR="lib" \
-DHIGH_BIT_DEPTH='TRUE' \
-DMAIN12='TRUE' \
-DEXPORT_C_API='FALSE' \
-DENABLE_CLI='FALSE' \
-DENABLE_SHARED='FALSE' \
+ -Wno-dev \
"${srcdir}"/x265/source
- make
+ ninja
mkdir -p "${srcdir}"/build-10-${_arch} && cd "${srcdir}"/build-10-${_arch}
${_arch}-cmake \
+ -G Ninja \
-DLIB_INSTALL_DIR="lib" \
-DHIGH_BIT_DEPTH='TRUE' \
-DEXPORT_C_API='FALSE' \
-DENABLE_CLI='FALSE' \
-DENABLE_SHARED='FALSE' \
+ -Wno-dev \
"${srcdir}"/x265/source
- make
+ ninja
mkdir -p "${srcdir}"/build-8-${_arch} && cd "${srcdir}"/build-8-${_arch}
- ln -s ../build-10-${_arch}/libx265.a libx265_main10.a
- ln -s ../build-12-${_arch}/libx265.a libx265_main12.a
-
${_arch}-cmake \
+ -G Ninja \
-DLIB_INSTALL_DIR="lib" \
-DENABLE_SHARED='TRUE' \
-DENABLE_HDR10_PLUS='TRUE' \
@@ -69,16 +71,21 @@ build() {
-DLINKED_10BIT='TRUE' \
-DLINKED_12BIT='TRUE' \
-DENABLE_CLI='TRUE' \
+ -Wno-dev \
"${srcdir}"/x265/source
- make
+ ln -s ../build-10-${_arch}/libx265.a libx265_main10.a
+ ln -s ../build-12-${_arch}/libx265.a libx265_main12.a
+ ninja
else
mkdir -p "${srcdir}"/build-8-${_arch} && cd "${srcdir}"/build-8-${_arch}
${_arch}-cmake \
+ -G Ninja \
-DLIB_INSTALL_DIR="lib" \
-DENABLE_SHARED='TRUE' \
-DENABLE_CLI='TRUE' \
+ -Wno-dev \
"${srcdir}"/x265/source
- make
+ ninja
fi
done
}
@@ -87,7 +94,7 @@ package() {
for _arch in ${_architectures}; do
cd "${srcdir}"/build-8-${_arch}
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja install
${_arch}-strip -s "${pkgdir}"/usr/${_arch}/bin/*.exe
${_arch}-strip -x -g "${pkgdir}"/usr/${_arch}/bin/*.dll
${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a