Sun Jul 26 18:25:01 2009 UTC ()
update brasero to 2.26.3
changes: minor bugfixes, translation updates

pkgsrc changes:
-in scsi io code, remove the code which builds a raw device path
 from a block device - use the raw_device hal property instead
-split out the nautilus plugin, allows to use brasero (and its
 clients, eg sound-juicer) with less gnome desktop overhead
-support playlist parsing as an option -- unfortunately this
 pulls in evolution-data-server indirectly which is pretty large
 for that limited gain of functionality (on per default, as in
 other pkgs able to use the evolution database)
-cleanup


(drochner)
diff -r1.475 -r1.476 pkgsrc/sysutils/Makefile
diff -r1.9 -r1.10 pkgsrc/sysutils/brasero/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/brasero/PLIST
diff -r1.2 -r1.3 pkgsrc/sysutils/brasero/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/sysutils/brasero/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/brasero-nautilus/DESCR
diff -r0 -r1.1 pkgsrc/sysutils/brasero-nautilus/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/brasero-nautilus/PLIST
diff -r1.2 -r1.3 pkgsrc/sysutils/brasero/files/scsi-netbsd.c
diff -r1.1 -r1.2 pkgsrc/sysutils/brasero/patches/patch-ac
diff -r0 -r1.1 pkgsrc/sysutils/brasero/patches/patch-ae
diff -r0 -r1.1 pkgsrc/sysutils/brasero/patches/patch-af
diff -r0 -r1.1 pkgsrc/sysutils/brasero/patches/patch-ag
diff -r0 -r1.1 pkgsrc/sysutils/brasero/patches/patch-ah

cvs diff -r1.475 -r1.476 pkgsrc/sysutils/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/Makefile 2009/07/23 15:31:20 1.475
+++ pkgsrc/sysutils/Makefile 2009/07/26 18:25:01 1.476
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.475 2009/07/23 15:31:20 drochner Exp $ 1# $NetBSD: Makefile,v 1.476 2009/07/26 18:25:01 drochner Exp $
2# 2#
3 3
4COMMENT= System utilities 4COMMENT= System utilities
5 5
6SUBDIR+= 855resolution 6SUBDIR+= 855resolution
7SUBDIR+= 915resolution 7SUBDIR+= 915resolution
8SUBDIR+= 9base 8SUBDIR+= 9base
9SUBDIR+= acpica-utils 9SUBDIR+= acpica-utils
10SUBDIR+= acpidump 10SUBDIR+= acpidump
11SUBDIR+= adjustkernel 11SUBDIR+= adjustkernel
12SUBDIR+= adtool 12SUBDIR+= adtool
13SUBDIR+= afbinit 13SUBDIR+= afbinit
14SUBDIR+= agedu 14SUBDIR+= agedu
@@ -25,26 +25,27 @@ SUBDIR+= bacula @@ -25,26 +25,27 @@ SUBDIR+= bacula
25SUBDIR+= bacula-clientonly 25SUBDIR+= bacula-clientonly
26SUBDIR+= bacula-doc 26SUBDIR+= bacula-doc
27SUBDIR+= bacula-gnome-console 27SUBDIR+= bacula-gnome-console
28SUBDIR+= bacula-qt-console 28SUBDIR+= bacula-qt-console
29SUBDIR+= bacula-tray-monitor 29SUBDIR+= bacula-tray-monitor
30SUBDIR+= bacula-wx-console 30SUBDIR+= bacula-wx-console
31SUBDIR+= bbsload 31SUBDIR+= bbsload
32SUBDIR+= bchunk 32SUBDIR+= bchunk
33SUBDIR+= bcmfw 33SUBDIR+= bcmfw
34SUBDIR+= bkpupsd 34SUBDIR+= bkpupsd
35SUBDIR+= boxbackup-client 35SUBDIR+= boxbackup-client
36SUBDIR+= boxbackup-server 36SUBDIR+= boxbackup-server
37SUBDIR+= brasero 37SUBDIR+= brasero
 38SUBDIR+= brasero-nautilus
38SUBDIR+= bsign 39SUBDIR+= bsign
39SUBDIR+= btpin-qt 40SUBDIR+= btpin-qt
40SUBDIR+= bubblemon 41SUBDIR+= bubblemon
41SUBDIR+= burn 42SUBDIR+= burn
42SUBDIR+= capistrano 43SUBDIR+= capistrano
43SUBDIR+= ccd2iso 44SUBDIR+= ccd2iso
44SUBDIR+= ccze 45SUBDIR+= ccze
45SUBDIR+= cdbkup 46SUBDIR+= cdbkup
46SUBDIR+= cdrdao 47SUBDIR+= cdrdao
47SUBDIR+= cdrkit 48SUBDIR+= cdrkit
48SUBDIR+= cdrtools 49SUBDIR+= cdrtools
49SUBDIR+= cfengine2 50SUBDIR+= cfengine2
50SUBDIR+= checkpassword 51SUBDIR+= checkpassword

