From ef45c1593a1296d7047cb4c269c839c0919171db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 17:09:59 +0000 Subject: [PATCH 1/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From fb132f5bc89ef92761b8f24371826be5effbb5a5 Mon Sep 17 00:00:00 2001 From: Felix Wang Date: Fri, 16 Aug 2024 21:23:06 +0800 Subject: [PATCH 2/7] 1.8.2 --- .gitignore | 1 + megapixels.spec | 23 +++++------------------ packit.yaml | 3 ++- sources | 2 +- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 8020d38..9dd3285 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /megapixels-1.6.1.tar.gz /megapixels-1.7.0.tar.gz /Megapixels-1.8.1.tar.bz2 +/Megapixels-1.8.2.tar.bz2 diff --git a/megapixels.spec b/megapixels.spec index 964fbd3..18c11ad 100644 --- a/megapixels.spec +++ b/megapixels.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/megapixels-org/Megapixels -Version: 1.8.1 +Version: 1.8.2 %global tag %{version} %forgemeta @@ -10,9 +10,6 @@ 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 - -Patch0: 0000-patch-build-gschemas.patch BuildRequires: gcc BuildRequires: meson @@ -43,7 +40,6 @@ It uses opengl to debayer the raw sensor data for the preview. %prep %forgeautosetup -p1 -cp %{SOURCE1} . %build %meson @@ -56,27 +52,18 @@ cp %{SOURCE1} . 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 -%{_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 +%dir %{_datadir}/megapixels +%dir %{_datadir}/megapixels/config +%{_datadir}/megapixels/config/*.ini +%{_datadir}/megapixels/config/*.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 b5e6841..8117a2d 100644 --- a/packit.yaml +++ b/packit.yaml @@ -15,5 +15,6 @@ jobs: - job: bodhi_update trigger: commit + allowed_builders: ["packit", "topazus"] dist_git_branches: - - fedora-all + - fedora-branched diff --git a/sources b/sources index ca62dda..4293aa7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Megapixels-1.8.1.tar.bz2) = 2a90198f7681233fe2a633b63ceab4cb64670c5e17eef747d7e2627aa0a1746c4a22c178e8e4eb3b21f1bfbc2dc0e1ded39a29203467e8b221b319534b511351 +SHA512 (Megapixels-1.8.2.tar.bz2) = cbcb76a70f153faaf5ad5cca10947243a0d9b7370ecd1e16b7690b4ee9dd59cfd96eda2cb67a52e2b719748b8e49be94dbe227ddbf6035426ca3d5f2a8212c11 From fa12143e6c9ff466cfc9438085ff888592160013 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 17:24:47 +0000 Subject: [PATCH 3/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4415b98f545b1b40474b09f3009e8351da8ac8ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:31:34 +0000 Subject: [PATCH 4/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a4aa6de7f4465283393a69e6f3225ba877493c95 Mon Sep 17 00:00:00 2001 From: Sandipan Roy Date: Wed, 13 Aug 2025 22:22:46 +0530 Subject: [PATCH 5/7] Update to 1.8.3 - Update version from 1.8.2 to 1.8.3 in spec file - Update sources with new SHA512 hash for Megapixels-1.8.3.tar.bz2 - Add patch to fix compilation error in capture callback signature - Remove conflicting changelog file (using %autochangelog in spec) - Add ExcludeArch for 32-bit architectures (i686, armv7hl) due to memory requirements - Fix indentation issues in spec file (replace tabs with spaces) Resolves: compilation errors and architecture-specific build failures Tested: Local mock build successful on x86_64 --- .gitignore | 1 + 0001-fix-capture-callback-signature.patch | 25 ++++++++ changelog | 76 ----------------------- megapixels.spec | 16 +++-- sources | 2 +- 5 files changed, 38 insertions(+), 82 deletions(-) create mode 100644 0001-fix-capture-callback-signature.patch delete mode 100644 changelog diff --git a/.gitignore b/.gitignore index 9dd3285..b1ecfcb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /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 new file mode 100644 index 0000000..1d8a2bf --- /dev/null +++ b/0001-fix-capture-callback-signature.patch @@ -0,0 +1,25 @@ +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 deleted file mode 100644 index 67fe30e..0000000 --- a/changelog +++ /dev/null @@ -1,76 +0,0 @@ -* 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 18c11ad..44a544d 100644 --- a/megapixels.spec +++ b/megapixels.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/megapixels-org/Megapixels -Version: 1.8.2 +Version: 1.8.3 %global tag %{version} %forgemeta @@ -11,6 +11,12 @@ License: GPL-3.0-or-later URL: %{forgeurl} Source0: %{forgesource} +# Only available on 64-bit architectures due to memory requirements +ExcludeArch: %{ix86} armv7hl + +# Patches +Patch0: 0001-fix-capture-callback-signature.patch + BuildRequires: gcc BuildRequires: meson @@ -24,11 +30,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 diff --git a/sources b/sources index 4293aa7..f272b8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Megapixels-1.8.2.tar.bz2) = cbcb76a70f153faaf5ad5cca10947243a0d9b7370ecd1e16b7690b4ee9dd59cfd96eda2cb67a52e2b719748b8e49be94dbe227ddbf6035426ca3d5f2a8212c11 +SHA512 (Megapixels-1.8.3.tar.bz2) = 3e326cf3c6a9ab49c1efab687eb769afef90518ceac12d674718424cfc1388cc677d288b8d5627b22231a4cabcb71fa80302dadff9de12eb6e4dbcc9e7830786 From 58ffeb61237d949d8ef5de733fc47b8529f139f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 20:46:38 +0000 Subject: [PATCH 6/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 5262b43aea995f018305f677f55c76d75a4ad836 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 08:08:52 +0000 Subject: [PATCH 7/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild