Hello community, here is the log from the commit of package oaml for openSUSE:Leap:15.2 checked in at 2020-04-05 17:07:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/oaml (Old) and /work/SRC/openSUSE:Leap:15.2/.oaml.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oaml" Sun Apr 5 17:07:05 2020 rev:11 rq:789979 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/oaml/oaml.changes 2020-01-15 15:34:10.150891087 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.oaml.new.3248/oaml.changes 2020-04-05 17:07:13.778223529 +0200 @@ -1,0 +2,16 @@ +Mon Mar 30 11:58:24 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 1.3.4 + * Fixed bug with playing conditional audios + * Conditions can now be set before a PlayTrack() call. + * Added a new function ClearConditions() + * Implemented two new functions: SaveState and LoadState + * Added resampling support through libsoxr. + https://github.com/oamldev/oaml/releases for the full list of + changes. +- spec-cleanup +- Add patches: + * 0001-Link-to-pthread-unconditionnally.patch + * 0001-Don-t-hardcode-lib.patch + +------------------------------------------------------------------- Old: ---- oaml-1.2.tar.gz New: ---- 0001-Don-t-hardcode-lib.patch 0001-Link-to-pthread-unconditionnally.patch oaml-1.3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oaml.spec ++++++ --- /var/tmp/diff_new_pack.4lt0y8/_old 2020-04-05 17:07:14.154223930 +0200 +++ /var/tmp/diff_new_pack.4lt0y8/_new 2020-04-05 17:07:14.158223934 +0200 @@ -1,7 +1,7 @@ # # spec file for package oaml # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,26 +12,31 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define lname lib%{name}_shared1 +%define lname lib%{name}1 Name: oaml -Version: 1.2 +Version: 1.3.4 Release: 0 Summary: Open Adaptive Music Library License: Apache-2.0 Group: Development/Libraries/C and C++ -Url: https://github.com/marcelofg55/oaml/ +URL: https://github.com/marcelofg55/oaml/ Source: https://github.com/marcelofg55/oaml/archive/v%{version}/oaml-%{version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Link-to-pthread-unconditionnally.patch +# PATCH-FIX-OPENSUSE +Patch1: 0001-Don-t-hardcode-lib.patch BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkg-config BuildRequires: pkgconfig +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libpulse-simple) +BuildRequires: pkgconfig(soxr) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbisfile) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description OAML is a library for implementing adaptive music in games. @@ -54,11 +59,11 @@ This package contains the shared library. %prep -%setup -q +%autosetup -p1 %build %cmake -DENABLE_STATIC=OFF -make %{?_smp_mflags} +%cmake_build %install %cmake_install @@ -67,14 +72,16 @@ %postun -n %{lname} -p /sbin/ldconfig %files -n %{lname} -%defattr(-,root,root) -%doc LICENSE.md -%{_libdir}/lib%{name}_shared.so.* +%license LICENSE.md +%{_libdir}/lib%{name}.so.* %files devel -%defattr(-,root,root) %doc README.md +%dir %{_libdir}/cmake +%dir %{_libdir}/cmake/oaml %{_includedir}/oaml.h -%{_libdir}/lib%{name}_shared.so +%{_libdir}/cmake/oaml/oaml.cmake +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/oaml.pc %changelog ++++++ 0001-Don-t-hardcode-lib.patch ++++++ >From 06a276407504d20c214d759ae8822049bf7b349f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Mon, 30 Mar 2020 16:09:51 +0200 Subject: [PATCH] Don't hardcode 'lib' --- CMakeLists.txt | 6 ++++-- oaml.cmake.in | 2 +- oaml.pc.in | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf1a575..1f4cfe6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,8 @@ endif () set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) +include(GNUInstallDirs) + include(GetGitRevisionDescription) get_git_head_revision(GIT_REFSPEC GIT_SHA1) @@ -286,9 +288,9 @@ if (ENABLE_SHARED) endif() configure_file("oaml.cmake.in" "oaml.cmake" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/oaml.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/oaml/) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/oaml.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/oaml/) configure_file("oaml.pc.in" "oaml.pc" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/oaml.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/oaml.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/oaml.h DESTINATION include) diff --git a/oaml.cmake.in b/oaml.cmake.in index e236fdb..e1f5623 100644 --- a/oaml.cmake.in +++ b/oaml.cmake.in @@ -1,3 +1,3 @@ find_path(OAML_INCLUDE_DIRS NAMES oaml.h PATHS "@CMAKE_INSTALL_PREFIX@/include") -find_library(OAML_LIBRARIES NAMES oaml PATHS "@CMAKE_INSTALL_PREFIX@/lib") +find_library(OAML_LIBRARIES NAMES oaml PATHS "@CMAKE_INSTALL_FULL_LIBDIR@") set(OAML_VERSION "@OAML_VERSION@") diff --git a/oaml.pc.in b/oaml.pc.in index d8fe22e..c655096 100644 --- a/oaml.pc.in +++ b/oaml.pc.in @@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ includedir=${prefix}/include Name: oaml -- 2.26.0 ++++++ 0001-Link-to-pthread-unconditionnally.patch ++++++ >From f26507dda730ace8daff38d1d4dd87e6fea1bc23 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Mon, 30 Mar 2020 14:48:30 +0200 Subject: [PATCH] Link to pthread unconditionnally. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b757c99..cf1a575 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,14 +136,14 @@ endif() if (ENABLE_RTAUDIO) add_definitions(-D__HAVE_RTAUDIO) + find_package(Threads REQUIRED CMAKE_THREAD_PREFER_PTHREAD) + list(APPEND OAML_LIBS ${CMAKE_THREAD_LIBS_INIT}) if (CMAKE_SYSTEM_NAME MATCHES ".*BSD") message(STATUS "*BSD detected, using OSS") - find_package(Threads REQUIRED CMAKE_THREAD_PREFER_PTHREAD) if (CMAKE_SYSTEM_NAME MATCHES "kNetBSD|NetBSD") list(APPEND OAML_LIBS ossaudio) endif () - list(APPEND OAML_LIBS ${CMAKE_THREAD_LIBS_INIT}) set(AUDIO_LINUX_OSS ON) elseif (UNIX AND NOT APPLE) find_library(PULSE_LIB pulse) -- 2.26.0 ++++++ oaml-1.2.tar.gz -> oaml-1.3.4.tar.gz ++++++ ++++ 3873 lines of diff (skipped)
