diff --git a/visualboyadvance-m-2.0.0-refresh-on-wayland.patch b/visualboyadvance-m-2.0.0-refresh-on-wayland.patch new file mode 100644 index 0000000..6744d82 --- /dev/null +++ b/visualboyadvance-m-2.0.0-refresh-on-wayland.patch @@ -0,0 +1,13 @@ +--- a/src/wx/panel.cpp ++++ b/src/wx/panel.cpp +@@ -1402,6 +1402,10 @@ void DrawingPanelBase::PaintEv(wxPaintEvent& ev) + + DrawArea(dc); + DrawOSD(dc); ++#ifndef NO_CAIRO ++ if (!paused) ++ GetWindow()->Refresh(); ++#endif + } + + void DrawingPanelBase::EraseBackground(wxEraseEvent& ev) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index f73bdc7..373dc6f 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -5,7 +5,7 @@ Name: visualboyadvance-m Version: 2.0.0 -Release: 0.7%{?rctag:.%{rctag}}%{?dist} +Release: 0.8%{?rctag:.%{rctag}}%{?dist} Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -14,6 +14,9 @@ Source0: https://github.com/visualboyadvance-m/visualboyadvance-m/archive #Workaround for sound synchronization issues: #https://github.com/visualboyadvance-m/visualboyadvance-m/issues/51 Patch0: %{name}-%{version}-soundsync.patch +#Queue Window Refresh, needed for wayland support: +#https://github.com/visualboyadvance-m/visualboyadvance-m/pull/68 +Patch1: %{name}-%{version}-refresh-on-wayland.patch BuildRequires: cairo-devel BuildRequires: cmake BuildRequires: libjpeg-turbo-devel @@ -71,8 +74,6 @@ Advance project, with many improvements from various developments of VBA. %autosetup -p1 -n %{name}-Beta-3 sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt sed -i 's/ -mtune=generic//g' CMakeLists.txt -#Workaround for Wayland, launch script to force xwayland: -echo -e "#!/bin/sh\nGDK_BACKEND=x11 %name-x11 \$@\n" > %{name}.sh %build %cmake . \ @@ -87,9 +88,6 @@ echo -e "#!/bin/sh\nGDK_BACKEND=x11 %name-x11 \$@\n" > %{name}.sh %install %make_install -#Move binary and install launch script -mv -f %{buildroot}/%{_bindir}/%{name} %{buildroot}/%{_bindir}/%{name}-x11 -install -p -D -m 0755 %{name}.sh %{buildroot}/%{_bindir}/%{name} %find_lang wx%{shortname} %check @@ -103,7 +101,6 @@ appstream-util validate-relax --nonet \ %doc doc/ips.htm %{_mandir}/man6/%{name}.* %{_bindir}/%{name} -%{_bindir}/%{name}-x11 %{_datadir}/applications/wx%{shortname}.desktop %{_datadir}/appdata/wx%{shortname}.appdata.xml %{_datadir}/%{shortname} @@ -135,6 +132,10 @@ fi /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Jan 29 2017 Jeremy Newton - 2.0.0-0.8.Beta3 +- Add patch to fix wayland drawing +- Remove launcher to force xwayland + * Thu Jan 19 2017 Jeremy Newton - 2.0.0-0.7.Beta3 - Force X11/xwayland, rendering issues exist on Wayland - Enable cairo to fix wx segfaults on xwayland