Compare commits
No commits in common. "rawhide" and "f36" have entirely different histories.
6 changed files with 112 additions and 111 deletions
8
.gitignore
vendored
8
.gitignore
vendored
|
|
@ -10,11 +10,3 @@
|
|||
/megapixels-1.4.0.tar.gz
|
||||
/megapixels-1.4.2.tar.gz
|
||||
/megapixels-1.4.3.tar.gz
|
||||
/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
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/data/meson.build b/data/meson.build
|
||||
index c16f78b..ad77cef 100644
|
||||
index c16f78b..ca932cc 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -14,7 +14,7 @@ install_data(['postprocess.sh'],
|
||||
@@ -14,7 +14,8 @@ install_data(['postprocess.sh'],
|
||||
install_dir: get_option('datadir') / 'megapixels/',
|
||||
install_mode: 'rwxr-xr-x')
|
||||
|
||||
|
|
@ -10,20 +10,21 @@ index c16f78b..ad77cef 100644
|
|||
-schemas_dir = get_option('datadir') / 'glib-2.0' / 'schemas'
|
||||
-install_data(settings_schemas, install_dir: schemas_dir)
|
||||
-gnome.compile_schemas(depend_files: files(settings_schemas))
|
||||
+install_data(
|
||||
+ 'org.postmarketos.Megapixels.gschema.xml',
|
||||
+ install_dir: join_paths (get_option('datadir'), 'glib-2.0', 'schemas')
|
||||
+install_data(
|
||||
+ 'org.postmarketos.Megapixels.gschema.xml',
|
||||
+ install_dir: join_paths (get_option('datadir'), 'glib-2.0', 'schemas')
|
||||
+)
|
||||
+
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 626adad..bca4093 100644
|
||||
index 15b968c..485dff3 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -54,6 +54,8 @@ executable('megapixels',
|
||||
install: true,
|
||||
link_args: '-Wl,-ldl')
|
||||
@@ -78,6 +78,8 @@ executable('megapixels-camera-test',
|
||||
dependencies: [gtkdep],
|
||||
install: true)
|
||||
|
||||
+meson.add_install_script('post_install.py')
|
||||
+
|
||||
install_data(
|
||||
[
|
||||
'config/pine64,pinephone-1.0.ini',
|
||||
# Formatting
|
||||
clang_format = find_program('clang-format-12', required: false)
|
||||
if clang_format.found()
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
From 57244c666e622c01f1e22603da467856d36c50a2 Mon Sep 17 00:00:00 2001
|
||||
From: Sandipan Roy <sandipan@redhat.com>
|
||||
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
|
||||
|
||||
141
megapixels.spec
141
megapixels.spec
|
|
@ -1,51 +1,42 @@
|
|||
%global forgeurl https://gitlab.com/megapixels-org/Megapixels
|
||||
Version: 1.8.3
|
||||
%global tag %{version}
|
||||
%forgemeta
|
||||
Name: megapixels
|
||||
Version: 1.4.3
|
||||
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: 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 +45,87 @@ 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/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 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Dec 13 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 1.4.3-1
|
||||
- Update to 1.4.3
|
||||
|
||||
* Mon Dec 06 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 1.4.2-1
|
||||
- Update to 1.4.2
|
||||
|
||||
* Fri Nov 12 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 1.4.0-1
|
||||
- Update to 1.4.0
|
||||
|
||||
* Fri Sep 10 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 1.3.0-1
|
||||
- Update to 1.3.0
|
||||
|
||||
* Fri Jul 30 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 1.2.0-1
|
||||
- Update to 1.2.0
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jun 23 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 1.1.0-1
|
||||
- Update to 1.1.0
|
||||
|
||||
* Tue May 04 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 1.0.1-1
|
||||
- Update to 1.0.1
|
||||
|
||||
* Mon Mar 29 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 0.16.0-1
|
||||
- Update to 0.16.0
|
||||
|
||||
* Sun Feb 21 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 0.15.0-1
|
||||
- Update to 0.15.0
|
||||
|
||||
* Mon Jan 11 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 0.14.0-1
|
||||
- Update to 0.14.0
|
||||
|
||||
* Fri Jan 01 2021 Torrey Sorensen <torbuntu@fedoraproject.org> - 0.13.2-1
|
||||
- Update to 0.13.2
|
||||
|
||||
* Tue Dec 15 2020 Torrey Sorensen <torbuntu@fedoraproject.org> - 0.13.1-2
|
||||
- Adding license and README
|
||||
|
||||
* Thu Dec 10 2020 Torrey Sorensen <torbuntu@fedoraproject.org> - 0.13.1-1
|
||||
- Update to 0.13.1
|
||||
|
||||
* Thu Dec 03 2020 Torrey Sorensen <torbuntu@fedoraproject.org> - 0.12.0-2
|
||||
- Adding dependencies for postprocess.sh
|
||||
|
||||
* Sat Nov 14 2020 Torrey Sorensen <torbuntu@fedoraproject.org> - 0.12.0-1
|
||||
- Initial packaging
|
||||
|
||||
|
|
|
|||
20
packit.yaml
20
packit.yaml
|
|
@ -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
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (Megapixels-1.8.3.tar.bz2) = 3e326cf3c6a9ab49c1efab687eb769afef90518ceac12d674718424cfc1388cc677d288b8d5627b22231a4cabcb71fa80302dadff9de12eb6e4dbcc9e7830786
|
||||
SHA512 (megapixels-1.4.3.tar.gz) = 71c6e93cf212a5927a56b2b71847331c476c5e778f628e644100a759985b3575ffe5dec24f63ac2254c6bcc4b2e211fc6dfd9efb2e7190e4896e652e001bb25b
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue