Add patch to build with last version of libcdio. Closes bug #128206.

Package-Manager: portage-2.1_pre7-r3

4 files changed, 53 insertions, 11 deletions

diff --git a/app-cdr/kiso/ChangeLog b/app-cdr/kiso/ChangeLog
index 31dd6f13c328..8b06f8807446 100644
--- a/app-cdr/kiso/ChangeLog
+++ b/app-cdr/kiso/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/kiso
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kiso/ChangeLog,v 1.29 2006/03/19 21:41:17 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kiso/ChangeLog,v 1.30 2006/03/31 21:45:12 flameeyes Exp $
+
+  31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kiso-0.8.3-libcdio-077.patch, kiso-0.8.3.ebuild:
+  Add patch to build with last version of libcdio. Closes bug #128206.
 
   19 Mar 2006; Luis Medinas <metalgod@gentoo.org> kiso-0.8.3.ebuild:
   Stable on amd64. Bug #124068.
diff --git a/app-cdr/kiso/Manifest b/app-cdr/kiso/Manifest
index 92d24ce2876f..509dbdb736e2 100644
--- a/app-cdr/kiso/Manifest
+++ b/app-cdr/kiso/Manifest
@@ -1,28 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ad31785e3a2ee01c93f574f3184a1cdb ChangeLog 3321
-RMD160 ddb3780807d26b10da2176f7346cf68ce18deca9 ChangeLog 3321
-SHA256 77df80e2518a6a46c74e1e19914731255e921507a0f46b81faafeb12392c5355 ChangeLog 3321
+MD5 9b252e9ac16fb59aac6e4e31aa828cbc ChangeLog 3505
+RMD160 097f2be4c62e8fcde8b314cb2dba78ca0494b7c2 ChangeLog 3505
+SHA256 9d77deb39587463317c9f80c682108f1eb740882a6bfe50bc9e517752ab3e421 ChangeLog 3505
 MD5 b8d39b20e3fe608fc79e75c9da09b275 files/digest-kiso-0.8.2c 65
 RMD160 5fad54edbce8de2b19bd9eb1a0be2a5667736f21 files/digest-kiso-0.8.2c 65
 SHA256 8f003f0ba95f25ae08abec6e688e07813c708e132b588dec4ac5e074ea838eb2 files/digest-kiso-0.8.2c 65
 MD5 8a290422f225f3458b9a21aab377bd2b files/digest-kiso-0.8.3 63
 RMD160 325bc22b54f6600030848591232b315d44ffd26f files/digest-kiso-0.8.3 63
 SHA256 9779a3f981a970f44d13b4480e0f789d7a334fcb2fe4ee46cc56661cd7988f69 files/digest-kiso-0.8.3 63
+MD5 e6de467b2edf75e7dba24ff06735209e files/kiso-0.8.3-libcdio-077.patch 1017
+RMD160 bfc77ba71357ee24d24d92a04c79ef34c69c4c45 files/kiso-0.8.3-libcdio-077.patch 1017
+SHA256 db80ccf745864b4277f6e2cbd484cfb079dd5fcc527083c045b898cc8f3fe315 files/kiso-0.8.3-libcdio-077.patch 1017
 MD5 8ee1b37cc4a6c7e8c3fc6ffac7b2c41f kiso-0.8.2c.ebuild 918
 RMD160 5c04d75904d28f83ef2e5c02435262182e519fcd kiso-0.8.2c.ebuild 918
 SHA256 4e6f41a4251958191ae20e60cab48b85bdb7b9641d4a86c0bf152d8ebbb0e494 kiso-0.8.2c.ebuild 918
-MD5 5d1e09966e3a03b1068d0af659dca283 kiso-0.8.3.ebuild 915
-RMD160 765e7958389c5a9fbc9fe7013542f2ed2f313fed kiso-0.8.3.ebuild 915
-SHA256 71ee13c33fd2d9cc378d82226fc4a5698c2781693ee27c68a0aeac0fa84ec7d9 kiso-0.8.3.ebuild 915
+MD5 a3961670de59ea1c3962d8dee212ecbb kiso-0.8.3.ebuild 962
+RMD160 4a3f1072390c0831fb549860fd882153eed9a221 kiso-0.8.3.ebuild 962
+SHA256 432fd0ded0b02390af58a844a6c1bb5b7457000e2b747a3342888dc40a55620e kiso-0.8.3.ebuild 962
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEHc/6wUpWvClEHQoRAuUNAJ4qO662LVRe8KIJA9LVO48k0tR/nACcCZB3
-AkWodLeVB9s7d0PP4Z03HsI=
-=/yEI
+iD8DBQFELaMPAiZjviIA2XgRAjUPAKCrM/dEJl5VVMqSVJk1mPliYaIqhQCgsHsy
+rOZGi+IqJ8TCGeo8UHxqEso=
+=VkYV
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/kiso/files/kiso-0.8.3-libcdio-077.patch b/app-cdr/kiso/files/kiso-0.8.3-libcdio-077.patch
new file mode 100644
index 000000000000..0d0467720c84
--- /dev/null
+++ b/app-cdr/kiso/files/kiso-0.8.3-libcdio-077.patch
@@ -0,0 +1,33 @@
+Index: kiso-0.8.3/src/kiso.cpp
+===================================================================
+--- kiso-0.8.3.orig/src/kiso.cpp
++++ kiso-0.8.3/src/kiso.cpp
+@@ -43,6 +43,11 @@
+ 
+ #define DEFAULT_TIMEOUT_MS 10000
+ 
++#if LIBCDIO_VERSION_NUM < 77
++#define mmc_csb_t scsi_mmc_t
++#define mmc_run_cmd scsi_run_cmd
++#endif
++
+ static const char* const image2_data[] = { 
+ "32 32 41 1",
+ ". c None",
+@@ -3591,14 +3596,14 @@ void Mainform::showdrive()
+ 
+     int i_status; 
+     uint8_t buf[500] = { 0, };
+-    scsi_mmc_cdb_t cdb = {{0, }};
++    mmc_cdb_t cdb = {{0, }};
+ 
+     CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION);
+     CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf));
+     cdb.field[1] = CDIO_MMC_GET_CONF_ALL_FEATURES;
+     cdb.field[3] = 0x0;
+ 
+-    i_status = scsi_mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf), &buf);
++    i_status = mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf), &buf);
+     if (i_status == 0) {
+       uint8_t *p;
+       uint32_t i_data;
diff --git a/app-cdr/kiso/kiso-0.8.3.ebuild b/app-cdr/kiso/kiso-0.8.3.ebuild
index d1cbd48b3005..38e8877b1bc7 100644
--- a/app-cdr/kiso/kiso-0.8.3.ebuild
+++ b/app-cdr/kiso/kiso-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kiso/kiso-0.8.3.ebuild,v 1.4 2006/03/19 21:41:19 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kiso/kiso-0.8.3.ebuild,v 1.5 2006/03/31 21:45:12 flameeyes Exp $
 
 inherit kde
 
@@ -20,6 +20,8 @@ RDEPEND="${DEPEND}
 	app-cdr/cdrtools
 	app-admin/sudo"
 
+PATCHES="${FILESDIR}/${P}-libcdio-077.patch"
+
 need-kde 3.2
 
 pkg_postinst() {