Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/mgorny:master commit in: media-video/stk11xx/files/, media-video/stk11xx/
Date: Fri, 04 Feb 2011 23:43:29
Message-Id: 74c7885eeb2081287905702627e8f6af65780cd2.mgorny@gentoo
1 commit: 74c7885eeb2081287905702627e8f6af65780cd2
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 4 23:42:36 2011 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 4 23:42:36 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=74c7885e
7
8 media-video/stk11xx: Add a patch to fix building against 2.6.37 kernel.
9
10 (Portage version: 2.2.0_alpha19_p84/git/Linux x86_64, signed Manifest commit with key 05DE07BB)
11
12 ---
13 media-video/stk11xx/Manifest | 11 ++++++-----
14 media-video/stk11xx/files/stk11xx-2.6.37.patch | 16 ++++++++++++++++
15 media-video/stk11xx/stk11xx-9999.ebuild | 6 +++++-
16 3 files changed, 27 insertions(+), 6 deletions(-)
17
18 diff --git a/media-video/stk11xx/Manifest b/media-video/stk11xx/Manifest
19 index c5cfbe1..6061735 100644
20 --- a/media-video/stk11xx/Manifest
21 +++ b/media-video/stk11xx/Manifest
22 @@ -1,12 +1,13 @@
23 -----BEGIN PGP SIGNED MESSAGE-----
24 Hash: SHA1
25
26 -EBUILD stk11xx-9999.ebuild 690 RMD160 e364c019bc89b217e6ddd585c9277ca88c533e77 SHA1 03fbbadc9d1b42b5f5115651197aa01f5adadbcc SHA256 b3047d95e4534f09d0402a52ed05123c375dbc68c4c3dc4c1b6c4ff47c3a9dfc
27 +AUX stk11xx-2.6.37.patch 441 RMD160 65e53a75130414ebb1428e9ba9bb10ce15c618ad SHA1 e4dcdb2a68eff161fe9720acbbbe60e29631f06e SHA256 18b3d8156e5c913dea3505106d4be28e9d78171ebe1bb16be4f2d91bc6d0a7ae
28 +EBUILD stk11xx-9999.ebuild 836 RMD160 bfa47c4f0876bc4580f44e1ff91d8f51cee8d9ba SHA1 731fa5ba17e91111dc4d6da988f61804413db36c SHA256 454f03e4e3938e32e252258c35f1f8efe699e191377f1d717b86c1f95c05ae5a
29 MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SHA1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640acbe75500ca6067b5f565223f62fbd525bda216b972
30 -----BEGIN PGP SIGNATURE-----
31 -Version: GnuPG v2.0.16 (GNU/Linux)
32 +Version: GnuPG v2.0.17 (GNU/Linux)
33
34 -iEYEARECAAYFAkzMRNEACgkQnGSe5QXeB7tmkgCglSDpqFfwI8+SABA1PMFDjtS8
35 -+XwAoK1dF3NxqylknDK4EO1IMlXC/Odz
36 -=tiGt
37 +iEYEARECAAYFAk1MjusACgkQnGSe5QXeB7uN+gCfcFpAfyHf5wcAFwBLy/omAPPP
38 +J7QAoJf+s7xXjKaG/CC6dWC18pipRmuq
39 +=2MCw
40 -----END PGP SIGNATURE-----
41
42 diff --git a/media-video/stk11xx/files/stk11xx-2.6.37.patch b/media-video/stk11xx/files/stk11xx-2.6.37.patch
43 new file mode 100644
44 index 0000000..d7a8bac
45 --- /dev/null
46 +++ b/media-video/stk11xx/files/stk11xx-2.6.37.patch
47 @@ -0,0 +1,16 @@
48 +diff -ruN driver.org//stk11xx-usb.c driver/stk11xx-usb.c
49 +--- driver.org//stk11xx-usb.c 2011-01-06 21:51:53.674999852 +0200
50 ++++ driver/stk11xx-usb.c 2011-01-06 21:56:44.418999851 +0200
51 +@@ -844,7 +844,12 @@
52 + }
53 +
54 + // Init mutexes, spinlock, etc.
55 ++
56 ++#ifndef init_MUTEX
57 ++ sema_init(&dev->mutex,1);
58 ++#else
59 + init_MUTEX(&dev->mutex);
60 ++#endif
61 + mutex_init(&dev->modlock);
62 + spin_lock_init(&dev->spinlock);
63 + init_waitqueue_head(&dev->wait_frame);
64
65 diff --git a/media-video/stk11xx/stk11xx-9999.ebuild b/media-video/stk11xx/stk11xx-9999.ebuild
66 index e0d2222..3d79fcf 100644
67 --- a/media-video/stk11xx/stk11xx-9999.ebuild
68 +++ b/media-video/stk11xx/stk11xx-9999.ebuild
69 @@ -1,4 +1,4 @@
70 -# Copyright 1999-2010 Gentoo Foundation
71 +# Copyright 1999-2011 Gentoo Foundation
72 # Distributed under the terms of the GNU General Public License v2
73 # $Header: $
74
75 @@ -25,6 +25,10 @@ pkg_setup() {
76 BUILD_TARGETS="${PN}.ko"
77 BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S}"
78
79 + PATCHES=(
80 + # http://sourceforge.net/tracker/index.php?func=detail&aid=3152597&group_id=178178&atid=884193
81 + "${FILESDIR}"/${PN}-2.6.37.patch
82 + )
83 MODULESD_STK11XX_DOCS=( README )
84 }