cvs diff -r1.9 -r1.10 pkgsrc/sysutils/brasero/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/brasero/Makefile 2009/07/22 09:01:45 1.9
+++ pkgsrc/sysutils/brasero/Makefile 2009/07/26 18:25:01 1.10
@@ -1,49 +1,60 @@ @@ -1,49 +1,60 @@
1# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:45 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2009/07/26 18:25:01 drochner Exp $
2# 2#
3 3
4DISTNAME= brasero-2.26.2 4DISTNAME= brasero-2.26.3
5CATEGORIES= sysutils gnome 5CATEGORIES= sysutils gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/brasero/2.26/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/brasero/2.26/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://projects.gnome.org/brasero/ 10HOMEPAGE= http://projects.gnome.org/brasero/
11COMMENT= Disc-burning software for the GNOME desktop 11COMMENT= Disc-burning software for the GNOME desktop
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16# gnome-common provides m4 files we need 16# gnome-common provides m4 files we need
17# 17#
18BUILD_DEPENDS+= gnome-common>=2.26.0:../../devel/gnome-common 18BUILD_DEPENDS+= gnome-common>=2.26.0:../../devel/gnome-common
19 19
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22USE_TOOLS+= pkg-config gmake intltool gawk msgfmt 22USE_TOOLS+= pkg-config gmake intltool gawk msgfmt
23 23
24CONFIGURE_ARGS+= --disable-inotify 24CONFIGURE_ARGS+= --disable-inotify
25 25
26GCONF_SCHEMAS+= brasero.schemas 26GCONF_SCHEMAS+= brasero.schemas
27PKGCONFIG_OVERRIDE+= libbrasero-media.pc.in 27PKGCONFIG_OVERRIDE+= libbrasero-media.pc.in
28 28
 29# The playlist feature needs totem-pl-parser which in turn
 30# pulls in evolution-data-server.
 31PKG_OPTIONS_VAR= PKG_OPTIONS.brasero
 32PKG_SUPPORTED_OPTIONS= evolution
 33PKG_SUGGESTED_OPTIONS= evolution
 34
 35.include "../../mk/bsd.options.mk"
 36
29# sent upstream in http://bugzilla.gnome.org/show_bug.cgi?id=583332 37# sent upstream in http://bugzilla.gnome.org/show_bug.cgi?id=583332
30post-extract: 38post-extract:
31 cp ${FILESDIR}/scsi-netbsd.c ${WRKSRC}/libbrasero-media/ 39 cp ${FILESDIR}/scsi-netbsd.c ${WRKSRC}/libbrasero-media/
32 40
33.include "../../databases/shared-mime-info/mimedb.mk" 41.include "../../databases/shared-mime-info/mimedb.mk"
34.include "../../devel/GConf/schemas.mk" 42.include "../../devel/GConf/schemas.mk"
35.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 43.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
36BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.10 44BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.10
37.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 45.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
38BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.15 46BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.15
39.include "../../multimedia/gstreamer0.10/buildlink3.mk" 47.include "../../multimedia/gstreamer0.10/buildlink3.mk"
40.include "../../sysutils/dbus/buildlink3.mk" 48.include "../../sysutils/dbus/buildlink3.mk"
41.include "../../sysutils/dbus-glib/buildlink3.mk" 49.include "../../sysutils/dbus-glib/buildlink3.mk"
42.include "../../sysutils/desktop-file-utils/desktopdb.mk" 50.include "../../sysutils/desktop-file-utils/desktopdb.mk"
43.include "../../sysutils/hal/buildlink3.mk" 51.include "../../sysutils/hal/buildlink3.mk"
44.include "../../sysutils/libnotify/buildlink3.mk" 52.include "../../sysutils/libnotify/buildlink3.mk"
45.include "../../sysutils/nautilus/buildlink3.mk" 53.if !empty(PKG_OPTIONS:Mevolution)
 54.include "../../multimedia/totem-pl-parser/buildlink3.mk"
 55.endif
