diff options
author | drochner <drochner@pkgsrc.org> | 2009-12-09 19:01:05 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2009-12-09 19:01:05 +0000 |
commit | 51c2b8bc5f64d449e986732ea2149364cb7bb44b (patch) | |
tree | f50aa922247c41cbfc5173646d8f3981d452aa4b /sysutils/brasero | |
parent | 1cd0192cdcab681f4427f8d3ec72c67412491cb5 (diff) | |
download | pkgsrc-51c2b8bc5f64d449e986732ea2149364cb7bb44b.tar.gz |
update to 2.28.2
this switches to the gnome-2.28 release branch
Diffstat (limited to 'sysutils/brasero')
-rw-r--r-- | sysutils/brasero/Makefile | 13 | ||||
-rw-r--r-- | sysutils/brasero/PLIST | 124 | ||||
-rw-r--r-- | sysutils/brasero/buildlink3.mk | 3 | ||||
-rw-r--r-- | sysutils/brasero/distinfo | 19 | ||||
-rw-r--r-- | sysutils/brasero/patches/patch-aa | 38 | ||||
-rw-r--r-- | sysutils/brasero/patches/patch-ab | 18 | ||||
-rw-r--r-- | sysutils/brasero/patches/patch-ac | 175 | ||||
-rw-r--r-- | sysutils/brasero/patches/patch-ad | 57 | ||||
-rw-r--r-- | sysutils/brasero/patches/patch-ae | 17 | ||||
-rw-r--r-- | sysutils/brasero/patches/patch-af | 27 | ||||
-rw-r--r-- | sysutils/brasero/patches/patch-ag | 13 | ||||
-rw-r--r-- | sysutils/brasero/patches/patch-ah | 27 | ||||
-rw-r--r-- | sysutils/brasero/patches/patch-aj | 20 | ||||
-rw-r--r-- | sysutils/brasero/patches/patch-ba | 40 |
14 files changed, 191 insertions, 400 deletions
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index aa5ee547ef8..14a24e52023 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: Makefile,v 1.12 2009/12/09 19:01:05 drochner Exp $ # -DISTNAME= brasero-2.26.3 -PKGREVISION= 1 +DISTNAME= brasero-2.28.2 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/brasero/2.26/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/brasero/2.28/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -35,10 +34,6 @@ PKG_SUGGESTED_OPTIONS= evolution .include "../../mk/bsd.options.mk" -# sent upstream in http://bugzilla.gnome.org/show_bug.cgi?id=583332 -post-extract: - cp ${FILESDIR}/scsi-netbsd.c ${WRKSRC}/libbrasero-media/ - .include "../../databases/shared-mime-info/mimedb.mk" .include "../../devel/GConf/schemas.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" @@ -49,7 +44,6 @@ BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.15 .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/hal/buildlink3.mk" .include "../../sysutils/libnotify/buildlink3.mk" .if !empty(PKG_OPTIONS:Mevolution) .include "../../multimedia/totem-pl-parser/buildlink3.mk" @@ -57,5 +51,6 @@ BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.15 .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libunique/buildlink3.mk" .include "../../mk/omf-scrollkeeper.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/brasero/PLIST b/sysutils/brasero/PLIST index ed47ddb13bf..32dc3572a7d 100644 --- a/sysutils/brasero/PLIST +++ b/sysutils/brasero/PLIST @@ -1,11 +1,34 @@ -@comment $NetBSD: PLIST,v 1.4 2009/07/26 18:25:01 drochner Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/12/09 19:01:05 drochner Exp $ bin/brasero +include/brasero/brasero-blank-dialog.h +include/brasero/brasero-burn-dialog.h +include/brasero/brasero-burn-lib.h +include/brasero/brasero-burn-options.h +include/brasero/brasero-burn.h include/brasero/brasero-drive-selection.h include/brasero/brasero-drive.h +include/brasero/brasero-enums.h +include/brasero/brasero-error.h include/brasero/brasero-media.h include/brasero/brasero-medium-monitor.h include/brasero/brasero-medium-selection.h include/brasero/brasero-medium.h +include/brasero/brasero-session-cfg.h +include/brasero/brasero-session-span.h +include/brasero/brasero-session.h +include/brasero/brasero-status.h +include/brasero/brasero-sum-dialog.h +include/brasero/brasero-tags.h +include/brasero/brasero-tool-dialog.h +include/brasero/brasero-track-data-cfg.h +include/brasero/brasero-track-data.h +include/brasero/brasero-track-disc.h +include/brasero/brasero-track-image-cfg.h +include/brasero/brasero-track-image.h +include/brasero/brasero-track-stream-cfg.h +include/brasero/brasero-track-stream.h +include/brasero/brasero-track-type.h +include/brasero/brasero-track.h include/brasero/brasero-units.h include/brasero/brasero-volume.h lib/brasero/plugins/libbrasero-burn-uri.la @@ -28,13 +51,13 @@ lib/brasero/plugins/libbrasero-transcode.la lib/brasero/plugins/libbrasero-vcdimager.la lib/brasero/plugins/libbrasero-vob.la lib/brasero/plugins/libbrasero-wodim.la +lib/libbrasero-burn.la lib/libbrasero-media.la +lib/libbrasero-utils.la +lib/pkgconfig/libbrasero-burn.pc lib/pkgconfig/libbrasero-media.pc man/man1/brasero.1 share/applications/brasero-copy-medium.desktop -share/applications/brasero-open-image.desktop -share/applications/brasero-open-playlist.desktop -share/applications/brasero-open-project.desktop share/applications/brasero.desktop share/brasero/icons/hicolor/16x16/actions/insert-pause.png share/brasero/icons/hicolor/16x16/actions/iso-image-burn.png @@ -197,6 +220,8 @@ share/gnome/help/brasero/C/figures/brasero_main.png share/gnome/help/brasero/C/legal.xml share/gnome/help/brasero/ca/brasero.xml share/gnome/help/brasero/ca/figures/brasero_main.png +share/gnome/help/brasero/cs/brasero.xml +share/gnome/help/brasero/cs/figures/brasero_main.png share/gnome/help/brasero/de/brasero.xml share/gnome/help/brasero/de/figures/brasero_main.png share/gnome/help/brasero/el/brasero.xml @@ -215,24 +240,67 @@ share/gnome/help/brasero/ru/brasero.xml share/gnome/help/brasero/ru/figures/brasero_main.png share/gnome/help/brasero/sv/brasero.xml share/gnome/help/brasero/sv/figures/brasero_main.png -share/gtk-doc/html/brasero/BraseroDrive.html -share/gtk-doc/html/brasero/BraseroDriveSelection.html -share/gtk-doc/html/brasero/BraseroMedium.html -share/gtk-doc/html/brasero/BraseroMediumMonitor.html -share/gtk-doc/html/brasero/BraseroMediumSelection.html -share/gtk-doc/html/brasero/BraseroVolume.html -share/gtk-doc/html/brasero/brasero-brasero-media.html -share/gtk-doc/html/brasero/brasero-brasero-units.html -share/gtk-doc/html/brasero/brasero.devhelp -share/gtk-doc/html/brasero/brasero.devhelp2 -share/gtk-doc/html/brasero/ch01.html -share/gtk-doc/html/brasero/home.png -share/gtk-doc/html/brasero/index.html -share/gtk-doc/html/brasero/index.sgml -share/gtk-doc/html/brasero/left.png -share/gtk-doc/html/brasero/right.png -share/gtk-doc/html/brasero/style.css -share/gtk-doc/html/brasero/up.png +share/gnome/help/brasero/zh_CN/brasero.xml +share/gnome/help/brasero/zh_CN/figures/brasero_main.png +share/gnome/help/brasero/zh_HK/brasero.xml +share/gnome/help/brasero/zh_HK/figures/brasero_main.png +share/gnome/help/brasero/zh_TW/brasero.xml +share/gnome/help/brasero/zh_TW/figures/brasero_main.png +share/gtk-doc/html/libbrasero-burn/api-index-full.html +share/gtk-doc/html/libbrasero-burn/ch01.html +share/gtk-doc/html/libbrasero-burn/home.png +share/gtk-doc/html/libbrasero-burn/index.html +share/gtk-doc/html/libbrasero-burn/index.sgml +share/gtk-doc/html/libbrasero-burn/left.png +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroBlankDialog.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroBurn.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroBurnDialog.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroBurnOptions.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroBurnSession.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroSessionCfg.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroSessionSpan.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroSumDialog.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroToolDialog.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrack.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackData.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackDataCfg.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackDisc.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackImage.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackImageCfg.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackStream.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackStreamCfg.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-burn-lib.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-enums.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-error.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-status.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-tags.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-track-type.html +share/gtk-doc/html/libbrasero-burn/libbrasero-burn.devhelp +share/gtk-doc/html/libbrasero-burn/libbrasero-burn.devhelp2 +share/gtk-doc/html/libbrasero-burn/object-tree.html +share/gtk-doc/html/libbrasero-burn/right.png +share/gtk-doc/html/libbrasero-burn/style.css +share/gtk-doc/html/libbrasero-burn/up.png +share/gtk-doc/html/libbrasero-media/api-index-full.html +share/gtk-doc/html/libbrasero-media/ch01.html +share/gtk-doc/html/libbrasero-media/home.png +share/gtk-doc/html/libbrasero-media/index.html +share/gtk-doc/html/libbrasero-media/index.sgml +share/gtk-doc/html/libbrasero-media/left.png +share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroDrive.html +share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroDriveSelection.html +share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroMedium.html +share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroMediumMonitor.html +share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroMediumSelection.html +share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroVolume.html +share/gtk-doc/html/libbrasero-media/libbrasero-media-brasero-media.html +share/gtk-doc/html/libbrasero-media/libbrasero-media-brasero-units.html +share/gtk-doc/html/libbrasero-media/libbrasero-media.devhelp +share/gtk-doc/html/libbrasero-media/libbrasero-media.devhelp2 +share/gtk-doc/html/libbrasero-media/object-tree.html +share/gtk-doc/html/libbrasero-media/right.png +share/gtk-doc/html/libbrasero-media/style.css +share/gtk-doc/html/libbrasero-media/up.png share/icons/hicolor/16x16/apps/brasero.png share/icons/hicolor/22x22/apps/brasero.png share/icons/hicolor/24x24/apps/brasero.png @@ -241,9 +309,14 @@ share/icons/hicolor/48x48/apps/brasero.png share/icons/hicolor/scalable/apps/brasero.svg share/locale/ar/LC_MESSAGES/brasero.mo share/locale/as/LC_MESSAGES/brasero.mo +share/locale/ast/LC_MESSAGES/brasero.mo +share/locale/be/LC_MESSAGES/brasero.mo share/locale/bg/LC_MESSAGES/brasero.mo +share/locale/bn/LC_MESSAGES/brasero.mo share/locale/bn_IN/LC_MESSAGES/brasero.mo +share/locale/br/LC_MESSAGES/brasero.mo share/locale/ca/LC_MESSAGES/brasero.mo +share/locale/ca@valencia/LC_MESSAGES/brasero.mo share/locale/cs/LC_MESSAGES/brasero.mo share/locale/da/LC_MESSAGES/brasero.mo share/locale/de/LC_MESSAGES/brasero.mo @@ -255,6 +328,7 @@ share/locale/et/LC_MESSAGES/brasero.mo share/locale/eu/LC_MESSAGES/brasero.mo share/locale/fi/LC_MESSAGES/brasero.mo share/locale/fr/LC_MESSAGES/brasero.mo +share/locale/ga/LC_MESSAGES/brasero.mo share/locale/gl/LC_MESSAGES/brasero.mo share/locale/gu/LC_MESSAGES/brasero.mo share/locale/he/LC_MESSAGES/brasero.mo @@ -264,8 +338,10 @@ share/locale/it/LC_MESSAGES/brasero.mo share/locale/ja/LC_MESSAGES/brasero.mo share/locale/kn/LC_MESSAGES/brasero.mo share/locale/ko/LC_MESSAGES/brasero.mo +share/locale/ku/LC_MESSAGES/brasero.mo share/locale/lt/LC_MESSAGES/brasero.mo share/locale/lv/LC_MESSAGES/brasero.mo +share/locale/mai/LC_MESSAGES/brasero.mo share/locale/mk/LC_MESSAGES/brasero.mo share/locale/ml/LC_MESSAGES/brasero.mo share/locale/mr/LC_MESSAGES/brasero.mo @@ -295,6 +371,7 @@ share/locale/zh_TW/LC_MESSAGES/brasero.mo share/mime/packages/brasero.xml share/omf/brasero/brasero-C.omf share/omf/brasero/brasero-ca.omf +share/omf/brasero/brasero-cs.omf share/omf/brasero/brasero-de.omf share/omf/brasero/brasero-el.omf share/omf/brasero/brasero-en_GB.omf @@ -304,3 +381,6 @@ share/omf/brasero/brasero-it.omf share/omf/brasero/brasero-pl.omf share/omf/brasero/brasero-ru.omf share/omf/brasero/brasero-sv.omf +share/omf/brasero/brasero-zh_CN.omf +share/omf/brasero/brasero-zh_HK.omf +share/omf/brasero/brasero-zh_TW.omf diff --git a/sysutils/brasero/buildlink3.mk b/sysutils/brasero/buildlink3.mk index 61426ca7ccb..9cbf391ed35 100644 --- a/sysutils/brasero/buildlink3.mk +++ b/sysutils/brasero/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/12/09 19:01:05 drochner Exp $ BUILDLINK_TREE+= brasero @@ -11,7 +11,6 @@ BUILDLINK_PKGSRCDIR.brasero?= ../../sysutils/brasero .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../sysutils/hal/buildlink3.mk" .endif # BRASERO_BUILDLINK3_MK diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo index df545c31fef..c9d8ae59174 100644 --- a/sysutils/brasero/distinfo +++ b/sysutils/brasero/distinfo @@ -1,13 +1,8 @@ -$NetBSD: distinfo,v 1.5 2009/07/26 18:25:01 drochner Exp $ +$NetBSD: distinfo,v 1.6 2009/12/09 19:01:05 drochner Exp $ -SHA1 (brasero-2.26.3.tar.bz2) = 97273908948481ea2f97d4a12e7bf5031ca613cb -RMD160 (brasero-2.26.3.tar.bz2) = f1f811b239f4b5edfa0a3dfde65b028c43e4906c -Size (brasero-2.26.3.tar.bz2) = 3312144 bytes -SHA1 (patch-aa) = 3799e6f3a59e03bc8a187b0eca025c1f15bf5135 -SHA1 (patch-ab) = 5e9c3a4c3608a04270d6c7e034b5e3dd0c25e44f -SHA1 (patch-ac) = ab62c40cc9046020c9088ae7958fe3e7a3af8eba -SHA1 (patch-ad) = 80632fe45694e98692ab2aa69d24f97ad13de346 -SHA1 (patch-ae) = e5dfb8da776b860074aa935a97152968222ae9bc -SHA1 (patch-af) = 41414c465307b08de981a281e4fa1219dd47f28e -SHA1 (patch-ag) = a97f16bfc2a82d50904c2432daab9bb456cbe5ce -SHA1 (patch-ah) = 91325870ad2bbfe307bbf3bc82243375b43e229c +SHA1 (brasero-2.28.2.tar.bz2) = 7475e8ea33eaf2bf7c9f5cb8397a30642311820a +RMD160 (brasero-2.28.2.tar.bz2) = 2c836d0096cb0457c839dfcd3d1acbf0cb641d8c +Size (brasero-2.28.2.tar.bz2) = 4072165 bytes +SHA1 (patch-ah) = da517a1ace02a62bbe95cbb5630cc6ce72fdf3fc +SHA1 (patch-aj) = 31928e19cfcc2612bd0826f0a89a23eb7b378c7f +SHA1 (patch-ba) = 1e314b690f72c767f553bcfb8360076f61b0a8b8 diff --git a/sysutils/brasero/patches/patch-aa b/sysutils/brasero/patches/patch-aa deleted file mode 100644 index 4916abc0e39..00000000000 --- a/sysutils/brasero/patches/patch-aa +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2009/05/20 13:43:21 wiz Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=583332 - ---- configure.in.orig 2009-03-15 20:47:59.000000000 -0400 -+++ configure.in -@@ -82,6 +82,11 @@ AC_CHECK_TYPES([sg_io_hdr_t],[has_sg="ye - [#include <sys/types.h> - #include <scsi/sg.h>]) - -+dnl ***************** check for netbsd ************************* -+AC_CHECK_TYPES([scsireq_t],[has_scsiio="yes"],[has_scsiio="no"], -+[#include <sys/types.h> -+ #include <sys/scsiio.h>]) -+ - dnl ***************** check for solaris uscsi interface ******** - AC_CHECK_TYPES([struct uscsi_cmd],[has_uscsi="yes"],[has_uscsi="no"], - [#include <sys/types.h> -@@ -91,15 +96,18 @@ if test x"$has_cam" = x"yes"; then - BRASERO_SCSI_LIBS="-lcam" - elif test x"$has_sg" = x"yes"; then - : -+elif test x"$has_scsiio" = x"yes"; then -+ : - elif test x"$has_uscsi" = x"yes"; then - : - else -- AC_ERROR([Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found.]) -+ AC_ERROR([Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found.]) - fi - - AM_CONDITIONAL(HAVE_CAM_LIB_H, test x"$has_cam" = "xyes") - AM_CONDITIONAL(HAVE_SG_IO_HDR_T, test x"$has_sg" = "xyes") - AM_CONDITIONAL(HAVE_USCSI_H, test x"$has_uscsi" = "xyes") -+AM_CONDITIONAL(HAVE_SCSIIO_H, test x"$has_scsiio" = "xyes") - - dnl ***************** LARGE FILE SUPPORT *********************** - diff --git a/sysutils/brasero/patches/patch-ab b/sysutils/brasero/patches/patch-ab deleted file mode 100644 index 17890351fe9..00000000000 --- a/sysutils/brasero/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2009/05/20 13:43:21 wiz Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=583332 - ---- libbrasero-media/Makefile.am.orig 2009-03-15 20:47:51.000000000 -0400 -+++ libbrasero-media/Makefile.am -@@ -141,6 +141,11 @@ if HAVE_SG_IO_HDR_T - libbrasero_media_la_SOURCES += scsi-sg.c - endif - -+# NetBSD's scsi(4) -+if HAVE_SCSIIO_H -+libbrasero_media_la_SOURCES += scsi-netbsd.c -+endif -+ - # Solaris's USCSI interface - if HAVE_USCSI_H - libbrasero_media_la_SOURCES += scsi-uscsi.c diff --git a/sysutils/brasero/patches/patch-ac b/sysutils/brasero/patches/patch-ac deleted file mode 100644 index 63f10b2f81f..00000000000 --- a/sysutils/brasero/patches/patch-ac +++ /dev/null @@ -1,175 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2009/07/26 18:25:01 drochner Exp $ - ---- configure.orig 2009-07-01 03:03:18.000000000 +0200 -+++ configure -@@ -900,6 +900,8 @@ ENABLE_GTK_DOC_TRUE - GTKDOC_CHECK - PKG_CONFIG - HTML_DIR -+HAVE_SCSIIO_H_FALSE -+HAVE_SCSIIO_H_TRUE - HAVE_USCSI_H_FALSE - HAVE_USCSI_H_TRUE - HAVE_SG_IO_HDR_T_FALSE -@@ -12828,6 +12830,116 @@ else - fi - - -+{ $as_echo "$as_me:$LINENO: checking for scsireq_t" >&5 -+$as_echo_n "checking for scsireq_t... " >&6; } -+if test "${ac_cv_type_scsireq_t+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_type_scsireq_t=no -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/types.h> -+ #include <sys/scsiio.h> -+ -+int -+main () -+{ -+if (sizeof (scsireq_t)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/types.h> -+ #include <sys/scsiio.h> -+ -+int -+main () -+{ -+if (sizeof ((scsireq_t))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_type_scsireq_t=yes -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_scsireq_t" >&5 -+$as_echo "$ac_cv_type_scsireq_t" >&6; } -+if test "x$ac_cv_type_scsireq_t" = x""yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_SCSIREQ_T 1 -+_ACEOF -+ -+has_scsiio="yes" -+else -+ has_scsiio="no" -+fi -+ -+ - { $as_echo "$as_me:$LINENO: checking for struct uscsi_cmd" >&5 - $as_echo_n "checking for struct uscsi_cmd... " >&6; } - if test "${ac_cv_type_struct_uscsi_cmd+set}" = set; then -@@ -12942,11 +13054,13 @@ if test x"$has_cam" = x"yes"; then - BRASERO_SCSI_LIBS="-lcam" - elif test x"$has_sg" = x"yes"; then - : -+elif test x"$has_scsiio" = x"yes"; then -+ : - elif test x"$has_uscsi" = x"yes"; then - : - else -- { { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found." >&5 --$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;} -+ { { $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 -+$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -12974,6 +13088,14 @@ else - HAVE_USCSI_H_FALSE= - fi - -+ if test x"$has_scsiio" = "xyes"; then -+ HAVE_SCSIIO_H_TRUE= -+ HAVE_SCSIIO_H_FALSE='#' -+else -+ HAVE_SCSIIO_H_TRUE='#' -+ HAVE_SCSIIO_H_FALSE= -+fi -+ - - - # Check whether --enable-largefile was given. -@@ -19787,6 +19909,13 @@ $as_echo "$as_me: error: conditional \"H - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${HAVE_SCSIIO_H_TRUE}" && test -z "${HAVE_SCSIIO_H_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SCSIIO_H\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"HAVE_SCSIIO_H\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 diff --git a/sysutils/brasero/patches/patch-ad b/sysutils/brasero/patches/patch-ad deleted file mode 100644 index 38baa8eca12..00000000000 --- a/sysutils/brasero/patches/patch-ad +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2009/07/06 15:22:14 joerg Exp $ - ---- libbrasero-media/Makefile.in.orig 2009-05-18 17:06:54.000000000 +0200 -+++ libbrasero-media/Makefile.in -@@ -40,8 +40,11 @@ host_triplet = @host@ - # Linux's SCSI CAM interface - @HAVE_SG_IO_HDR_T_TRUE@am__append_2 = scsi-sg.c - -+# NetBSD's scsi(4) -+@HAVE_SCSIIO_H_TRUE@am__append_3 = scsi-netbsd.c -+ - # Solaris's USCSI interface --@HAVE_USCSI_H_TRUE@am__append_3 = scsi-uscsi.c -+@HAVE_USCSI_H_TRUE@am__append_4 = scsi-uscsi.c - subdir = libbrasero-media - DIST_COMMON = $(libbraseromediainclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/brasero-media.h.in COPYING -@@ -96,10 +99,11 @@ am__libbrasero_media_la_SOURCES_DIST = l - brasero-drive-selection.c brasero-drive-selection.h \ - brasero-media-private.h brasero-medium-selection-priv.h \ - brasero-gio-operation.h brasero-gio-operation.c scsi-cam.c \ -- scsi-sg.c scsi-uscsi.c -+ scsi-sg.c scsi-uscsi.c scsi-netbsd.c - @HAVE_CAM_LIB_H_TRUE@am__objects_1 = scsi-cam.lo - @HAVE_SG_IO_HDR_T_TRUE@am__objects_2 = scsi-sg.lo --@HAVE_USCSI_H_TRUE@am__objects_3 = scsi-uscsi.lo -+@HAVE_SCSIIO_H_TRUE@am__objects_3 = scsi-netbsd.lo -+@HAVE_USCSI_H_TRUE@am__objects_4 = scsi-uscsi.lo - am_libbrasero_media_la_OBJECTS = libbrasero-marshal.lo \ - scsi-get-configuration.lo scsi-read-disc-info.lo \ - scsi-read-toc-pma-atip.lo scsi-sense-data.lo scsi-error.lo \ -@@ -114,7 +118,7 @@ am_libbrasero_media_la_OBJECTS = libbras - brasero-volume.lo brasero-drive.lo brasero-medium-selection.lo \ - brasero-units.lo brasero-drive-selection.lo \ - brasero-gio-operation.lo $(am__objects_1) $(am__objects_2) \ -- $(am__objects_3) -+ $(am__objects_3) $(am__objects_4) - libbrasero_media_la_OBJECTS = $(am_libbrasero_media_la_OBJECTS) - libbrasero_media_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -420,7 +424,7 @@ libbrasero_media_la_SOURCES = libbrasero - brasero-drive-selection.c brasero-drive-selection.h \ - brasero-media-private.h brasero-medium-selection-priv.h \ - brasero-gio-operation.h brasero-gio-operation.c \ -- $(am__append_1) $(am__append_2) $(am__append_3) -+ $(am__append_1) $(am__append_2) $(am__append_3) $(am__append_4) - EXTRA_DIST = \ - libbrasero-marshal.list - -@@ -534,6 +538,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-sense-data.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-sg.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-test-unit-ready.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-netbsd.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-uscsi.Plo@am__quote@ - - .c.o: diff --git a/sysutils/brasero/patches/patch-ae b/sysutils/brasero/patches/patch-ae deleted file mode 100644 index aa5fcb18128..00000000000 --- a/sysutils/brasero/patches/patch-ae +++ /dev/null @@ -1,17 +0,0 @@ -$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 diff --git a/sysutils/brasero/patches/patch-af b/sysutils/brasero/patches/patch-af deleted file mode 100644 index aca5cebdb55..00000000000 --- a/sysutils/brasero/patches/patch-af +++ /dev/null @@ -1,27 +0,0 @@ -$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; - diff --git a/sysutils/brasero/patches/patch-ag b/sysutils/brasero/patches/patch-ag deleted file mode 100644 index bd4a5c9962f..00000000000 --- a/sysutils/brasero/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$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", diff --git a/sysutils/brasero/patches/patch-ah b/sysutils/brasero/patches/patch-ah index a0711fcae60..31eda695979 100644 --- a/sysutils/brasero/patches/patch-ah +++ b/sysutils/brasero/patches/patch-ah @@ -1,23 +1,30 @@ -$NetBSD: patch-ah,v 1.1 2009/07/26 18:25:01 drochner Exp $ +$NetBSD: patch-ah,v 1.2 2009/12/09 19:01:06 drochner Exp $ ---- nautilus/Makefile.in.orig 2009-07-01 03:03:20.000000000 +0200 +--- nautilus/Makefile.in.orig 2009-10-19 18:05:45.000000000 +0200 +++ nautilus/Makefile.in -@@ -54,8 +54,7 @@ am__installdirs = "$(DESTDIR)$(nautilus_ - nautilus_extensionLTLIBRARIES_INSTALL = $(INSTALL) +@@ -71,10 +71,7 @@ am__installdirs = "$(DESTDIR)$(nautilus_ + "$(DESTDIR)$(desktopdir)" LTLIBRARIES = $(nautilus_extension_LTLIBRARIES) am__DEPENDENCIES_1 = -libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- ../libbrasero-media/libbrasero-media.la +- ../libbrasero-utils/libbrasero-utils.la \ +- ../libbrasero-media/libbrasero-media.la \ +- ../libbrasero-burn/libbrasero-burn.la +libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libnautilus_brasero_extension_la_OBJECTS = nautilus-burn-bar.lo \ - nautilus-burn-extension.lo + nautilus-burn-extension.lo brasero-project-name.lo libnautilus_brasero_extension_la_OBJECTS = \ -@@ -307,7 +306,7 @@ libnautilus_brasero_extension_la_SOURCES - $(NULL) +@@ -355,9 +352,10 @@ libnautilus_brasero_extension_la_SOURCES 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 + $(NAUTILUS_EXTENSION_LIBS) \ +- ../libbrasero-utils/libbrasero-utils.la \ +- ../libbrasero-media/libbrasero-media.la \ +- ../libbrasero-burn/libbrasero-burn.la ++ -L$(prefix)/lib -Wl,-R$(prefix)/lib \ ++ -lbrasero-utils \ ++ -lbrasero-media \ ++ -lbrasero-burn libnautilus_brasero_extension_la_LDFLAGS = $(module_flags) all: all-am diff --git a/sysutils/brasero/patches/patch-aj b/sysutils/brasero/patches/patch-aj new file mode 100644 index 00000000000..1939efa599d --- /dev/null +++ b/sysutils/brasero/patches/patch-aj @@ -0,0 +1,20 @@ +$NetBSD: patch-aj,v 1.1 2009/12/09 19:01:06 drochner Exp $ + +--- libbrasero-media/scsi-netbsd.c.orig 2009-10-21 23:47:35.000000000 +0200 ++++ libbrasero-media/scsi-netbsd.c +@@ -164,14 +164,11 @@ brasero_device_handle_open (const gchar + int fd; + int flags = OPEN_FLAGS; + BraseroDeviceHandle *handle; +- gchar *rdevnode; + + if (exclusive) + flags |= O_EXCL; + +- rdevnode = g_strdup_printf ("/dev/r%s", path + strlen ("/dev/")); +- fd = open (rdevnode, flags); +- g_free (rdevnode); ++ fd = open (path, flags); + if (fd < 0) { + if (code) { + if (errno == EAGAIN diff --git a/sysutils/brasero/patches/patch-ba b/sysutils/brasero/patches/patch-ba new file mode 100644 index 00000000000..e3e52d107d9 --- /dev/null +++ b/sysutils/brasero/patches/patch-ba @@ -0,0 +1,40 @@ +$NetBSD: patch-ba,v 1.1 2009/12/09 19:01:06 drochner Exp $ + +--- libbrasero-burn/brasero-data-project.c.orig 2009-10-19 17:10:18.000000000 +0200 ++++ libbrasero-burn/brasero-data-project.c +@@ -653,7 +653,7 @@ brasero_data_project_uri_to_nodes (Brase + if (graft) + break; + +- parent = dirname (parent); ++ parent = g_path_get_dirname (parent); + } + + if (!graft) { +@@ -829,7 +829,7 @@ brasero_data_project_uri_has_parent (Bra + return TRUE; + } + +- parent = dirname (parent); ++ parent = g_path_get_dirname (parent); + } + + g_free (parent); +@@ -903,7 +903,7 @@ brasero_data_project_uri_is_graft_needed + * node is missing. */ + graft_parent = g_hash_table_lookup (priv->grafts, parent); + while (parent && !graft_parent) { +- parent = dirname (parent); ++ parent = g_path_get_dirname (parent); + graft_parent = g_hash_table_lookup (priv->grafts, parent); + } + g_free (parent); +@@ -3437,7 +3437,7 @@ brasero_data_project_add_excluded_uri (B + break; + + graft = NULL; +- parent_uri = dirname (parent_uri); ++ parent_uri = g_path_get_dirname (parent_uri); + } + g_free (parent_uri); + |