x265: updated cmake syntax

2 files changed, 49 insertions, 44 deletions

diff --git a/x265/.signature b/x265/.signature
index 2acf3914e..880e0367b 100644
--- a/x265/.signature
+++ b/x265/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zG7Kj8RWlIB1AS1JBEqKmCvv1YCTumn681JUP7WrFKyjg0YRyT7cINqAC4137RhaWa1gLY0QOvS49u36Ajf7gc=
-SHA256 (Pkgfile) = 76e265d72eb7987d7105364c4f75173f1c4677b6fdeeb0ab2018ba75a08f0a7f
+RWSagIOpLGJF3419JwbWNtUHpgAkcUsc8I2X1St0fdIcIJPeDMweR0JnoKZKQJYfgXxjB812F/zU9kWuB8Y34JJBzIK/ovBccAg=
+SHA256 (Pkgfile) = d79ca12ccbcec5111912d4932c8148763f4a93826ee61e48de9923df0e219b9e
 SHA256 (.footprint) = 69ed2110e482df297278785cb91c53864871982ea4a281fdc7c8ecf53cbb0806
 SHA256 (x265_3.4.tar.gz) = c2047f23a6b729e5c70280d23223cb61b57bfe4ad4e8f1471eeee2a61d148672
diff --git a/x265/Pkgfile b/x265/Pkgfile
index e0d18e4f6..f517e03f9 100644
--- a/x265/Pkgfile
+++ b/x265/Pkgfile
@@ -9,46 +9,51 @@ release=1
 source=(https://bitbucket.org/multicoreware/$name/downloads/${name}_$version.tar.gz)
 
 build() {
-	cd ${name}_$version
-
-	install -d build-{12,10,8}
-	cd build-12
-
-	cmake ../source \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DHIGH_BIT_DEPTH='TRUE' \
-		-DMAIN12='TRUE' \
-		-DEXPORT_C_API='FALSE' \
-		-DENABLE_CLI='FALSE' \
-		-DENABLE_SHARED='FALSE'
-
-	make
-
-	cd ../build-10
-
-	cmake ../source \
-		-DCMAKE_INSTALL_PREFIX='/usr' \
-		-DHIGH_BIT_DEPTH='TRUE' \
-		-DEXPORT_C_API='FALSE' \
-		-DENABLE_CLI='FALSE' \
-		-DENABLE_SHARED='FALSE'
-
-	make
-
-	cd ../build-8
-
-	ln -s ../build-12/libx265.a libx265_main12.a
-	ln -s ../build-10/libx265.a libx265_main10.a
-
-	cmake ../source \
-		-DCMAKE_INSTALL_PREFIX='/usr' \
-		-DENABLE_SHARED='TRUE' \
-		-DEXTRA_LIB='x265_main10.a;x265_main12.a' \
-		-DEXTRA_LINK_FLAGS='-L.' \
-		-DLINKED_10BIT='TRUE' \
-		-DLINKED_12BIT='TRUE'
-
-	make
-	make DESTDIR=$PKG install
+	[[ -e /usr/bin/ninja ]] && PKGMK_X265+=' -G Ninja'
+
+	# build 12
+	cmake -S $SRC/${name}_$version/source -B build-12 $PKGMK_X265 \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG -Wno-deprecated" \
+		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG -Wno-deprecated" \
+		-D HIGH_BIT_DEPTH=TRUE \
+		-D MAIN12=TRUE \
+		-D EXPORT_C_API=FALSE \
+		-D ENABLE_CLI=FALSE \
+		-D ENABLE_SHARED=FALSE \
+		-Wno-dev
+	cmake --build build-12
+
+	# build 10
+	cmake -S $SRC/${name}_$version/source -B build-10 $PKGMK_X265 \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \
+		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \
+		-D HIGH_BIT_DEPTH=TRUE \
+		-D EXPORT_C_API=FALSE \
+		-D ENABLE_CLI=FALSE \
+		-D ENABLE_SHARED=FALSE \
+		-Wno-dev
+	cmake --build build-10
+
+	# build 8
+	mkdir build-8
+	ln -s $SRC/build-12/libx265.a $SRC/build-8/libx265_main12.a
+	ln -s $SRC/build-10/libx265.a $SRC/build-8/libx265_main10.a
+
+	cmake -S $SRC/${name}_$version/source -B build-8 $PKGMK_X265 \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \
+		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \
+		-D ENABLE_SHARED=TRUE \
+		-D EXTRA_LIB='x265_main10.a;x265_main12.a' \
+		-D EXTRA_LINK_FLAGS='-L.' \
+		-D LINKED_10BIT=TRUE \
+		-D LINKED_12BIT=TRUE \
+		-Wno-dev
+	cmake --build build-8
+	DESTDIR=$PKG cmake --install build-8
 }