46.include "../../textproc/gnome-doc-utils/buildlink3.mk" 56.include "../../textproc/gnome-doc-utils/buildlink3.mk"
47.include "../../x11/gtk2/buildlink3.mk" 57.include "../../x11/gtk2/buildlink3.mk"
 58.include "../../x11/libSM/buildlink3.mk"
48.include "../../mk/omf-scrollkeeper.mk" 59.include "../../mk/omf-scrollkeeper.mk"
49.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"

cvs diff -r1.3 -r1.4 pkgsrc/sysutils/brasero/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/brasero/PLIST 2009/06/14 18:16:01 1.3
+++ pkgsrc/sysutils/brasero/PLIST 2009/07/26 18:25:01 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:01 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2009/07/26 18:25:01 drochner Exp $
2bin/brasero 2bin/brasero
3include/brasero/brasero-drive-selection.h 3include/brasero/brasero-drive-selection.h
4include/brasero/brasero-drive.h 4include/brasero/brasero-drive.h
5include/brasero/brasero-media.h 5include/brasero/brasero-media.h
6include/brasero/brasero-medium-monitor.h 6include/brasero/brasero-medium-monitor.h
7include/brasero/brasero-medium-selection.h 7include/brasero/brasero-medium-selection.h
8include/brasero/brasero-medium.h 8include/brasero/brasero-medium.h
9include/brasero/brasero-units.h 9include/brasero/brasero-units.h
10include/brasero/brasero-volume.h 10include/brasero/brasero-volume.h
11lib/brasero/plugins/libbrasero-burn-uri.la 11lib/brasero/plugins/libbrasero-burn-uri.la
12lib/brasero/plugins/libbrasero-cdrdao.la 12lib/brasero/plugins/libbrasero-cdrdao.la
13lib/brasero/plugins/libbrasero-cdrecord.la 13lib/brasero/plugins/libbrasero-cdrecord.la
14lib/brasero/plugins/libbrasero-checksum-file.la 14lib/brasero/plugins/libbrasero-checksum-file.la
@@ -19,31 +19,29 @@ lib/brasero/plugins/libbrasero-dvdrwform @@ -19,31 +19,29 @@ lib/brasero/plugins/libbrasero-dvdrwform
19lib/brasero/plugins/libbrasero-genisoimage.la 19lib/brasero/plugins/libbrasero-genisoimage.la
20lib/brasero/plugins/libbrasero-growisofs.la 20lib/brasero/plugins/libbrasero-growisofs.la
21lib/brasero/plugins/libbrasero-local-track.la 21lib/brasero/plugins/libbrasero-local-track.la
22lib/brasero/plugins/libbrasero-mkisofs.la 22lib/brasero/plugins/libbrasero-mkisofs.la
23lib/brasero/plugins/libbrasero-normalize.la 23lib/brasero/plugins/libbrasero-normalize.la
24lib/brasero/plugins/libbrasero-readcd.la 24lib/brasero/plugins/libbrasero-readcd.la
25lib/brasero/plugins/libbrasero-readom.la 25lib/brasero/plugins/libbrasero-readom.la
26lib/brasero/plugins/libbrasero-toc2cue.la 26lib/brasero/plugins/libbrasero-toc2cue.la
27lib/brasero/plugins/libbrasero-transcode.la 27lib/brasero/plugins/libbrasero-transcode.la
28lib/brasero/plugins/libbrasero-vcdimager.la 28lib/brasero/plugins/libbrasero-vcdimager.la
29lib/brasero/plugins/libbrasero-vob.la 29lib/brasero/plugins/libbrasero-vob.la
30lib/brasero/plugins/libbrasero-wodim.la 30lib/brasero/plugins/libbrasero-wodim.la
31lib/libbrasero-media.la 31lib/libbrasero-media.la
32lib/nautilus/extensions-2.0/libnautilus-brasero-extension.la 
33lib/pkgconfig/libbrasero-media.pc 32lib/pkgconfig/libbrasero-media.pc
34man/man1/brasero.1 33man/man1/brasero.1
35share/applications/brasero-copy-medium.desktop 34share/applications/brasero-copy-medium.desktop
36share/applications/brasero-nautilus.desktop 
37share/applications/brasero-open-image.desktop 35share/applications/brasero-open-image.desktop
38share/applications/brasero-open-playlist.desktop 36share/applications/brasero-open-playlist.desktop
39share/applications/brasero-open-project.desktop 37share/applications/brasero-open-project.desktop
40share/applications/brasero.desktop 38share/applications/brasero.desktop
41share/brasero/icons/hicolor/16x16/actions/insert-pause.png 39share/brasero/icons/hicolor/16x16/actions/insert-pause.png
42share/brasero/icons/hicolor/16x16/actions/iso-image-burn.png 40share/brasero/icons/hicolor/16x16/actions/iso-image-burn.png
43share/brasero/icons/hicolor/16x16/actions/iso-image-new.png 41share/brasero/icons/hicolor/16x16/actions/iso-image-new.png
44share/brasero/icons/hicolor/16x16/actions/media-optical-audio-new.png 42share/brasero/icons/hicolor/16x16/actions/media-optical-audio-new.png
45share/brasero/icons/hicolor/16x16/actions/media-optical-blank.png 43share/brasero/icons/hicolor/16x16/actions/media-optical-blank.png
46share/brasero/icons/hicolor/16x16/actions/media-optical-burn.png 44share/brasero/icons/hicolor/16x16/actions/media-optical-burn.png
47share/brasero/icons/hicolor/16x16/actions/media-optical-copy.png 45share/brasero/icons/hicolor/16x16/actions/media-optical-copy.png
48share/brasero/icons/hicolor/16x16/actions/media-optical-data-new.png 46share/brasero/icons/hicolor/16x16/actions/media-optical-data-new.png
49share/brasero/icons/hicolor/16x16/actions/media-optical-video-new.png 47share/brasero/icons/hicolor/16x16/actions/media-optical-video-new.png

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/brasero/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/brasero/buildlink3.mk 2009/03/20 19:25:23 1.2
+++ pkgsrc/sysutils/brasero/buildlink3.mk 2009/07/26 18:25:01 1.3
@@ -1,12 +1,17 @@ @@ -1,12 +1,17 @@
1# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:23 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2009/07/26 18:25:01 drochner Exp $
2 2
3BUILDLINK_TREE+= brasero 3BUILDLINK_TREE+= brasero
4 4
5.if !defined(BRASERO_BUILDLINK3_MK) 5.if !defined(BRASERO_BUILDLINK3_MK)
6BRASERO_BUILDLINK3_MK:= 6BRASERO_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.brasero+= brasero>=2.26.0 8BUILDLINK_API_DEPENDS.brasero+= brasero>=2.26.0
9BUILDLINK_PKGSRCDIR.brasero?= ../../sysutils/brasero 9BUILDLINK_PKGSRCDIR.brasero?= ../../sysutils/brasero
 10
 11.include "../../devel/glib2/buildlink3.mk"
 12.include "../../x11/gtk2/buildlink3.mk"
 13.include "../../sysutils/hal/buildlink3.mk"
 14
