pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/multimedia/x265
Module Name: pkgsrc
Committed By: ryoon
Date: Fri Apr 5 13:45:51 UTC 2024
Modified Files:
pkgsrc/multimedia/x265: Makefile distinfo
pkgsrc/multimedia/x265/patches: patch-CMakeLists.txt
patch-common_cpu.cpp patch-common_cpu.h patch-common_quant.cpp
patch-common_version.cpp patch-encoder_analysis.cpp
patch-encoder_encoder.cpp
Log Message:
multimedia/x265: Follow upstream tarball replace
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/multimedia/x265/Makefile \
pkgsrc/multimedia/x265/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt \
pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp \
pkgsrc/multimedia/x265/patches/patch-common_quant.cpp
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/x265/patches/patch-common_cpu.h \
pkgsrc/multimedia/x265/patches/patch-common_version.cpp \
pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp
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.38 pkgsrc/multimedia/x265/Makefile:1.39
--- pkgsrc/multimedia/x265/Makefile:1.38 Fri Apr 5 09:22:33 2024
+++ pkgsrc/multimedia/x265/Makefile Fri Apr 5 13:45:50 2024
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.38 2024/04/05 09:22:33 adam Exp $
+# $NetBSD: Makefile,v 1.39 2024/04/05 13:45:50 ryoon Exp $
DISTNAME= x265_3.6
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= multimedia
MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/downloads/
+DIST_SUBDIR= ${DISTNAME}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.x265.org/
COMMENT= High Efficiency Video Coding (HEVC)
LICENSE= gnu-gpl-v2
-WRKSRC= ${WRKDIR}/source
+WRKSRC= ${WRKDIR}/${DISTNAME}/source
USE_LANGUAGES= c c++
@@ -19,6 +20,13 @@ CMAKE_ARGS+= -DENABLE_PIC=ON
CMAKE_ARGS+= -DX265_VERSION=${PKGVERSION_NOREV}
CMAKE_ARGS+= -DX265_LATEST_TAG=${PKGVERSION_NOREV}
+SUBST_CLASSES+= cr
+SUBST_STAGE.cr= post-extract
+SUBST_FILES.cr+= *
+SUBST_FILES.cr+= */*
+SUBST_FILTER_CMD.cr= ${TR} -d '\r'
+SUBST_NOOP_OK.cr= yes
+
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/multimedia/x265/distinfo
diff -u pkgsrc/multimedia/x265/distinfo:1.38 pkgsrc/multimedia/x265/distinfo:1.39
--- pkgsrc/multimedia/x265/distinfo:1.38 Fri Apr 5 09:22:33 2024
+++ pkgsrc/multimedia/x265/distinfo Fri Apr 5 13:45:50 2024
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.38 2024/04/05 09:22:33 adam Exp $
+$NetBSD: distinfo,v 1.39 2024/04/05 13:45:50 ryoon Exp $
-BLAKE2s (x265_3.6.tar.gz) = 9389825cc213ed0859e57fccf8382822501ad9cca2805502b80e502e059b2a06
-SHA512 (x265_3.6.tar.gz) = b3e00e18b410c2994699ae8b47ade8fa7011d48ae883bbd7e48a9b6a3e936cfe9298b1e72248dee243fcf0f361312c6a77daffd83fa066cc0c82179995012f74
-Size (x265_3.6.tar.gz) = 1668556 bytes
-SHA1 (patch-CMakeLists.txt) = 5b355d9d2d3c58b1455f19516ed9ee45618aff1d
-SHA1 (patch-common_cpu.cpp) = 9dbe83e44ab09d877d6a517dacdebfd206c7ec95
-SHA1 (patch-common_cpu.h) = 0bc594b87b26ed06827e56b6d1515b756f07504e
-SHA1 (patch-common_quant.cpp) = 2b2edfe6a167808854bb89582b81ce5bd338675d
-SHA1 (patch-common_version.cpp) = 0a157bbc23a2f41e735bdc984b148652ff55186c
-SHA1 (patch-encoder_analysis.cpp) = addc4174bd9bf1d0c5f7645414b2571d7a5a3053
-SHA1 (patch-encoder_encoder.cpp) = f81e0cd1030e6e3b57258feebfde1a6e309d9671
+BLAKE2s (x265_3.6/x265_3.6.tar.gz) = 5b0d4e3a05cb0bc5c3b9cef140029e7a93b3637e165381dbd3e866d0e2f8ef1c
+SHA512 (x265_3.6/x265_3.6.tar.gz) = 570429c3f0b560b2f946ac9baba97d66d7d6485e46eb695b17003b5913028f62d35822477633e911cd3ea60e6ce0ecc7d9d82de7d8257272f9ca7b43761438be
+Size (x265_3.6/x265_3.6.tar.gz) = 1655889 bytes
+SHA1 (patch-CMakeLists.txt) = b69463b742ad1408b96ef2a87162900674a2cc8a
+SHA1 (patch-common_cpu.cpp) = 63c57523ab8b194bcbdddf7ba6cbdc565fa04187
+SHA1 (patch-common_cpu.h) = 000f9b6e40a459db4e3428730c8a9f5eeb6d9449
+SHA1 (patch-common_quant.cpp) = 648e21479e7af9007e5aca1db86a7f1de50047ea
+SHA1 (patch-common_version.cpp) = b7deaf67279a391e79e1820078bfd248fb66759a
+SHA1 (patch-encoder_analysis.cpp) = c9661f34f73b03055273331065052f1f6bb41507
+SHA1 (patch-encoder_encoder.cpp) = 7305a5b065d02eb5f3824b1af1ab4a85a14cb4c4
Index: pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt
diff -u pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.3 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.3 Fri Apr 5 09:22:33 2024
+++ pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt Fri Apr 5 13:45:50 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2024/04/05 09:22:33 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2024/04/05 13:45:50 ryoon Exp $
Get X265_VERSION and X265_LATEST_TAG from outside.
@@ -12,23 +12,23 @@ Solaris ld: Passing "-Wa,--noexecstack"
--- CMakeLists.txt.orig 2024-04-04 09:39:50.000000000 +0000
+++ CMakeLists.txt
@@ -523,7 +523,6 @@ if(POWER)
- endif()
- endif()
-
--include(Version) # determine X265_VERSION and X265_LATEST_TAG
- include_directories(. common encoder "${PROJECT_BINARY_DIR}")
-
- option(ENABLE_PPA "Enable PPA profiling instrumentation" OFF)
+ endif()
+ endif()
+
+-include(Version) # determine X265_VERSION and X265_LATEST_TAG
+ include_directories(. common encoder "${PROJECT_BINARY_DIR}")
+
+ option(ENABLE_PPA "Enable PPA profiling instrumentation" OFF)
@@ -745,7 +744,11 @@ if(ENABLE_SHARED)
- elseif(CYGWIN)
- # Cygwin is not officially supported or tested. MinGW with msys is recommended.
- else()
-- list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
-+ if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-+ list(APPEND LINKER_OPTIONS "-mimpure-text -Wa,--noexecstack")
-+ else()
-+ list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
-+ endif()
- endif()
- endif()
- set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})
+ elseif(CYGWIN)
+ # Cygwin is not officially supported or tested. MinGW with msys is recommended.
+ else()
+- list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
++ if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
++ list(APPEND LINKER_OPTIONS "-mimpure-text -Wa,--noexecstack")
++ else()
++ list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
++ endif()
+ endif()
+ endif()
+ set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})
Index: pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp
diff -u pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp:1.3 pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp:1.4
--- pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp:1.3 Fri Apr 5 09:22:33 2024
+++ pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp Fri Apr 5 13:45:50 2024
@@ -1,26 +1,26 @@
-$NetBSD: patch-common_cpu.cpp,v 1.3 2024/04/05 09:22:33 adam Exp $
+$NetBSD: patch-common_cpu.cpp,v 1.4 2024/04/05 13:45:50 ryoon Exp $
Retire detect512, make enable512 a global.
--- common/cpu.cpp.orig 2024-04-04 09:39:50.000000000 +0000
+++ common/cpu.cpp
@@ -62,7 +62,7 @@ static void sigill_handler(int sig)
- #endif // if X265_ARCH_ARM
-
- namespace X265_NS {
--static bool enable512 = false;
+ #endif // if X265_ARCH_ARM
+
+ namespace X265_NS {
+-static bool enable512 = false;
+bool enable512 = false;
- const cpu_name_t cpu_names[] =
- {
- #if X265_ARCH_X86
+ const cpu_name_t cpu_names[] =
+ {
+ #if X265_ARCH_X86
@@ -135,10 +135,6 @@ uint64_t PFX(cpu_xgetbv)(int xcr);
- #pragma warning(disable: 4309) // truncation of constant value
- #endif
-
--bool detect512()
--{
-- return(enable512);
--}
-
- uint32_t cpu_detect(bool benableavx512 )
- {
+ #pragma warning(disable: 4309) // truncation of constant value
+ #endif
+
+-bool detect512()
+-{
+- return(enable512);
+-}
+
+ uint32_t cpu_detect(bool benableavx512 )
+ {
Index: pkgsrc/multimedia/x265/patches/patch-common_quant.cpp
diff -u pkgsrc/multimedia/x265/patches/patch-common_quant.cpp:1.3 pkgsrc/multimedia/x265/patches/patch-common_quant.cpp:1.4
--- pkgsrc/multimedia/x265/patches/patch-common_quant.cpp:1.3 Fri Apr 5 09:22:33 2024
+++ pkgsrc/multimedia/x265/patches/patch-common_quant.cpp Fri Apr 5 13:45:50 2024
@@ -1,22 +1,22 @@
-$NetBSD: patch-common_quant.cpp,v 1.3 2024/04/05 09:22:33 adam Exp $
+$NetBSD: patch-common_quant.cpp,v 1.4 2024/04/05 13:45:50 ryoon Exp $
Use enable512 as a global, not through detect512
--- common/quant.cpp.orig 2024-04-05 09:11:03.482354127 +0000
+++ common/quant.cpp
@@ -708,7 +708,6 @@ uint32_t Quant::rdoQuant(const CUData& c
- uint32_t scanPosBase = (cgScanPos << MLS_CG_SIZE);
- uint32_t blkPos = codeParams.scan[scanPosBase];
- #if X265_ARCH_X86
-- bool enable512 = detect512();
- if (enable512)
- primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
- else
+ uint32_t scanPosBase = (cgScanPos << MLS_CG_SIZE);
+ uint32_t blkPos = codeParams.scan[scanPosBase];
+ #if X265_ARCH_X86
+- bool enable512 = detect512();
+ if (enable512)
+ primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
+ else
@@ -795,7 +794,6 @@ uint32_t Quant::rdoQuant(const CUData& c
- if (usePsyMask)
- {
- #if X265_ARCH_X86
-- bool enable512 = detect512();
- if (enable512)
- primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
- else
+ if (usePsyMask)
+ {
+ #if X265_ARCH_X86
+- bool enable512 = detect512();
+ if (enable512)
+ primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
+ else
Index: pkgsrc/multimedia/x265/patches/patch-common_cpu.h
diff -u pkgsrc/multimedia/x265/patches/patch-common_cpu.h:1.2 pkgsrc/multimedia/x265/patches/patch-common_cpu.h:1.3
--- pkgsrc/multimedia/x265/patches/patch-common_cpu.h:1.2 Fri Apr 5 09:22:33 2024
+++ pkgsrc/multimedia/x265/patches/patch-common_cpu.h Fri Apr 5 13:45:50 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-common_cpu.h,v 1.2 2024/04/05 09:22:33 adam Exp $
+$NetBSD: patch-common_cpu.h,v 1.3 2024/04/05 13:45:50 ryoon Exp $
Retire detect512, use enable512 as a global
--- common/cpu.h.orig 2024-04-05 09:13:16.246340956 +0000
+++ common/cpu.h
@@ -50,7 +50,7 @@ extern "C" void PFX(safe_intel_cpu_indic
-
- namespace X265_NS {
- uint32_t cpu_detect(bool);
--bool detect512();
+
+ namespace X265_NS {
+ uint32_t cpu_detect(bool);
+-bool detect512();
+extern bool enable512;
-
- struct cpu_name_t
- {
+
+ struct cpu_name_t
+ {
Index: pkgsrc/multimedia/x265/patches/patch-common_version.cpp
diff -u pkgsrc/multimedia/x265/patches/patch-common_version.cpp:1.2 pkgsrc/multimedia/x265/patches/patch-common_version.cpp:1.3
--- pkgsrc/multimedia/x265/patches/patch-common_version.cpp:1.2 Fri Apr 5 09:22:33 2024
+++ pkgsrc/multimedia/x265/patches/patch-common_version.cpp Fri Apr 5 13:45:50 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-common_version.cpp,v 1.2 2024/04/05 09:22:33 adam Exp $
+$NetBSD: patch-common_version.cpp,v 1.3 2024/04/05 13:45:50 ryoon Exp $
Recognise NetBSD.
--- common/version.cpp.orig 2024-04-05 09:11:41.485595483 +0000
+++ common/version.cpp
@@ -61,6 +61,8 @@
- #define ONOS "[Windows]"
- #elif __linux
- #define ONOS "[Linux]"
+ #define ONOS "[Windows]"
+ #elif __linux
+ #define ONOS "[Linux]"
+#elif __NetBSD__
+#define ONOS "[NetBSD]"
- #elif __OpenBSD__
- #define ONOS "[OpenBSD]"
- #elif __CYGWIN__
+ #elif __OpenBSD__
+ #define ONOS "[OpenBSD]"
+ #elif __CYGWIN__
Index: pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp
diff -u pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp:1.2 pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp:1.3
--- pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp:1.2 Fri Apr 5 09:22:33 2024
+++ pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp Fri Apr 5 13:45:51 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-encoder_analysis.cpp,v 1.2 2024/04/05 09:22:33 adam Exp $
+$NetBSD: patch-encoder_analysis.cpp,v 1.3 2024/04/05 13:45:51 ryoon Exp $
Ensure std::log() is used.
--- encoder/analysis.cpp.orig 2024-04-04 09:39:50.000000000 +0000
+++ encoder/analysis.cpp
@@ -3739,7 +3739,7 @@ void Analysis::normFactor(const pixel* s
-
- // 2. Calculate ac component
- uint64_t z_k = 0;
-- int block = (int)(((log(blockSize) / log(2)) - 2) + 0.5);
+
+ // 2. Calculate ac component
+ uint64_t z_k = 0;
+- int block = (int)(((log(blockSize) / log(2)) - 2) + 0.5);
+ int block = (int)(((std::log(blockSize) / std::log(2)) - 2) + 0.5);
- primitives.cu[block].normFact(src, blockSize, shift, &z_k);
-
- // Remove the DC part
+ primitives.cu[block].normFact(src, blockSize, shift, &z_k);
+
+ // Remove the DC part
Index: pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp
diff -u pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp:1.4 pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp:1.5
--- pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp:1.4 Fri Apr 5 09:22:33 2024
+++ pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp Fri Apr 5 13:45:51 2024
@@ -1,14 +1,14 @@
-$NetBSD: patch-encoder_encoder.cpp,v 1.4 2024/04/05 09:22:33 adam Exp $
+$NetBSD: patch-encoder_encoder.cpp,v 1.5 2024/04/05 13:45:51 ryoon Exp $
Fix error: call of overloaded 'pow(int, int)' is ambiguous
--- encoder/encoder.cpp.orig 2024-04-04 09:39:50.000000000 +0000
+++ encoder/encoder.cpp
@@ -118,6 +118,7 @@ VideoSignalTypePresets vstPresets[] =
- static const char* defaultAnalysisFileName = "x265_analysis.dat";
-
- using namespace X265_NS;
+ static const char* defaultAnalysisFileName = "x265_analysis.dat";
+
+ using namespace X265_NS;
+using std::pow;
-
- Encoder::Encoder()
- {
+
+ Encoder::Encoder()
+ {
Home |
Main Index |
Thread Index |
Old Index