CVS commit: pkgsrc/multimedia/x265

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 11 08:33:14 UTC 2025

Modified Files:
        pkgsrc/multimedia/x265: Makefile distinfo
        pkgsrc/multimedia/x265/patches: patch-CMakeLists.txt

Log Message:
x265: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/multimedia/x265/Makefile \
    pkgsrc/multimedia/x265/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/x265/Makefile
diff -u pkgsrc/multimedia/x265/Makefile:1.42 pkgsrc/multimedia/x265/Makefile:1.43
--- pkgsrc/multimedia/x265/Makefile:1.42        Sun Nov 24 06:55:24 2024
+++ pkgsrc/multimedia/x265/Makefile     Mon Aug 11 08:33:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2024/11/24 06:55:24 adam Exp $
+# $NetBSD: Makefile,v 1.43 2025/08/11 08:33:14 wiz Exp $
 
 DISTNAME=      x265_4.1
 PKGNAME=       ${DISTNAME:S/_/-/}
@@ -18,6 +18,7 @@ CMAKE_CONFIGURE_ARGS+=        -DENABLE_PIC=ON
 # Set version here instead of relying on git; see patch-CMakeLists.txt
 CMAKE_CONFIGURE_ARGS+= -DX265_VERSION=${PKGVERSION_NOREV}
 CMAKE_CONFIGURE_ARGS+= -DX265_LATEST_TAG=${PKGVERSION_NOREV}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 SUBST_CLASSES+=                cr
 SUBST_STAGE.cr=                post-extract
Index: pkgsrc/multimedia/x265/distinfo
diff -u pkgsrc/multimedia/x265/distinfo:1.42 pkgsrc/multimedia/x265/distinfo:1.43
--- pkgsrc/multimedia/x265/distinfo:1.42        Thu Nov 28 09:35:34 2024
+++ pkgsrc/multimedia/x265/distinfo     Mon Aug 11 08:33:14 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2024/11/28 09:35:34 nia Exp $
+$NetBSD: distinfo,v 1.43 2025/08/11 08:33:14 wiz Exp $
 
 BLAKE2s (x265_4.1.tar.gz) = d0b785b8746848f2fd4b62b81218485ad95d87c78ee53c74975059a23cc43857
 SHA512 (x265_4.1.tar.gz) = 5af5b958ff507f96a52813a6b72847c9fbc555bf95af287ae7f011055338266fb647dfea3b7789730c7f5c746f7e6cb7d9395ba10cbe43eb5034d3ed99730c3f
 Size (x265_4.1.tar.gz) = 1725279 bytes
-SHA1 (patch-CMakeLists.txt) = a1daf0c0dc40732a475c1a366dc9f7c93d07ed97
+SHA1 (patch-CMakeLists.txt) = 8e841b147ecc74eebb0c7e12b90ae2a1bfb1bfbe
 SHA1 (patch-common_common.h) = eece838c76a1f199af29de88d9fc5c5a7a7243c0
 SHA1 (patch-common_cpu.cpp) = 63c57523ab8b194bcbdddf7ba6cbdc565fa04187
 SHA1 (patch-common_cpu.h) = 000f9b6e40a459db4e3428730c8a9f5eeb6d9449

Index: pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt
diff -u pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.5 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.5     Thu Nov 28 09:35:34 2024
+++ pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt Mon Aug 11 08:33:14 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2024/11/28 09:35:34 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2025/08/11 08:33:14 wiz Exp $
+
+Do not insist on old cmake policies (allows build with cmake 4).
 
 Get X265_VERSION and X265_LATEST_TAG from outside.
 
@@ -11,7 +13,23 @@ Solaris ld: Passing "-Wa,--noexecstack" 
 
 --- CMakeLists.txt.orig        2024-11-22 12:07:34.000000000 +0000
 +++ CMakeLists.txt
-@@ -207,6 +207,11 @@ if(HAVE_INT_TYPES_H)
+@@ -6,15 +6,9 @@ if(NOT CMAKE_BUILD_TYPE)
+         FORCE)
+ endif()
+ message(STATUS "cmake version ${CMAKE_VERSION}")
+-if(POLICY CMP0025)
+-    cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
+-endif()
+ if(POLICY CMP0042)
+     cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
+ endif()
+-if(POLICY CMP0054)
+-    cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
+-endif()
+ 
+ project (x265)
+ cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
+@@ -207,6 +201,11 @@ if(HAVE_INT_TYPES_H)
      add_definitions(-DHAVE_INT_TYPES_H=1)
  endif()
  
@@ -23,7 +41,7 @@ Solaris ld: Passing "-Wa,--noexecstack" 
  if(INTEL_CXX AND UNIX)
      set(GCC 1) # treat icpc roughly like gcc
  elseif(CLANG)
-@@ -658,7 +663,6 @@ if(POWER)
+@@ -658,7 +657,6 @@ if(POWER)
      endif()
  endif()
  
@@ -31,7 +49,7 @@ Solaris ld: Passing "-Wa,--noexecstack" 
  include_directories(. common encoder "${PROJECT_BINARY_DIR}")
  
  option(ENABLE_PPA "Enable PPA profiling instrumentation" OFF)
-@@ -906,7 +910,11 @@ if(ENABLE_SHARED)
+@@ -906,7 +904,11 @@ if(ENABLE_SHARED)
          elseif(CYGWIN)
              # Cygwin is not officially supported or tested. MinGW with msys is recommended.
          else()