Accepting request 753765 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/753765
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgme?expand=0&rev=17
This commit is contained in:
2019-12-11 11:08:27 +00:00
committed by Git OBS Bridge
3 changed files with 25 additions and 4 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 392b018..71d215e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
if (__LIBGME_TEST_VISIBILITY)
# get the gcc version
exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
- string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+ string (REGEX MATCH "[0-9]+\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
# gcc <4.1 had poor support for symbol visibility
if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 3 16:59:18 UTC 2019 - Martin Liška <mliska@suse.cz>
- Add fix-gcc10-compiler-detection.patch in order
to fix boo#1158320.
-------------------------------------------------------------------
Sat Jan 20 20:58:17 UTC 2018 - tom.mbrt@googlemail.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package libgme
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# 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/
#
@@ -21,11 +21,12 @@ Name: libgme
Version: 0.6.2
Release: 0
Summary: Collection of video game music file emulators
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: System/Libraries
Url: https://bitbucket.org/mpyne/game-music-emu/wiki/Home
URL: https://bitbucket.org/mpyne/game-music-emu/wiki/Home
Source0: https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-%{version}.tar.xz
Source1: baselibs.conf
Patch0: fix-gcc10-compiler-detection.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkg-config
@@ -72,6 +73,7 @@ which use libgme.
%prep
%setup -q -n game-music-emu-%{version}
%patch0 -p1
sed -i 's/\r$//' changes.txt design.txt gme.txt license.txt readme.txt
%build