diff --git a/.celluloid.metadata b/.celluloid.metadata index 90b0360..626164d 100644 --- a/.celluloid.metadata +++ b/.celluloid.metadata @@ -1 +1 @@ -ec470fda74b9f5c398e24838b5ba058827a46e0b SOURCES/celluloid-0.25.tar.xz +2d940c07c3290a3dc25cc296484c54f6c14ecc60 SOURCES/celluloid-0.22.tar.xz diff --git a/.gitignore b/.gitignore index e58b3d7..82f6bcf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/celluloid-0.25.tar.xz +SOURCES/celluloid-0.22.tar.xz diff --git a/SOURCES/52a7d396c846eb337ad7796fdb7163e2bc208d64.patch b/SOURCES/52a7d396c846eb337ad7796fdb7163e2bc208d64.patch new file mode 100644 index 0000000..c5f4153 --- /dev/null +++ b/SOURCES/52a7d396c846eb337ad7796fdb7163e2bc208d64.patch @@ -0,0 +1,29 @@ +From 52a7d396c846eb337ad7796fdb7163e2bc208d64 Mon Sep 17 00:00:00 2001 +From: gnome-mpv +Date: Sat, 13 Nov 2021 00:39:59 +0700 +Subject: [PATCH] controller: Fix autofit triggering regardless of settings + +When a video is opened for the first time, the window-scale property is +updated, triggering an autofit. Fix this by checking if window-scale is +transitioning from the value of zero, which indicates that a video is +being opened for the first time, and only requesting an autofit if this +is not the case. + +Fixes #705. +--- + src/celluloid-controller.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/celluloid-controller.c b/src/celluloid-controller.c +index d62ac1da..bfabfd1a 100644 +--- a/src/celluloid-controller.c ++++ b/src/celluloid-controller.c +@@ -920,7 +920,7 @@ window_scale_handler(GObject *object, GParamSpec *pspec, gpointer data) + window_scale = MIN( width/(gdouble)video_width, + height/(gdouble)video_height ); + +- if(ABS(window_scale-new_window_scale) > 0.0001) ++ if(window_scale > 0.0 && ABS(window_scale-new_window_scale) > 0.0001) + { + celluloid_controller_autofit(data, new_window_scale); + } diff --git a/SOURCES/65d0e47fcede58cb78df8e9a29ff669e2287273b.patch b/SOURCES/65d0e47fcede58cb78df8e9a29ff669e2287273b.patch new file mode 100644 index 0000000..0ead188 --- /dev/null +++ b/SOURCES/65d0e47fcede58cb78df8e9a29ff669e2287273b.patch @@ -0,0 +1,25 @@ +From 65d0e47fcede58cb78df8e9a29ff669e2287273b Mon Sep 17 00:00:00 2001 +From: gnome-mpv +Date: Sun, 21 Nov 2021 17:54:34 +0700 +Subject: [PATCH] main-window: Fix window size shrinking across sessions + +Fixes #713. +--- + src/celluloid-main-window.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/celluloid-main-window.c b/src/celluloid-main-window.c +index e96b50f3..6af84749 100644 +--- a/src/celluloid-main-window.c ++++ b/src/celluloid-main-window.c +@@ -576,8 +576,8 @@ celluloid_main_window_save_state(CelluloidMainWindow *wnd) + + if(!maximized) + { +- g_settings_set_int(settings, "width", width - 52); +- g_settings_set_int(settings, "height", height - 52); ++ g_settings_set_int(settings, "width", width); ++ g_settings_set_int(settings, "height", height); + } + + if(celluloid_main_window_get_playlist_visible(wnd)) diff --git a/SPECS/celluloid.spec b/SPECS/celluloid.spec index be2d88b..3975070 100644 --- a/SPECS/celluloid.spec +++ b/SPECS/celluloid.spec @@ -1,22 +1,24 @@ Name: celluloid -Version: 0.25 -Release: 1%{?dist} +Version: 0.22 +Release: 3%{?dist} Summary: A simple GTK+ frontend for mpv License: GPL-3.0-or-later URL: https://github.com/celluloid-player/celluloid Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz +# Fix autofit triggering regardless of settings +Patch0: 65d0e47fcede58cb78df8e9a29ff669e2287273b.patch +Patch1: 52a7d396c846eb337ad7796fdb7163e2bc208d64.patch BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glib-2.0) >= 2.44 -BuildRequires: pkgconfig(gtk4) >= 4.6.1 +BuildRequires: pkgconfig(gtk4) BuildRequires: intltool >= 0.40.6 BuildRequires: libappstream-glib BuildRequires: pkgconfig(epoxy) BuildRequires: mpv-libs-devel -BuildRequires: pkgconfig(libadwaita-1) Requires: yt-dlp Requires: hicolor-icon-theme Requires: dbus-common @@ -58,36 +60,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/io.github.celluloid_p %{_mandir}/man1/%{name}.1.* %changelog -* Mon Jul 17 2023 Arkady L. Shane - 0.25.1 -- Rebuilt for MSVSPhere 9.2 - -* Mon Mar 27 2023 Vasiliy N. Glazov - 0.25-1 -- Update to 0.25 - -* Wed Jan 18 2023 Fedora Release Engineering - 0.24-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sun Nov 13 2022 Vitaly Zaitsev - 0.24-4 -- Rebuilt due to mpv update. - -* Fri Sep 09 2022 Vasiliy N. Glazov - 0.24-3 -- Require dbus-common - -* Fri Sep 09 2022 Vasiliy N. Glazov - 0.24-2 -- Bump release for Fedora official repo - -* Sun Aug 21 2022 Vasiliy N. Glazov - 0.24-1 -- Update to 0.24 - -* Sun Aug 07 2022 RPM Fusion Release Engineering - 0.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg - 5.1 - -* Mon Mar 07 2022 Vasiliy N. Glazov - 0.23-1 -- Update to 0.23 - -* Wed Feb 09 2022 RPM Fusion Release Engineering - 0.22-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Tue Jul 18 2023 Arkady L. Shane - 0.22-3 +- Rebuilt for MSVSphere 9.2 * Wed Dec 08 2021 Vasiliy N. Glazov - 0.22-3 - Fix autofit triggering regardless of settings