pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils update brasero to 2.26.3
details: https://anonhg.NetBSD.org/pkgsrc/rev/c923f4b0b8ae
branches: trunk
changeset: 396516:c923f4b0b8ae
user: drochner <drochner%pkgsrc.org@localhost>
date: Sun Jul 26 18:25:01 2009 +0000
description:
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
diffstat:
sysutils/Makefile | 3 +-
sysutils/brasero-nautilus/DESCR | 3 ++
sysutils/brasero-nautilus/Makefile | 50 ++++++++++++++++++++++++++++++++++++
sysutils/brasero-nautilus/PLIST | 3 ++
sysutils/brasero/Makefile | 17 ++++++++++--
sysutils/brasero/PLIST | 4 +--
sysutils/brasero/buildlink3.mk | 7 ++++-
sysutils/brasero/distinfo | 14 ++++++---
sysutils/brasero/files/scsi-netbsd.c | 7 +---
sysutils/brasero/patches/patch-ac | 35 +++++++++---------------
sysutils/brasero/patches/patch-ae | 17 ++++++++++++
sysutils/brasero/patches/patch-af | 27 +++++++++++++++++++
sysutils/brasero/patches/patch-ag | 13 +++++++++
sysutils/brasero/patches/patch-ah | 23 ++++++++++++++++
14 files changed, 183 insertions(+), 40 deletions(-)
diffs (truncated from 382 to 300 lines):
diff -r 80c807975bc4 -r c923f4b0b8ae sysutils/Makefile
--- a/sysutils/Makefile Sun Jul 26 18:06:22 2009 +0000
+++ b/sysutils/Makefile Sun Jul 26 18:25:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.475 2009/07/23 15:31:20 drochner Exp $
+# $NetBSD: Makefile,v 1.476 2009/07/26 18:25:01 drochner Exp $
#
COMMENT= System utilities
@@ -35,6 +35,7 @@
SUBDIR+= boxbackup-client
SUBDIR+= boxbackup-server
SUBDIR+= brasero
+SUBDIR+= brasero-nautilus
SUBDIR+= bsign
SUBDIR+= btpin-qt
SUBDIR+= bubblemon
diff -r 80c807975bc4 -r c923f4b0b8ae sysutils/brasero-nautilus/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/brasero-nautilus/DESCR Sun Jul 26 18:25:01 2009 +0000
@@ -0,0 +1,3 @@
+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.
diff -r 80c807975bc4 -r c923f4b0b8ae sysutils/brasero-nautilus/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/brasero-nautilus/Makefile Sun Jul 26 18:25:01 2009 +0000
@@ -0,0 +1,50 @@
+# $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@localhost
+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"
diff -r 80c807975bc4 -r c923f4b0b8ae sysutils/brasero-nautilus/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/brasero-nautilus/PLIST Sun Jul 26 18:25:01 2009 +0000
@@ -0,0 +1,3 @@
+@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
diff -r 80c807975bc4 -r c923f4b0b8ae sysutils/brasero/Makefile
--- a/sysutils/brasero/Makefile Sun Jul 26 18:06:22 2009 +0000
+++ b/sysutils/brasero/Makefile Sun Jul 26 18:25:01 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:45 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/26 18:25:01 drochner Exp $
#
-DISTNAME= brasero-2.26.2
+DISTNAME= brasero-2.26.3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/brasero/2.26/}
EXTRACT_SUFX= .tar.bz2
@@ -26,6 +26,14 @@
GCONF_SCHEMAS+= brasero.schemas
PKGCONFIG_OVERRIDE+= libbrasero-media.pc.in
+# The playlist feature needs totem-pl-parser which in turn
+# pulls in evolution-data-server.
+PKG_OPTIONS_VAR= PKG_OPTIONS.brasero
+PKG_SUPPORTED_OPTIONS= evolution
+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/
@@ -42,8 +50,11 @@
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/hal/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../sysutils/nautilus/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mevolution)
+.include "../../multimedia/totem-pl-parser/buildlink3.mk"
+.endif
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
.include "../../mk/omf-scrollkeeper.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 80c807975bc4 -r c923f4b0b8ae sysutils/brasero/PLIST
--- a/sysutils/brasero/PLIST Sun Jul 26 18:06:22 2009 +0000
+++ b/sysutils/brasero/PLIST Sun Jul 26 18:25:01 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/07/26 18:25:01 drochner Exp $
bin/brasero
include/brasero/brasero-drive-selection.h
include/brasero/brasero-drive.h
@@ -29,11 +29,9 @@
lib/brasero/plugins/libbrasero-vob.la
lib/brasero/plugins/libbrasero-wodim.la
lib/libbrasero-media.la
-lib/nautilus/extensions-2.0/libnautilus-brasero-extension.la
lib/pkgconfig/libbrasero-media.pc
man/man1/brasero.1
share/applications/brasero-copy-medium.desktop
-share/applications/brasero-nautilus.desktop
share/applications/brasero-open-image.desktop
share/applications/brasero-open-playlist.desktop
share/applications/brasero-open-project.desktop
diff -r 80c807975bc4 -r c923f4b0b8ae sysutils/brasero/buildlink3.mk
--- a/sysutils/brasero/buildlink3.mk Sun Jul 26 18:06:22 2009 +0000
+++ b/sysutils/brasero/buildlink3.mk Sun Jul 26 18:25:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/07/26 18:25:01 drochner Exp $
BUILDLINK_TREE+= brasero
@@ -7,6 +7,11 @@
BUILDLINK_API_DEPENDS.brasero+= brasero>=2.26.0
BUILDLINK_PKGSRCDIR.brasero?= ../../sysutils/brasero
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/hal/buildlink3.mk"
+
.endif # BRASERO_BUILDLINK3_MK
BUILDLINK_TREE+= -brasero
diff -r 80c807975bc4 -r c923f4b0b8ae sysutils/brasero/distinfo
--- a/sysutils/brasero/distinfo Sun Jul 26 18:06:22 2009 +0000
+++ b/sysutils/brasero/distinfo Sun Jul 26 18:25:01 2009 +0000
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.4 2009/07/06 15:22:14 joerg Exp $
+$NetBSD: distinfo,v 1.5 2009/07/26 18:25:01 drochner Exp $
-SHA1 (brasero-2.26.2.tar.bz2) = a65f0167d209e86535611d37887481beb21e33c8
-RMD160 (brasero-2.26.2.tar.bz2) = 5110cd570448b9f3c4213483ee90f8f13a7dc038
-Size (brasero-2.26.2.tar.bz2) = 3326163 bytes
+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) = 9829e879d145586bb00390c26d76879d8d999179
+SHA1 (patch-ac) = ab62c40cc9046020c9088ae7958fe3e7a3af8eba
SHA1 (patch-ad) = 80632fe45694e98692ab2aa69d24f97ad13de346
+SHA1 (patch-ae) = e5dfb8da776b860074aa935a97152968222ae9bc
+SHA1 (patch-af) = 41414c465307b08de981a281e4fa1219dd47f28e
+SHA1 (patch-ag) = a97f16bfc2a82d50904c2432daab9bb456cbe5ce
+SHA1 (patch-ah) = 91325870ad2bbfe307bbf3bc82243375b43e229c
diff -r 80c807975bc4 -r c923f4b0b8ae sysutils/brasero/files/scsi-netbsd.c
--- a/sysutils/brasero/files/scsi-netbsd.c Sun Jul 26 18:06:22 2009 +0000
+++ b/sysutils/brasero/files/scsi-netbsd.c Sun Jul 26 18:25:01 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi-netbsd.c,v 1.2 2009/03/22 09:30:39 wiz Exp $ */
+/* $NetBSD: scsi-netbsd.c,v 1.3 2009/07/26 18:25:01 drochner Exp $ */
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* Libbrasero-media
@@ -164,14 +164,11 @@
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 -r 80c807975bc4 -r c923f4b0b8ae sysutils/brasero/patches/patch-ac
--- a/sysutils/brasero/patches/patch-ac Sun Jul 26 18:06:22 2009 +0000
+++ b/sysutils/brasero/patches/patch-ac Sun Jul 26 18:25:01 2009 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2009/07/06 15:22:14 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2009/07/26 18:25:01 drochner Exp $
---- configure.orig 2009-05-18 17:06:56.000000000 +0200
+--- configure.orig 2009-07-01 03:03:18.000000000 +0200
+++ configure
-@@ -912,6 +912,8 @@ HAVE_SG_IO_HDR_T_FALSE
- HAVE_SG_IO_HDR_T_TRUE
- HAVE_CAM_LIB_H_FALSE
- HAVE_CAM_LIB_H_TRUE
+@@ -900,6 +900,8 @@ ENABLE_GTK_DOC_TRUE
+ GTKDOC_CHECK
+ PKG_CONFIG
+ HTML_DIR
+HAVE_SCSIIO_H_FALSE
+HAVE_SCSIIO_H_TRUE
- BRASERO_SCSI_LIBS
- LIBTOOL
- ac_ct_F77
-@@ -21715,6 +21717,116 @@ else
+ HAVE_USCSI_H_FALSE
+ HAVE_USCSI_H_TRUE
+ HAVE_SG_IO_HDR_T_FALSE
+@@ -12828,6 +12830,116 @@ else
fi
@@ -128,7 +128,7 @@
{ $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
-@@ -21829,11 +21941,13 @@ if test x"$has_cam" = x"yes"; 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
:
@@ -144,7 +144,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -21861,6 +21975,14 @@ else
+@@ -12974,6 +13088,14 @@ else
HAVE_USCSI_H_FALSE=
fi
@@ -159,7 +159,7 @@
# Check whether --enable-largefile was given.
-@@ -28616,6 +28738,13 @@ $as_echo "$as_me: error: conditional \"H
+@@ -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
@@ -173,12 +173,3 @@
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
-@@ -29161,6 +29290,8 @@ do
- case $ac_option in
- # Handling of the options.
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+ : Avoid regenerating within pkgsrc
-+ exit 0
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
diff -r 80c807975bc4 -r c923f4b0b8ae sysutils/brasero/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/brasero/patches/patch-ae Sun Jul 26 18:25:01 2009 +0000
@@ -0,0 +1,17 @@
+$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"
Home |
Main Index |
Thread Index |
Old Index