[media-tv/kdetv] Patch for new udev

4 files changed, 130 insertions, 12 deletions

diff --git a/media-tv/kdetv/ChangeLog b/media-tv/kdetv/ChangeLog
index fbc07217..84420246 100644
--- a/media-tv/kdetv/ChangeLog
+++ b/media-tv/kdetv/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for media-tv/kdetv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.44 2009/06/09 10:27:56 tampakrap Exp $
 
+*kdetv-0.8.9-r3 (27 Jul 2010)
+
+  27 Jul 2010; Serghei Amelian <serghei@gentoo.org> +kdetv-0.8.9-r3.ebuild,
+  +files/kdetv-0.8.9-fix-new-udev.patch:
+  Patch for new udev
+
   09 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org> -kdetv-0.8.9.ebuild:
   Remove old
 
diff --git a/media-tv/kdetv/Manifest b/media-tv/kdetv/Manifest
index c9da8341..7ab8bf31 100644
--- a/media-tv/kdetv/Manifest
+++ b/media-tv/kdetv/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kdetv-0.8.9-desktop-entry.diff 806 RMD160 c5cf7e852024b4880578f9120da672ee2edf2b82 SHA1 77e73f98c1c39341ee787038c1e031a52f332e85 SHA256 526f666253439bc012372b7a78961e7615ac05774e20eb9366b1824d66ba3b35
+AUX kdetv-0.8.9-fix-new-udev.patch 1794 RMD160 43fdfbd46c1e1f319099d82ee962cfd181b6d94b SHA1 dcbff6f13980ad09ad1c602b03f84ec315c8869f SHA256 357f7788d04e41ff61be4eec01e8b19a59d3836bfda654600bbe71d50e4919df
 AUX kdetv-0.8.9-xinerama.patch 1573 RMD160 eacb00a750f0d46bb28d22e258d3ce805b14196a SHA1 55f019c73ac3c5ee7347c54162e7d0e657d6af9a SHA256 5264345962d22ceb40103e66a5af84313aa8989efdcda767ffecc6fd92103154
 DIST kdetv-0.8.9.tar.bz2 1304743 RMD160 7068e483e1d5ae2e91454c60acdfbdeae018deee SHA1 321c1c4ce2772ed8602cb556eafc05ab762ea28d SHA256 c55c0187175af5686acc9f93082b08a665aec760d60ff0fa3ddd297670ad1e88
 EBUILD kdetv-0.8.9-r2.ebuild 1581 RMD160 55512603ede1552c01361bbb76174a587358b286 SHA1 db4ef6995324de369431d9351c9b6ecf7e65ea4c SHA256 ff3ab40b2c68eee9a46af93f91fe0d3dfe6cab1bbd60c4724dd10f4408226148
