diff --git a/.gitignore b/.gitignore index d4b9199..1df90dd 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,8 @@ /retroarch-1.19.0.tar.gz /retroarch-assets-1.19.0.tar.gz /retroarch-joypad-autoconfig-1.19.0.tar.gz +/libretro-core-info-1.22.0.tar.gz +/libretro-database-1.22.0.tar.gz +/retroarch-1.22.0.tar.gz +/retroarch-assets-1.22.0.tar.gz +/retroarch-joypad-autoconfig-1.22.0.tar.gz diff --git a/retroarch.spec b/retroarch.spec index 9a22c98..8b7c4ba 100644 --- a/retroarch.spec +++ b/retroarch.spec @@ -22,7 +22,7 @@ ExcludeArch: s390x %global short_url https://github.com/libretro Name: %{appname}%{?p_suffix} -Version: 1.19.0 +Version: 1.22.0 Release: %autorelease Summary: Cross-platform, sophisticated frontend for the libretro API. %{?sum_suffix} @@ -129,10 +129,16 @@ BuildRequires: mesa-libEGL-devel BuildRequires: spirv-tools-libs BuildRequires: systemd-devel +# https://docs.fedoraproject.org/en-US/packaging-guidelines/#_packaging_header_only_libraries +BuildRequires: stb_image-static +BuildRequires: stb_rect_pack-static +BuildRequires: stb_truetype-static + BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(caca) BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(flac) +# Since Flac 1.5.0 update RetroArch won't compile +#BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gl) @@ -209,7 +215,7 @@ Recommends: libretro-stella2014 # * Dummy for future %endif -Provides: bundled(7zip) = 9.20 +Provides: bundled(7zip) = 19.00 Provides: bundled(discord-rpc) Provides: bundled(dr) Provides: bundled(glslang) @@ -218,9 +224,11 @@ Provides: bundled(ibxm) # https://github.com/libretro/RetroArch/issues/8153 Provides: bundled(lua) = 5.3.6 -Provides: bundled(rcheevos) = 10.7 +Provides: bundled(flac) = 1.3.2 +Provides: bundled(rcheevos) = 12.1 Provides: bundled(SPIRV-Cross) -Provides: bundled(stb) +# Unbundling this in the manner of the other stb libraries does not work. +Provides: bundled(stb_vorbis) %global _description %{expand: libretro is an API that exposes generic audio/video/input callbacks. A frontend @@ -232,8 +240,8 @@ While RetroArch is the reference frontend for libretro, several other projects have used the libretro interface to include support for emulators and/or game engines. libretro is completely open and free for anyone to use. -For how to download and install more libretro cores please read included README.fedora.md -file.} +For how to download and install more libretro cores please read included +README.fedora.md file.} %description %{_description} @@ -276,8 +284,8 @@ 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. +Each ROM that is scanned by the playlist generator is checked against a database +of ROMs that are known to be good copies. %prep @@ -291,7 +299,8 @@ database of ROMs that are known to be good copies. pushd deps rm -rf \ libfat \ - libFLAC \ +%dnl Since Flac 1.5.0 update RetroArch won't compile \ +%dnl libFLAC \ libiosuhax \ libvita2d \ libz \ @@ -300,6 +309,10 @@ rm -rf \ wayland-protocols \ %{nil} popd +for lib in image rect_pack truetype +do + ln -svf /usr/include/stb/stb_${lib}.h deps/stb/stb_${lib}.h +done # * Not part of the 'mbedtls' upstream source find deps/mbedtls/ ! -name 'cacert.h' -type f -exec rm -f {} + @@ -347,7 +360,7 @@ sed -e 's|retroarch.cfg|%{name}.cfg|g' \ %build ./configure \ --prefix=%{_prefix} \ - --disable-builtinflac \ +%dnl --disable-builtinflac \ --disable-builtinmbedtls \ --disable-builtinzlib \ --enable-dbus \ @@ -426,10 +439,6 @@ mv %{buildroot}%{_datadir}/libretro/autoconfig/ \ %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 - %if %{with freeworld} # Rename binary, desktop file, appdata manifest, manpage and config file mv %{buildroot}%{_bindir}/%{appname} \ diff --git a/sources b/sources index 2671772..19cfff3 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (libretro-core-info-1.19.0.tar.gz) = 17cca258bb3460f2078fea0f2d64319a946aecf915475f61ca4b8eac3c882edfb96e38ae897285b4e1959ab06cf277e93130317ea13c469515948fd28fc942cd -SHA512 (libretro-database-1.19.0.tar.gz) = 1ca406d93670ef9bd8fb4fdd4a551c8cff4f6523aad3b5172af62b78cc4ae69ffddc911f7077aa93cdbd5860ed20e75d93a6271d48b6a1d24b63528cfbea753f -SHA512 (retroarch-1.19.0.tar.gz) = fe807570eedac5e5142e68a0c9d4e085be923e4914a3cfa9635ef644c02de2d8f9777ce7dfbdee0d8584fc4fa038f04adc1c9a55e3fe46903ba8ce05878b17a0 -SHA512 (retroarch-assets-1.19.0.tar.gz) = 4e02e4c5d9b546ad12bf10d54aae51b43f18879e603edc7f90f02907712fff78c8cfd23adaa8fbce6b054aea91254ad942fc4ade60daf925906ba85e9b6ec9fb -SHA512 (retroarch-joypad-autoconfig-1.19.0.tar.gz) = 2644fe7f40dcb94fb433ea23b7825193ddc1b81d9fe9841b0a3bcba9598aa72286ea07426657ec6de404efb64e2c42950d81f58861ffc9193a892e8bd4a59a6d +SHA512 (libretro-core-info-1.22.0.tar.gz) = a9c4b471b77b09fcaa1d46f4fae9d56a07e30ef15665f1b067d53a28b5e14c2b83120dee8ddaa1ec9ba31bab198fb748f76d5d4990888f9141e774e256ec6e2d +SHA512 (libretro-database-1.22.0.tar.gz) = 832f020182d4371e88ddb817c9214f7292265a82e51e53e9a1645217f1de801ad67c2b05cd19e17b70732f79e3ee3d33e82e7045e5bda6d3d81414a677b3fcb5 +SHA512 (retroarch-1.22.0.tar.gz) = 99a2c1bf4d74090c357431e78968012187ec47040b2b22c5f5d155d9e1713583d3160b2fcd4b872e177f706a87cbc660efb37766181862865f8f3a437e3b92f5 +SHA512 (retroarch-assets-1.22.0.tar.gz) = 930683106b777745a799ce6a45aac82e09164946a788f820aed27856d1a3fcf39f26045edc84706f047afe654bd3ba265d84dcaf143def194258606c4ff656be +SHA512 (retroarch-joypad-autoconfig-1.22.0.tar.gz) = 1b59694d3520a516f145d3e48d12b42267591cd59f44ca0d6b1a3532d6c195884e2d4345a69326bf6fe75bf53b4edb077cfe57a4701e3fe72f04e61f66a0d317