Gentoo Archives: gentoo-commits

From: Mike Auty <ikelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/ikelos:master commit in: app-forensics/libforensic1394/, app-forensics/libforensic1394/files/
Date: Mon, 01 Aug 2011 11:26:26
Message-Id: 2011158249f11051047e270894089b028f2620c0.ikelos@gentoo
1 commit: 2011158249f11051047e270894089b028f2620c0
2 Author: Mike Auty <mike.auty <AT> gmail <DOT> com>
3 AuthorDate: Mon Aug 1 11:25:20 2011 +0000
4 Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 1 11:25:20 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=20111582
7
8 Make libforensic1394 multilib-strict compatible.
9
10 ---
11 app-forensics/libforensic1394/Manifest | 6 +++---
12 .../libforensic1394/files/request-pipeline.patch | 2 +-
13 .../libforensic1394/libforensic1394-0.2.ebuild | 8 +++++---
14 .../libforensic1394/libforensic1394-9999.ebuild | 2 ++
15 4 files changed, 11 insertions(+), 7 deletions(-)
16
17 diff --git a/app-forensics/libforensic1394/Manifest b/app-forensics/libforensic1394/Manifest
18 index 6f26418..bb227b8 100644
19 --- a/app-forensics/libforensic1394/Manifest
20 +++ b/app-forensics/libforensic1394/Manifest
21 @@ -1,4 +1,4 @@
22 -AUX request-pipeline.patch 392 RMD160 3218f6664c874bdbd67228e3e55ab3a518d1bbcb SHA1 c74abc7b0945c0c36cca5927a5cb89d4ae085836 SHA256 30ca6b557a9c222ba4ba22a707ecf18697bf6e125c2360609937cbb8e6b23434
23 +AUX request-pipeline.patch 392 RMD160 67b08da7d0955fded250b84818156d8179d94844 SHA1 2b09a9ce826b13c0a46a1df0a9a5365f0a9212da SHA256 d6744177fb0db01a86c5c7d29cf569ecb7075ec93db89c3228afb82a4867205e
24 DIST libforensic1394-0.2.tar.gz 59223 RMD160 3e3c6ccc7e143ac0c9fbba63e1a7eb2933404b01 SHA1 179526652977c291303e4f7edc3c7ed487eb0eca SHA256 50a82fe2899aa901104055da2ac00b4c438cf1d0d991f5ec1215d4658414652e
25 -EBUILD libforensic1394-0.2.ebuild 903 RMD160 1f36a25a3a5f5f5c457176680489447a0ffa73ba SHA1 ca1db67d2562c97c6bb087638783104d410e81b2 SHA256 67ed11750ea27bcb5b5b34bd4f79002bc55169eed677f2a5612d8795f9b6ff0c
26 -EBUILD libforensic1394-9999.ebuild 907 RMD160 bb479c4484d91bf43575cd6586f9673c445d2611 SHA1 675cf8cfffc1f5040bf7bab280424b35a6aa83df SHA256 2f9262cee39638b26e7e163fe3b72ca7b34801c6c120d50410c04f32b660968b
27 +EBUILD libforensic1394-0.2.ebuild 989 RMD160 61c0fc3cc3d2b0d024fd53e41ce3b10b5a089dd4 SHA1 716fb308fdd1003c835f0790b9ad524bde957c5f SHA256 47d849f13127101e64e306b48935fc08803a6e5af701cb7253a05cb8886d9ade
28 +EBUILD libforensic1394-9999.ebuild 991 RMD160 9b142e27843ccbce076986301340c229eac2cd44 SHA1 c96e62945e878a19ba92d2e4545e51fc1f56bd18 SHA256 3a7d30c4e80ea7d5874254f529cd143d82f9b39941ad76fbf85f9e12009a8602
29
30 diff --git a/app-forensics/libforensic1394/files/request-pipeline.patch b/app-forensics/libforensic1394/files/request-pipeline.patch
31 index 07fa29c..9316a7c 100644
32 --- a/app-forensics/libforensic1394/files/request-pipeline.patch
33 +++ b/app-forensics/libforensic1394/files/request-pipeline.patch
34 @@ -7,7 +7,7 @@ index 03f014c..e7daf76 100644
35 * current kernels (at least up to 2.6.35) this is currently limited to 1.
36 */
37 -#define REQUEST_PIPELINE_SZ 1
38 -+#define REQUEST_PIPELINE_SZ 2
39 ++#define REQUEST_PIPELINE_SZ 4
40
41 struct _platform_bus
42 {
43
44 diff --git a/app-forensics/libforensic1394/libforensic1394-0.2.ebuild b/app-forensics/libforensic1394/libforensic1394-0.2.ebuild
45 index 84206a5..7c0f48f 100644
46 --- a/app-forensics/libforensic1394/libforensic1394-0.2.ebuild
47 +++ b/app-forensics/libforensic1394/libforensic1394-0.2.ebuild
48 @@ -19,9 +19,11 @@ IUSE="python"
49 DEPEND="python? ( dev-lang/python )"
50 RDEPEND="${DEPEND}"
51
52 -#src_prepare() {
53 -# epatch "${FILESDIR}/request-pipeline.patch"
54 -#}
55 +src_prepare() {
56 + # epatch "${FILESDIR}/request-pipeline.patch"
57 + sed -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
58 + -i "${S}/CMakeLists.txt"
59 +}
60
61 src_compile() {
62 cmake-utils_src_compile
63
64 diff --git a/app-forensics/libforensic1394/libforensic1394-9999.ebuild b/app-forensics/libforensic1394/libforensic1394-9999.ebuild
65 index e3c8f80..5891097 100644
66 --- a/app-forensics/libforensic1394/libforensic1394-9999.ebuild
67 +++ b/app-forensics/libforensic1394/libforensic1394-9999.ebuild
68 @@ -21,6 +21,8 @@ DEPEND="python? ( dev-lang/python )"
69 RDEPEND="${DEPEND}"
70
71 src_prepare() {
72 + sed -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
73 + -i "${S}/CMakeLists.txt"
74 epatch "${FILESDIR}/request-pipeline.patch"
75 }