summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-02-19 02:59:54 +0000
committerMike Frysinger <vapier@gentoo.org>2008-02-19 02:59:54 +0000
commit969961146b4d554e0991cc4719ccf4a3c63656b8 (patch)
tree726bbeb5b3ce2e5beb540965cc0b4412f7f3fb7a /app-cdr
parentold (diff)
downloadgentoo-2-969961146b4d554e0991cc4719ccf4a3c63656b8.tar.gz
gentoo-2-969961146b4d554e0991cc4719ccf4a3c63656b8.tar.bz2
gentoo-2-969961146b4d554e0991cc4719ccf4a3c63656b8.zip
Fix from upstream for newer libata versions #210391 by Slava Gorbunov.
(Portage version: 2.2_pre2)
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/qpxtool/ChangeLog10
-rw-r--r--app-cdr/qpxtool/files/qpxtool-0.6.1-libata.patch26
-rw-r--r--app-cdr/qpxtool/qpxtool-0.6.1-r1.ebuild33
3 files changed, 67 insertions, 2 deletions
diff --git a/app-cdr/qpxtool/ChangeLog b/app-cdr/qpxtool/ChangeLog
index d7552b85dad4..23153d0588af 100644
--- a/app-cdr/qpxtool/ChangeLog
+++ b/app-cdr/qpxtool/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-cdr/qpxtool
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/ChangeLog,v 1.12 2007/10/08 20:22:39 coldwind Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/ChangeLog,v 1.13 2008/02/19 02:59:54 vapier Exp $
+
+*qpxtool-0.6.1-r1 (19 Feb 2008)
+
+ 19 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/qpxtool-0.6.1-libata.patch, +qpxtool-0.6.1-r1.ebuild:
+ Fix from upstream for newer libata versions #210391 by Slava Gorbunov.
08 Oct 2007; Santiago M. Mola <coldwind@gentoo.org> qpxtool-0.6.1.ebuild:
Add menu entry (#188584).
diff --git a/app-cdr/qpxtool/files/qpxtool-0.6.1-libata.patch b/app-cdr/qpxtool/files/qpxtool-0.6.1-libata.patch
new file mode 100644
index 000000000000..145e486308d7
--- /dev/null
+++ b/app-cdr/qpxtool/files/qpxtool-0.6.1-libata.patch
@@ -0,0 +1,26 @@
+http://bugs.gentoo.org/210392
+
+--- lib/qpxtransport/qpx_transport.cpp
++++ lib/qpxtransport/qpx_transport.cpp
+@@ -215,6 +215,21 @@
+ #define KERNEL_BROKEN 0
+ if (use_sg_io)
+ {
++ /* see linux-2.6.23/block/scsi_ioctl.c:36 */
++ static const unsigned char scsi_command_size[8] =
++ {
++ 6, 10, 10, 12,
++ 16, 12, 10, 10
++ };
++ char cmdsize, opcode;
++
++ opcode = cgc.cmd[0];
++ /* see linux-2.6.23/include/scsi/scsi.h:25 */
++ cmdsize = scsi_command_size[((opcode) >> 5) & 7];
++ if ((sg_io.cmd_len > 0) && (sg_io.cmd_len < cmdsize)) {
++ sg_io.cmd_len = cmdsize;
++ }
++
+ sg_io.dxferp = buf;
+ sg_io.dxfer_len = sz;
+ sg_io.dxfer_direction = use_sg_io[dir];
diff --git a/app-cdr/qpxtool/qpxtool-0.6.1-r1.ebuild b/app-cdr/qpxtool/qpxtool-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..94e022642b41
--- /dev/null
+++ b/app-cdr/qpxtool/qpxtool-0.6.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/qpxtool-0.6.1-r1.ebuild,v 1.1 2008/02/19 02:59:54 vapier Exp $
+
+inherit kde-functions qt3 multilib eutils
+
+DESCRIPTION="cd/dvd quality checker for a variety of drives"
+HOMEPAGE="http://qpxtool.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpxtool/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="=x11-libs/qt-3*"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-libata.patch #210392
+ sed -i \
+ -e '/^PREFIX/s:/usr/local:/usr:' \
+ -e "/^LIBDIR/s:/lib:/$(get_libdir):" \
+ Makefile || die
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ newicon qpxtool-gui/img/q.xpm ${PN}.xpm
+ make_desktop_entry ${PN} Qpxtool ${PN}.xpm "Utility;Qt;DiscBurning"
+ dodoc AUTHORS ChangeLog README TODO
+}