Changes - SailfishOS Open Build Service

Changes of Revision 2

[-] [+]	Changed	_service:tar_git:AtomicParsley.changes
@@ -1,3 +1,7 @@ +* Mon Aug 9 2021 Nephros <sailfish@nephros.org> 0.9.6.20210715 +- move to OBS/chum +- fix building on older SFOS versions + * Sun Aug 8 2021 Nephros <sailfish@nephros.org> 0.9.6.20210715 - move to OBS/chum
[-] [+]	Changed	_service:tar_git:AtomicParsley.spec ^
@@ -9,13 +9,17 @@ # << macros Summary: MP4 video metadata tool -Version: 0.9.6.20210715+obs4 +Version: 0.9.6.20210715+obs9 Release: 1 Group: Applications/Multimedia License: GPLv2 URL: http://github.com/wez/atomicparsley Source0: %{name}-%{version}.tar.gz Source100: AtomicParsley.yaml +Patch0: atomicparsley-cmake-3.11.patch +Patch1: atomicparsley-cmake-runtime-destination.patch +Patch2: atomicparsley-cmake-cxx11.patch +BuildRequires: pkgconfig(zlib) BuildRequires: cmake BuildRequires: automake @@ -25,6 +29,12 @@ %prep %setup -q -n %{name}-%{version}/upstream +# atomicparsley-cmake-3.11.patch +%patch0 -p1 +# atomicparsley-cmake-runtime-destination.patch +%patch1 -p1 +# atomicparsley-cmake-cxx11.patch +%patch2 -p1 # >> setup # << setup
[-] [+]	Added	_service:tar_git:atomicparsley-cmake-3.11.patch ^
@@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4bc0c4f..1db576d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.16) ++cmake_minimum_required(VERSION 3.11) + project(AtomicParsley) + + if(NOT CMAKE_BUILD_TYPE)
[-] [+]	Added	_service:tar_git:atomicparsley-cmake-cxx11.patch ^
@@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 136ed42..4d468f2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -95,6 +95,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + ) + endif() + ++set_target_properties( ++ AtomicParsley PROPERTIES ++ CXX_STANDARD 11 ++ CXX_STANDARD_REQUIRED YES ++ CXX_EXTENSIONS NO ++) ++ + if (ASAN) + set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") + set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
[-] [+]	Added	_service:tar_git:atomicparsley-cmake-runtime-destination.patch ^
@@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 136ed42..72e63bd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -100,4 +100,4 @@ if (ASAN) + set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") + endif() + +-install(TARGETS AtomicParsley RUNTIME) ++install(TARGETS AtomicParsley RUNTIME DESTINATION bin)
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://gitlab.com/nephros/openrepos-atomicparsley</param> <param name="branch">obs</param> - <param name="revision">0.9.6.20210715+obs4</param> + <param name="revision">0.9.6.20210715+obs9</param> <param name="debian">N</param> <param name="dumb">N</param> </service>
	Renamed	_service:tar_git:AtomicParsley-0.9.6.20210715+obs9.tar.gz ^
[-] [+]	Changed	_service:tar_git:AtomicParsley.yaml ^
@@ -13,13 +13,23 @@ Sources: # https://github.com/wez/atomicparsley/archive/20210114.184825.1dbe1be.tar.gz - '%{name}-%{version}.tar.gz' -# its really cmake, make and then manually install -# make install does not work, so no Builder -#Patches: -# - atomicparsley-cmake-3.11.patch +# these could be applied conditionally thusly: +# < 4.1: need to lower CMake version +# if CMake == 3.11, must give runtime destination +# <= 3.1 must specify CXX standard because of older gcc +# BUT, conditional patching produces SRCRPMs that are not valid for all build environments, +# so we patch for all build for now +Patches: + - atomicparsley-cmake-3.11.patch + - atomicparsley-cmake-runtime-destination.patch + - atomicparsley-cmake-cxx11.patch SetupOptions: '-q -n %{name}-%{version}/upstream' Configure: none +# its really cmake, make and then manually install +# make install does not work, so no Builder Builder: none +PkgConfigBR: + - zlib PkgBR: - cmake - automake