diff --git a/.gitignore b/.gitignore index b603412..55e4029 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,4 @@ cheese-2.31.1.tar.bz2 /cheese-3.33.90.1.tar.xz /cheese-3.34.0.tar.xz /cheese-3.38.0.tar.xz +/cheese-41.0.tar.xz diff --git a/cheese-41.0-introspection.patch b/cheese-41.0-introspection.patch new file mode 100644 index 0000000..846d96a --- /dev/null +++ b/cheese-41.0-introspection.patch @@ -0,0 +1,52 @@ +From 6cba16a610adf7eddd17113d283b3a989e26328c Mon Sep 17 00:00:00 2001 +From: David King +Date: Mon, 20 Sep 2021 08:26:54 +0100 +Subject: [PATCH 1/2] introspection: Pin the API version for now + +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 82f663f5..79c6cf98 100644 +--- a/meson.build ++++ b/meson.build +@@ -13,7 +13,8 @@ version_array = cheese_version.split('.') + cheese_major_version = version_array[0].to_int() + cheese_minor_version = version_array[1].to_int() + +-cheese_api_version = cheese_major_version.to_string() + '.0' ++#cheese_api_version = cheese_major_version.to_string() + '.0' ++cheese_api_version = 3.0 + + cheese_prefix = get_option('prefix') + cheese_bindir = get_option('bindir') +-- +2.31.1 + + +From 760fe75d06831b3d0f3d0e820f32967602878e08 Mon Sep 17 00:00:00 2001 +From: David King +Date: Mon, 20 Sep 2021 08:31:58 +0100 +Subject: [PATCH 2/2] Fix the API version + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 79c6cf98..48de79d1 100644 +--- a/meson.build ++++ b/meson.build +@@ -14,7 +14,7 @@ cheese_major_version = version_array[0].to_int() + cheese_minor_version = version_array[1].to_int() + + #cheese_api_version = cheese_major_version.to_string() + '.0' +-cheese_api_version = 3.0 ++cheese_api_version = '3.0' + + cheese_prefix = get_option('prefix') + cheese_bindir = get_option('bindir') +-- +2.31.1 + diff --git a/cheese.spec b/cheese.spec index 0265a8a..b67f6a6 100644 --- a/cheese.spec +++ b/cheese.spec @@ -1,16 +1,14 @@ Name: cheese Epoch: 2 -Version: 3.38.0 -Release: 5%{?dist} +Version: 41.0 +Release: 1%{?dist} Summary: Application for taking pictures and movies from a webcam License: GPLv2+ URL: https://wiki.gnome.org/Apps/Cheese -Source0: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/41/%{name}-%{version}.tar.xz -# https://gitlab.gnome.org/GNOME/cheese/-/merge_requests/39 -Patch0: 0001-Fix-infinite-loop-if-thumbnailer-is-not-available.patch -Patch1: cheese-3.38.0-vala-genericarray.patch +Patch0: cheese-41.0-introspection.patch BuildRequires: gcc BuildRequires: meson @@ -124,6 +122,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desk %changelog +* Mon Sep 20 2021 David King - 2:41.0-1 +- Update to 41.0 + * Wed Jul 28 2021 David King - 2:3.38.0-5 - Add isa to gstreamer plugin Requires (#1986432) diff --git a/sources b/sources index f807cdd..39a6529 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cheese-3.38.0.tar.xz) = 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae +SHA512 (cheese-41.0.tar.xz) = c5de776e080974703289ea36097e52402439265db17ae5b22687253c1cdd77ad27e95bbbc4acab0ec514954aae7fe9042e50f36eb407df3cc02783bc62cb896e