diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile index 9c7136c4cd2..60a6314a951 100644 --- a/multimedia/x265/Makefile +++ b/multimedia/x265/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2021/04/24 20:08:20 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.52 2021/04/27 04:42:09 rsadowski Exp $ COMMENT= free H.265/HEVC encoder @@ -23,9 +23,6 @@ WRKSRC= ${WRKDIST}/source MODULES= devel/cmake -# source/cmake/Version.cmake -BUILD_DEPENDS+= devel/git - # XXX requires __sync builtins COMPILER= base-clang ports-gcc @@ -37,6 +34,9 @@ CONFIGURE_ARGS+=-DCMAKE_ASM_YASM_FLAGS_DEBUG="-g dwarf2" \ -DENABLE_PIC=On \ -DENABLE_TESTS=On +CONFIGURE_ARGS+=-DX265_VERSION=${VER} \ + -DX265_LATEST_TAG=${VER} + .if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=-DENABLE_ASSEMBLY=Off .endif diff --git a/multimedia/x265/patches/patch-source_CMakeLists_txt b/multimedia/x265/patches/patch-source_CMakeLists_txt new file mode 100644 index 00000000000..49d069ebce7 --- /dev/null +++ b/multimedia/x265/patches/patch-source_CMakeLists_txt @@ -0,0 +1,15 @@ +$OpenBSD: patch-source_CMakeLists_txt,v 1.6 2021/04/27 04:42:09 rsadowski Exp $ + +Index: source/CMakeLists.txt +--- source/CMakeLists.txt.orig ++++ source/CMakeLists.txt +@@ -485,7 +485,8 @@ if(POWER) + endif() + endif() + +-include(Version) # determine X265_VERSION and X265_LATEST_TAG ++set(X265_VERSION "unknown" CACHE STRING "") ++set(X265_LATEST_TAG "0.0" CACHE STRING "") + include_directories(. common encoder "${PROJECT_BINARY_DIR}") + + option(ENABLE_PPA "Enable PPA profiling instrumentation" OFF)