From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q2quh-0000AN-8Q for garchives@archives.gentoo.org; Thu, 24 Mar 2011 20:13:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EC221C065; Thu, 24 Mar 2011 20:13:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D18031C065 for ; Thu, 24 Mar 2011 20:13:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3888C1B40EB for ; Thu, 24 Mar 2011 20:13:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 925798006A for ; Thu, 24 Mar 2011 20:13:37 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] dev/mgorny:master commit in: media-video/stk11xx/files/, media-video/stk11xx/ X-VCS-Repository: dev/mgorny X-VCS-Files: media-video/stk11xx/Manifest media-video/stk11xx/files/stk11xx-2.6.37.patch media-video/stk11xx/stk11xx-9999.ebuild X-VCS-Directories: media-video/stk11xx/files/ media-video/stk11xx/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f23e033a6699b5796ea11688115e76765a966441 Date: Thu, 24 Mar 2011 20:13:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: cd9f279225a1b90375756cc7f8cc3e70 commit: f23e033a6699b5796ea11688115e76765a966441 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Thu Mar 24 20:13:35 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Thu Mar 24 20:13:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D= commit;h=3Df23e033a media-video/stk11xx: The 2.6.37 kernel patch has been applied upstream. (Portage version: 2.2.0_alpha28_p7/git/Linux x86_64, signed Manifest comm= it with key 05DE07BB) --- media-video/stk11xx/Manifest | 9 ++++----- media-video/stk11xx/files/stk11xx-2.6.37.patch | 16 ---------------- media-video/stk11xx/stk11xx-9999.ebuild | 4 ---- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/media-video/stk11xx/Manifest b/media-video/stk11xx/Manifest index 6061735..9874a77 100644 --- a/media-video/stk11xx/Manifest +++ b/media-video/stk11xx/Manifest @@ -1,13 +1,12 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 =20 -AUX stk11xx-2.6.37.patch 441 RMD160 65e53a75130414ebb1428e9ba9bb10ce15c6= 18ad SHA1 e4dcdb2a68eff161fe9720acbbbe60e29631f06e SHA256 18b3d8156e5c913= dea3505106d4be28e9d78171ebe1bb16be4f2d91bc6d0a7ae -EBUILD stk11xx-9999.ebuild 836 RMD160 bfa47c4f0876bc4580f44e1ff91d8f51ce= e8d9ba SHA1 731fa5ba17e91111dc4d6da988f61804413db36c SHA256 454f03e4e3938= e32e252258c35f1f8efe699e191377f1d717b86c1f95c05ae5a +EBUILD stk11xx-9999.ebuild 690 RMD160 7bac8cdfb51f1d4a318f6023d6e71fde4a= 28aff2 SHA1 95bdefd706e8b661bc467a56ca8696d0600c832b SHA256 dc85e3a68708c= ba3a9fa3f3221bb38bf071fd5464ecd7d690dddf4a1b1486ebb MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SH= A1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640a= cbe75500ca6067b5f565223f62fbd525bda216b972 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iEYEARECAAYFAk1MjusACgkQnGSe5QXeB7uN+gCfcFpAfyHf5wcAFwBLy/omAPPP -J7QAoJf+s7xXjKaG/CC6dWC18pipRmuq -=3D2MCw +iEYEARECAAYFAk2Lpe4ACgkQnGSe5QXeB7ub/QCg0B8fH31fT0LfCKZl8jat9PV8 +z6QAnj85DmN+3oRvVle6EUYn3YurLf4H +=3Dhq1O -----END PGP SIGNATURE----- diff --git a/media-video/stk11xx/files/stk11xx-2.6.37.patch b/media-video= /stk11xx/files/stk11xx-2.6.37.patch deleted file mode 100644 index d7a8bac..0000000 --- a/media-video/stk11xx/files/stk11xx-2.6.37.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN driver.org//stk11xx-usb.c driver/stk11xx-usb.c ---- driver.org//stk11xx-usb.c 2011-01-06 21:51:53.674999852 +0200 -+++ driver/stk11xx-usb.c 2011-01-06 21:56:44.418999851 +0200 -@@ -844,7 +844,12 @@ - } -=20 - // Init mutexes, spinlock, etc. -+ -+#ifndef init_MUTEX -+ sema_init(&dev->mutex,1); -+#else - init_MUTEX(&dev->mutex); -+#endif - mutex_init(&dev->modlock); - spin_lock_init(&dev->spinlock); - init_waitqueue_head(&dev->wait_frame); diff --git a/media-video/stk11xx/stk11xx-9999.ebuild b/media-video/stk11x= x/stk11xx-9999.ebuild index 3d79fcf..bf8bb20 100644 --- a/media-video/stk11xx/stk11xx-9999.ebuild +++ b/media-video/stk11xx/stk11xx-9999.ebuild @@ -25,10 +25,6 @@ pkg_setup() { BUILD_TARGETS=3D"${PN}.ko" BUILD_PARAMS=3D"-C ${KV_DIR} SUBDIRS=3D${S}" =20 - PATCHES=3D( - # http://sourceforge.net/tracker/index.php?func=3Ddetail&aid=3D3152597= &group_id=3D178178&atid=3D884193 - "${FILESDIR}"/${PN}-2.6.37.patch - ) MODULESD_STK11XX_DOCS=3D( README ) } =20