-MISC ChangeLog 6590 RMD160 0bdf04aea5062fdee8fa5e5e9a244e0fa2af3300 SHA1 ad223c52f94d94a457668d001da018af68d18804 SHA256 41cd6bb263c4184f0543415e4b4cd8241aa83bfa751c81933b5dd0b0c09417fa
+EBUILD kdetv-0.8.9-r3.ebuild 1620 RMD160 55169befb6793c26c626e2df1fe131943e13f30f SHA1 5f7f2cc2c8d54da517c549570fd258130b5b6b35 SHA256 80fd9fcbff1cb2d00ecc40f7d23c8d5023c36feb2d0e846c2a04c66bb0bcf36a
+MISC ChangeLog 6760 RMD160 c01e24021d6f753434a284a155bd832b036302f0 SHA1 8efc4080481781d35729c1e8e9836107d0aa7be0 SHA256 2048605dcd2b12e84f89a2ec3b9fd7960e62532daf832b0dd3b80732f0e1c73c
 MISC metadata.xml 244 RMD160 7bddb4b6683ade6b0a2d663c874ea6bf146bb3c7 SHA1 1351e9ab9d57d274c2e2f74658d2f82e60a8fe89 SHA256 74e2a4a8f201b3f16c6b991c019bf1b6e04e93a5898b001fd0a3ccf340041e57
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkouRh4ACgkQjDdoMVfcAHg3NACaA+I214XCfBpiOfVGrOa3GFDv
-FWwAnj4iMD2+V16i8Z2P/5k6yzBSdwZp
-=90G/
------END PGP SIGNATURE-----
diff --git a/media-tv/kdetv/files/kdetv-0.8.9-fix-new-udev.patch b/media-tv/kdetv/files/kdetv-0.8.9-fix-new-udev.patch
new file mode 100644
index 00000000..e8b8064c
--- /dev/null
+++ b/media-tv/kdetv/files/kdetv-0.8.9-fix-new-udev.patch
@@ -0,0 +1,54 @@
+diff -r -u kdetv-0.8.9.orig/kdetv/plugins/video/v4l/kdetv_v4l.cpp kdetv-0.8.9/kdetv/plugins/video/v4l/kdetv_v4l.cpp
+--- kdetv-0.8.9.orig/kdetv/plugins/video/v4l/kdetv_v4l.cpp	2006-07-09 21:30:49.000000000 +0300
++++ kdetv-0.8.9/kdetv/plugins/video/v4l/kdetv_v4l.cpp	2010-07-27 22:04:47.000000000 +0300
+@@ -466,22 +466,11 @@
+ 
+ int KdetvV4L::probeDevices()
+ {
+-    QString dev;
+-    struct stat sb;
+-
+-
+     // don't probe multiple times, it's unnecessary and might yield incorrect
+     // results if plugin is currently using the device
+     if (_probed) return 0;
+ 
+-    int rc = stat("/dev/v4l", &sb);
+-    if (!rc && S_ISDIR(sb.st_mode) && !access("/dev/v4l", R_OK|X_OK)) {
+-        // DEVFS
+-        dev = "/dev/v4l/video%1";
+-    } else {
+-        // Normal V4L case
+-        dev = "/dev/video%1";
+-    }
++    QString dev = "/dev/video%1";
+ 
+     _devices.clear();
+     _sources.clear();
+diff -r -u kdetv-0.8.9.orig/kdetv/plugins/video/v4l2/kdetv_v4l2.cpp kdetv-0.8.9/kdetv/plugins/video/v4l2/kdetv_v4l2.cpp
+--- kdetv-0.8.9.orig/kdetv/plugins/video/v4l2/kdetv_v4l2.cpp	2006-07-09 21:30:53.000000000 +0300
++++ kdetv-0.8.9/kdetv/plugins/video/v4l2/kdetv_v4l2.cpp	2010-07-27 22:05:08.000000000 +0300
+@@ -479,22 +479,11 @@
+ 
+ int KdetvV4L2::probeDevices()
+ {
+-    QString dev;
+-    struct stat sb;
+-
+-
+     // don't probe multiple times, it's unnecessary and might yield incorrect
+     // results if plugin is currently using the device
+     if (_probed) return 0;
+ 
+-    int rc = stat("/dev/v4l", &sb);
+-    if (!rc && S_ISDIR(sb.st_mode) && !access("/dev/v4l", R_OK|X_OK)) {
+-        // DEVFS
+-        dev = "/dev/v4l/video%1";
+-    } else {
+-        // Normal V4L2 case
+-        dev = "/dev/video%1";
+-    }
++    QString dev = "/dev/video%1";
+ 
+     _devices.clear();
+     _sources.clear();
diff --git a/media-tv/kdetv/kdetv-0.8.9-r3.ebuild b/media-tv/kdetv/kdetv-0.8.9-r3.ebuild
new file mode 100644
index 00000000..4feff594
--- /dev/null
+++ b/media-tv/kdetv/kdetv-0.8.9-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.9-r2.ebuild,v 1.4 2009/06/01 16:27:02 nixnut Exp $
+
+EAPI="2"
+
+ARTS_REQUIRED="never"
+
+LANGS="bg ca br da de cs cy el es et fi ga fr gl hu is it lt nb mt nl pa pl pt ro ru rw ta sr sv tr en_GB pt_BR zh_CN sr@Latn"
+LANGS_DOC="da et fr it nl pt ru sv"
+
+USE_KEG_PACKAGING=1
+
+inherit flag-o-matic kde
+
+DESCRIPTION="A TV application for KDE"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=11602"
+SRC_URI="http://dziegel.free.fr/releases/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="3.5"
+KEYWORDS="amd64 ppc x86"
+IUSE="lirc zvbi opengl"
+
+RDEPEND="
+	!${CATEGORY}/${PN}:0
+	zvbi? ( >=media-libs/zvbi-0.2.4 )
+	lirc? ( app-misc/lirc )
+	opengl? ( virtual/opengl x11-libs/qt[opengl] )
+	media-libs/alsa-lib
+	x11-libs/libICE
+	x11-libs/libXxf86dga
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libSM
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libXrender"
+
+DEPEND="${RDEPEND}
+	x11-proto/xf86dgaproto
+	x11-proto/videoproto
+	virtual/os-headers"
+
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/${P}-xinerama.patch"
+	"${FILESDIR}/kdetv-0.8.9-desktop-entry.diff"
+	"${FILESDIR}/${P}-fix-new-udev.patch"
+	)
+
+src_configure() {
+	local myconf="$(use_enable lirc kdetv-lirc)
+		$(use_with zvbi) $(use_with opengl gl)"
+	#Filtering the below on x86 and amd64 for bug #145754 and bug #153721
+	if [[ ( "$ARCH" == "x86" ) || ( "$ARCH" == "amd64" ) ]]; then
+		filter-flags -fforce-addr
+	fi
+	append-flags -fno-strict-aliasing
+
+	rm -f "${S}"/configure
+
+	kde_src_configure
+}