Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package alure for openSUSE:Factory checked in at 2022-02-18 23:03:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alure (Old) and /work/SRC/openSUSE:Factory/.alure.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alure" Fri Feb 18 23:03:09 2022 rev:3 rq:955915 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/alure/alure.changes 2021-04-24 23:09:49.335451576 +0200 +++ /work/SRC/openSUSE:Factory/.alure.new.1958/alure.changes 2022-02-18 23:03:52.729408457 +0100 @@ -1,0 +2,13 @@ +Mon Feb 14 14:28:23 UTC 2022 - Ferdinand Thiessen <r...@fthiessen.de> + +- Changes authored by mun...@googlemail.com + * Enabled MPG123 support + * Restructured the SPEC file + * Renamed alure-gcc47.patch to fix-missing-include.patch + * Renamed alure-lib-suffix.patch to fix-lib-suffix.patch + * Add patches: + * fix-cmake_minimum_required.patch + * fix-link-flac.patch + * fix-FLUIDSYNTH_CFLAGS.patch + +------------------------------------------------------------------- Old: ---- alure-gcc47.patch alure-lib-suffix.patch New: ---- fix-FLUIDSYNTH_CFLAGS.patch fix-cmake_minimum_required.patch fix-lib-suffix.patch fix-link-flac.patch fix-missing-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alure.spec ++++++ --- /var/tmp/diff_new_pack.R7SJKA/_old 2022-02-18 23:03:53.437408402 +0100 +++ /var/tmp/diff_new_pack.R7SJKA/_new 2022-02-18 23:03:53.445408401 +0100 @@ -1,8 +1,7 @@ # # spec file for package alure # -# Copyright (c) 2021 SUSE LLC -# Copyright (c) 2012 openSUSE_user1 +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +16,8 @@ # +%define sover 1 + Name: alure Version: 1.2 Release: 0 @@ -26,52 +27,59 @@ Group: Development/Libraries/C and C++ URL: https://github.com/kcat/alure Source0: %{name}-%{version}.tar.bz2 -# PATCh-FIX-UPSTREAM alure-gcc47.patch -- patch for build with gcc47 -Patch0: alure-gcc47.patch -# PATCH-FIX-UPSTREAM alure-lib-suffix.patch -- Enable installation in suffixed directory -Patch1: alure-lib-suffix.patch +Patch0: fix-cmake_minimum_required.patch +Patch1: fix-missing-include.patch +Patch2: fix-lib-suffix.patch +Patch3: fix-link-flac.patch +Patch4: fix-FLUIDSYNTH_CFLAGS.patch BuildRequires: cmake -BuildRequires: flac-devel -BuildRequires: fluidsynth-devel BuildRequires: gcc-c++ -BuildRequires: libmodplug-devel -BuildRequires: libsndfile-devel -BuildRequires: libvorbis-devel -BuildRequires: openal-soft-devel +BuildRequires: ninja BuildRequires: pkgconfig +BuildRequires: pkgconfig(dumb) +BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(fluidsynth) +BuildRequires: pkgconfig(libmodplug) +BuildRequires: pkgconfig(libmpg123) +BuildRequires: pkgconfig(openal) +BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(vorbis) %description ALURE is a utility library to help manage common tasks with OpenAL applications. This includes device enumeration and initialization, file loading, and streaming. +%package -n lib%{name}%{sover} +Summary: Utility library around OpenAL +License: LGPL-2.0-or-later +Group: System/Libraries + +%description -n lib%{name}%{sover} +ALURE is a utility library to help manage common tasks with OpenAL +applications. + %package devel Summary: Development files for %{name} # Devel doc includes some files under GPLv2+ from NaturalDocs -License: LGPL-2.0-or-later AND GPL-2.0-or-later +License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: lib%{name}%{sover} = %{version} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package -n libalure1 -Summary: Utility library around OpenAL -License: LGPL-2.0-or-later -Group: System/Libraries - -%description -n libalure1 -ALURE is a utility library to help manage common tasks with OpenAL -applications. - %prep -%autosetup -p0 +%autosetup -p1 %build +%define __builder ninja +export CXXFLAGS="%{optflags} -fpermissive" %cmake \ -DBUILD_STATIC=OFF \ - -DMPG123=OFF \ + -DDYNLOAD=OFF \ + -DMPG123=ON \ -DMODPLUG=ON %cmake_build @@ -85,20 +93,20 @@ # fix encoding sed -i 's/\r$//' docs/html/javascript/main.js docs/html/styles/1.css -%post -n libalure1 -p /sbin/ldconfig -%postun -n libalure1 -p /sbin/ldconfig +%post -n lib%{name}%{sover} -p /sbin/ldconfig +%postun -n lib%{name}%{sover} -p /sbin/ldconfig %files %license COPYING -%{_bindir}/alure* +%{_bindir}/alure{cdplay,play,stream} -%files -n libalure1 -%{_libdir}/libalure.so.* +%files -n lib%{name}%{sover} +%{_libdir}/lib%{name}.so.* %files devel %doc docs/html examples -%{_includedir}/AL/ -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%{_includedir}/AL +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/%{name}.pc %changelog ++++++ fix-FLUIDSYNTH_CFLAGS.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -376,7 +376,7 @@ SET(HAS_FLUIDSYNTH 1) LINK_DIRECTORIES(${FLUIDSYNTH_LIBRARY_DIRS}) SET_SOURCE_FILES_PROPERTIES(src/codec_fluidsynth.cpp PROPERTIES - COMPILE_FLAGS "${FLUIDSYNTH_CFLAGS}") + COMPILE_OPTIONS "${FLUIDSYNTH_CFLAGS}") ENDIF(NOT FLUIDSYNTH_FOUND) IF(HAS_FLUIDSYNTH) SET(ALURE_OBJS ${ALURE_OBJS} src/codec_fluidsynth.cpp) ++++++ fix-cmake_minimum_required.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # CMakeLists.txt for ALURE -CMAKE_MINIMUM_REQUIRED(VERSION 2.4) +CMAKE_MINIMUM_REQUIRED(VERSION 3.0) IF(COMMAND CMAKE_POLICY) CMAKE_POLICY(SET CMP0003 NEW) ++++++ fix-lib-suffix.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,14 @@ SET(LIB_MINOR_VERSION "2") SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}") +IF(CMAKE_SIZEOF_VOID_P EQUAL 4) + SET(LIB_SUFFIX "") + SET(PACK_ARCH "") +ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4) + SET(LIB_SUFFIX 64) + SET(PACK_ARCH .x86_64) +ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4) + INCLUDE_DIRECTORIES(include "${ALURE_BINARY_DIR}") ++++++ fix-link-flac.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -281,6 +281,7 @@ IF(FLAC) IF(FLAC_FOUND) INCLUDE_DIRECTORIES(${FLAC_INCLUDE_DIR}) SET(HAS_FLAC 1) + SET(LIBFLAC_LIBRARIES ${FLAC_LIBRARIES}) ENDIF(FLAC_FOUND) IF(HAS_FLAC) SET(ALURE_OBJS ${ALURE_OBJS} src/codec_flac.cpp) ++++++ fix-missing-include.patch ++++++ --- a/include/main.h +++ b/include/main.h @@ -4,6 +4,8 @@ #include "AL/alure.h" #include "alext.h" +#include <unistd.h> + #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif
