[ppsspp] Release 1.13.2
by sagitter
commit e413312e5e099958162012fb25febe16f283a2c6
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sat Sep 24 18:41:31 2022 +0200
Release 1.13.2
.gitignore | 1 +
ppsspp-use-qt6.patch | 31 +++++++++++++++++++++++++++++++
ppsspp.spec | 15 ++++++++++-----
sources | 2 +-
4 files changed, 43 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b9cd2a2..7de0c8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/ppsspp-ffmpeg-1.12.3.tar.gz
/ppsspp-ffmpeg-1.13.tar.gz
/ppsspp-ffmpeg-1.13.1.tar.gz
+/ppsspp-ffmpeg-1.13.2.tar.gz
diff --git a/ppsspp-use-qt6.patch b/ppsspp-use-qt6.patch
new file mode 100644
index 0000000..15fe05f
--- /dev/null
+++ b/ppsspp-use-qt6.patch
@@ -0,0 +1,31 @@
+--- a/CMakeLists.orig.txt 2022-08-20 19:23:21.899167000 +0200
++++ b/CMakeLists.txt 2022-08-20 19:25:18.521420643 +0200
+@@ -1102,7 +1102,7 @@
+ set(TargetBin PPSSPP)
+ elseif(USING_QT_UI)
+ set(CMAKE_AUTOMOC ON)
+- find_package(Qt5 COMPONENTS OpenGL Gui Core Multimedia)
++ find_package(Qt6 COMPONENTS OpenGL Gui Core Multimedia)
+ list(APPEND NativeAppSource
+ Qt/QtMain.cpp
+ Qt/QtMain.h
+@@ -1118,7 +1118,7 @@
+
+ include_directories(Qt)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+- set(nativeExtraLibs ${nativeExtraLibs} Qt5::OpenGL Qt5::Gui Qt5::Core Qt5::Multimedia)
++ set(nativeExtraLibs ${nativeExtraLibs} Qt6::OpenGL Qt6::Gui Qt6::Core Qt6::Multimedia)
+ set(TargetBin PPSSPPQt)
+
+ # Enable SDL joystick if SDL is found
+--- a/Common/Render/Text/draw_text_qt.orig.cpp 2022-08-09 19:30:10.000000000 +0200
++++ b/Common/Render/Text/draw_text_qt.cpp 2022-08-20 20:01:54.828779935 +0200
+@@ -14,7 +14,7 @@
+ #include <QtGui/QImage>
+ #include <QtGui/QPainter>
+ #include <QtGui/QFontMetrics>
+-#include <QtOpenGL/QGLWidget>
++#include <QtOpenGLWidgets/QOpenGLWidget>
+
+ TextDrawerQt::TextDrawerQt(Draw::DrawContext *draw) : TextDrawer(draw) {
+ }
diff --git a/ppsspp.spec b/ppsspp.spec
index 67e4615..53d226f 100644
--- a/ppsspp.spec
+++ b/ppsspp.spec
@@ -73,8 +73,8 @@ ExcludeArch: %{power64}
Name: ppsspp
-Version: 1.13.1
-Release: 2%{?dist}
+Version: 1.13.2
+Release: 1%{?dist}
Summary: A PSP emulator
License: BSD and GPLv2+
URL: https://www.ppsspp.org/
@@ -116,6 +116,7 @@ Patch2: %{name}-ffmpeg-set_x64_build_flags.patch
Patch3: %{name}-ffmpeg-set_aarch64_build_flags.patch
Patch4: %{name}-ffmpeg-set_arm_build_flags.patch
Patch5: %{name}-fix_compile_issue.patch
+Patch6: %{name}-use-qt6.patch
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(glesv2)
@@ -142,9 +143,9 @@ BuildRequires: gcc gcc-c++
BuildRequires: libzip-devel
BuildRequires: snappy-devel
BuildRequires: zlib-devel
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qttools-devel
-BuildRequires: qt5-qtmultimedia-devel
+BuildRequires: qt6-qtbase-devel
+BuildRequires: qt6-qttools-devel
+BuildRequires: qt6-qtmultimedia-devel
BuildRequires: libappstream-glib
BuildRequires: rapidjson-devel
@@ -202,6 +203,7 @@ PPSSPP with Qt5 frontend wrapper.
%patch4 -p1 -b .backup
%patch5 -p1 -b .backup
%endif
+%patch6 -p1 -b .qt6_backup
# Remove bundled libraries
rm -rf /ext/native/ext/libzip
@@ -421,6 +423,9 @@ fi
%{_datadir}/icons/%{name}/
%changelog
+* Sat Sep 24 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 1.13.2-1
+- Release 1.13.2
+
* Sat Aug 20 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 1.13.1-2
- Fix QT_QPA_PLATFORM env variables
diff --git a/sources b/sources
index 2516fe1..1f7b1c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ppsspp-ffmpeg-1.13.1.tar.gz) = 9826393f801590d73712c24bde859190f50d6b3b9dea261aadbe2c88c78db7ff57ab774c4ef692bd2ba38ca2e10141afc983eb8def6460d865b59a874aa1e5a7
+SHA512 (ppsspp-ffmpeg-1.13.2.tar.gz) = f850e392dad7c121635ae85b0f83d7252df4fc5a499dd5177bab7385fbde940ad4c971ce0d4e2c8035a3124623f4f5ebd929ac546a01f16cf8cc8c38ff4fd731
2 years, 1 month
[ppsspp] Release 1.13.2 | Switch back to Qt5
by sagitter
commit 5e3621946a764a0b4a65ade00c4ff2ed64fcb2b3
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sat Sep 24 18:56:14 2022 +0200
Release 1.13.2 | Switch back to Qt5
ppsspp.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/ppsspp.spec b/ppsspp.spec
index c15355a..ac1ecb2 100644
--- a/ppsspp.spec
+++ b/ppsspp.spec
@@ -142,9 +142,9 @@ BuildRequires: gcc gcc-c++
BuildRequires: libzip-devel
BuildRequires: snappy-devel
BuildRequires: zlib-devel
-BuildRequires: qt6-qtbase-devel
-BuildRequires: qt6-qttools-devel
-BuildRequires: qt6-qtmultimedia-devel
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qttools-devel
+BuildRequires: qt5-qtmultimedia-devel
BuildRequires: libappstream-glib
BuildRequires: rapidjson-devel
2 years, 1 month
[discord] Bump
by Nicolas Chauvet
commit 285b7386234104b90f8b183c1cdb95028e196716
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 21 13:22:41 2022 +0200
Bump
discord.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/discord.spec b/discord.spec
index e8148fe..fab2d0e 100644
--- a/discord.spec
+++ b/discord.spec
@@ -5,7 +5,7 @@
Name: discord
Version: 0.0.20
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: All-in-one voice and text chat for gamers
# License Information: https://bugzilla.rpmfusion.org/show_bug.cgi?id=4441#c14
2 years, 1 month
[vdr-markad] Update to 3.0.26
by Martin Gansser
commit 74429f23b7077bd3fa720b169faccedb6aa6439b
Author: Martin Gansser <mgansser(a)online.de>
Date: Sat Sep 24 16:38:33 2022 +0200
Update to 3.0.26
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5661ca3..eb3538c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-3.0.23.tar.gz
/vdr-markad-3.0.24.tar.gz
/vdr-markad-3.0.25.tar.gz
+/vdr-markad-3.0.26.tar.gz
diff --git a/sources b/sources
index 5ab8f2e..43f22da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-3.0.25.tar.gz) = 9123cdb803430b4aa94777dffe210a58c4fffdf4983c3d18e9b3aa8e0e098155da4964e39d0288a49e1e343fa1e8018733ed6c3da8525f1b515b66068a3fdb49
+SHA512 (vdr-markad-3.0.26.tar.gz) = 25dde58b89cb46d383fc8b14fb3c7e3008a0c938b4ace9105a4a5a1cceeeecef1561dbf73614edd749315b7e19fde4f9781080ae66434582886890fed6e13926
diff --git a/vdr-markad.spec b/vdr-markad.spec
index b16bc55..6247ece 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -8,8 +8,8 @@
%endif
Name: vdr-markad
-Version: 3.0.25
-Release: 2%{?dist}
+Version: 3.0.26
+Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
URL: https://github.com/kfb77/vdr-plugin-markad
@@ -74,6 +74,9 @@ fi
%doc html
%changelog
+* Sat Sep 24 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 3.0.26-1
+- Update to 3.0.26
+
* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3.0.25-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
2 years, 1 month
[xorg-x11-drv-nvidia] Fix f38 lib screw up
by Leigh Scott
commit 46c8e4c98406cab758aac8f3a464a8bf4c84abe5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Sep 21 09:05:45 2022 +0100
Fix f38 lib screw up
xorg-x11-drv-nvidia.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index bc0f3a7..ba78884 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -507,6 +507,8 @@ fi ||:
%{_libdir}/libnvidia-rtcore.so.%{version}
%{_libdir}/libnvidia-vulkan-producer.so.%{version}
%{_libdir}/libnvidia-vulkan-producer.so
+# Fix f38 screw up
+%exclude %{_libdir}/libnvidia-vulkan-producer.so.515
%{_libdir}/libnvoptix.so.1
%{_libdir}/libnvoptix.so.%{version}
%{_winedir}/
2 years, 1 month
[nvidia-kmod/f36: 7/7] Merge branch 'master' into f36
by Leigh Scott
commit 23247908187fe134a1b3eb182a570ab8cf9261ca
Merge: 26e6401 4d37408
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Sep 21 16:14:50 2022 +0100
Merge branch 'master' into f36
nvidia-kmod.spec | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
---
2 years, 1 month
