summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--misc/libcdio/Makefile8
-rw-r--r--misc/libcdio/PLIST23
-rw-r--r--misc/libcdio/distinfo10
-rw-r--r--misc/libcdio/files/_cdio_netbsd.c29
-rw-r--r--misc/libcdio/patches/patch-aa6
5 files changed, 55 insertions, 21 deletions
diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index 3a91c0fc92a..0b492a032df 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/04/19 10:53:49 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/02 17:11:17 drochner Exp $
#
-DISTNAME= libcdio-0.70
+DISTNAME= libcdio-0.73
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU:=libcdio/}
@@ -14,6 +14,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= libcdio.pc.in
+PKGCONFIG_OVERRIDE+= libcdio_cdda.pc.in
+PKGCONFIG_OVERRIDE+= libcdio_paranoia.pc.in
PKGCONFIG_OVERRIDE+= libiso9660.pc.in
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-versioned-libs
@@ -25,7 +27,7 @@ INFO_FILES= libcdio.info
.if ${OPSYS} == "NetBSD"
# XXX we just replace the freebsd module so save patches
pre-patch:
- ${CP} ${FILESDIR}/_cdio_netbsd.c ${WRKSRC}/lib/FreeBSD/freebsd.c
+ ${CP} ${FILESDIR}/_cdio_netbsd.c ${WRKSRC}/lib/driver/FreeBSD/freebsd.c
.endif
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/misc/libcdio/PLIST b/misc/libcdio/PLIST
index 3901c6b2398..9fd9fa9e1b7 100644
--- a/misc/libcdio/PLIST
+++ b/misc/libcdio/PLIST
@@ -1,23 +1,44 @@
-@comment $NetBSD: PLIST,v 1.8 2005/04/19 10:53:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/05/02 17:11:17 drochner Exp $
bin/cd-drive
bin/cd-info
+bin/cd-paranoia
bin/cd-read
+bin/cdda-player
bin/iso-info
bin/iso-read
+include/cdio/audio.h
+include/cdio/bytesex.h
+include/cdio/bytesex_asm.h
include/cdio/cd_types.h
+include/cdio/cdda.h
include/cdio/cdio.h
+include/cdio/cdio_config.h
include/cdio/cdtext.h
+include/cdio/device.h
+include/cdio/disc.h
+include/cdio/ds.h
include/cdio/dvd.h
include/cdio/iso9660.h
include/cdio/logging.h
+include/cdio/mmc.h
+include/cdio/paranoia.h
+include/cdio/read.h
+include/cdio/rock.h
include/cdio/scsi_mmc.h
include/cdio/sector.h
+include/cdio/track.h
include/cdio/types.h
include/cdio/util.h
include/cdio/version.h
include/cdio/xa.h
lib/libcdio.la
+lib/libcdio_cdda.la
+lib/libcdio_paranoia.la
lib/libiso9660.la
lib/pkgconfig/libcdio.pc
+lib/pkgconfig/libcdio_cdda.pc
+lib/pkgconfig/libcdio_paranoia.pc
lib/pkgconfig/libiso9660.pc
+man/jp/man1/cd-paranoia.1
+man/man1/cd-paranoia.1
@dirrm include/cdio
diff --git a/misc/libcdio/distinfo b/misc/libcdio/distinfo
index 4de1a11c921..0af5eabb40f 100644
--- a/misc/libcdio/distinfo
+++ b/misc/libcdio/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/04/19 10:53:49 wiz Exp $
+$NetBSD: distinfo,v 1.8 2005/05/02 17:11:17 drochner Exp $
-SHA1 (libcdio-0.70.tar.gz) = 57d45525fc5dc8de8c0dc9fd574d90cb534b36df
-RMD160 (libcdio-0.70.tar.gz) = fdbabe1aa484e010d09e9a5612f1ffc9ebe6617f
-Size (libcdio-0.70.tar.gz) = 1474322 bytes
-SHA1 (patch-aa) = ebda7a5453404e6adf4755f768a5293ca9871878
+SHA1 (libcdio-0.73.tar.gz) = a802ddba996d4c2eaf5bc7efee035611e17f6144
+RMD160 (libcdio-0.73.tar.gz) = 47c3b4d1462433442de01556b246aa021b57fe34
+Size (libcdio-0.73.tar.gz) = 1797009 bytes
+SHA1 (patch-aa) = 52c6b20279cfb8bb5b53653f43cb94cabfed4fc5
diff --git a/misc/libcdio/files/_cdio_netbsd.c b/misc/libcdio/files/_cdio_netbsd.c
index 57cbf367d00..65a66e2ecdb 100644
--- a/misc/libcdio/files/_cdio_netbsd.c
+++ b/misc/libcdio/files/_cdio_netbsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: _cdio_netbsd.c,v 1.2 2004/10/05 14:23:18 drochner Exp $ */
+/* $NetBSD: _cdio_netbsd.c,v 1.3 2005/05/02 17:11:17 drochner Exp $ */
/*
* Copyright (c) 2003
@@ -72,10 +72,10 @@ typedef struct {
int sessionformat[100]; /* format of the session the track is in */
} _img_private_t;
-static int
+static driver_return_code_t
run_scsi_cmd_freebsd(const void *p_user_data, unsigned int i_timeout_ms,
- unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb,
- scsi_mmc_direction_t e_direction,
+ unsigned int i_cdb, const mmc_cdb_t *p_cdb,
+ mmc_direction_t e_direction,
unsigned int i_buf, void *p_buf )
{
const _img_private_t *_obj = p_user_data;
@@ -487,7 +487,14 @@ cdio_get_default_device_freebsd()
return strdup(DEFAULT_CDIO_DEVICE);
}
-static cdio_funcs _funcs = {
+driver_return_code_t
+close_tray_freebsd (const char *psz_device)
+{
+
+ return DRIVER_OP_SUCCESS;
+}
+
+static cdio_funcs_t _funcs = {
.eject_media = _cdio_eject_media,
.free = cdio_generic_free,
.get_arg = _cdio_get_arg,
@@ -495,9 +502,9 @@ static cdio_funcs _funcs = {
.get_default_device = cdio_get_default_device_freebsd,
.get_devices = cdio_get_devices_freebsd,
.get_discmode = get_discmode_generic,
- .get_drive_cap = scsi_mmc_get_drive_cap_generic,
+ .get_drive_cap = get_drive_cap_mmc,
.get_first_track_num= _cdio_get_first_track_num,
- .get_mcn = scsi_mmc_get_mcn_generic,
+ .get_mcn = get_mcn_mmc,
.get_num_tracks = _cdio_get_num_tracks,
.get_track_format = _cdio_get_track_format,
.get_track_green = _cdio_get_track_green,
@@ -509,9 +516,13 @@ static cdio_funcs _funcs = {
.read_mode2_sector = _cdio_read_mode2_sector,
.read_mode2_sectors = _cdio_read_mode2_sectors,
.read_toc = read_toc_freebsd,
- .run_scsi_mmc_cmd = run_scsi_cmd_freebsd,
+#if 1
+ .run_mmc_cmd = run_scsi_cmd_freebsd,
+#endif
.set_arg = _cdio_set_arg,
+#if 0
.stat_size = _cdio_stat_size
+#endif
};
CdIo *
@@ -520,7 +531,7 @@ cdio_open_freebsd(const char *source_name)
CdIo *ret;
_img_private_t *_data;
- _data = _cdio_malloc(sizeof(_img_private_t));
+ _data = calloc(1, sizeof(_img_private_t));
_data->gen.init = false;
_data->gen.fd = -1;
_data->toc_valid = false;
diff --git a/misc/libcdio/patches/patch-aa b/misc/libcdio/patches/patch-aa
index 9a0af66e84b..c6a07798a02 100644
--- a/misc/libcdio/patches/patch-aa
+++ b/misc/libcdio/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2005/04/19 10:53:50 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2005/05/02 17:11:18 drochner Exp $
---- lib/logging.c.orig 2004-04-18 17:24:27.000000000 +0000
-+++ lib/logging.c 2004-04-18 17:25:33.000000000 +0000
+--- lib/driver/logging.c.orig 2004-04-18 17:24:27.000000000 +0000
++++ lib/driver/logging.c 2004-04-18 17:25:33.000000000 +0000
@@ -44,7 +44,9 @@
fprintf (stderr, "**ERROR: %s\n", message);
fflush (stderr);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 09:30:58 +0000