commit: e36fb57526053b522c45893f5a13a2ee4663e00e Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sat Nov 30 11:27:11 2024 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> CommitDate: Sat Nov 30 11:27:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e36fb575
media-video/megapixels: fix build with GCC 15 Closes: https://bugs.gentoo.org/932831 Closes: https://bugs.gentoo.org/945308 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> .../megapixels/files/megapixels-1.4.3-gcc15.patch | 14 ++++++++++++++ ...xels-1.4.3.ebuild => megapixels-1.4.3-r1.ebuild} | 21 +++++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/media-video/megapixels/files/megapixels-1.4.3-gcc15.patch b/media-video/megapixels/files/megapixels-1.4.3-gcc15.patch new file mode 100644 index 000000000..ca485039e --- /dev/null +++ b/media-video/megapixels/files/megapixels-1.4.3-gcc15.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/945308 +https://gitlab.com/megapixels-org/Megapixels/-/merge_requests/34 +Fix build with GCC 15. +--- a/src/process_pipeline.c ++++ b/src/process_pipeline.c +@@ -693,7 +693,7 @@ mp_process_pipeline_process_image(MPBuffer buffer) + } + + static void +-capture() ++capture(struct _MPPipeline *, const void *) + { + char template[] = "/tmp/megapixels.XXXXXX"; + char *tempdir; diff --git a/media-video/megapixels/megapixels-1.4.3.ebuild b/media-video/megapixels/megapixels-1.4.3-r1.ebuild similarity index 65% rename from media-video/megapixels/megapixels-1.4.3.ebuild rename to media-video/megapixels/megapixels-1.4.3-r1.ebuild index bd92e5ad0..5ed70ec6e 100644 --- a/media-video/megapixels/megapixels-1.4.3.ebuild +++ b/media-video/megapixels/megapixels-1.4.3-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome2-utils meson xdg -DESCRIPTION="A GTK3 camera application that knows how to deal with the media request api" +DESCRIPTION="GTK4 camera application that knows how to deal with the media request api" HOMEPAGE="https://git.sr.ht/~martijnbraam/megapixels"; SRC_URI="https://gitlab.com/postmarketOS/megapixels/-/archive/${PV}/${P}.tar.bz2"; @@ -14,17 +14,22 @@ SLOT="0" KEYWORDS="~amd64 ~arm64" DEPEND=" - gui-libs/gtk - x11-libs/gtk+:3 - media-libs/tiff + dev-libs/glib:2 + gui-libs/gtk:4 media-gfx/zbar media-libs/libepoxy - media-libs/libraw + media-libs/tiff:= +" +RDEPEND=" + ${DEPEND} media-gfx/dcraw media-gfx/imagemagick " -RDEPEND="${DEPEND}" +PATCHES=( + # bug #945308 + "${FILESDIR}/${P}-gcc15.patch" +) pkg_postinst() { xdg_pkg_postinst
