Accepting request 1037762 from home:AndreasStieger:branches:Emulators

- switch to stable tarball for next Leap and to fix build
- package license files correctly

OBS-URL: https://build.opensuse.org/request/show/1037762
OBS-URL: https://build.opensuse.org/package/show/Emulators/ppsspp?expand=0&rev=363

_service

@@ -1,26 +0,0 @@
-<services>
- <service name="tar_scm" mode="localonly">
-    <param name="scm">git</param>
-    <param name="url">https://github.com/hrydgard/ppsspp.git</param>
-    <param name="filename">ppsspp</param>
-    <param name="versionformat">@PARENT_TAG@~git%cd</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="changesgenerate">enable</param>
-    <param name="exclude">dx9sdk</param>
-    <param name="exclude">UWP</param>
-    <param name="exclude">Windows</param>
-    <param name="exclude">*.cmd</param>
-    <param name="exclude">*.dll</param>
-    <param name="exclude">*.vcxproj</param>
-    <param name="exclude">*.vcxproj.user</param>
-    <param name="exclude">*.vcxproj.filters</param>
-    <param name="exclude">*.yml</param>
-    <param name="exclude">*.props</param>
-    <param name="exclude">*.sln</param>
- </service>
- <service name="recompress" mode="localonly">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
- </service>
- <service name="set_version" mode="localonly"/>
-</services>

_servicedata

@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">https://github.com/hrydgard/ppsspp.git</param>
-              <param name="changesrevision">6796d3de8982518307f4b7bd3677bd809f61129f</param></service></servicedata>

ppsspp-1.13.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df0edaff6ccee55d5bc245ef84190801279214ec2e3d1d3673329e01662764ee
+size 40363040

ppsspp-1.13.2~git20221119.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c6c065fcf1f3653d0588577e9f19e567fd3c8aa1465b9baefb69f0a64f20acf
-size 233300276

ppsspp.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 23 20:30:47 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- switch to stable tarball for next Leap and to fix build
+- package license files correctly 
+
 -------------------------------------------------------------------
 Wed Nov 23 12:51:43 UTC 2022 - meissner@suse.com
 

ppsspp.spec

@@ -18,13 +18,13 @@
 
 %define _lto_cflags %{nil}
 Name:           ppsspp
-Version:        1.13.2~git20221123
+Version:        1.13.2
 Release:        0
 Summary:        PlayStation Portable Emulator
 License:        GPL-2.0-or-later
 Group:          System/Emulators/Other
-URL:            http://www.ppsspp.org
+URL:            https://www.ppsspp.org
-Source:         %{name}-%{version}.tar.xz
+Source:         https://github.com/hrydgard/ppsspp/releases/download/v%{version}/%{name}-%{version}.tar.xz
 BuildRequires:  Mesa-devel
 BuildRequires:  cmake >= 3.6
 BuildRequires:  fdupes
@@ -52,6 +52,7 @@ BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glew)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libzip)
+BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  pkgconfig(zlib)
@@ -59,7 +60,7 @@ Requires:       %{name}-common
 Requires(post): hicolor-icon-theme
 Requires(postun):hicolor-icon-theme
 # never built for PowerPC/Arm on 20200721
-ExcludeArch:    aarch64 %arm ppc ppc64 ppc64le s390x
+ExcludeArch:    aarch64 %{arm} ppc ppc64 ppc64le s390x
 
 %description
 PPSSPP is a PSP emulator written in C++, and translates PSP CPU instructions directly into optimized x86, x64 and ARM machine code, using JIT recompilers (dynarecs).
@@ -88,7 +89,7 @@ Group:          System/Emulators/Other
 Required assets for PPSSPP GUI and assorted configuration files
 
 %prep
-%setup -q
+%autosetup -p1
 
 sed -i \
 -e 's|png17|png16|g' \
@@ -114,32 +115,35 @@ const char *PPSSPP_GIT_VERSION = \"%{version}\";
 mkdir build-headless build-qt build
 
 cd build-headless
+# FIXME: you should use the %%cmake macros
 cmake  .. \
         -DUSE_SYSTEM_FFMPEG="ON" \
         -DHEADLESS="ON" \
-        -DCMAKE_C_FLAGS="%optflags" \
+        -DCMAKE_C_FLAGS="%{optflags}" \
-        -DCMAKE_CXX_FLAGS="%optflags" \
+        -DCMAKE_CXX_FLAGS="%{optflags}" \
         -DCMAKE_BUILD_TYPE="Release|RelWithDebugInfo" \
         -DCMAKE_SKIP_RPATH="YES" \
         -Wno-dev
 %make_jobs
 
 cd ../build-qt
+# FIXME: you should use the %%cmake macros
 cmake  .. \
         -DUSE_SYSTEM_FFMPEG="ON" \
         -DUSING_QT_UI="ON" \
-        -DCMAKE_C_FLAGS="%optflags" \
+        -DCMAKE_C_FLAGS="%{optflags}" \
-        -DCMAKE_CXX_FLAGS="%optflags" \
+        -DCMAKE_CXX_FLAGS="%{optflags}" \
         -DCMAKE_BUILD_TYPE="Release|RelWithDebugInfo" \
         -DCMAKE_SKIP_RPATH="YES" \
         -Wno-dev
 %make_jobs
 
 cd ../build
+# FIXME: you should use the %%cmake macros
 cmake  .. \
         -DUSE_SYSTEM_FFMPEG="ON" \
-        -DCMAKE_C_FLAGS="%optflags" \
+        -DCMAKE_C_FLAGS="%{optflags}" \
-        -DCMAKE_CXX_FLAGS="%optflags" \
+        -DCMAKE_CXX_FLAGS="%{optflags}" \
         -DCMAKE_BUILD_TYPE="Release|RelWithDebugInfo" \
         -DCMAKE_SKIP_RPATH="YES" \
         -Wno-dev
@@ -233,18 +237,17 @@ install -m 444 -D icons/icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
 %icon_theme_cache_postun
 
 %files headless
-%defattr(644,root,root)
+%license LICENSE.TXT
 %attr(755,root,root) %{_bindir}/%{name}-headless
 %attr(755,root,root) %{_libexecdir}/%{name}/%{name}-headless
 
 %files qt
-%defattr(644,root,root)
+%license LICENSE.TXT
 %attr(755, root, root) %{_bindir}/%{name}-qt
 %attr(755, root, root) %{_libexecdir}/%{name}/%{name}-qt
 %{_datadir}/applications/%{name}-qt.desktop
 
 %files common
-%defattr(644,root,root)
 %doc README.md
 %license LICENSE.TXT
 %{_libexecdir}/%{name}/assets
@@ -253,7 +256,7 @@ install -m 444 -D icons/icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %files
-%defattr(644,root,root)
+%license LICENSE.TXT
 %dir %{_libexecdir}/%{name}
 %attr(755, root, root) %{_bindir}/%{name}
 %attr(755, root, root) %{_libexecdir}/%{name}/%{name}