From acbeeb4cb95d6ebcdbe643dfddf7c10fdf813f85 Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Oct 18 2020 21:49:45 +0000 Subject: Update to 2.2.0 (#1819020) Remove patches already included upstream Update patch to disable LTO Use new directory for AppData files Add gtk3-devel to BuildRequires --- diff --git a/.gitignore b/.gitignore index 66108d8..9e52816 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ scummvm-icons.tar.gz /scummvm-2.0.0.tar.bz2 /scummvm-2.1.0.tar.bz2 /scummvm-2.1.1.tar.bz2 +/scummvm-2.2.0.tar.bz2 diff --git a/gcc-lto-2.2.0.patch b/gcc-lto-2.2.0.patch new file mode 100644 index 0000000..a8ffbe4 --- /dev/null +++ b/gcc-lto-2.2.0.patch @@ -0,0 +1,19 @@ +diff -uNr scummvm-2.2.0.orig/configure scummvm-2.2.0/configure +--- scummvm-2.2.0.orig/configure 2020-09-14 20:43:40.457070313 +0200 ++++ scummvm-2.2.0/configure 2020-09-14 20:44:26.482818478 +0200 +@@ -2403,11 +2403,11 @@ + # + echo_n "Checking endianness... " + cat > tmp_endianness_check.cpp << EOF +-unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +-unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; ++__attribute__ ((used)) unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; ++__attribute__ ((used)) unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + const char * _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; return s; } +-unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +-unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; ++__attribute__ ((used)) unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; ++__attribute__ ((used)) unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + const char * _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; return s; } + int main() { _ascii (); _ebcdic (); return 0; } + EOF diff --git a/gcc-lto.patch b/gcc-lto.patch deleted file mode 100644 index 5da0d6a..0000000 --- a/gcc-lto.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/configure b/configure -index 26a4d1f..22e32e6 100755 ---- a/configure -+++ b/configure -@@ -2350,11 +2350,11 @@ fi - # - echo_n "Checking endianness... " - cat > tmp_endianness_check.cpp << EOF --unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; --unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -+__attribute__ ((used)) unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -+__attribute__ ((used)) unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; - void _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; } --unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; --unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -+__attribute__ ((used)) unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -+__attribute__ ((used)) unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; - void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; } - int main() { _ascii (); _ebcdic (); return 0; } - EOF diff --git a/scummvm-2.1.1-AUDIO_Fix_Compilation_Against_Fluidsynth_v2_1_and_later.patch b/scummvm-2.1.1-AUDIO_Fix_Compilation_Against_Fluidsynth_v2_1_and_later.patch deleted file mode 100644 index 2fdf3ca..0000000 --- a/scummvm-2.1.1-AUDIO_Fix_Compilation_Against_Fluidsynth_v2_1_and_later.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6 Mon Sep 17 00:00:00 2001 -From: D G Turner -Date: Sun, 15 Dec 2019 22:22:20 +0000 -Subject: [PATCH] AUDIO: Fix Compilation Against Fluidsynth v2.1+ - -This is as reported by eriktorbjorn. ---- - audio/softsynth/fluidsynth.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp -index 4034b2ffc36..33a74a15247 100644 ---- a/audio/softsynth/fluidsynth.cpp -+++ b/audio/softsynth/fluidsynth.cpp -@@ -35,7 +35,12 @@ - #include "backends/platform/ios7/ios7_common.h" - #endif - -+// Fluidsynth v2.1+ uses printf in one of it's headers, so this is -+// needed to allow compilation, as reported by eriktorbjorn on 20191215 -+// This is in include/fluidsynth/log.h around line 82 -+#define FORBIDDEN_SYMBOL_EXCEPTION_printf - #include -+#undef FORBIDDEN_SYMBOL_EXCEPTION_printf - - class MidiDriver_FluidSynth : public MidiDriver_Emulated { - private: diff --git a/scummvm-2.1.1-AUDIO_Really_Fix_Compilation_Against_Fluidsynth_v2_1_and_later.patch b/scummvm-2.1.1-AUDIO_Really_Fix_Compilation_Against_Fluidsynth_v2_1_and_later.patch deleted file mode 100644 index a8bf73a..0000000 --- a/scummvm-2.1.1-AUDIO_Really_Fix_Compilation_Against_Fluidsynth_v2_1_and_later.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001 -From: D G Turner -Date: Tue, 17 Dec 2019 04:21:04 +0000 -Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+ - -The previous fix did not work as the forbidden exception had no effect -since scummsys.h and thus forbidden.h had already been included prior -to the fluidsynth header being included. This also meant that undefining -the exception define after the header would have had no effect anyway. - -This new solution was suggest by eriktorbjorn on bug #11278 and should -avoid the need to add an exception which would persist over the entire -source file. ---- - audio/softsynth/fluidsynth.cpp | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp -index 33a74a15247..f8c2412492e 100644 ---- a/audio/softsynth/fluidsynth.cpp -+++ b/audio/softsynth/fluidsynth.cpp -@@ -20,10 +20,16 @@ - * - */ - --#include "common/scummsys.h" -+#include "config.h" - - #ifdef USE_FLUIDSYNTH - -+// Fluidsynth v2.1+ uses printf in one of it's headers, -+// include/fluidsynth/log.h around line 82 so need to include this -+// prior scummsys.h inclusion and thus forbidden.h -+#include -+ -+#include "common/scummsys.h" - #include "common/config-manager.h" - #include "common/error.h" - #include "common/system.h" -@@ -35,13 +41,6 @@ - #include "backends/platform/ios7/ios7_common.h" - #endif - --// Fluidsynth v2.1+ uses printf in one of it's headers, so this is --// needed to allow compilation, as reported by eriktorbjorn on 20191215 --// This is in include/fluidsynth/log.h around line 82 --#define FORBIDDEN_SYMBOL_EXCEPTION_printf --#include --#undef FORBIDDEN_SYMBOL_EXCEPTION_printf -- - class MidiDriver_FluidSynth : public MidiDriver_Emulated { - private: - MidiChannel_MPU401 _midiChannels[16]; diff --git a/scummvm-2.1.1-BUILD_Use_unmodified_SAVED_LDFLAGS_from_env_for_linking_plugins.patch b/scummvm-2.1.1-BUILD_Use_unmodified_SAVED_LDFLAGS_from_env_for_linking_plugins.patch deleted file mode 100644 index bf088a0..0000000 --- a/scummvm-2.1.1-BUILD_Use_unmodified_SAVED_LDFLAGS_from_env_for_linking_plugins.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d284bb3164f318ae6b99747ef16fe84998824239 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Sat, 22 Feb 2020 15:12:13 +0100 -Subject: [PATCH] BUILD: Use unmodified SAVED_LDFLAGS from env for linking - plugins. - -In commit dce6b012 we added the LDFLAGS, which were modified by the -configure script, to the linker stage of the plugins. Doing so turns -out not to work well for system architectures. - -This approach uses the unmodified LDFLAGS, stored in the SAVED_LDFLAGS -variable by the configure script, from the system environment for -linking dynamic plugins, which is very likely not to cause any harm. ---- - rules.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules.mk b/rules.mk -index 1138c8b8fde..b793ea480b1 100644 ---- a/rules.mk -+++ b/rules.mk -@@ -47,7 +47,7 @@ ifdef PLUGIN - PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX) - $(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS) - $(QUIET)$(MKDIR) plugins -- $(QUIET_PLUGIN)$(CXX) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@ -+ $(QUIET_PLUGIN)$(CXX) $(SAVED_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@ - - # Reset PLUGIN var - PLUGIN:= diff --git a/scummvm-2.1.1-CONFIGURE_Add_compatibility_for_RPM_configure_macro.patch b/scummvm-2.1.1-CONFIGURE_Add_compatibility_for_RPM_configure_macro.patch deleted file mode 100644 index fa96dca..0000000 --- a/scummvm-2.1.1-CONFIGURE_Add_compatibility_for_RPM_configure_macro.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 275d6402bc5fc8584a89d8cdd01972ef30963846 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Fri, 21 Feb 2020 23:16:45 +0100 -Subject: [PATCH 1/2] CONFIGURE: Ignore options valid for Autotools configure - -RPM-based distributions come with a configure macro, that sets up the -whole build environment. In order to be able to use this macro, some -options, which are valid for the configure script generated by GNU -Autotools, should not error-out when preparing the build stage. ---- - configure | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/configure b/configure -index 9f3c4b07bfc..89cf2ab5988 100755 ---- a/configure -+++ b/configure -@@ -1192,6 +1192,19 @@ EOF - - for ac_option in $@; do - case "$ac_option" in -+ # Silently ignore options valid for Autotools configure. -+ --build=*) ;; -+ --program-prefix=*) ;; -+ --sbindir=*) ;; -+ --sysconfdir=*) ;; -+ --includedir=*) ;; -+ --libexecdir=*) ;; -+ --localstatedir=*) ;; -+ --sharedstatedir=*) ;; -+ --infodir=*) ;; -+ --disable-dependency-tracking) ;; -+ --enable-dependency-tracking) ;; -+ # End of ignored options. - --enable-static) _static_build=yes ;; - --disable-16bit) _16bit=no ;; - --enable-highres) _highres=yes ;; - -From 51828b578d965c19c19fcbe0b1a5444c1502ee03 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Fri, 21 Feb 2020 23:34:22 +0100 -Subject: [PATCH 2/2] CONFIGURE: Add an environemt variable that discards the - --host option - -In the previous commit we modified the configure script to silently -ignore some options, that are not needed for ScummVM, but are valid -for the configure script generated by GNU Autotools, so the configure -macro for RPM-based distributions can be used when building a rpm -package for them. - -Unfortunately the configure script, as used by ScummVM uses the --host -option to determine the target system it will actually be build for. -Autotools based configure scripts have a --target option for such a -purpose, and use the --host option to determine the system the build -is performed on. - -For that reason there should be a way to discard the parameters passed -to the configure script with the --host option. The easiest approach -to achieve this goal, is to have an environment variable, which when -set influences the configure script to ignore the parameters of the ---host option. - -Thus we introduced a variable called 'CONFIGURE_NO_HOST', that will -when set to anything, but an empty value, before invoking the configure -script, have the parameters of the --host option take no influence on -the configure stage (and the build stage as well). ---- - configure | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 89cf2ab5988..d3bd5eda478 100755 ---- a/configure -+++ b/configure -@@ -1155,6 +1155,7 @@ Some influential environment variables: - AR archiver command - AS assembler command - ASFLAGS assembler flags -+ CONFIGURE_NO_HOST Ignore the cross-compile target set by the --host= option - CPPFLAGS C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory - CXX C++ compiler command -@@ -1474,7 +1475,11 @@ for ac_option in $@; do - _xcodetoolspath=`echo $ac_option | cut -d '=' -f 2` - ;; - --host=*) -- _host=`echo $ac_option | cut -d '=' -f 2` -+ if test -z "$CONFIGURE_NO_HOST"; then -+ _host=`echo $ac_option | cut -d '=' -f 2` -+ else -+ echo "Ignoring --host option!" >&2 -+ fi - ;; - --prefix=*) - prefix=`echo $ac_option | cut -d '=' -f 2` diff --git a/scummvm.spec b/scummvm.spec index ef2fb1b..d3f632d 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -13,20 +13,13 @@ Name: scummvm -Version: 2.1.1 -Release: 11%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: Interpreter for several adventure games License: GPLv2+ URL: http://www.scummvm.org/ Source0: http://www.scummvm.org/frs/%{name}/%{version}/%{name}-%{version}.tar.bz2 -# Fluidsynth 1&2 support. From upstream trunk. -Patch0000: %{git_url}/commit/8593a9e1.patch#/%{name}-2.1.1-AUDIO_Fix_Compilation_Against_Fluidsynth_v2_1_and_later.patch -Patch0001: %{git_url}/commit/68758a87.patch#/%{name}-2.1.1-AUDIO_Really_Fix_Compilation_Against_Fluidsynth_v2_1_and_later.patch -# Add compatibility for RPM's configure macro. -Patch0002: %{git_url}/pull/2079.patch#/%{name}-2.1.1-CONFIGURE_Add_compatibility_for_RPM_configure_macro.patch -# Properly apply LDFLAGS to plugins. From upstream pull-request. -Patch0003: %{git_url}/pull/2082.patch#/%{name}-2.1.1-BUILD_Use_unmodified_SAVED_LDFLAGS_from_env_for_linking_plugins.patch -Patch0004: gcc-lto.patch +Patch0004: gcc-lto-2.2.0.patch Patch0005: scummvm-2.1.1-ftbfs-use-bfd-linker-on-x86.patch # Needed for AppData check. @@ -34,7 +27,7 @@ BuildRequires: libappstream-glib speech-dispatcher-devel alsa-lib-devel BuildRequires: SDL2-devel libvorbis-devel flac-devel zlib-devel BuildRequires: fluidsynth-devel desktop-file-utils libtheora-devel BuildRequires: libpng-devel freetype-devel libjpeg-devel libmad-devel -BuildRequires: readline-devel libcurl-devel libmpeg2-devel +BuildRequires: readline-devel libcurl-devel libmpeg2-devel gtk3-devel BuildRequires: gcc-c++ %ifarch %{ix86} BuildRequires: nasm @@ -111,7 +104,7 @@ export CONFIGURE_NO_HOST=true %check # Check the AppData add-on to comply with guidelines. -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.xml +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.xml %install @@ -142,7 +135,7 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.so' | xargs chmod -Rc 0755 %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.svg %{_datadir}/pixmaps/%{name}.xpm -%{_datadir}/appdata/%{name}.appdata.xml +%{_metainfodir}/%{name}.appdata.xml %files data @@ -150,6 +143,13 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.so' | xargs chmod -Rc 0755 %changelog +* Sun Oct 18 2020 Christian Krause - 2.2.0-1 +- Update to 2.2.0 (#1819020) +- Remove patches already included upstream +- Update patch to disable LTO +- Use new directory for AppData files +- Add gtk3-devel to BuildRequires + * Mon Sep 14 2020 Than Ngo - 2.1.1-11 - Fix FTBFS diff --git a/sources b/sources index b101d48..ee9bb15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scummvm-2.1.1.tar.bz2) = c27de3cf226ca6b11b1b431d40ab416c4e10e93244ab96535ead4f704c74267d816545448ae3618be2762ae148b0008952c26784fa4937ac0f3697b2d77f98d9 +SHA512 (scummvm-2.2.0.tar.bz2) = 5bf41df110884f01f3ceb00e1117c762e49f5ff44053927fda243b29c3aee9e7a4132f28cc028b7c7d7589095d651246d4bf832193d0d7d1560b3e43656ae227