10.endif # BRASERO_BUILDLINK3_MK 15.endif # BRASERO_BUILDLINK3_MK
11 16
12BUILDLINK_TREE+= -brasero 17BUILDLINK_TREE+= -brasero

cvs diff -r1.4 -r1.5 pkgsrc/sysutils/brasero/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/brasero/distinfo 2009/07/06 15:22:14 1.4
+++ pkgsrc/sysutils/brasero/distinfo 2009/07/26 18:25:01 1.5
@@ -1,9 +1,13 @@ @@ -1,9 +1,13 @@
1$NetBSD: distinfo,v 1.4 2009/07/06 15:22:14 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2009/07/26 18:25:01 drochner Exp $
2 2
3SHA1 (brasero-2.26.2.tar.bz2) = a65f0167d209e86535611d37887481beb21e33c8 3SHA1 (brasero-2.26.3.tar.bz2) = 97273908948481ea2f97d4a12e7bf5031ca613cb
4RMD160 (brasero-2.26.2.tar.bz2) = 5110cd570448b9f3c4213483ee90f8f13a7dc038 4RMD160 (brasero-2.26.3.tar.bz2) = f1f811b239f4b5edfa0a3dfde65b028c43e4906c
5Size (brasero-2.26.2.tar.bz2) = 3326163 bytes 5Size (brasero-2.26.3.tar.bz2) = 3312144 bytes
6SHA1 (patch-aa) = 3799e6f3a59e03bc8a187b0eca025c1f15bf5135 6SHA1 (patch-aa) = 3799e6f3a59e03bc8a187b0eca025c1f15bf5135
7SHA1 (patch-ab) = 5e9c3a4c3608a04270d6c7e034b5e3dd0c25e44f 7SHA1 (patch-ab) = 5e9c3a4c3608a04270d6c7e034b5e3dd0c25e44f
8SHA1 (patch-ac) = 9829e879d145586bb00390c26d76879d8d999179 8SHA1 (patch-ac) = ab62c40cc9046020c9088ae7958fe3e7a3af8eba
9SHA1 (patch-ad) = 80632fe45694e98692ab2aa69d24f97ad13de346 9SHA1 (patch-ad) = 80632fe45694e98692ab2aa69d24f97ad13de346
 10SHA1 (patch-ae) = e5dfb8da776b860074aa935a97152968222ae9bc
 11SHA1 (patch-af) = 41414c465307b08de981a281e4fa1219dd47f28e
 12SHA1 (patch-ag) = a97f16bfc2a82d50904c2432daab9bb456cbe5ce
 13SHA1 (patch-ah) = 91325870ad2bbfe307bbf3bc82243375b43e229c

