Accepting request 955915 from games

OBS-URL: https://build.opensuse.org/request/show/955915
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alure?expand=0&rev=3

alure.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Feb 14 14:28:23 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Changes authored by munix9@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
+
 -------------------------------------------------------------------
 Sat Apr 17 18:14:57 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
 

alure.spec

@@ -1,8 +1,7 @@
 #
 # spec file for package alure
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
-# Copyright (c) 2012 openSUSE_user1
 #
 # 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,53 +27,60 @@ License:        LGPL-2.0-or-later
 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:         fix-cmake_minimum_required.patch
-Patch0:         alure-gcc47.patch
+Patch1:         fix-missing-include.patch
-# PATCH-FIX-UPSTREAM alure-lib-suffix.patch -- Enable installation in suffixed directory
+Patch2:         fix-lib-suffix.patch
-Patch1:         alure-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:  ninja
-BuildRequires:  libsndfile-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  openal-soft-devel
 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        devel
+%package -n lib%{name}%{sover}
-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
-Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{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
+%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:        GPL-2.0-or-later AND LGPL-2.0-or-later
+Group:          Development/Libraries/C and C++
+Requires:       lib%{name}%{sover} = %{version}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
 %prep
-%autosetup -p0
+%autosetup -p1
 
 %build
+%define __builder ninja
+export CXXFLAGS="%{optflags} -fpermissive"
 %cmake \
-  -DBUILD_STATIC=OFF \
+	-DBUILD_STATIC=OFF	\
-  -DMPG123=OFF \
+	-DDYNLOAD=OFF		\
-  -DMODPLUG=ON
+	-DMPG123=ON		\
+	-DMODPLUG=ON
 %cmake_build
 
 %install
@@ -85,20 +93,20 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}/html
 # fix encoding
 sed -i 's/\r$//' docs/html/javascript/main.js docs/html/styles/1.css
 
-%post   -n libalure1 -p /sbin/ldconfig
+%post -n lib%{name}%{sover} -p /sbin/ldconfig
-%postun -n libalure1 -p /sbin/ldconfig
+%postun -n lib%{name}%{sover} -p /sbin/ldconfig
 
 %files
 %license COPYING
-%{_bindir}/alure*
+%{_bindir}/alure{cdplay,play,stream}
 
-%files -n libalure1
+%files -n lib%{name}%{sover}
-%{_libdir}/libalure.so.*
+%{_libdir}/lib%{name}.so.*
 
 %files devel
 %doc docs/html examples
-%{_includedir}/AL/
+%{_includedir}/AL
-%{_libdir}/*.so
+%{_libdir}/lib%{name}.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/%{name}.pc
 
 %changelog

fix-FLUIDSYNTH_CFLAGS.patch

@@ -0,0 +1,11 @@
+--- 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

@@ -0,0 +1,9 @@
+--- 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

@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2012-07-15 04:16:33.395014404 +0300
+--- a/CMakeLists.txt
-+++ CMakeLists.txt	2012-07-15 04:21:37.780014550 +0300
++++ b/CMakeLists.txt
 @@ -30,6 +30,14 @@
  SET(LIB_MINOR_VERSION "2")
  SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}")

fix-link-flac.patch

@@ -0,0 +1,10 @@
+--- 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

@@ -1,5 +1,5 @@
---- include/main.h.orig	2012-01-30 23:27:53.230334632 -0600
+--- a/include/main.h
-+++ include/main.h	2012-01-30 23:28:26.241530184 -0600
++++ b/include/main.h
 @@ -4,6 +4,8 @@
  #include "AL/alure.h"
  #include "alext.h"