[gentoo-commits] dev/ikelos:master commit in: app-forensics/libforensic1394/, app-forensics/libforensic1394/files/

[gentoo-commits] dev/ikelos:master commit in: app-forensics/libforensic1394/, app-forensics/libforensic1394/files/

[Mike Auty]

commit:     1f514342d275fd0b271aa56e3ab98a034088474a
Author:     Mike Auty <mike.auty <AT> gmail <DOT> com>
AuthorDate: Tue Mar 27 12:33:56 2012 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 12:33:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=1f514342

Add in exception patch for libforensic1394.

---
 app-forensics/libforensic1394/Manifest             |    3 ++-
 .../files/libforensic-exception.patch              |   15 +++++++++++++++
 .../libforensic1394/libforensic1394-0.2.ebuild     |    1 +
 3 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/app-forensics/libforensic1394/Manifest b/app-forensics/libforensic1394/Manifest
index 3360796..8d42313 100644
--- a/app-forensics/libforensic1394/Manifest
+++ b/app-forensics/libforensic1394/Manifest
@@ -1,4 +1,5 @@
+AUX libforensic-exception.patch 939 RMD160 f5ad2a27f988ed397f213d7428c5299846e72a78 SHA1 2c2117b0133c77cc2801350447fdb4ac2a3717d7 SHA256 7e99a6de02813bc62454960b9c9db963fd795ca5a9808a28d33a53840e1bf608
 AUX request-pipeline.patch 392 RMD160 67b08da7d0955fded250b84818156d8179d94844 SHA1 2b09a9ce826b13c0a46a1df0a9a5365f0a9212da SHA256 d6744177fb0db01a86c5c7d29cf569ecb7075ec93db89c3228afb82a4867205e
 DIST libforensic1394-0.2.tar.gz 59223 RMD160 3e3c6ccc7e143ac0c9fbba63e1a7eb2933404b01 SHA1 179526652977c291303e4f7edc3c7ed487eb0eca SHA256 50a82fe2899aa901104055da2ac00b4c438cf1d0d991f5ec1215d4658414652e
-EBUILD libforensic1394-0.2.ebuild 989 RMD160 61c0fc3cc3d2b0d024fd53e41ce3b10b5a089dd4 SHA1 716fb308fdd1003c835f0790b9ad524bde957c5f SHA256 47d849f13127101e64e306b48935fc08803a6e5af701cb7253a05cb8886d9ade
+EBUILD libforensic1394-0.2.ebuild 1039 RMD160 05c85ade16369a37743df4ac0642ea08a0273595 SHA1 47a42053f2eec4a24fe65a8eaadc7bcf9122f3b8 SHA256 3b4c0dd094bc8d400b8b9ddb15eb3f27a5ceb73d74eb086db908153c6c7a6ae6
 EBUILD libforensic1394-9999.ebuild 993 RMD160 d5cf7d6846af35ed268f01e25320d5f213ca82ca SHA1 f8d77db2991c2f6c54c21d15fa84dd6d716f18cd SHA256 4130e46c37701b6aa686fbb3bb8af379c3ed626d345ee9b5b0d6853fe9d363e3

diff --git a/app-forensics/libforensic1394/files/libforensic-exception.patch b/app-forensics/libforensic1394/files/libforensic-exception.patch
new file mode 100644
index 0000000..a2e2b1c
--- /dev/null
+++ b/app-forensics/libforensic1394/files/libforensic-exception.patch
@@ -0,0 +1,15 @@
+X-Git-Url: https://gitweb.freddie.witherden.org/?p=forensic1394.git;a=blobdiff_plain;f=python%2Fforensic1394%2Ffunctions.py;h=543c35c29cdd32329181c726f6df6da14fe30e7b;hp=33c58c8a74c9b33e302d25b27161180e58a1cb14;hb=b43eff4da98ce99f811c5d88d4c30d696f58bdbf;hpb=620795150ca68b03594a143968158cce6c8a6d71
+
+diff --git a/python/forensic1394/functions.py b/python/forensic1394/functions.py
+index 33c58c8..543c35c 100644
+--- a/python/forensic1394/functions.py
++++ b/python/forensic1394/functions.py
+@@ -117,7 +117,7 @@ forensic1394_read_device_v.argtypes = [devptr,
+                                        POINTER(forensic1394_req),
+                                        c_size_t]
+ forensic1394_read_device_v.restype = c_int
+-forensic1394_read_device.errcheck = process_result
++forensic1394_read_device_v.errcheck = process_result
+ 
+ # Wrap the write device function
+ # C def: forensic1394_result forensic1394_write_device(forensic1394_dev *dev,

diff --git a/app-forensics/libforensic1394/libforensic1394-0.2.ebuild b/app-forensics/libforensic1394/libforensic1394-0.2.ebuild
index 7c0f48f..66195ce 100644
--- a/app-forensics/libforensic1394/libforensic1394-0.2.ebuild
+++ b/app-forensics/libforensic1394/libforensic1394-0.2.ebuild
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	# epatch "${FILESDIR}/request-pipeline.patch"
+	epatch "${FILESDIR}/libforensic-exception.patch"
 	sed -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
 	    -i "${S}/CMakeLists.txt"
 }

[gentoo-commits] dev/ikelos:master commit in: app-forensics/libforensic1394/, app-forensics/libforensic1394/files/

[Mike Auty]