File Added: pkgsrc/sysutils/brasero-nautilus/Attic/DESCR
Brasero is an application to burn CDs and DVDs for the GNOME desktop. It is
designed to be as simple as possible and has some unique features to enable
users to create their discs easily and quickly.

File Added: pkgsrc/sysutils/brasero-nautilus/Attic/Makefile
# $NetBSD: Makefile,v 1.1 2009/07/26 18:25:01 drochner Exp $
#

DISTNAME=	brasero-2.26.3
PKGNAME=	brasero-nautilus-2.26.3
CATEGORIES=	sysutils gnome
MASTER_SITES=	${MASTER_SITE_GNOME:=sources/brasero/2.26/}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://projects.gnome.org/brasero/
COMMENT=	Nautilus plugin for brasero
LICENSE=	gnu-gpl-v2

PKG_DESTDIR_SUPPORT=	user-destdir

DISTINFO_FILE=	${.CURDIR}/../brasero/distinfo
PATCHDIR=	${.CURDIR}/../brasero/patches
FILESDIR=	${.CURDIR}/../brasero/files

# gnome-common provides m4 files we need
#
BUILD_DEPENDS+=         gnome-common>=2.26.0:../../devel/gnome-common

GNU_CONFIGURE=	yes
USE_LIBTOOL=	yes
USE_TOOLS+=	pkg-config gmake intltool gawk msgfmt

CONFIGURE_ARGS+=	--disable-inotify
BUILD_DIRS=		${WRKSRC}/nautilus
INSTALL_DIRS=		${WRKSRC}/nautilus

# sent upstream in http://bugzilla.gnome.org/show_bug.cgi?id=583332
post-extract:
	cp ${FILESDIR}/scsi-netbsd.c ${WRKSRC}/libbrasero-media/

.include "../../sysutils/brasero/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
.include "../../devel/GConf/buildlink3.mk"
BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.10
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
BUILDLINK_API_DEPENDS.gstreamer0.10+=		gstreamer0.10>=0.10.15
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/sysutils/brasero-nautilus/Attic/PLIST
@comment $NetBSD: PLIST,v 1.1 2009/07/26 18:25:01 drochner Exp $
lib/nautilus/extensions-2.0/libnautilus-brasero-extension.la
share/applications/brasero-nautilus.desktop

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/brasero/files/Attic/scsi-netbsd.c (expand / switch to unified diff)

