diff --git a/.gitignore b/.gitignore index b1ecfcb..9effdc4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,3 @@ /megapixels-1.5.1.tar.gz /megapixels-1.5.2.tar.gz /megapixels-1.6.0.tar.gz -/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/megapixels.spec b/megapixels.spec index 44a544d..67d2dd9 100644 --- a/megapixels.spec +++ b/megapixels.spec @@ -1,51 +1,43 @@ -%global forgeurl https://gitlab.com/megapixels-org/Megapixels -Version: 1.8.3 -%global tag %{version} -%forgemeta +Name: megapixels +Version: 1.6.0 +Release: 2%{?dist} +Summary: GTK4 camera application that knows how to deal with the media request api -Name: megapixels -Release: %autorelease -Summary: GTK4 camera application that knows how to deal with the media request api +License: GPLv3+ +URL: https://gitlab.com/postmarketOS/megapixels +Source0: https://gitlab.com/postmarketOS/megapixels/-/archive/%{version}/megapixels-%{version}.tar.gz +Source1: post_install.py -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 +Patch0: 0000-patch-build-gschemas.patch BuildRequires: gcc BuildRequires: meson +BuildRequires: cmake -BuildRequires: pkgconfig(gtk4) -BuildRequires: pkgconfig(libfeedback-0.0) +BuildRequires: pkgconfig(gio-2.0) >= 2.50.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.62.0 +BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(zbar) -BuildRequires: pkgconfig(epoxy) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xrandr) -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(epoxy) +BuildRequires: pkgconfig(libfeedback-0.0) +BuildRequires: inih-devel +BuildRequires: zbar-devel +BuildRequires: /usr/bin/xvfb-run +BuildRequires: /usr/bin/xauth +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib -BuildRequires: /usr/bin/xvfb-run -BuildRequires: /usr/bin/xauth - -BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib - -Requires: hicolor-icon-theme +Requires: hicolor-icon-theme # for postprocess.sh -Requires: dcraw +Requires: dcraw + %description -A GTK4 camera application that knows how to deal with the media request api. -It uses opengl to debayer the raw sensor data for the preview. +A GTK4 camera application that knows how to deal with the media request api. It uses opengl to debayer the raw sensor data for the preview. %prep -%forgeautosetup -p1 +%autosetup -p1 -n %{name}-%{version} +cp %{SOURCE1} . %build %meson @@ -54,25 +46,103 @@ It uses opengl to debayer the raw sensor data for the preview. %install %meson_install + %check -desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.postmarketos.Megapixels.metainfo.xml + +desktop-file-validate %{buildroot}/%{_datadir}/applications/org.postmarketos.Megapixels.desktop + +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/postprocess.sh %{_datadir}/metainfo/org.postmarketos.Megapixels.metainfo.xml %{_datadir}/glib-2.0/schemas/org.postmarketos.Megapixels.gschema.xml +%doc README.md +%license LICENSE + + %changelog -%autochangelog +* 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/packit.yaml b/packit.yaml deleted file mode 100644 index 8117a2d..0000000 --- a/packit.yaml +++ /dev/null @@ -1,20 +0,0 @@ -upstream_project_url: https://gitlab.com/megapixels-org/Megapixels - -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-rawhide - - - job: koji_build - trigger: commit - allowed_pr_authors: ["packit", "topazus"] - allowed_committers: ["packit", "topazus"] - dist_git_branches: - - fedora-all - - - job: bodhi_update - trigger: commit - allowed_builders: ["packit", "topazus"] - dist_git_branches: - - fedora-branched diff --git a/sources b/sources index f272b8b..ad3f519 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Megapixels-1.8.3.tar.bz2) = 3e326cf3c6a9ab49c1efab687eb769afef90518ceac12d674718424cfc1388cc677d288b8d5627b22231a4cabcb71fa80302dadff9de12eb6e4dbcc9e7830786 +SHA512 (megapixels-1.6.0.tar.gz) = 6711383c91c4d02363f8dc8580940436bb37637b56d8bb905d597df2ed98ed15be32b7d63666bb33b290ddfdda891dbc277c15a2e71aad9f2daa0c2d705b293a