commit:     2011158249f11051047e270894089b028f2620c0
Author:     Mike Auty <mike.auty <AT> gmail <DOT> com>
AuthorDate: Mon Aug  1 11:25:20 2011 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 11:25:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=20111582

Make libforensic1394 multilib-strict compatible.

---
 app-forensics/libforensic1394/Manifest             |    6 +++---
 .../libforensic1394/files/request-pipeline.patch   |    2 +-
 .../libforensic1394/libforensic1394-0.2.ebuild     |    8 +++++---
 .../libforensic1394/libforensic1394-9999.ebuild    |    2 ++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app-forensics/libforensic1394/Manifest b/app-forensics/libforensic1394/Manifest
index 6f26418..bb227b8 100644
--- a/app-forensics/libforensic1394/Manifest
+++ b/app-forensics/libforensic1394/Manifest
@@ -1,4 +1,4 @@
-AUX request-pipeline.patch 392 RMD160 3218f6664c874bdbd67228e3e55ab3a518d1bbcb SHA1 c74abc7b0945c0c36cca5927a5cb89d4ae085836 SHA256 30ca6b557a9c222ba4ba22a707ecf18697bf6e125c2360609937cbb8e6b23434
+AUX request-pipeline.patch 392 RMD160 67b08da7d0955fded250b84818156d8179d94844 SHA1 2b09a9ce826b13c0a46a1df0a9a5365f0a9212da SHA256 d6744177fb0db01a86c5c7d29cf569ecb7075ec93db89c3228afb82a4867205e
 DIST libforensic1394-0.2.tar.gz 59223 RMD160 3e3c6ccc7e143ac0c9fbba63e1a7eb2933404b01 SHA1 179526652977c291303e4f7edc3c7ed487eb0eca SHA256 50a82fe2899aa901104055da2ac00b4c438cf1d0d991f5ec1215d4658414652e
-EBUILD libforensic1394-0.2.ebuild 903 RMD160 1f36a25a3a5f5f5c457176680489447a0ffa73ba SHA1 ca1db67d2562c97c6bb087638783104d410e81b2 SHA256 67ed11750ea27bcb5b5b34bd4f79002bc55169eed677f2a5612d8795f9b6ff0c
-EBUILD libforensic1394-9999.ebuild 907 RMD160 bb479c4484d91bf43575cd6586f9673c445d2611 SHA1 675cf8cfffc1f5040bf7bab280424b35a6aa83df SHA256 2f9262cee39638b26e7e163fe3b72ca7b34801c6c120d50410c04f32b660968b
+EBUILD libforensic1394-0.2.ebuild 989 RMD160 61c0fc3cc3d2b0d024fd53e41ce3b10b5a089dd4 SHA1 716fb308fdd1003c835f0790b9ad524bde957c5f SHA256 47d849f13127101e64e306b48935fc08803a6e5af701cb7253a05cb8886d9ade
+EBUILD libforensic1394-9999.ebuild 991 RMD160 9b142e27843ccbce076986301340c229eac2cd44 SHA1 c96e62945e878a19ba92d2e4545e51fc1f56bd18 SHA256 3a7d30c4e80ea7d5874254f529cd143d82f9b39941ad76fbf85f9e12009a8602

diff --git a/app-forensics/libforensic1394/files/request-pipeline.patch b/app-forensics/libforensic1394/files/request-pipeline.patch
index 07fa29c..9316a7c 100644
--- a/app-forensics/libforensic1394/files/request-pipeline.patch
+++ b/app-forensics/libforensic1394/files/request-pipeline.patch
@@ -7,7 +7,7 @@ index 03f014c..e7daf76 100644
   *  current kernels (at least up to 2.6.35) this is currently limited to 1.
   */
 -#define REQUEST_PIPELINE_SZ 1
-+#define REQUEST_PIPELINE_SZ 2
++#define REQUEST_PIPELINE_SZ 4
  
  struct _platform_bus
  {

diff --git a/app-forensics/libforensic1394/libforensic1394-0.2.ebuild b/app-forensics/libforensic1394/libforensic1394-0.2.ebuild
index 84206a5..7c0f48f 100644
--- a/app-forensics/libforensic1394/libforensic1394-0.2.ebuild
+++ b/app-forensics/libforensic1394/libforensic1394-0.2.ebuild
@@ -19,9 +19,11 @@ IUSE="python"
 DEPEND="python? ( dev-lang/python )"
 RDEPEND="${DEPEND}"
 
-#src_prepare() {
-#	epatch "${FILESDIR}/request-pipeline.patch"
-#}
+src_prepare() {
+	# epatch "${FILESDIR}/request-pipeline.patch"
+	sed -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
+	    -i "${S}/CMakeLists.txt"
+}
 
 src_compile() {
 	cmake-utils_src_compile

diff --git a/app-forensics/libforensic1394/libforensic1394-9999.ebuild b/app-forensics/libforensic1394/libforensic1394-9999.ebuild
index e3c8f80..5891097 100644
--- a/app-forensics/libforensic1394/libforensic1394-9999.ebuild
+++ b/app-forensics/libforensic1394/libforensic1394-9999.ebuild
@@ -21,6 +21,8 @@ DEPEND="python? ( dev-lang/python )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
+		-i "${S}/CMakeLists.txt"
 	epatch "${FILESDIR}/request-pipeline.patch"
 }