--- pkgsrc/sysutils/brasero/files/Attic/scsi-netbsd.c 2009/03/22 09:30:39 1.2
+++ pkgsrc/sysutils/brasero/files/Attic/scsi-netbsd.c 2009/07/26 18:25:01 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: scsi-netbsd.c,v 1.2 2009/03/22 09:30:39 wiz Exp $ */ 1/* $NetBSD: scsi-netbsd.c,v 1.3 2009/07/26 18:25:01 drochner Exp $ */
2/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ 2/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
3/* 3/*
4 * Libbrasero-media 4 * Libbrasero-media
5 * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app@wanadoo.fr> 5 * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app@wanadoo.fr>
6 * Jared D. McNeill 2009 <jmcneill@NetBSD.org> 6 * Jared D. McNeill 2009 <jmcneill@NetBSD.org>
7 * 7 *
8 * Libbrasero-media is free software; you can redistribute it and/or modify 8 * Libbrasero-media is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * The Libbrasero-media authors hereby grant permission for non-GPL compatible 13 * The Libbrasero-media authors hereby grant permission for non-GPL compatible
14 * GStreamer plugins to be used and distributed together with GStreamer 14 * GStreamer plugins to be used and distributed together with GStreamer
@@ -154,34 +154,31 @@ brasero_scsi_command_free (gpointer cmd) @@ -154,34 +154,31 @@ brasero_scsi_command_free (gpointer cmd)
154 154
155/** 155/**
156 * This is to open a device 156 * This is to open a device
157 */ 157 */
158 158
159BraseroDeviceHandle * 159BraseroDeviceHandle *
160brasero_device_handle_open (const gchar *path, 160brasero_device_handle_open (const gchar *path,
161 gboolean exclusive, 161 gboolean exclusive,
162 BraseroScsiErrCode *code) 162 BraseroScsiErrCode *code)
163{ 163{
164 int fd; 164 int fd;
165 int flags = OPEN_FLAGS; 165 int flags = OPEN_FLAGS;
166 BraseroDeviceHandle *handle; 166 BraseroDeviceHandle *handle;
167 gchar *rdevnode; 
168 167
169 if (exclusive) 168 if (exclusive)
170 flags |= O_EXCL; 169 flags |= O_EXCL;
171 170
172 rdevnode = g_strdup_printf ("/dev/r%s", path + strlen ("/dev/")); 171 fd = open (path, flags);
173 fd = open (rdevnode, flags); 
174 g_free (rdevnode); 
175 if (fd < 0) { 172 if (fd < 0) {
176 if (code) { 173 if (code) {
177 if (errno == EAGAIN 174 if (errno == EAGAIN
178 || errno == EWOULDBLOCK 175 || errno == EWOULDBLOCK
179 || errno == EBUSY) 176 || errno == EBUSY)
180 *code = BRASERO_SCSI_NOT_READY; 177 *code = BRASERO_SCSI_NOT_READY;
181 else 178 else
182 *code = BRASERO_SCSI_ERRNO; 179 *code = BRASERO_SCSI_ERRNO;
183 } 180 }
184 181
185 return NULL; 182 return NULL;
186 } 183 }
187 184

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/brasero/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/sysutils/brasero/patches/Attic/patch-ac 2009/07/06 15:22:14 1.1
+++ pkgsrc/sysutils/brasero/patches/Attic/patch-ac 2009/07/26 18:25:01 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-ac,v 1.1 2009/07/06 15:22:14 joerg Exp $ 1$NetBSD: patch-ac,v 1.2 2009/07/26 18:25:01 drochner Exp $
2 2
3--- configure.orig 2009-05-18 17:06:56.000000000 +0200 3--- configure.orig 2009-07-01 03:03:18.000000000 +0200
4+++ configure 4+++ configure
5@@ -912,6 +912,8 @@ HAVE_SG_IO_HDR_T_FALSE 5@@ -900,6 +900,8 @@ ENABLE_GTK_DOC_TRUE
6 HAVE_SG_IO_HDR_T_TRUE 6 GTKDOC_CHECK
7 HAVE_CAM_LIB_H_FALSE 7 PKG_CONFIG
8 HAVE_CAM_LIB_H_TRUE 8 HTML_DIR
9+HAVE_SCSIIO_H_FALSE 9+HAVE_SCSIIO_H_FALSE
10+HAVE_SCSIIO_H_TRUE 10+HAVE_SCSIIO_H_TRUE
11 BRASERO_SCSI_LIBS 11 HAVE_USCSI_H_FALSE
12 LIBTOOL 12 HAVE_USCSI_H_TRUE
13 ac_ct_F77 13 HAVE_SG_IO_HDR_T_FALSE
14@@ -21715,6 +21717,116 @@ else 14@@ -12828,6 +12830,116 @@ else
15 fi 15 fi
16  16
17  17
18+{ $as_echo "$as_me:$LINENO: checking for scsireq_t" >&5 18+{ $as_echo "$as_me:$LINENO: checking for scsireq_t" >&5
19+$as_echo_n "checking for scsireq_t... " >&6; } 19+$as_echo_n "checking for scsireq_t... " >&6; }
20+if test "${ac_cv_type_scsireq_t+set}" = set; then 20+if test "${ac_cv_type_scsireq_t+set}" = set; then
21+ $as_echo_n "(cached) " >&6 21+ $as_echo_n "(cached) " >&6
22+else 22+else
23+ ac_cv_type_scsireq_t=no 23+ ac_cv_type_scsireq_t=no
24+cat >conftest.$ac_ext <<_ACEOF 24+cat >conftest.$ac_ext <<_ACEOF
25+/* confdefs.h. */ 25+/* confdefs.h. */
26+_ACEOF 26+_ACEOF
27+cat confdefs.h >>conftest.$ac_ext 27+cat confdefs.h >>conftest.$ac_ext
@@ -118,67 +118,58 @@ $NetBSD: patch-ac,v 1.1 2009/07/06 15:22 @@ -118,67 +118,58 @@ $NetBSD: patch-ac,v 1.1 2009/07/06 15:22
118+cat >>confdefs.h <<_ACEOF 118+cat >>confdefs.h <<_ACEOF
119+#define HAVE_SCSIREQ_T 1 119+#define HAVE_SCSIREQ_T 1
120+_ACEOF 120+_ACEOF
121+ 121+
122+has_scsiio="yes" 122+has_scsiio="yes"
123+else 123+else
124+ has_scsiio="no" 124+ has_scsiio="no"
125+fi 125+fi
126+ 126+
127+ 127+
128 { $as_echo "$as_me:$LINENO: checking for struct uscsi_cmd" >&5 128 { $as_echo "$as_me:$LINENO: checking for struct uscsi_cmd" >&5
129 $as_echo_n "checking for struct uscsi_cmd... " >&6; } 129 $as_echo_n "checking for struct uscsi_cmd... " >&6; }
130 if test "${ac_cv_type_struct_uscsi_cmd+set}" = set; then 130 if test "${ac_cv_type_struct_uscsi_cmd+set}" = set; then
131@@ -21829,11 +21941,13 @@ if test x"$has_cam" = x"yes"; then 131@@ -12942,11 +13054,13 @@ if test x"$has_cam" = x"yes"; then
132 BRASERO_SCSI_LIBS="-lcam" 132 BRASERO_SCSI_LIBS="-lcam"
133 elif test x"$has_sg" = x"yes"; then 133 elif test x"$has_sg" = x"yes"; then
134 : 134 :
135+elif test x"$has_scsiio" = x"yes"; then 135+elif test x"$has_scsiio" = x"yes"; then
136+ : 136+ :
137 elif test x"$has_uscsi" = x"yes"; then 137 elif test x"$has_uscsi" = x"yes"; then
138 : 138 :
139 else 139 else
140- { { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found." >&5 140- { { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found." >&5
141-$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;} 141-$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;}
142+ { { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&5 142+ { { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&5
143+$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;} 143+$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;}
144 { (exit 1); exit 1; }; } 144 { (exit 1); exit 1; }; }
145 fi 145 fi
146  146
147@@ -21861,6 +21975,14 @@ else 147@@ -12974,6 +13088,14 @@ else
148 HAVE_USCSI_H_FALSE= 148 HAVE_USCSI_H_FALSE=
149 fi 149 fi
150  150
151+ if test x"$has_scsiio" = "xyes"; then 151+ if test x"$has_scsiio" = "xyes"; then
152+ HAVE_SCSIIO_H_TRUE= 152+ HAVE_SCSIIO_H_TRUE=
153+ HAVE_SCSIIO_H_FALSE='#' 153+ HAVE_SCSIIO_H_FALSE='#'
154+else 154+else
155+ HAVE_SCSIIO_H_TRUE='#' 155+ HAVE_SCSIIO_H_TRUE='#'
156+ HAVE_SCSIIO_H_FALSE= 156+ HAVE_SCSIIO_H_FALSE=
157+fi 157+fi
158+ 158+
159  159
160  160
161 # Check whether --enable-largefile was given. 161 # Check whether --enable-largefile was given.
162@@ -28616,6 +28738,13 @@ $as_echo "$as_me: error: conditional \"H 162@@ -19787,6 +19909,13 @@ $as_echo "$as_me: error: conditional \"H
163 Usually this means the macro was only invoked conditionally." >&2;} 163 Usually this means the macro was only invoked conditionally." >&2;}
164 { (exit 1); exit 1; }; } 164 { (exit 1); exit 1; }; }
165 fi 165 fi
166+if test -z "${HAVE_SCSIIO_H_TRUE}" && test -z "${HAVE_SCSIIO_H_FALSE}"; then 166+if test -z "${HAVE_SCSIIO_H_TRUE}" && test -z "${HAVE_SCSIIO_H_FALSE}"; then
167+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SCSIIO_H\" was never defined. 167+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SCSIIO_H\" was never defined.
168+Usually this means the macro was only invoked conditionally." >&5 168+Usually this means the macro was only invoked conditionally." >&5
169+$as_echo "$as_me: error: conditional \"HAVE_SCSIIO_H\" was never defined. 169+$as_echo "$as_me: error: conditional \"HAVE_SCSIIO_H\" was never defined.
170+Usually this means the macro was only invoked conditionally." >&2;} 170+Usually this means the macro was only invoked conditionally." >&2;}
171+ { (exit 1); exit 1; }; } 171+ { (exit 1); exit 1; }; }
172+fi 172+fi
173 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then 173 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
174 { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. 174 { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
175 Usually this means the macro was only invoked conditionally." >&5 175 Usually this means the macro was only invoked conditionally." >&5
176@@ -29161,6 +29290,8 @@ do 
177 case $ac_option in 
178 # Handling of the options. 
179 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) 
180+ : Avoid regenerating within pkgsrc 
181+ exit 0 
182 ac_cs_recheck=: ;; 
183 --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) 
184 $as_echo "$ac_cs_version"; exit ;; 

