pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/dvdisaster Updated to version 0.70.6
details: https://anonhg.NetBSD.org/pkgsrc/rev/6442a339b90d
branches: trunk
changeset: 550536:6442a339b90d
user: heinz <heinz%pkgsrc.org@localhost>
date: Sun Nov 23 23:40:12 2008 +0000
description:
Updated to version 0.70.6
Maintainer update by Sergey Svishchev (small changes by Klaus Heinz)
Pkgsrc changes:
- Required version of GTK2 is now 2.6.0 and up.
- Many pkgsrc patches related to NetBSD support (scsi-netbsd.c, patch-ab,
patch-ac, patch-ae and part of patch-ad) were committed to the stable
branch of dvdisaster (0.70.x). The rest (except for patch-ah) was
integrated into the unstable branch (0.71.x).
Changes since version 0.70.4:
=============================
NOTE to downstream maintainers:
- Keep up the good work! Thanks :-)
- GTK+ dependency has been bumped up to >= 2.6.0 (was formerly 2.0)
0.70 (pl6) 04-03-2008
- rolled back the Windows filename encoding fixes;
they caused large file support to be broken
Thanks to Markus G. for bringing this to my attention!
0.70 (pl5) 24-02-2008 various backports from 0.71.24:
- enlarged scsi timeout for Linux as newer Kernels seem
to freeze on timeout
- Windows filename encoding fixes
diffstat:
sysutils/dvdisaster/Makefile | 22 +--
sysutils/dvdisaster/PLIST | 3 +-
sysutils/dvdisaster/distinfo | 17 +-
sysutils/dvdisaster/files/scsi-netbsd.c | 185 --------------------------------
sysutils/dvdisaster/patches/patch-ab | 24 ----
sysutils/dvdisaster/patches/patch-ac | 136 -----------------------
sysutils/dvdisaster/patches/patch-ad | 28 +---
sysutils/dvdisaster/patches/patch-ae | 51 --------
sysutils/dvdisaster/patches/patch-af | 3 +-
sysutils/dvdisaster/patches/patch-ag | 3 +-
10 files changed, 28 insertions(+), 444 deletions(-)
diffs (truncated from 577 to 300 lines):
diff -r cdfc95d1265a -r 6442a339b90d sysutils/dvdisaster/Makefile
--- a/sysutils/dvdisaster/Makefile Sun Nov 23 23:37:18 2008 +0000
+++ b/sysutils/dvdisaster/Makefile Sun Nov 23 23:40:12 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2007/12/09 23:02:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/11/23 23:40:12 heinz Exp $
#
-DISTNAME= dvdisaster-0.70.4
-PKGREVISION= 2
+DISTNAME= dvdisaster-0.70.6
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdisaster/}
EXTRACT_SUFX= .tar.bz2
@@ -18,26 +17,25 @@
BUILD_DEPENDS+= gettext-tools>=0.14:../../devel/gettext-tools
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
+
ONLY_FOR_COMPILER= gcc
USE_LANGUAGES= c
USE_PKGLOCALEDIR= yes
USE_TOOLS+= bash gmake pkg-config
HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+= --docdir=${PREFIX:Q}/share/doc
-CONFIGURE_ARGS+= --localedir=${PREFIX:Q}/${PKGLOCALEDIR}/locale
-CONFIGURE_ARGS+= --mandir=${PREFIX:Q}/${PKGMANDIR}
-CONFIGURE_ARGS+= --buildroot=${DESTDIR:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc
+CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
+CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+= --buildroot=${DESTDIR}
CONFIGURE_ARGS+= --with-embedded-src-path=no
CONFIG_SHELL= ${TOOLS_PATH.bash}
MAKE_FILE= GNUmakefile
-pre-configure:
- cp ${FILESDIR:Q}/scsi-netbsd.c ${WRKSRC:Q}
-
post-install:
- rm -f ${DESTDIR:Q}${PREFIX:Q}/bin/dvdisaster-uninstall.sh
+ rm -f ${DESTDIR}${PREFIX}/bin/dvdisaster-uninstall.sh
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
diff -r cdfc95d1265a -r 6442a339b90d sysutils/dvdisaster/PLIST
--- a/sysutils/dvdisaster/PLIST Sun Nov 23 23:37:18 2008 +0000
+++ b/sysutils/dvdisaster/PLIST Sun Nov 23 23:40:12 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/11/23 23:40:12 heinz Exp $
bin/dvdisaster
share/doc/${PKGNAME}/CHANGELOG
share/doc/${PKGNAME}/COPYING
@@ -236,6 +236,7 @@
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/dvdisaster.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dvdisaster.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/dvdisaster.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/dvdisaster.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dvdisaster.mo
${PKGMANDIR}/cs/man1/dvdisaster.1
${PKGMANDIR}/de/man1/dvdisaster.1
diff -r cdfc95d1265a -r 6442a339b90d sysutils/dvdisaster/distinfo
--- a/sysutils/dvdisaster/distinfo Sun Nov 23 23:37:18 2008 +0000
+++ b/sysutils/dvdisaster/distinfo Sun Nov 23 23:40:12 2008 +0000
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.2 2007/08/05 19:15:47 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/11/23 23:40:12 heinz Exp $
-SHA1 (dvdisaster-0.70.4.tar.bz2) = 0ab5fe59d4c91e77c2f73b389485d0f5443d8873
-RMD160 (dvdisaster-0.70.4.tar.bz2) = 917457581309db33aef5ceddc7dddbd2ef084497
-Size (dvdisaster-0.70.4.tar.bz2) = 1148733 bytes
+SHA1 (dvdisaster-0.70.6.tar.bz2) = e5d6b301f2f9b1139a9ac5fa596bf4df9f7063c4
+RMD160 (dvdisaster-0.70.6.tar.bz2) = 8b88b3b12717b916e1877b6586fc777d64f6df26
+Size (dvdisaster-0.70.6.tar.bz2) = 1167208 bytes
SHA1 (patch-aa) = 97fe33bdc514925041718992b28d75b672b4be0c
-SHA1 (patch-ab) = 837785ee7f012dfcb63e1cd1bab454c8015a0c90
-SHA1 (patch-ac) = b33ae1b4142f20c16219725bb6aa03bdb2365d13
-SHA1 (patch-ad) = 3cf91a78105fac99e176fa261b10989a9c9956b6
-SHA1 (patch-ae) = 9386da56b3668141eed764714a1d07a7bb1700c4
-SHA1 (patch-af) = 33069cda271d85634189b712a1361ed2232dc804
-SHA1 (patch-ag) = 3dad3065b93817f091dea422787192e02e0e52d8
+SHA1 (patch-ad) = 56355c919f1b1cd4c716d1bf3e9a762afb8490e2
+SHA1 (patch-af) = c3819a7ea476878b293cc37005047852f52804f6
+SHA1 (patch-ag) = 4f941f14abcaba457dbec99935d07e91276df597
SHA1 (patch-ah) = 9cb1e03dc8c13e560a2f862811a4e828563db112
diff -r cdfc95d1265a -r 6442a339b90d sysutils/dvdisaster/files/scsi-netbsd.c
--- a/sysutils/dvdisaster/files/scsi-netbsd.c Sun Nov 23 23:37:18 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/* dvdisaster: Additional error correction for optical media.
- * Copyright (C) 2004-2007 Carsten Gnoerlich.
- * Project home page: http://www.dvdisaster.com
- * Email: carsten%dvdisaster.com@localhost -or- cgnoerlich%fsfe.org@localhost
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA,
- * or direct your browser at http://www.gnu.org.
- */
-
-/* NetBSD support by Sergey Svishchev <svs%ropnet.ru@localhost>.
- */
-
-#include "dvdisaster.h"
-
-#include "scsi-layer.h"
-#include "udf.h"
-
-#ifdef SYS_NETBSD
-
-#include <sys/device.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/scsiio.h>
-#include <util.h>
-
-
-char* DefaultDevice()
-{ DeviceHandle *dh;
- char *disknames, *p, raw;
- int dev_type, sysctl_mib[2];
- size_t sysctl_len;
-
- raw = 'a' + getrawpartition();
-
- sysctl_mib[0] = CTL_HW;
- sysctl_mib[1] = HW_DISKNAMES;
- if (-1 == sysctl(sysctl_mib, 2, NULL, &sysctl_len, NULL, 0)) {
- PrintLog("Failed to get value of sysctl `hw.disknames'\n");
- return g_strdup("no_drives");
- }
- if (!(disknames = g_malloc(sysctl_len))) {
- PrintLog("Out of memory constructing scan device list\n");
- return g_strdup("no_drives");
- }
- if (-1 == sysctl(sysctl_mib, 2, disknames, &sysctl_len, NULL, 0)) {
- PrintLog("Failed to get value of sysctl `hw.disknames'\n");
- g_free(disknames);
- return g_strdup("no_drives");
- }
-
- dh = g_malloc(sizeof(DeviceHandle));
-
- for (p = strtok(disknames, " "); p; p = strtok(NULL, " "))
- {
- if(!strncmp(p,"cd",2))
- { char buf[80];
-
- sprintf(buf,"/dev/r%s%c", p, raw);
-
- memset(dh, 0, sizeof(DeviceHandle));
- dh->fd = open(buf, O_RDONLY | O_NONBLOCK);
- dh->device = buf;
-
- if(dh->fd < 0) /* device not even present */
- continue;
-
- dev_type = InquireDevice(dh, 1);
- close(dh->fd);
-
- if(dev_type != 5) /* not a CD/DVD ROM */
- continue;
-
- g_ptr_array_add(Closure->deviceNodes, g_strdup(buf));
- sprintf(buf, "%s (/dev/r%s%c)", dh->devinfo, p, raw);
- g_ptr_array_add(Closure->deviceNames, g_strdup(buf));
- }
- }
-
- g_free(dh);
-
- if(Closure->deviceNodes->len)
- return g_strdup(g_ptr_array_index(Closure->deviceNodes, 0));
- else
- { PrintLog(_("No CD/DVD drives found.\n"
- "No drives will be pre-selected.\n"));
-
- return g_strdup("no_drives");
- }
-}
-
-DeviceHandle* OpenDevice(char *device)
-{ DeviceHandle *dh;
-
- dh = g_malloc0(sizeof(DeviceHandle));
- dh->fd = open(device, O_RDONLY | O_NONBLOCK);
-
- if(dh->fd < 0)
- { g_free(dh);
- Stop(_("Could not open %s: %s"),device, strerror(errno));
- return NULL;
- }
-
- dh->device = g_strdup(device);
-
- return dh;
-}
-
-void CloseDevice(DeviceHandle *dh)
-{
- if(dh->fd)
- close(dh->fd);
- if(dh->device)
- g_free(dh->device);
- if(dh->rs02Header)
- g_free(dh->rs02Header);
- if(dh->mediumDescr)
- g_free(dh->mediumDescr);
- if(dh->isoInfo)
- FreeIsoInfo(dh->isoInfo);
- if(dh->defects)
- FreeBitmap(dh->defects);
- g_free(dh);
-}
-
-int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char *buf, int size, Sense *sense, int data_mode)
-{ struct scsireq sc;
- int rc;
-
- /* prepare the scsi request */
-
- memset(&sc, 0, sizeof(sc));
- memcpy(sc.cmd, cmd, cdb_size);
- sc.cmdlen = cdb_size;
- sc.databuf = (char *)buf;
- sc.datalen = size;
- sc.senselen = 24; /* Maybe SENSEBUFLEN would be better? -cg */
- sc.timeout = 60000; /* linux uses 5000 = 5 * HZ */
-
- switch(data_mode)
- { case DATA_READ:
- sc.flags = SCCMD_READ;
- break;
- default:
- Stop(_("illegal data_mode: %d"),data_mode);
- }
-
- /* Send the request and save the sense data. */
-
- rc = ioctl(dh->fd, SCIOCCOMMAND, &sc);
- memcpy(sense, sc.sense, sc.senselen_used);
-
- /* See what we've got back */
-
- if(rc<0) return rc; /* does not happen on SCSI errors */
-
- switch(sc.retsts)
- { case SCCMD_OK: /* everything went fine */
- return 0;
- case SCCMD_TIMEOUT: /* we don't know how to handle that yet */
- PrintLog("SendPacket() - SCSI timeout\n");
- return -1;
- case SCCMD_BUSY: /* same here */
- PrintLog("SendPacket() - target busy\n");
- return -1;
- case SCCMD_SENSE: /* SCSI error occurred, sense data available */
- return -1;
- default: /* something other went wrong */
- return -1;
- }
-
- return -1; /* unreachable */
-}
-#endif /* SYS_NETBSD */
diff -r cdfc95d1265a -r 6442a339b90d sysutils/dvdisaster/patches/patch-ab
--- a/sysutils/dvdisaster/patches/patch-ab Sun Nov 23 23:37:18 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $
-
- make it work with NetBSD's SCSI layer
-
---- scsi-layer.h.orig 2007-01-20 15:44:49.000000000 +0000
-+++ scsi-layer.h 2007-01-27 17:36:15.000000000 +0000
-@@ -117,7 +117,7 @@
- } Sense;
- #endif
-
--#ifdef SYS_UNKNOWN
-+#if defined(SYS_UNKNOWN) || defined(SYS_NETBSD)
- #define MAX_CDB_SIZE 16 /* longest possible SCSI command */
-
- /* This is actually the little endian version of the
-@@ -177,7 +177,7 @@
-
Home |
Main Index |
Thread Index |
Old Index