From fcedea46a37aaa3d942e4d4e6501bc50b9afbdead27a44d859b3418b457f5b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Mon, 8 May 2017 14:05:15 +0000 Subject: [PATCH] Accepting request 493074 from home:xenonpk Source Update OBS-URL: https://build.opensuse.org/request/show/493074 OBS-URL: https://build.opensuse.org/package/show/Emulators/ppsspp?expand=0&rev=7 --- _service | 1 - _servicedata | 2 +- ppsspp-1.4.0~git20170427.tar.xz | 3 -- ppsspp-1.4.0~git20170505.tar.xz | 3 ++ ppsspp.changes | 45 +++++++++++++++++++++++ ppsspp.spec | 63 ++++++++++++++++++--------------- 6 files changed, 84 insertions(+), 33 deletions(-) delete mode 100644 ppsspp-1.4.0~git20170427.tar.xz create mode 100644 ppsspp-1.4.0~git20170505.tar.xz diff --git a/_service b/_service index f25bca8..feb8d26 100644 --- a/_service +++ b/_service @@ -6,7 +6,6 @@ @PARENT_TAG@.0~git%cd v(.*) enable - ffmpeg dx9sdk UWP Windows diff --git a/_servicedata b/_servicedata index 8c519a5..5e9ab9c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/hrydgard/ppsspp.git - 14e6667f3a88ff3afd11b2a860656f05ef597af2 \ No newline at end of file + 793178c106ff77ea0b5693f9f552e3a5e5de5c29 \ No newline at end of file diff --git a/ppsspp-1.4.0~git20170427.tar.xz b/ppsspp-1.4.0~git20170427.tar.xz deleted file mode 100644 index 7c9a8eb..0000000 --- a/ppsspp-1.4.0~git20170427.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce00c72868a381de5593a99e161bfdf99f05105389db9ccc7406d70bc0ff38fd -size 22653560 diff --git a/ppsspp-1.4.0~git20170505.tar.xz b/ppsspp-1.4.0~git20170505.tar.xz new file mode 100644 index 0000000..bfed3f4 --- /dev/null +++ b/ppsspp-1.4.0~git20170505.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28d88dce6d89a272f5739169051ae92625ce4b37f911d1919708e6349ea11caf +size 161497272 diff --git a/ppsspp.changes b/ppsspp.changes index 2409bca..e8cee21 100644 --- a/ppsspp.changes +++ b/ppsspp.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Fri May 05 18:29:35 UTC 2017 - pousaduarte@gmail.com + +- Update to version 1.4.0~git20170505: + * Fix to partial restarts (when switching backends), plus misc. Helps #9666 + * Oops again.. sigh + * Windows: Initialize WindowsHost in EmuThread. + +------------------------------------------------------------------- +Fri May 05 09:36:58 UTC 2017 - pousaduarte@gmail.com + +- Update to version 1.4.0~git20170505: + * Handle alt+tab and drop down menu when mouse is confined and game is running + +------------------------------------------------------------------- +Thu May 04 07:33:00 UTC 2017 - pousaduarte@gmail.com + +- Update to version 1.4.0~git20170504: + * Experiment (#9647): Wipe RawInput buffers + * Experiment (#9647): Prevent NaN values from getting into the UI system through TouchInput + * Add a constructor to GestureDetector, to see if that fixes initialization + * Also memset. + +------------------------------------------------------------------- +Mon May 01 14:32:56 UTC 2017 - pousaduarte@gmail.com + +- Update to version 1.4.0~git20170501: + * Windows: Fix minor leak in disassembly UI. + * UI: Make GPU events more consistent. + * D3D11: Free swapchain on graphics reset. + * Minor OCD fix;]. + * Fix "copy type" pointer cwc + * UI: Allow choosing bgs (android) + * Remove blank line + * Windows: Simplify host shutdown. + * Core: Cleanup MAC address handling. + * UI: Fix crash on item select with hidden items. + * System: Use a separate API for bool props. + * Windows: Init with OpenGL 4.5 if possible. + * SoftGPU: Implement CONTINUE prim type. + * Arg, gcc buildfix. + * Add some paranoid checks around touch IDs that probably won't help #9647 + * Oops + * Fix: in some extreme case on-screen touch controls get stuck on iOS + ------------------------------------------------------------------- Fri Apr 28 07:56:49 UTC 2017 - pousaduarte@gmail.com diff --git a/ppsspp.spec b/ppsspp.spec index 78c0880..116d91d 100644 --- a/ppsspp.spec +++ b/ppsspp.spec @@ -17,7 +17,7 @@ Name: ppsspp -Version: 1.4.0~git20170427 +Version: 1.4.0~git20170505 Release: 0 Summary: PlayStation Portable Emulator License: GPL-2.0+ @@ -26,7 +26,7 @@ Url: http://www.ppsspp.org Source: %{name}-%{version}.tar.xz BuildRequires: gcc-c++ -BuildRequires: cmake >= 3.6 +BuildRequires: cmake >= 3.3.2 BuildRequires: Mesa-devel BuildRequires: libzip-devel BuildRequires: snappy-devel @@ -42,15 +42,15 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5OpenGL) -#ffmpeg deps: -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libswscale) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) -BuildRequires: pkgconfig(libavdevice) -BuildRequires: pkgconfig(libavfilter) -BuildRequires: pkgconfig(libpostproc) -BuildRequires: pkgconfig(libswresample) +#ffmpeg deps: (Restore once https://github.com/hrydgard/ppsspp/issues/9026 is closed) +#BuildRequires: pkgconfig(libavcodec) +#BuildRequires: pkgconfig(libswscale) +#BuildRequires: pkgconfig(libavformat) +#BuildRequires: pkgconfig(libavutil) +#BuildRequires: pkgconfig(libavdevice) +#BuildRequires: pkgconfig(libavfilter) +#BuildRequires: pkgconfig(libpostproc) +#BuildRequires: pkgconfig(libswresample) #Desktop icon deps BuildRequires: update-desktop-files @@ -80,6 +80,8 @@ Required assets for PPSSPP GUI %prep %setup -q +sed -i 's|cmake_minimum_required(VERSION 3.6)|cmake_minimum_required(VERSION 3.3.2)|g' CMakeLists.txt + echo "// This is a generated file. const char *PPSSPP_GIT_VERSION = \"%{version}\"; @@ -89,27 +91,32 @@ const char *PPSSPP_GIT_VERSION = \"%{version}\"; " > git-version.cpp %build -%cmake .. \ +#Restore -DUSE_SYSTEM_FFMPEG="ON" \ once ffmpeg bug is fixed upstream +mkdir build-qt +cd build-qt +cmake .. \ -DUSE_FFMPEG="ON" \ - -DUSE_SYSTEM_FFMPEG="ON" \ -DUSING_QT_UI="ON" \ - -DGOLD="ON" - + -DCMAKE_C_FLAGS="%optflags" \ + -DCMAKE_CXX_FLAGS="%optflags" \ + -DCMAKE_BUILD_TYPE="Release|RelWithDebugInfo" \ + -DCMAKE_SKIP_RPATH="YES" %make_jobs -cd .. -%__mv build build-qt +mkdir ../build +cd ../build -%cmake .. \ +cmake .. \ -DUSE_FFMPEG="ON" \ - -DUSE_SYSTEM_FFMPEG="ON" \ - -DGOLD="ON" - + -DCMAKE_C_FLAGS="%optflags" \ + -DCMAKE_CXX_FLAGS="%optflags" \ + -DCMAKE_BUILD_TYPE="Release|RelWithDebugInfo" \ + -DCMAKE_SKIP_RPATH="YES" %make_jobs %install -%__mkdir -p %{buildroot}%{_bindir} -%__mkdir -p %{buildroot}%{_libexecdir}/%{name} +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_libexecdir}/%{name} #setup wrapper(s) @@ -127,12 +134,12 @@ EOF #install files -%__install -m 755 -D build-qt/PPSSPPQt %{buildroot}%{_libexecdir}/%{name}/%{name}-qt -%__install -m 755 -D build/PPSSPPSDL %{buildroot}%{_libexecdir}/%{name}/%{name} +install -m 755 -D build-qt/PPSSPPQt %{buildroot}%{_libexecdir}/%{name}/%{name}-qt +install -m 755 -D build/PPSSPPSDL %{buildroot}%{_libexecdir}/%{name}/%{name} -%__mv assets %{buildroot}%{_libexecdir}/%{name}/ -%__mkdir -p %{buildroot}%{_datadir}/pixmaps -%__install -m 444 -D icons/icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg +mv assets %{buildroot}%{_libexecdir}/%{name}/ +mkdir -p %{buildroot}%{_datadir}/pixmaps +install -m 444 -D icons/icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg %suse_update_desktop_file -c %{name} PPSSPP 'PSP Emulator' %{name} %{name} System Emulator %suse_update_desktop_file -c %{name}-qt PPSSPPQt 'PSP Emulator' %{name}-qt %{name} System Emulator