Wed Jul 12 19:45:18 2023 UTC ()
atomicparsley: Require a compiler that understands "nullptr".
Don't attempt to use git to examine the (most likely pkgsrc)
repository during the build process.


(nia)
diff -r1.1.1.1 -r1.2 pkgsrc/multimedia/atomicparsley/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/multimedia/atomicparsley/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/atomicparsley/patches/patch-CMakeLists.txt
cvs diff -r1.1.1.1 -r1.2 pkgsrc/multimedia/atomicparsley/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/atomicparsley/Makefile 2023/03/12 17:29:03 1.1.1.1
+++ pkgsrc/multimedia/atomicparsley/Makefile 2023/07/12 19:45:18 1.2
@@ -1,29 +1,32 @@ @@ -1,29 +1,32 @@
1# $NetBSD: Makefile,v 1.1.1.1 2023/03/12 17:29:03 abs Exp $ 1# $NetBSD: Makefile,v 1.2 2023/07/12 19:45:18 nia Exp $
2 2
3GITHUB_PROJECT= atomicparsley 3GITHUB_PROJECT= atomicparsley
4GITHUB_TAG= refs/tags/20221229.172126.d813aa6 4GITHUB_TAG= refs/tags/20221229.172126.d813aa6
5DISTNAME= 20221229.172126.d813aa6 5DISTNAME= 20221229.172126.d813aa6
6PKGNAME= ${GITHUB_PROJECT}-${DISTNAME:C:\..*::} 6PKGNAME= ${GITHUB_PROJECT}-${DISTNAME:C:\..*::}
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= ${MASTER_SITE_GITHUB:=wez/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=wez/}
9DIST_SUBDIR= ${GITHUB_PROJECT} 9DIST_SUBDIR= ${GITHUB_PROJECT}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://github.com/wez/atomicparsley/ 12HOMEPAGE= https://github.com/wez/atomicparsley/
13COMMENT= Tool to read, parse and set metadata into MPEG-4 files 13COMMENT= Tool to read, parse and set metadata into MPEG-4 files
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16WRKSRC= ${WRKDIR}/atomicparsley-20221229.172126.d813aa6 16WRKSRC= ${WRKDIR}/atomicparsley-20221229.172126.d813aa6
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18 18
 19# Uses nullptr in the code.
 20GCC_REQD+= 4.8
 21
19INSTALLATION_DIRS= share/doc/atomicparsley 22INSTALLATION_DIRS= share/doc/atomicparsley
20 23
21post-install: 24post-install:
22 ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/atomicparsley 25 ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/atomicparsley
23 ${INSTALL_DATA} ${WRKSRC}/CREDITS ${DESTDIR}${PREFIX}/share/doc/atomicparsley 26 ${INSTALL_DATA} ${WRKSRC}/CREDITS ${DESTDIR}${PREFIX}/share/doc/atomicparsley
24 ${INSTALL_DATA} ${WRKSRC}/Changes.txt ${DESTDIR}${PREFIX}/share/doc/atomicparsley 27 ${INSTALL_DATA} ${WRKSRC}/Changes.txt ${DESTDIR}${PREFIX}/share/doc/atomicparsley
25 ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/atomicparsley 28 ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/atomicparsley
26 29
27.include "../../devel/zlib/buildlink3.mk" 30.include "../../devel/zlib/buildlink3.mk"
28.include "../../devel/cmake/build.mk" 31.include "../../devel/cmake/build.mk"
29.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/multimedia/atomicparsley/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/atomicparsley/distinfo 2023/03/12 17:29:03 1.1.1.1
+++ pkgsrc/multimedia/atomicparsley/distinfo 2023/07/12 19:45:18 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1.1.1 2023/03/12 17:29:03 abs Exp $ 1$NetBSD: distinfo,v 1.2 2023/07/12 19:45:18 nia Exp $
2 2
3BLAKE2s (atomicparsley/20221229.172126.d813aa6.tar.gz) = 7047dd36e1efb6877e39b9e015bd95bfd4a8576f58edb588e728195d29b21fd4 3BLAKE2s (atomicparsley/20221229.172126.d813aa6.tar.gz) = 7047dd36e1efb6877e39b9e015bd95bfd4a8576f58edb588e728195d29b21fd4
4SHA512 (atomicparsley/20221229.172126.d813aa6.tar.gz) = eb6de26f71a977cf4512f0d4249c3e0ae9225b5aef42a4bbdaaa54b022985f277095b7019c741a26078d26fba07e8dea7bf117017d0ef43d630751873e6b4899 4SHA512 (atomicparsley/20221229.172126.d813aa6.tar.gz) = eb6de26f71a977cf4512f0d4249c3e0ae9225b5aef42a4bbdaaa54b022985f277095b7019c741a26078d26fba07e8dea7bf117017d0ef43d630751873e6b4899
5Size (atomicparsley/20221229.172126.d813aa6.tar.gz) = 230461 bytes 5Size (atomicparsley/20221229.172126.d813aa6.tar.gz) = 230461 bytes
 6SHA1 (patch-CMakeLists.txt) = ac01c00782b53ad7b7675d2f0cafa40f78a34da0
6SHA1 (patch-src_CDtoc.cpp) = 6cff5fab2b3a5ccf27ca2e7ae5e6b38d8d3bdac4 7SHA1 (patch-src_CDtoc.cpp) = 6cff5fab2b3a5ccf27ca2e7ae5e6b38d8d3bdac4
File Added: pkgsrc/multimedia/atomicparsley/patches/patch-CMakeLists.txt
$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)