CVS commit: pkgsrc/multimedia/atomicparsley

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul 12 19:45:18 UTC 2023

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

Log Message:
atomicparsley: Require a compiler that understands "nullptr".
Don't attempt to use git to examine the (most likely pkgsrc)
repository during the build process.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/multimedia/atomicparsley/Makefile \
    pkgsrc/multimedia/atomicparsley/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/atomicparsley/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/atomicparsley/Makefile
diff -u pkgsrc/multimedia/atomicparsley/Makefile:1.1.1.1 pkgsrc/multimedia/atomicparsley/Makefile:1.2
--- pkgsrc/multimedia/atomicparsley/Makefile:1.1.1.1    Sun Mar 12 17:29:03 2023
+++ pkgsrc/multimedia/atomicparsley/Makefile    Wed Jul 12 19:45:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2023/03/12 17:29:03 abs Exp $
+# $NetBSD: Makefile,v 1.2 2023/07/12 19:45:18 nia Exp $
 
 GITHUB_PROJECT=        atomicparsley
 GITHUB_TAG=    refs/tags/20221229.172126.d813aa6
@@ -16,6 +16,9 @@ LICENSE=      gnu-gpl-v2
 WRKSRC=                ${WRKDIR}/atomicparsley-20221229.172126.d813aa6
 USE_LANGUAGES= c c++
 
+# Uses nullptr in the code.
+GCC_REQD+=     4.8
+
 INSTALLATION_DIRS=     share/doc/atomicparsley
 
 post-install:
Index: pkgsrc/multimedia/atomicparsley/distinfo
diff -u pkgsrc/multimedia/atomicparsley/distinfo:1.1.1.1 pkgsrc/multimedia/atomicparsley/distinfo:1.2
--- pkgsrc/multimedia/atomicparsley/distinfo:1.1.1.1    Sun Mar 12 17:29:03 2023
+++ pkgsrc/multimedia/atomicparsley/distinfo    Wed Jul 12 19:45:18 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2023/03/12 17:29:03 abs Exp $
+$NetBSD: distinfo,v 1.2 2023/07/12 19:45:18 nia Exp $
 
 BLAKE2s (atomicparsley/20221229.172126.d813aa6.tar.gz) = 7047dd36e1efb6877e39b9e015bd95bfd4a8576f58edb588e728195d29b21fd4
 SHA512 (atomicparsley/20221229.172126.d813aa6.tar.gz) = eb6de26f71a977cf4512f0d4249c3e0ae9225b5aef42a4bbdaaa54b022985f277095b7019c741a26078d26fba07e8dea7bf117017d0ef43d630751873e6b4899
 Size (atomicparsley/20221229.172126.d813aa6.tar.gz) = 230461 bytes
+SHA1 (patch-CMakeLists.txt) = ac01c00782b53ad7b7675d2f0cafa40f78a34da0
 SHA1 (patch-src_CDtoc.cpp) = 6cff5fab2b3a5ccf27ca2e7ae5e6b38d8d3bdac4

Added files:

Index: pkgsrc/multimedia/atomicparsley/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/multimedia/atomicparsley/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Wed Jul 12 19:45:18 2023
+++ pkgsrc/multimedia/atomicparsley/patches/patch-CMakeLists.txt        Wed Jul 12 19:45:18 2023
@@ -0,0 +1,40 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2023/07/12 19:45:18 nia Exp $
+
+Build with C++11, this uses nullptr and will fail with a compiler
+that defaults to an earlier standard.
+
+Don't try to invoke git to get the version number since this
+isn't cloned from git.
+
+--- CMakeLists.txt.orig        2022-12-30 01:21:26.000000000 +0000
++++ CMakeLists.txt
+@@ -1,5 +1,6 @@
+ cmake_minimum_required(VERSION 3.5)
+ project(AtomicParsley)
++set(CMAKE_CXX_STANDARD 11)
+ 
+ if(NOT CMAKE_BUILD_TYPE)
+   set(CMAKE_BUILD_TYPE Release)
+@@ -7,22 +8,6 @@ endif()
+ 
+ option(ASAN "whether to enable ASAN" OFF)
+ 
+-find_program(GIT git)
+-if(GIT)
+-  execute_process(
+-    COMMAND "${GIT}" "show" "-s" "--format=%H;%cd" "--date=format:%Y%m%d.%H%M%S.0"
+-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+-    RESULT_VARIABLE git_result
+-    OUTPUT_VARIABLE git_data
+-    ERROR_VARIABLE git_err
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  if(git_result EQUAL 0)
+-    list(GET git_data 0 BUILD_INFO)
+-    list(GET git_data 1 PACKAGE_VERSION)
+-  endif()
+-endif()
+-
+ include(CheckSymbolExists)
+ check_symbol_exists(strsep "string.h" HAVE_STRSEP)
+ if(HAVE_STRSEP)