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 1PlVJJ-0002AV-1e for garchives@archives.gentoo.org; Fri, 04 Feb 2011 23:43:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 618BFE0671; Fri, 4 Feb 2011 23:43:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1B58BE0671 for ; Fri, 4 Feb 2011 23:43:21 +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 887271B40C6 for ; Fri, 4 Feb 2011 23:43:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EC5008006A for ; Fri, 4 Feb 2011 23:43:19 +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: <74c7885eeb2081287905702627e8f6af65780cd2.mgorny@gentoo> 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: 74c7885eeb2081287905702627e8f6af65780cd2 Date: Fri, 4 Feb 2011 23:43:19 +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: dd0f5b463dbf3982081be4abc1015425 commit: 74c7885eeb2081287905702627e8f6af65780cd2 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Feb 4 23:42:36 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Feb 4 23:42:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D= commit;h=3D74c7885e media-video/stk11xx: Add a patch to fix building against 2.6.37 kernel. (Portage version: 2.2.0_alpha19_p84/git/Linux x86_64, signed Manifest com= mit with key 05DE07BB) --- media-video/stk11xx/Manifest | 11 ++++++----- media-video/stk11xx/files/stk11xx-2.6.37.patch | 16 ++++++++++++++++ media-video/stk11xx/stk11xx-9999.ebuild | 6 +++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/media-video/stk11xx/Manifest b/media-video/stk11xx/Manifest index c5cfbe1..6061735 100644 --- a/media-video/stk11xx/Manifest +++ b/media-video/stk11xx/Manifest @@ -1,12 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 =20 -EBUILD stk11xx-9999.ebuild 690 RMD160 e364c019bc89b217e6ddd585c9277ca88c= 533e77 SHA1 03fbbadc9d1b42b5f5115651197aa01f5adadbcc SHA256 b3047d95e4534= f09d0402a52ed05123c375dbc68c4c3dc4c1b6c4ff47c3a9dfc +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 MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SH= A1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640a= cbe75500ca6067b5f565223f62fbd525bda216b972 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) =20 -iEYEARECAAYFAkzMRNEACgkQnGSe5QXeB7tmkgCglSDpqFfwI8+SABA1PMFDjtS8 -+XwAoK1dF3NxqylknDK4EO1IMlXC/Odz -=3DtiGt +iEYEARECAAYFAk1MjusACgkQnGSe5QXeB7uN+gCfcFpAfyHf5wcAFwBLy/omAPPP +J7QAoJf+s7xXjKaG/CC6dWC18pipRmuq +=3D2MCw -----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 new file mode 100644 index 0000000..d7a8bac --- /dev/null +++ b/media-video/stk11xx/files/stk11xx-2.6.37.patch @@ -0,0 +1,16 @@ +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 e0d2222..3d79fcf 100644 --- a/media-video/stk11xx/stk11xx-9999.ebuild +++ b/media-video/stk11xx/stk11xx-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -25,6 +25,10 @@ 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