gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 16 insertions, 51 deletions

diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest
index 73152c10976d..b652f7369ecc 100644
--- a/media-tv/ivtv-utils/Manifest
+++ b/media-tv/ivtv-utils/Manifest
@@ -1,6 +1,6 @@
 AUX ivtv-utils-1.4.0-gentoo.patch 2423 BLAKE2B cf0cb7fb1ea7c0d9cd62b6d2fce3e342b45b835b1d27708f431fcc371e5f7763d4fcc3809d3e775a6d6a9b08077825ea5786f948c480e72931e2e7db2339abb0 SHA512 1737dc876704775dbcd361af38dce65711215a25c3e7b5c0f4f447518d9752b3488df308ef82693ce2c7471600527d49c374209bee02e1686575d15cf3ac06cd
 AUX ivtv-utils-1.4.1-overflow.patch 1774 BLAKE2B 7ec6fe101125f367a90f54b771f9ac6bd2179e94986115177e34d2fc294cffd9d893b9aeb15e629f1990c99c5d7d3d6d5b4189d3dac8cc24f572b2b2bab91796 SHA512 5c19bc5420f0e7f1f501b0e117fdd3108799607f380bc8609ccd9126eb6fade4da21a41918f88613127969afd6712ab19bcb2dbc295d93454f5da918609c66eb
+AUX ivtv-utils-1.4.1-redefine.patch 434 BLAKE2B 00fd6a71cd9567116388daae634c3da9c57a5b69b3544a4f4faf2dee0dca974ea06ae49eea9a50e773a68d6269a333406b4b63ceed90915deef06527df5df8b1 SHA512 41caddff5d1c06e3717b07134d7d8935587fd93ab715fc2676c039af4971c67ba7663634d52c5e7db6bdc9e7dfd3639f749ddf8c64650114b1f8d1272421398e
 DIST ivtv-utils-1.4.1.tar.gz 189918 BLAKE2B 7880b532ffb3a1ffa13c38b74b57f82a199486ba5bc8e310cb5447ad78d05a0380b51070a0dc67e4f1120d49c8c7d9a2b829e3922585484906efccc4f2b96fb5 SHA512 719c922fb819ba7f0ca3d4bbede571c416dc9f282bd8a7e2fbe7d9b4298541a104f8a848e113379eeec052206658b7a0a2e0eea1b7917e90f2aee37fe0010bed
-EBUILD ivtv-utils-1.4.1-r1.ebuild 940 BLAKE2B f1288ce5f18923e5f4750d6c72469477c2cebcca6a32556443d436b5af10f215e8fb5a790b903534648a62f80010d4b077e8317894196205c3a956ec95a418bc SHA512 e2cfd9b23f72d6b065c6afe19d559a374228e06b746652c2709b76d4849bc1200288042c2a5b9e4a0b58c0b12891b7172001aa4260e06368e4a2236c475a3137
-EBUILD ivtv-utils-1.4.1.ebuild 962 BLAKE2B 2862aedc8eecbdefbf652432f2c158bcc3b8581912edb3022fabc494ad3f7bae179247714f085a6295d4ab810e65e47a4a1b5454a1c41dd6cf8a219be4f44244 SHA512 101e2f791b4505ff6ce67cad51c41add877fd4428169bdeaa10493045fa2852189aa66cbfca48e048a62b274364dcee44e812ddd7b9ec173bd812b050a52fbf5
+EBUILD ivtv-utils-1.4.1-r1.ebuild 980 BLAKE2B b6454699c9025cf08d35301fb7447286fc39be8b6847f8e2a4e899d3eda5acd0934e67b60407d344fcfb1134ac61d810efda1e523052968bdc4fd29bfb05f8f4 SHA512 f68e1593924bcd48e8dc7efd36d06a02875914cd6576c47b713b819bb0cf77e75bd9d7672b261e39fb0502bc0cddfc741f1b544fcf1aaaf1d82d19140104edde
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
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..d1f7bc8fbbe3 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
@@ -11,7 +11,7 @@ SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/$(ver_cut 1-2).x/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="perl"
 
 RDEPEND="
@@ -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() {
diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
deleted file mode 100644
index 57a6fc766ab5..000000000000
--- a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="IVTV utilities for Hauppauge PVR PCI cards"
-HOMEPAGE="http://www.ivtvdriver.org/"
-SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/$(ver_cut 1-2).x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="perl"
-
-DEPEND="!media-tv/ivtv"
-RDEPEND="${DEPEND}
-	media-tv/v4l-utils
-	perl? (
-		dev-perl/Video-Frequencies
-		dev-perl/Video-ivtv
-		dev-perl/Config-IniFiles
-		dev-perl/Tk
-		virtual/perl-Getopt-Long
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-gentoo.patch
-	"${FILESDIR}"/${PN}-1.4.1-overflow.patch
-)
-
-src_configure() {
-	tc-export CC CXX
-
-	# bug 907679
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc -r ChangeLog README doc/.
-
-	if use perl; then
-		dobin utils/perl/*.pl
-		dodoc utils/perl/README.ptune
-	fi
-}