File Added: pkgsrc/sysutils/brasero/patches/Attic/patch-ae
$NetBSD: patch-ae,v 1.1 2009/07/26 18:25:01 drochner Exp $

--- libbrasero-media/brasero-drive.c.orig	2009-07-01 03:02:50.000000000 +0200
+++ libbrasero-media/brasero-drive.c
@@ -57,8 +57,12 @@
 #define BLOCK_DEVICE	"block.solaris.raw_device"
 #else
 #define DEVICE_MODEL	"storage.model"
+#ifdef __NetBSD__
+#define BLOCK_DEVICE    "block.netbsd.raw_device"
+#else
 #define BLOCK_DEVICE	"block.device"
 #endif
+#endif
 
 typedef struct _BraseroDrivePrivate BraseroDrivePrivate;
 struct _BraseroDrivePrivate

File Added: pkgsrc/sysutils/brasero/patches/Attic/patch-af
$NetBSD: patch-af,v 1.1 2009/07/26 18:25:01 drochner Exp $

--- libbrasero-media/burn-hal-watch.c.orig	2009-07-01 03:02:36.000000000 +0200
+++ libbrasero-media/burn-hal-watch.c
@@ -136,7 +136,7 @@ brasero_hal_watch_init (BraseroHALWatch 
 	priv->ctx = libhal_ctx_new ();
 	if (priv->ctx == NULL) {
 		g_warning ("Cannot initialize hal library\n");
-		goto error;
+		return;
 	}
 
 	dbus_error_init (&error);
@@ -161,12 +161,11 @@ brasero_hal_watch_init (BraseroHALWatch 
 	if (libhal_ctx_init (priv->ctx, &error))
 		return;
 
-	g_warning ("Failed to initialize hal : %s\n", error.message);
+	g_warning ("Failed to initialize hal : %s\n", error.message ? error.message : "(?)");
 	dbus_error_free (&error);
 
 error:
 
-	libhal_ctx_shutdown (priv->ctx, NULL);
 	libhal_ctx_free (priv->ctx);
 	priv->ctx = NULL;
 

File Added: pkgsrc/sysutils/brasero/patches/Attic/patch-ag
$NetBSD: patch-ag,v 1.1 2009/07/26 18:25:01 drochner Exp $

--- libbrasero-media/brasero-medium-monitor.c.orig	2009-07-01 03:02:50.000000000 +0200
+++ libbrasero-media/brasero-medium-monitor.c
@@ -421,6 +421,8 @@ brasero_medium_monitor_init (BraseroMedi
 
 	watch = brasero_hal_watch_get_default ();
 	ctx = brasero_hal_watch_get_ctx (watch);
+	if (!ctx)
+		return;
 
 	g_signal_connect (watch,
 			  "device-added",

File Added: pkgsrc/sysutils/brasero/patches/Attic/patch-ah
$NetBSD: patch-ah,v 1.1 2009/07/26 18:25:01 drochner Exp $

--- nautilus/Makefile.in.orig	2009-07-01 03:03:20.000000000 +0200
+++ nautilus/Makefile.in
@@ -54,8 +54,7 @@ am__installdirs = "$(DESTDIR)$(nautilus_
 nautilus_extensionLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(nautilus_extension_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	../libbrasero-media/libbrasero-media.la
+libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libnautilus_brasero_extension_la_OBJECTS = nautilus-burn-bar.lo \
 	nautilus-burn-extension.lo
 libnautilus_brasero_extension_la_OBJECTS =  \
@@ -307,7 +306,7 @@ libnautilus_brasero_extension_la_SOURCES
 	$(NULL)
 
 libnautilus_brasero_extension_la_LIBADD = \
-	$(NAUTILUS_EXTENSION_LIBS) ../libbrasero-media/libbrasero-media.la
+	$(NAUTILUS_EXTENSION_LIBS) -L$(prefix)/lib -Wl,-R$(prefix)/lib -lbrasero-media
 
 libnautilus_brasero_extension_la_LDFLAGS = $(module_flags)
 all: all-am