Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mirrormagic for openSUSE:Factory checked in at 2021-05-20 19:25:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mirrormagic (Old) and /work/SRC/openSUSE:Factory/.mirrormagic.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mirrormagic" Thu May 20 19:25:36 2021 rev:4 rq:894607 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mirrormagic/mirrormagic.changes 2017-05-17 10:55:07.024387919 +0200 +++ /work/SRC/openSUSE:Factory/.mirrormagic.new.2988/mirrormagic.changes 2021-05-20 19:26:07.881678936 +0200 @@ -1,0 +2,22 @@ +Thu Apr 29 21:58:39 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- Update to 3.0.0 + * Build with SDL2 + * Integrated the classic Mirror Magic game engine into the game + Rocks???n???Diamonds as a new custom game engine + * Mirror Magic now also offers new features already known from + R???n???D like scalable window size and fullscreen mode and + solution tapes were added to the included level sets + ???Deflektor??? and ???Mindbender???. +- Add fix-multiple-definitions.patch +- Drop upstream fixed mirrormagic-2.0.2-src_tools.c.patch, + mirrormagic-2.0.2-src_editor.c.patch, + mirrormagic-2.0.2-src_events.c.patch, + mirrormagic-2.0.2-src_files.c.patch, + mirrormagic-2.0.2-src_libgame_sdl.c.patch, + mirrormagic-2.0.2-src_libgame_sdl.h.patch, + mirrormagic-2.0.2-src_libgame_gadgets.c.patch and + mirrormagic-2.0.2-src_main.h.patch + + +------------------------------------------------------------------- Old: ---- mirrormagic-2.0.2-src_editor.c.patch mirrormagic-2.0.2-src_events.c.patch mirrormagic-2.0.2-src_files.c.patch mirrormagic-2.0.2-src_libgame_gadgets.c.patch mirrormagic-2.0.2-src_libgame_sdl.c.patch mirrormagic-2.0.2-src_libgame_sdl.h.patch mirrormagic-2.0.2-src_main.h.patch mirrormagic-2.0.2-src_tools.c.patch mirrormagic-2.0.2.tar.gz New: ---- fix-multiple-definitions.patch mirrormagic-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mirrormagic.spec ++++++ --- /var/tmp/diff_new_pack.ncsbPX/_old 2021-05-20 19:26:08.385676869 +0200 +++ /var/tmp/diff_new_pack.ncsbPX/_new 2021-05-20 19:26:08.385676869 +0200 @@ -1,7 +1,7 @@ # # spec file for package mirrormagic # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,49 +12,30 @@ # 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/ # Name: mirrormagic -Version: 2.0.2 +Version: 3.0.0 Release: 0 Summary: Puzzle game where you steer a beam of light using mirrors -License: GPL-2.0 +License: GPL-2.0-only Group: Amusements/Games/Logic -Url: http://www.artsoft.org/mirrormagic/ -Source0: http://www.artsoft.org/RELEASES/unix/%{name}/%{name}-%{version}.tar.gz +URL: https://www.artsoft.org/mirrormagic/ +Source0: https://www.artsoft.org/RELEASES/unix/%{name}/%{name}-%{version}.tar.gz Source1: %{name}-icons.tar Source2: %{name}.desktop -# Fix deprecated code -Patch0: %{name}-%{version}-src_editor.c.patch -# Correct SDL code -Patch1: %{name}-%{version}-src_events.c.patch -# Correct highscore -Patch2: %{name}-%{version}-src_files.c.patch -# Correct GCC code -Patch3: %{name}-%{version}-src_main.h.patch -# Correct that works with 64 and 386 bit -Patch4: %{name}-%{version}-src_libgame_gadgets.c.patch -# Correct SDL code -Patch5: %{name}-%{version}-src_libgame_sdl.c.patch -# Correct SDL code -Patch6: %{name}-%{version}-src_libgame_sdl.h.patch -# Correct security code -Patch7: %{name}-%{version}-src_tools.c.patch -%if 0%{?suse_version} +# PATCH-FIX-UPSTREAM -- Fix LTO multiple definitions linking issue +Patch0: fix-multiple-definitions.patch BuildRequires: fdupes -BuildRequires: update-desktop-files -%endif BuildRequires: hicolor-icon-theme -BuildRequires: pkgconfig(SDL_image) -BuildRequires: pkgconfig(SDL_mixer) -BuildRequires: pkgconfig(sdl) -%if 0%{?suse_version} < 1330 -Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd -%else +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(SDL2_image) +BuildRequires: pkgconfig(SDL2_mixer) +BuildRequires: pkgconfig(SDL2_net) +BuildRequires: pkgconfig(sdl2) Requires(pre): group(games) user(games) -%endif %description This is a nice little game with color graphics and sound for your @@ -68,18 +49,15 @@ %prep %setup -q -b 1 -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 +%patch0 -p1 +rm -rfv lib mirrormagic +find . -name "*.orig" -delete %build -make %{?_smp_mflags} sdl \ - OPTIONS="%{optflags} -w -fgnu89-inline" \ +%make_build sdl2 \ + PROGBASE=%{name} \ + OPTIONS="%{optflags} -fPIE" \ + EXTRA_LDFLAGS="%{optflags} -pie" \ RO_GAME_DIR=%{_datadir}/%{name} \ RW_GAME_DIR=%{_localstatedir}/games/%{name} @@ -102,25 +80,17 @@ # install Desktop file install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop -install -Dm 755 -d %{buildroot}%{_localstatedir}/games/%{name} +install -Dm 755 -d %{buildroot}%{_localstatedir}/games/%{name}/scores -%if 0%{?suse_version} - %suse_update_desktop_file %{name} - %fdupes -s %{buildroot}%{_prefix} -%endif - -%if 0%{?suse_version} < 1330 -%pre -getent group games >/dev/null || groupadd -r games -getent passwd games >/dev/null || useradd -r -g games -d /var/games -s /sbin/nologin -%endif +%suse_update_desktop_file %{name} +%fdupes -s %{buildroot}%{_prefix} %files -%defattr(-,root,root,-) -%doc CHANGES COPYING README TODO +%license COPYING +%doc ChangeLog CREDITS %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/ +%{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/%{name} %attr(0775,games,games) %{_localstatedir}/games/%{name} ++++++ fix-multiple-definitions.patch ++++++ diff -Nur mirrormagic-3.0.0/src/game_sp/main.c new/src/game_sp/main.c --- mirrormagic-3.0.0/src/game_sp/main.c 2018-04-10 21:44:08.000000000 +0200 +++ new/src/game_sp/main.c 2021-04-30 00:06:48.558038604 +0200 @@ -9,8 +9,6 @@ int GfxElementLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT]; int GfxGraphicLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT]; int GfxGraphic[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT]; -int GfxFrame[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT]; - void InitGameEngine_SP() { diff -Nur mirrormagic-3.0.0/src/main.c new/src/main.c --- mirrormagic-3.0.0/src/main.c 2018-04-10 21:44:08.000000000 +0200 +++ new/src/main.c 2021-04-30 00:08:34.807029181 +0200 @@ -138,7 +138,6 @@ struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL; struct HiScore highscore[MAX_SCORE_ENTRIES]; struct TapeInfo tape; -struct SetupInfo setup; struct GameInfo game; struct GlobalInfo global; struct BorderInfo border; ++++++ mirrormagic-2.0.2.tar.gz -> mirrormagic-3.0.0.tar.gz ++++++ ++++ 201559 lines of diff (skipped)
