commit bf44318e4f6d41038b22688a59cfc150b4939d3b Author: Artem Polishchuk <ego.cordatus(a)gmail.com&gt; Date: Wed May 20 02:13:12 2020 +0300 Add Database files (cheatcode, content data, cursors) | Fix: RH#1822743 Disable LTO .gitignore | 4 +++ retroarch-freeworld.spec | 80 ++++++++++++++++++++++++++++++++++++------------ sources | 7 +++-- 3 files changed, 68 insertions(+), 23 deletions(-) --- diff --git a/.gitignore b/.gitignore index 9d8e0bc..413c10c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,7 @@ /retroarch-1.8.6.tar.gz /retroarch-assets-20200507git5b945e9.tar.gz /retroarch-joypad-autoconfig-20200507gitfd99334.tar.gz +/libretro-core-info-1.8.7.tar.gz +/libretro-database-1.8.7.tar.gz +/retroarch-1.8.7.tar.gz +/retroarch-joypad-autoconfig-20200514git28180c1.tar.gz diff --git a/retroarch-freeworld.spec b/retroarch-freeworld.spec index c8199b1..e75be20 100644 --- a/retroarch-freeworld.spec +++ b/retroarch-freeworld.spec @@ -14,10 +14,6 @@ %global sum_suffix %{nil} %endif -# LTO -%global optflags %{optflags} -flto -%global build_ldflags %{build_ldflags} -flto - %global short_url https://github.com/libretro # Assets @@ -26,13 +22,13 @@ %global date 20200507 # Joypad Autoconfig Files -%global commit4 fd99334cffbaa844a9bb8fa6192e486bfa956916 +%global commit4 28180c1369097b86c310f89c9f7b791e3451e579 %global shortcommit4 %(c=%{commit4}; echo ${c:0:7}) -%global date4 20200507 +%global date4 20200514 Name: %{appname}%{?p_suffix} -Version: 1.8.6 -Release: 1%{?dist} +Version: 1.8.7 +Release: 2%{?dist} Summary: Cross-platform, sophisticated frontend for the libretro API. %{?sum_suffix} # CC-BY: Assets @@ -113,6 +109,9 @@ Source3: %{short_url}/libretro-core-info/archive/v%{version}/libretro-cor # Joypad Autoconfig Files Source4: %{short_url}/%{appname}-joypad-autoconfig/archive/%{commit4}/%{appname}-joypad-autoconfig-%{date4}git%{shortcommit4}.tar.gz +# Database files (cheatcode, content data, cursors) +Source5: %{short_url}/libretro-database/archive/v%{version}/libretro-database-%{version}.tar.gz + # https://github.com/libretro/retroarch-assets/pull/334 Patch0: https://github.com/libretro/retroarch-assets/pull/334.patch#/add-executab... @@ -162,6 +161,7 @@ Requires: perl(Net::DBus) %dnl Fedora package: perl-Net-DBus Requires: perl(X11::Protocol) %dnl Fedora package: perl-X11-Protocol Recommends: %{name}-assets = %{?epoch:%{epoch}:}%{version}-%{release} +Recommends: %{name}-database%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Recommends: %{name}-filters%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Recommends: libretro-beetle-ngp%{?_isa} Recommends: libretro-beetle-pce-fast%{?_isa} @@ -237,6 +237,19 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Audio and video filters for %{name}. +# Database package +%package database +Summary: Database files (cheatcode, content data, cursors) for %{name} +BuildArch: noarch + +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description database +RetroArch incoporates a ROM scanning system to automatically produce playlists. +Each ROM that is scanned by the playlist generator is checked against a +database of ROMs that are known to be good copies. + + %prep %setup -n RetroArch-%{version} -q %setup -n RetroArch-%{version} -q -D -T -a1 @@ -245,6 +258,7 @@ pushd %{appname}-assets-%{commit1} popd %setup -n RetroArch-%{version} -q -D -T -a3 %setup -n RetroArch-%{version} -q -D -T -a4 +%setup -n RetroArch-%{version} -q -D -T -a5 # Unbundling pushd deps @@ -262,22 +276,28 @@ popd # * Not part of the 'mbedtls' upstream source find deps/mbedtls/ ! -name 'cacert.h' -type f -exec rm -f {} + -# Use system assets, libretro cores, libretro's core info and audio/video -# filters +# Use system assets, libretro cores, libretro's core info and audio/video, +# filters, database files (cheatcode, content data, cursors) sed -e 's|# libretro_directory =|libretro_directory = %{_libdir}/libretro/|g' \ -i retroarch.cfg %if %{with freeworld} -sed -e 's|# assets_directory =|assets_directory = %{_datadir}/libretro/assets-freeworld/|g' \ - -e 's|# video_filter_dir =|video_filter_dir = %{_libdir}/retroarch/filters/video-freeworld/|g' \ - -e 's|# audio_filter_dir =|audio_filter_dir = %{_libdir}/retroarch/filters/audio-freeworld/|g' \ - -e 's|# libretro_info_path =|libretro_info_path = %{_datadir}/libretro/info-freeworld/|g' \ - -e 's|# joypad_autoconfig_dir =|joypad_autoconfig_dir = %{_datadir}/libretro/autoconfig-freeworld/|g' \ +sed -e 's|# assets_directory =|assets_directory = %{_datadir}/libretro/assets-freeworld/|g' \ + -e 's|# video_filter_dir =|video_filter_dir = %{_libdir}/retroarch/filters/video-freeworld/|g' \ + -e 's|# audio_filter_dir =|audio_filter_dir = %{_libdir}/retroarch/filters/audio-freeworld/|g' \ + -e 's|# libretro_info_path =|libretro_info_path = %{_datadir}/libretro/info-freeworld/|g' \ + -e 's|# joypad_autoconfig_dir =|joypad_autoconfig_dir = %{_datadir}/libretro/autoconfig-freeworld/|g' \ + -e 's|# content_database_path =|content_database_path = %{_datadir}/libretro/database/rdb-freeworld/|g' \ + -e 's|# cheat_database_path =|cheat_database_path = %{_datadir}/libretro/database/cht-freeworld/|g' \ + -e 's|# cursor_directory =|cursor_directory = %{_datadir}/libretro/database/cursors-freeworld/|g' \ %else -sed -e 's|# assets_directory =|assets_directory = %{_datadir}/libretro/assets/|g' \ - -e 's|# video_filter_dir =|video_filter_dir = %{_libdir}/retroarch/filters/video/|g' \ - -e 's|# audio_filter_dir =|audio_filter_dir = %{_libdir}/retroarch/filters/audio/|g' \ - -e 's|# libretro_info_path =|libretro_info_path = %{_datadir}/libretro/info/|g' \ - -e 's|# joypad_autoconfig_dir =|joypad_autoconfig_dir = %{_datadir}/libretro/autoconfig/|g' \ +sed -e 's|# assets_directory =|assets_directory = %{_datadir}/libretro/assets/|g' \ + -e 's|# video_filter_dir =|video_filter_dir = %{_libdir}/retroarch/filters/video/|g' \ + -e 's|# audio_filter_dir =|audio_filter_dir = %{_libdir}/retroarch/filters/audio/|g' \ + -e 's|# libretro_info_path =|libretro_info_path = %{_datadir}/libretro/info/|g' \ + -e 's|# joypad_autoconfig_dir =|joypad_autoconfig_dir = %{_datadir}/libretro/autoconfig/|g' \ + -e 's|# content_database_path =|content_database_path = %{_datadir}/libretro/database/rdb/|g' \ + -e 's|# cheat_database_path =|cheat_database_path = %{_datadir}/libretro/database/cht/|g' \ + -e 's|# cursor_directory =|cursor_directory = %{_datadir}/libretro/database/cursors/|g' \ %endif -i retroarch.cfg @@ -322,6 +342,9 @@ sed -e 's|retroarch.cfg|%{name}.cfg|g' \ # Joypad Autoconfig Files %make_build -C %{appname}-joypad-autoconfig-%{commit4} +# Database files (cheatcode, content data, cursors) +%make_build -C libretro-database-%{version} + %install %make_install @@ -368,6 +391,10 @@ mv %{buildroot}%{_datadir}/libretro/autoconfig/ \ %{buildroot}%{_datadir}/libretro/autoconfig-freeworld/ %endif +# Database files (cheatcode, content data, cursors) +%make_install -C libretro-database-%{version} \ + INSTALLDIR=%{_datadir}/libretro/database%{?p_suffix} + # Rename desktop file to UUID for compatibility mv %{buildroot}%{_datadir}/applications/%{appname}.desktop \ %{buildroot}%{_datadir}/applications/%{uuid}.desktop @@ -431,7 +458,20 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml %dir %{_libdir}/%{appname}/ +%files database +%{_datadir}/libretro/database/cht%{?p_suffix}/ +%{_datadir}/libretro/database/cursors%{?p_suffix}/ +%{_datadir}/libretro/database/rdb%{?p_suffix}/ + + %changelog +* Tue May 19 2020 Artem Polishchuk <ego.cordatus(a)gmail.com&gt; - 1.8.7-2 +- Add Database files (cheatcode, content data, cursors) | Fix: RH#1822743 +- Disable LTO + +* Mon May 18 2020 Artem Polishchuk <ego.cordatus(a)gmail.com&gt; - 1.8.7-1 +- Update to 1.8.7 + * Thu May 07 2020 Artem Polishchuk <ego.cordatus(a)gmail.com&gt; - 1.8.6-1 - Update to 1.8.6 diff --git a/sources b/sources index 8d2c982..adf42e7 100644 --- a/sources +++ b/sources @@ -1,4 +1,5 @@ -SHA512 (libretro-core-info-1.8.6.tar.gz) = fcb8b84dcc9bc158808d025d87459d35b01418c63c00ecbba66930d7e5dbc190f40300ea63aa61361a7af4b9319a6dfe391142643ec5d750e71a795a9081003f -SHA512 (retroarch-1.8.6.tar.gz) = 483d449424ab567115c0d2af26784cbd876b6d5b71f021f64c3e94bd82b7a45c1a2dbea8bf2cdff5de195186ebf41e36eddd652215dbff8d667738a30c4d1fa6 +SHA512 (libretro-core-info-1.8.7.tar.gz) = 7168a5429e7f3c23c2b3a6d0ef125f4cc3e36b772987f4dc80947b5eb200deb3795cd2c72697ffdccef075cb4bee763dc354ac7d3f9f46ba7a5812e4ea41eb30 +SHA512 (libretro-database-1.8.7.tar.gz) = 8b33d6319bdd956670138129b23247efd52572c52e24deb16e4f1690e2105b6e27ddaca9df92d14e1984c2302a950aab49d1fa0c7870b63b59471abf2a2d99ae +SHA512 (retroarch-1.8.7.tar.gz) = d976511a36ec2bd160c8727872dd59e62f36c1e79c94369d85643939712988186030cc4ef6ecbd77d14ad70572d2b7d70526421aec5f8e0e37365acbd34d823f +SHA512 (retroarch-joypad-autoconfig-20200514git28180c1.tar.gz) = f9785e154e044b0d041151d177ea27edeaecc17e60cd50e2c5e72ba151e54d70015291982bdd15392405d16215764541c5374e9bd16a011e6b5fb5a4783b18e3 SHA512 (retroarch-assets-20200507git5b945e9.tar.gz) = 6a1e490701832d08e654df342f1d782e725c4cb22a317cdac18a2be6fe9c809494ea9592fa99fd00f920e6e39c43783b85093bbd13c52a35e852540b1d400923 -SHA512 (retroarch-joypad-autoconfig-20200507gitfd99334.tar.gz) = f710a2e0421b696951904f2d0675003d0184cd5fcc291608d6621b2b4a2816532753b1d85a96b0e530e5c28989b342bf7dbee8d03a8504651cd46bcdaaa49d40