2:17 p.m.
commit d83345ed2e5ee6ec0ef2183753cea89151d0307f
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sun Mar 3 17:30:02 2019 +0100
Updated to 1.59.2
Improved macro usage
.gitignore | 1 +
snes9x.appdata.xml => snes9x-gtk.appdata.xml | 2 +-
snes9x.spec | 39 ++++++++++++++++------------
sources | 2 +-
4 files changed, 25 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e01eab..ece2d24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ snes9x-1.53-src.tar.bz2
/snes9x-1.56.2.tar.gz
/snes9x-1.57.tar.gz
/snes9x-1.58.tar.gz
+/snes9x-1.59.2.tar.gz
diff --git a/snes9x.appdata.xml b/snes9x-gtk.appdata.xml
similarity index 96%
rename from snes9x.appdata.xml
rename to snes9x-gtk.appdata.xml
index d61eea1..ec32800 100644
--- a/snes9x.appdata.xml
+++ b/snes9x-gtk.appdata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
-<id>snes9x.desktop</id>
+ <id>snes9x-gtk.desktop</id>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<project_license>Other</project_license>
<name>Snes9x</name>
diff --git a/snes9x.spec b/snes9x.spec
index 6eaeccb..88ebecd 100644
--- a/snes9x.spec
+++ b/snes9x.spec
@@ -1,14 +1,16 @@
Summary: Super Nintendo Entertainment System emulator
Name: snes9x
-Version: 1.58
+Version: 1.59.2
Release: 1%{?dist}
License: Other
URL: http://www.snes9x.com/
Source0:
https://github.com/snes9xgit/snes9x/archive/%{version}.tar.gz#/%{name}-%{...
-Source1: %{name}.appdata.xml
+Source1: %{name}-gtk.appdata.xml
# Fix CFLAGS usage in CLI version
Patch0: %{name}-1.56.1-unix_flags.patch
+
BuildRequires: gcc-c++
+BuildRequires: meson
BuildRequires: autoconf
BuildRequires: zlib-devel
BuildRequires: libpng-devel
@@ -61,11 +63,8 @@ rm -rf unzip
%build
# Build GTK version
pushd gtk
-./autogen.sh
-%configure \
- --disable-silent-rules \
- --without-oss
-%make_build
+%meson
+%meson_build
popd
# Build CLI version
@@ -80,43 +79,49 @@ popd
%install
# Install GTK version
-%make_install -C gtk
+pushd gtk
+%meson_install
+popd
# Install CLI version
mkdir -p %{buildroot}%{_bindir}
-install -p -m 0755 unix/snes9x %{buildroot}%{_bindir}
+install -p -m 0755 unix/%{name} %{buildroot}%{_bindir}
# Validate desktop file
desktop-file-validate \
- %{buildroot}%{_datadir}/applications/%{name}.desktop
+ %{buildroot}%{_datadir}/applications/%{name}-gtk.desktop
# Install AppData file
install -d %{buildroot}%{_datadir}/metainfo
install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
-%find_lang snes9x-gtk
+%find_lang %{name}-gtk
%files
%license LICENSE
%doc docs/changes.txt
%doc unix/docs/readme_unix.html
-%{_bindir}/snes9x
+%{_bindir}/%{name}
-%files gtk -f snes9x-gtk.lang
+%files gtk -f %{name}-gtk.lang
%license LICENSE
%doc docs/changes.txt
%doc gtk/AUTHORS
-%{_bindir}/snes9x-gtk
+%{_bindir}/%{name}-gtk
%{_datadir}/%{name}
-%{_datadir}/metainfo/snes9x.appdata.xml
-%{_datadir}/applications/snes9x.desktop
-%{_datadir}/icons/hicolor/*/apps/snes9x.*
+%{_datadir}/metainfo/%{name}-gtk.appdata.xml
+%{_datadir}/applications/%{name}-gtk.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
%changelog
+* Sat Mar 02 2019 Andrea Musuruane <musuruan(a)gmail.com> - 1.59.2-1
+- Updated to 1.59.2
+- Improved macro usage
+
* Fri Dec 21 2018 Andrea Musuruane <musuruan(a)gmail.com> - 1.58-1
- Updated to 1.58
diff --git a/sources b/sources
index 95a3ff3..355aa5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff1232191732be636a4d0ac019a7cf6a snes9x-1.58.tar.gz
+8f66f3267a4dd0f9bc7e211d49df35b2 snes9x-1.59.2.tar.gz