diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-31 21:45:12 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-31 21:45:12 +0000 |
| commit | d61d247d704b8f6c8d81f9556af1ee3a35399e14 (patch) | |
| tree | f3f5f2fd61ce2ab18088357cfc89f2c09f87b053 /app-cdr | |
| parent | Removed vegastrike from the tree as it has been masked for about 2 months now... (diff) | |
| download | gentoo-2-d61d247d704b8f6c8d81f9556af1ee3a35399e14.tar.gz gentoo-2-d61d247d704b8f6c8d81f9556af1ee3a35399e14.tar.bz2 gentoo-2-d61d247d704b8f6c8d81f9556af1ee3a35399e14.zip | |
Add patch to build with last version of libcdio. Closes bug #128206.
(Portage version: 2.1_pre7-r3)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/kiso/ChangeLog | 6 | ||||
| -rw-r--r-- | app-cdr/kiso/files/kiso-0.8.3-libcdio-077.patch | 33 | ||||
| -rw-r--r-- | app-cdr/kiso/kiso-0.8.3.ebuild | 4 |
3 files changed, 41 insertions, 2 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/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() { |