diff --git a/.gitignore b/.gitignore index b1ecfcb..8020d38 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,3 @@ /megapixels-1.6.1.tar.gz /megapixels-1.7.0.tar.gz /Megapixels-1.8.1.tar.bz2 -/Megapixels-1.8.2.tar.bz2 -/Megapixels-1.8.3.tar.bz2 diff --git a/0001-fix-capture-callback-signature.patch b/0001-fix-capture-callback-signature.patch deleted file mode 100644 index 1d8a2bf..0000000 --- a/0001-fix-capture-callback-signature.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 57244c666e622c01f1e22603da467856d36c50a2 Mon Sep 17 00:00:00 2001 -From: Sandipan Roy -Date: Wed, 13 Aug 2025 21:30:39 +0530 -Subject: [PATCH] Fix capture callback signature - ---- - src/process_pipeline.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/process_pipeline.c b/src/process_pipeline.c -index cbe374d..d9ace69 100644 ---- a/src/process_pipeline.c -+++ b/src/process_pipeline.c -@@ -964,7 +964,7 @@ mp_process_pipeline_process_image(MPBuffer buffer) - } - - static void --capture() -+capture(MPPipeline *pipeline, const void *data) - { - char template[] = "/tmp/megapixels.XXXXXX"; - char *tempdir; --- -2.50.1 - diff --git a/changelog b/changelog new file mode 100644 index 0000000..67fe30e --- /dev/null +++ b/changelog @@ -0,0 +1,76 @@ +* Thu Jan 25 2024 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +%autochangelog + +* Thu Jul 20 2023 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Dec 04 2022 Torrey Sorensen - 0.6.0-1 +- Update to 0.6.0 + +* Thu Aug 25 2022 Torrey Sorensen - 1.5.2-1 +- Update to 1.5.2 + +* Thu Jul 21 2022 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 27 2022 Torrey Sorensen - 1.5.1-1 +- Update to 1.5.1 + +* Thu Jan 20 2022 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 13 2021 Torrey Sorensen - 1.4.3-1 +- Update to 1.4.3 + +* Mon Dec 06 2021 Torrey Sorensen - 1.4.2-1 +- Update to 1.4.2 + +* Fri Nov 12 2021 Torrey Sorensen - 1.4.0-1 +- Update to 1.4.0 + +* Fri Sep 10 2021 Torrey Sorensen - 1.3.0-1 +- Update to 1.3.0 + +* Fri Jul 30 2021 Torrey Sorensen - 1.2.0-1 +- Update to 1.2.0 + +* Thu Jul 22 2021 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 23 2021 Torrey Sorensen - 1.1.0-1 +- Update to 1.1.0 + +* Tue May 04 2021 Torrey Sorensen - 1.0.1-1 +- Update to 1.0.1 + +* Mon Mar 29 2021 Torrey Sorensen - 0.16.0-1 +- Update to 0.16.0 + +* Sun Feb 21 2021 Torrey Sorensen - 0.15.0-1 +- Update to 0.15.0 + +* Mon Jan 11 2021 Torrey Sorensen - 0.14.0-1 +- Update to 0.14.0 + +* Fri Jan 01 2021 Torrey Sorensen - 0.13.2-1 +- Update to 0.13.2 + +* Tue Dec 15 2020 Torrey Sorensen - 0.13.1-2 +- Adding license and README + +* Thu Dec 10 2020 Torrey Sorensen - 0.13.1-1 +- Update to 0.13.1 + +* Thu Dec 03 2020 Torrey Sorensen - 0.12.0-2 +- Adding dependencies for postprocess.sh + +* Sat Nov 14 2020 Torrey Sorensen - 0.12.0-1 +- Initial packaging diff --git a/megapixels.spec b/megapixels.spec index 44a544d..964fbd3 100644 --- a/megapixels.spec +++ b/megapixels.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/megapixels-org/Megapixels -Version: 1.8.3 +Version: 1.8.1 %global tag %{version} %forgemeta @@ -10,12 +10,9 @@ Summary: GTK4 camera application that knows how to deal with the media re License: GPL-3.0-or-later URL: %{forgeurl} Source0: %{forgesource} +Source1: post_install.py -# Only available on 64-bit architectures due to memory requirements -ExcludeArch: %{ix86} armv7hl - -# Patches -Patch0: 0001-fix-capture-callback-signature.patch +Patch0: 0000-patch-build-gschemas.patch BuildRequires: gcc BuildRequires: meson @@ -30,11 +27,11 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(libjpeg) -BuildRequires: /usr/bin/xvfb-run -BuildRequires: /usr/bin/xauth +BuildRequires: /usr/bin/xvfb-run +BuildRequires: /usr/bin/xauth -BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib Requires: hicolor-icon-theme # for postprocess.sh @@ -46,6 +43,7 @@ It uses opengl to debayer the raw sensor data for the preview. %prep %forgeautosetup -p1 +cp %{SOURCE1} . %build %meson @@ -58,18 +56,27 @@ It uses opengl to debayer the raw sensor data for the preview. desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml +LC_ALL=C.UTF-8 xvfb-run sh <<'SH' +%meson_test +SH + %files %doc README.md %license LICENSE +%dir %{_datadir}/megapixels +%dir %{_datadir}/megapixels/config %{_bindir}/megapixels %{_bindir}/megapixels-camera-test %{_bindir}/megapixels-list-devices %{_datadir}/applications/org.postmarketos.Megapixels.desktop %{_datadir}/icons/hicolor/scalable/apps/org.postmarketos.Megapixels.svg -%dir %{_datadir}/megapixels -%dir %{_datadir}/megapixels/config -%{_datadir}/megapixels/config/*.ini -%{_datadir}/megapixels/config/*.dcp +%{_datadir}/megapixels/config/pine64,pinephone-1.0.ini +%{_datadir}/megapixels/config/pine64,pinephone-1.1.ini +%{_datadir}/megapixels/config/pine64,pinephone-1.2.ini +%{_datadir}/megapixels/config/pine64,pinetab.ini +%{_datadir}/megapixels/config/xiaomi,scorpio.ini +%{_datadir}/megapixels/config/pine64,pinephone,front.dcp +%{_datadir}/megapixels/config/pine64,pinephone,rear.dcp %{_datadir}/megapixels/postprocess.sh %{_datadir}/metainfo/org.postmarketos.Megapixels.metainfo.xml %{_datadir}/glib-2.0/schemas/org.postmarketos.Megapixels.gschema.xml diff --git a/packit.yaml b/packit.yaml index 8117a2d..b5e6841 100644 --- a/packit.yaml +++ b/packit.yaml @@ -15,6 +15,5 @@ jobs: - job: bodhi_update trigger: commit - allowed_builders: ["packit", "topazus"] dist_git_branches: - - fedora-branched + - fedora-all diff --git a/sources b/sources index f272b8b..ca62dda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Megapixels-1.8.3.tar.bz2) = 3e326cf3c6a9ab49c1efab687eb769afef90518ceac12d674718424cfc1388cc677d288b8d5627b22231a4cabcb71fa80302dadff9de12eb6e4dbcc9e7830786 +SHA512 (Megapixels-1.8.1.tar.bz2) = 2a90198f7681233fe2a633b63ceab4cb64670c5e17eef747d7e2627aa0a1746c4a22c178e8e4eb3b21f1bfbc2dc0e1ded39a29203467e8b221b319534b511351