$ git diff --patch-with-stat --summary b2f09c77c4b4b62dd715482cfbd21227110302d5..c59dc8e3dfd6d34d05b9582b6b50b30c9ecef9a9
.abf.yml | 3 +--
.onedev-buildspec.yml | 4 ++++
scummvm.spec | 50 +++++++++++++++++++++++++++++++++-----------------
3 files changed, 38 insertions(+), 19 deletions(-)
create mode 100644 .onedev-buildspec.yml
diff --git a/.abf.yml b/.abf.yml
index dd5893c..f10b5de 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,2 @@
sources:
- files-before-rpm: d84826f7f99a972aa1cb61f26ac9dd04862426f0
- scummvm-2.6.1.tar.xz: 22bed92bf98b016b8d88450b7f2fb1896a266d17
+ scummvm-2.9.1.tar.gz: f0998fc44e76f39522b8d8c9c4c74ff73fad99df
diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
new file mode 100644
index 0000000..b95f83a
--- /dev/null
+++ b/.onedev-buildspec.yml
@@ -0,0 +1,4 @@
+version: 40
+imports:
+- projectPath: OpenMandriva/Packages
+ revision: mirroring
diff --git a/scummvm.spec b/scummvm.spec
index dffd501..750f908 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -1,11 +1,15 @@
+#define snapshot 20230616
+# Plugins reference symbols from scummvm
+%define _disable_ld_no_undefined 1
+
Summary: An implementation of LucasArts's SCUMM interpreter
Name: scummvm
-Version: 2.6.1
-Release: 1
+Version: 2.9.1
+Release: %{?snapshot:0.%{snapshot}.}2
License: GPLv2+ and LGPLv2.1+
Group: Games/Adventure
-Url: http://scummvm.org/
-Source0: http://scummvm.org/frs/%{name}/%{version}/%{name}-%{version}.tar.xz
+Url: https://scummvm.org/
+Source0: %{?snapshot:https://github.com/scummvm/scummvm/archive/refs/heads/master.tar.gz#/%{name}-%{snapshot}.tar.gz}%{!?snapshot:http://scummvm.org/frs/%{name}/%{version}/%{name}-%{version}.tar.gz}
#Patch0: drop-split-dwarf-want-lto.patch
BuildRequires: nasm
@@ -15,7 +19,20 @@ BuildRequires: pkgconfig(libmpeg2)
BuildRequires: pkgconfig(mad)
BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(sdl2)
+BuildRequires: pkgconfig(SDL2_net)
BuildRequires: pkgconfig(vorbis)
+BuildRequires: pkgconfig(theora)
+BuildRequires: pkgconfig(libjpeg)
+BuildRequires: pkgconfig(libpng)
+BuildRequires: giflib-devel
+BuildRequires: pkgconfig(vpx)
+BuildRequires: pkgconfig(liba52)
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(libmikmod)
+BuildRequires: pkgconfig(freetype2)
+BuildRequires: pkgconfig(lua)
+# Optional, but sadly main can't depend on restricted
+#BuildRequires: pkgconfig(faad2)
%description
ScummVM is an implementation of LucasArts S.C.U.M.M.
@@ -34,8 +51,7 @@ drascula packages from non-free repository to play.
#----------------------------------------------------------------------------
%prep
-%setup -q
-%autopatch -p1
+%autosetup -p1 -n %{name}-%{?snapshot:master}%{!?snapshot:%{version}}
%build
#export CC=gcc
@@ -55,28 +71,28 @@ sed -i '/tmp_endianness_check.cpp/ s/$CXXFLAGS/$CXXFLAGS -fno-lto -O0/' configur
--datadir=%{_gamesdatadir} \
--enable-release \
--enable-verbose-build \
+ --enable-plugins \
+ --default-dynamic \
+ --enable-optimizations \
+ --opengl-mode=any \
--enable-all-engines
%make_build NASMFLAGS="-Ox -gdwarf2 -f elf -Fdwarf" STRIP="true"
%install
%make_install STRIP="true"
-install -m644 dists/%{name}.desktop -D %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-install -m644 dists/maemo/scummvm48.png -D %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -m644 dists/maemo/scummvm64.png -D %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-#install -m644 dists/motomagx/pep/scummvm_big_usr.png -D %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -m644 icons/scummvm.svg -D %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-
mkdir -p %{buildroot}%{_datadir}/%{name}
%files
%doc %{_docdir}/%{name}
%{_gamesbindir}/*
%{_mandir}/*/*
-%{_datadir}/pixmaps/%{name}.xpm
%{_gamesdatadir}/*
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/metainfo/scummvm.appdata.xml
+%{_datadir}/applications/org.scummvm.scummvm.desktop
+%{_datadir}/metainfo/org.scummvm.scummvm.metainfo.xml
%dir %{_datadir}/%{name}
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/icons/hicolor/scalable/apps/org.scummvm.scummvm.svg
+%{_datadir}/pixmaps/org.scummvm.scummvm.xpm
+%dir %{_prefix}/lib/scummvm
+# FIXME split the various engines into subpackages
+%{_prefix}/lib/scummvm/*