CVS commit: pkgsrc/multimedia/x265

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Nov 28 09:35:34 UTC 2024

Modified Files:
        pkgsrc/multimedia/x265: distinfo
        pkgsrc/multimedia/x265/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/multimedia/x265/patches: patch-common_common.h

Log Message:
x265: Detect <alloca.h> and use it if available.

Should help the build on SunOS which is currently broken due to
alloca being undefined.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/x265/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/x265/patches/patch-common_common.h

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/distinfo
diff -u pkgsrc/multimedia/x265/distinfo:1.41 pkgsrc/multimedia/x265/distinfo:1.42
--- pkgsrc/multimedia/x265/distinfo:1.41        Sun Nov 24 06:55:24 2024
+++ pkgsrc/multimedia/x265/distinfo     Thu Nov 28 09:35:34 2024
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.41 2024/11/24 06:55:24 adam Exp $
+$NetBSD: distinfo,v 1.42 2024/11/28 09:35:34 nia 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) = b69463b742ad1408b96ef2a87162900674a2cc8a
+SHA1 (patch-CMakeLists.txt) = a1daf0c0dc40732a475c1a366dc9f7c93d07ed97
+SHA1 (patch-common_common.h) = eece838c76a1f199af29de88d9fc5c5a7a7243c0
 SHA1 (patch-common_cpu.cpp) = 63c57523ab8b194bcbdddf7ba6cbdc565fa04187
 SHA1 (patch-common_cpu.h) = 000f9b6e40a459db4e3428730c8a9f5eeb6d9449
 SHA1 (patch-common_quant.cpp) = 648e21479e7af9007e5aca1db86a7f1de50047ea

Index: pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt
diff -u pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.4 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.4     Fri Apr  5 13:45:50 2024
+++ pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt Thu Nov 28 09:35:34 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2024/04/05 13:45:50 ryoon Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2024/11/28 09:35:34 nia Exp $
 
 Get X265_VERSION and X265_LATEST_TAG from outside.
 
@@ -9,9 +9,21 @@ Solaris ld: Passing "-Wa,--noexecstack" 
             requesting a non executable stack. I don't know if Solaris ld
             is complying or just ignoring it.
 
---- CMakeLists.txt.orig        2024-04-04 09:39:50.000000000 +0000
+--- CMakeLists.txt.orig        2024-11-22 12:07:34.000000000 +0000
 +++ CMakeLists.txt
-@@ -523,7 +523,6 @@ if(POWER)
+@@ -207,6 +207,11 @@ if(HAVE_INT_TYPES_H)
+     add_definitions(-DHAVE_INT_TYPES_H=1)
+ endif()
+ 
++check_include_files(alloca.h HAVE_ALLOCA_H)
++if(HAVE_ALLOCA_H)
++    add_definitions(-DHAVE_ALLOCA_H=1)
++endif()
++
+ if(INTEL_CXX AND UNIX)
+     set(GCC 1) # treat icpc roughly like gcc
+ elseif(CLANG)
+@@ -658,7 +663,6 @@ if(POWER)
      endif()
  endif()
  
@@ -19,7 +31,7 @@ Solaris ld: Passing "-Wa,--noexecstack" 
  include_directories(. common encoder "${PROJECT_BINARY_DIR}")
  
  option(ENABLE_PPA "Enable PPA profiling instrumentation" OFF)
-@@ -745,7 +744,11 @@ if(ENABLE_SHARED)
+@@ -906,7 +910,11 @@ if(ENABLE_SHARED)
          elseif(CYGWIN)
              # Cygwin is not officially supported or tested. MinGW with msys is recommended.
          else()

Added files:

Index: pkgsrc/multimedia/x265/patches/patch-common_common.h
diff -u /dev/null pkgsrc/multimedia/x265/patches/patch-common_common.h:1.1
--- /dev/null   Thu Nov 28 09:35:34 2024
+++ pkgsrc/multimedia/x265/patches/patch-common_common.h        Thu Nov 28 09:35:34 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-common_common.h,v 1.1 2024/11/28 09:35:34 nia Exp $
+
+See the CMakeLists patch for how HAVE_ALLOCA_H gets defined.
+
+--- common/common.h.orig       2024-11-28 09:30:21.789646942 +0000
++++ common/common.h
+@@ -98,6 +98,10 @@
+ #define X265_LL "%lld"
+ #endif
+ 
++#if HAVE_ALLOCA_H
++#include <alloca.h>
++#endif
++
+ #if _DEBUG && defined(_MSC_VER)
+ #define DEBUG_BREAK() __debugbreak()
+ #elif __APPLE_CC__