commit: b0c6930a65322ff75515be5b0f1362e0936ea5c9 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Fri Jul 26 20:39:12 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Fri Jul 26 20:39:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c6930a
media-tv/ivtv-utils: Fix musl by patching out bad redefine Closes: https://bugs.gentoo.org/833882 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> media-tv/ivtv-utils/files/ivtv-utils-1.4.1-redefine.patch | 12 ++++++++++++ media-tv/ivtv-utils/ivtv-utils-1.4.1-r1.ebuild | 1 + 2 files changed, 13 insertions(+) diff --git a/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-redefine.patch b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-redefine.patch new file mode 100644 index 000000000000..70a1d0ed1745 --- /dev/null +++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-redefine.patch @@ -0,0 +1,12 @@ +This is already defined in linux/fb.h, and the int type is wrong anyway. + +diff -Naur a/utils/linux/ivtvfb.h b/utils/linux/ivtvfb.h +--- a/utils/linux/ivtvfb.h 2024-07-26 21:36:14.167005194 +0100 ++++ b/utils/linux/ivtvfb.h 2024-07-26 21:36:23.785286007 +0100 +@@ -32,6 +32,5 @@ + }; + + #define IVTVFB_IOC_DMA_FRAME _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) +-#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) + + #endif diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.1-r1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.1-r1.ebuild index 14068ad3896f..804c80293f10 100644 --- a/media-tv/ivtv-utils/ivtv-utils-1.4.1-r1.ebuild +++ b/media-tv/ivtv-utils/ivtv-utils-1.4.1-r1.ebuild @@ -27,6 +27,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.4.0-gentoo.patch "${FILESDIR}"/${PN}-1.4.1-overflow.patch + "${FILESDIR}"/${PN}-1.4.1-redefine.patch ) src_configure() {
