From 4fe1643df19db1a5ecf74a0f475db074d783a929614b055bd8aecea0fff82581 Mon Sep 17 00:00:00 2001 From: Dmitriy Perlow Date: Sat, 23 Nov 2019 19:45:52 +0000 Subject: [PATCH] Accepting request 750447 from home:munix9:branches:games - update to version 4.4.3.1 - clean up spec file - remove allegro-4.4.2-shared_plugins.patch (fixed upstream) - add allegro-4.4.3-texinfo-non-utf8-input-fix.patch (fix tw build) OBS-URL: https://build.opensuse.org/request/show/750447 OBS-URL: https://build.opensuse.org/package/show/games/allegro44?expand=0&rev=4 --- allegro-4.4.2-shared_plugins.patch | 13 -- allegro-4.4.2.tar.gz | 3 - ...gro-4.4.3-texinfo-non-utf8-input-fix.patch | 10 ++ allegro-4.4.3.1.tar.gz | 3 + allegro44.changes | 40 +++++++ allegro44.spec | 112 +++++++----------- fix-glx.patch | 5 +- 7 files changed, 97 insertions(+), 89 deletions(-) delete mode 100644 allegro-4.4.2-shared_plugins.patch delete mode 100644 allegro-4.4.2.tar.gz create mode 100644 allegro-4.4.3-texinfo-non-utf8-input-fix.patch create mode 100644 allegro-4.4.3.1.tar.gz diff --git a/allegro-4.4.2-shared_plugins.patch b/allegro-4.4.2-shared_plugins.patch deleted file mode 100644 index 72fc944..0000000 --- a/allegro-4.4.2-shared_plugins.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -833,7 +833,7 @@ option(WANT_JPGALLEG "Enable JPGAlleg" o - if(WANT_FRAMEWORKS) - set(ADDON_LINKAGE SHARED) - else() -- set(ADDON_LINKAGE STATIC) -+ set(ADDON_LINKAGE SHARED) - endif() - - if(WANT_ALLEGROGL) diff --git a/allegro-4.4.2.tar.gz b/allegro-4.4.2.tar.gz deleted file mode 100644 index 3ac7796..0000000 --- a/allegro-4.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc -size 4674902 diff --git a/allegro-4.4.3-texinfo-non-utf8-input-fix.patch b/allegro-4.4.3-texinfo-non-utf8-input-fix.patch new file mode 100644 index 0000000..1214cfa --- /dev/null +++ b/allegro-4.4.3-texinfo-non-utf8-input-fix.patch @@ -0,0 +1,10 @@ +--- docs/src/allegro._tx.orig ++++ docs/src/allegro._tx +@@ -23,6 +23,7 @@ + @man_shortdesc_force1=allegro + @man_shortdesc_force2=Allegro game programming library. + @$\input texinfo ++@$@documentencoding ISO-8859-1 + @$@setfilename allegro.inf + @$@settitle Allegro Manual + @$@setchapternewpage odd diff --git a/allegro-4.4.3.1.tar.gz b/allegro-4.4.3.1.tar.gz new file mode 100644 index 0000000..7712f16 --- /dev/null +++ b/allegro-4.4.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec19dbc9a021244582b4819b3583ee594b50141f9fcf6944a4ed8069cbf8d4d4 +size 4663634 diff --git a/allegro44.changes b/allegro44.changes index 3a0012e..138ffc0 100644 --- a/allegro44.changes +++ b/allegro44.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Sat Nov 23 12:53:46 UTC 2019 - munix9@googlemail.com + +- update to version 4.4.3.1 + * Fix a regression with the dat tool not working with plugins + (SiegeLord). + +- update to version 4.4.3 + * Allow building the dependencies as shared libraries. + (Michał Cichoń, Edgar Reynaldo) + * Fix typo preventing get_executable_name from using System V + procfs correctly. (Peter Wang) + * Relicense loadpng under ZLib license. + * Fix spelling of endianness in textconv (Andreas Rönnquist). + * Fix format string warnings (Andreas Rönnquist). + * Add Linux console tslib mouse "touch screen" driver. + (Tobi Vollebregt) + * Don't define a duplicate DLLMain. (SiegeLord) + * Fix Allegro crashes/compilation under 64 bit Windows. + (Sven Eden, David Capello) + * Fix possible random crashes on Windows restoring DirectDraw + surfaces. (David Capello) + * Make internal function get_value in jpgalleg static. + (Trent Gamblin) + * Implemented load_midi_pf, play_fli_pf, open_fli_pf. + (Ivan Mogilko) + * Make use of in MSVS 2010 and higher. (Ivan Mogilko) + * Fixes several issues related to fullscreen mode in Windows. + (Etienne Vouga) + * Windows: fixed TAB key getting stuck in key buffer when held + before ALT. (Ivan Mogilko) + * Fix building with Mesa 18.2.5 and later. (Andreas Rönnquist) + * Remove f* variants of fixed math functions. (Andreas Rönnquist) + * Fix complilation of datedit. (rofl0r) + * Modernize and fix release zipup script. (rofl0r) + +- clean up spec file +- remove allegro-4.4.2-shared_plugins.patch (fixed upstream) +- add allegro-4.4.3-texinfo-non-utf8-input-fix.patch + ------------------------------------------------------------------- Thu Sep 21 13:53:17 UTC 2017 - rpm@fthiessen.de diff --git a/allegro44.spec b/allegro44.spec index d0f0344..f81f24e 100644 --- a/allegro44.spec +++ b/allegro44.spec @@ -1,7 +1,7 @@ # # spec file for package allegro44 # -# Copyright (c) 2019 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,22 +12,22 @@ # 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/ # +%define base_version 4.4.3 + Name: allegro44 -Version: 4.4.2 +Version: 4.4.3.1 Release: 0 Summary: Cross-platform library for games and multimedia programming -# http://alleg.sourceforge.net/latestdocs/en/faq.html#The%20giftware%20licence +# https://liballeg.org/license.html#allegro-4-the-giftware-license License: SUSE-Permissive Group: System/Libraries -Url: http://alleg.sourceforge.net/ -Source0: https://downloads.sourceforge.net/project/alleg/allegro/%{version}/allegro-%{version}.tar.gz +URL: https://liballeg.org/ +Source0: https://github.com/liballeg/allegro5/releases/download/%{version}/allegro-%{version}.tar.gz Source1: baselibs.conf -# PATCH-FIX-OPENSUSE allegro-4.4.2-shared_plugins.patch reddwarf@opensuse.org -- Compile plugins as shared libs -Patch0: allegro-%{version}-shared_plugins.patch # PATCH-FIX-OPENSUSE allegro-4.4.2-pkgconfig.patch reddwarf@opensuse.org -- Correct pkg-config files to reflect shared_plugins patch Patch1: allegro-4.4.2-pkgconfig.patch # PATCH-FEATURE-OPENSUSE allegro-4.4.2-modules.patch reddwarf@opensuse.org -- Avoid allegro searching for modules that don't exist @@ -44,9 +44,11 @@ Patch6: allegro-4.4.2-monotonic.patch Patch7: allegro-4.4.2-src_x_xkeyboard.c.patch # PATCH-FIX-OPENSUSE fix-glx.patch -- Fix issue with GLXext Patch8: fix-glx.patch +# PATCH-FIX-OPENSUSE allegro-4.4.3-texinfo-non-utf8-input-fix.patch -- Fix default encoding +Patch9: allegro-4.4.3-texinfo-non-utf8-input-fix.patch BuildRequires: cmake BuildRequires: fdupes -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: texinfo BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(gl) @@ -79,14 +81,14 @@ and other types of multimedia programming. %package -n liballeg44-devel Summary: A game programming library Group: Development/Languages/C and C++ -Requires(pre): %install_info_prereq Requires: %{name} = %{version} Requires: liballeg4_4 = %{version} +Requires(pre): %{install_info_prereq} +Conflicts: allegro-devel > %{version} +Conflicts: liballeg-devel > %{version} Provides: allegro-devel = %{version} Provides: liballeg-devel = %{version} Obsoletes: allegro-devel < %{version} -Conflicts: allegro-devel > %{version} -Conflicts: liballeg-devel > %{version} %description -n liballeg44-devel Allegro is a cross-platform library intended for use in computer games @@ -146,8 +148,8 @@ handling functions. Summary: Development files for JPGAlleg Group: Development/Languages/C and C++ Requires: libjpgalleg4_4 = %{version} -Provides: libjpgalleg-devel = %{version} Conflicts: libjpgalleg-devel > %{version} +Provides: libjpgalleg-devel = %{version} %description -n libjpgalleg44-devel This package is needed to build programs that use JPGAlleg. @@ -164,8 +166,8 @@ handling functions. Summary: Development files for Allegro's loadpng Group: Development/Languages/C and C++ Requires: libloadpng4_4 = %{version} -Provides: libloadpng-devel = %{version} Conflicts: libloadpng-devel > %{version} +Provides: libloadpng-devel = %{version} %description -n libloadpng44-devel This package is needed to build programs that use Allegro's loadpng. @@ -181,83 +183,53 @@ This library allows to use Ogg Vorbis sound files from Allegro. Summary: Development files for Allegro's logg Group: Development/Languages/C and C++ Requires: liblogg4_4 = %{version} -Provides: liblogg-devel = %{version} Conflicts: liblogg-devel > %{version} +Provides: liblogg-devel = %{version} %description -n liblogg44-devel This package is needed to build programs that use Allegro's logg. %prep -%setup -q -n allegro-%{version} -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 -p1 +%autosetup -n allegro-%{version} -p0 # SED-FIX-OPENSUSE – Fix include, warning "xf86dga.h is obsolete and may be removed in the future." sed -i 's|X11/extensions/xf86dga.h|X11/extensions/Xxf86dga.h|' src/x/xdga2.c %build -mkdir build -cd build -export CFLAGS='%{optflags}' -export CXXFLAGS='%{optflags}' -cmake -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DDOCDIR=%{_docdir} \ - -DMANDIR=%{_mandir} \ - -DINFODIR=%{_infodir} \ - -DWANT_EXAMPLES=no \ - -DWANT_TESTS=no \ - -DWANT_OSS=no \ - .. -make %{?_smp_flags} +# hack for gcc9 warning: '__builtin___strncat_chk' specified bound depends on the length of the source argument +export CFLAGS="%{optflags} -Wno-stringop-overflow" + +%cmake \ + -DDOCDIR:PATH=%{_docdir} \ + -DMANDIR:PATH=%{_mandir} \ + -DINFODIR:PATH=%{_infodir} \ + -DWANT_EXAMPLES:BOOL=OFF \ + -DWANT_TESTS:BOOL=OFF \ + -DWANT_OSS:BOOL=OFF + +%cmake_build %install -cd build -%make_install -install -pm 0755 docs/makedoc %{buildroot}%{_bindir}/allegro-makedoc -rm -f %{buildroot}%{_includedir}/alleggl_config.h -# Since the CMakeLists.txt file is wrong install them manually -install -dm 0755 %{buildroot}%{_mandir}/man3 -install -pm 0644 docs/man/*.3 %{buildroot}%{_mandir}/man3 +%cmake_install -%if 0%{?suse_version} - %fdupes -s %{buildroot} -%endif +install -Dpm 0755 build/docs/makedoc %{buildroot}%{_bindir}/allegro-makedoc +# Since the CMakeLists.txt file is wrong install them manually +install -Dpm 0644 -t %{buildroot}%{_mandir}/man3/ build/docs/man/*.3 + +%fdupes -s %{buildroot} %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig - %post -n liballeg4_4 -p /sbin/ldconfig - %postun -n liballeg4_4 -p /sbin/ldconfig - %post -n liballeggl4_4 -p /sbin/ldconfig - %postun -n liballeggl4_4 -p /sbin/ldconfig - %post -n libjpgalleg4_4 -p /sbin/ldconfig - %postun -n libjpgalleg4_4 -p /sbin/ldconfig - %post -n libloadpng4_4 -p /sbin/ldconfig - %postun -n libloadpng4_4 -p /sbin/ldconfig - %post -n liblogg4_4 -p /sbin/ldconfig - %postun -n liblogg4_4 -p /sbin/ldconfig - %post -n liballeg44-devel %install_info --info-dir=%{_infodir} %{_infodir}/allegro.info%{ext_info} @@ -267,8 +239,8 @@ install -pm 0644 docs/man/*.3 %{buildroot}%{_mandir}/man3 %files %defattr(0644,root,root,0755) %{_libdir}/allegro -%exclude %{_libdir}/allegro/%{version}/alleg-jack.so -%exclude %{_libdir}/allegro/%{version}/alleg-dga2.so +%exclude %{_libdir}/allegro/%{base_version}/alleg-jack.so +%exclude %{_libdir}/allegro/%{base_version}/alleg-dga2.so %files -n liballeg4_4 %defattr(0644,root,root,0755) @@ -276,7 +248,7 @@ install -pm 0644 docs/man/*.3 %{buildroot}%{_mandir}/man3 %files -n liballeg44-devel %defattr(0644,root,root,0755) -%{_docdir}/allegro-%{version} +%{_docdir}/allegro-%{base_version} %attr(0755,-,-) %{_bindir}/allegro-config %attr(0755,-,-) %{_bindir}/allegro-makedoc %{_libdir}/liballeg.so @@ -284,7 +256,7 @@ install -pm 0644 docs/man/*.3 %{buildroot}%{_mandir}/man3 %{_includedir}/xalleg.h %{_includedir}/allegro %{_libdir}/pkgconfig/allegro.pc -%{_infodir}/allegro.info%{ext_info} +%{_infodir}/allegro.info%{?ext_info} %{_mandir}/man3/* %files -n allegro44-tools @@ -302,11 +274,11 @@ install -pm 0644 docs/man/*.3 %{buildroot}%{_mandir}/man3 %files jack-plugin %defattr(0644,root,root,0755) -%{_libdir}/allegro/%{version}/alleg-jack.so +%{_libdir}/allegro/%{base_version}/alleg-jack.so %files dga2-plugin %defattr(0644,root,root,0755) -%{_libdir}/allegro/%{version}/alleg-dga2.so +%{_libdir}/allegro/%{base_version}/alleg-dga2.so %files -n liballeggl4_4 %defattr(0644,root,root,0755) diff --git a/fix-glx.patch b/fix-glx.patch index 96d8464..35cf596 100644 --- a/fix-glx.patch +++ b/fix-glx.patch @@ -1,6 +1,5 @@ -diff -Nur allegro-4.4.2/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h new/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h ---- allegro-4.4.2/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h 2008-10-09 19:22:52.000000000 +0200 -+++ new/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h 2019-01-23 17:53:44.359602186 +0100 +--- addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h.orig 2008-10-09 19:22:52.000000000 +0200 ++++ addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h 2019-01-23 17:53:44.359602186 +0100 @@ -374,6 +374,10 @@ #define AGLX_ARB_fbconfig_float #define GLX_RGBA_FLOAT_TYPE 0x20B9