Index: head/sysutils/libcdio/Makefile =================================================================== --- head/sysutils/libcdio/Makefile (revision 138984) +++ head/sysutils/libcdio/Makefile (revision 138985) @@ -1,37 +1,36 @@ # New ports collection makefile for: libcdio # Date created: 2004-04-04 # Whom: arved # # $FreeBSD$ PORTNAME= libcdio -PORTVERSION= 0.74 -PORTREVISION= 1 +PORTVERSION= 0.75 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libcdio MAINTAINER= mich@FreeBSD.org COMMENT= Compact Disc Input and Control Library LIB_DEPENDS= cddb.2:${PORTSDIR}/audio/libcddb \ popt.0:${PORTSDIR}/devel/popt USE_LIBTOOL_VER=15 USE_GNOME= gnometarget pkgconfig gnomehack USE_GMAKE= yes USE_ICONV= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS+= --with-libpopt-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} \ --without-cd-paranoia USE_REINPLACE= yes USE_PERL5_BUILD=yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" INFO= libcdio post-patch: ${REINPLACE_CMD} -e "s,freebsd5\.\*,freebsd5\.\*|freebsd6\.\*," ${WRKSRC}/configure .include Property changes on: head/sysutils/libcdio/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/sysutils/libcdio/distinfo =================================================================== --- head/sysutils/libcdio/distinfo (revision 138984) +++ head/sysutils/libcdio/distinfo (revision 138985) @@ -1,2 +1,2 @@ -MD5 (libcdio-0.74.tar.gz) = 2b1b03d96a992d171ebf2b13bcdcd866 -SIZE (libcdio-0.74.tar.gz) = 1799345 +MD5 (libcdio-0.75.tar.gz) = 628bd9e6d62747ff6a2b14f976673ea0 +SIZE (libcdio-0.75.tar.gz) = 1810819 Property changes on: head/sysutils/libcdio/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/sysutils/libcdio/files/patch-src_cdda-player.c =================================================================== --- head/sysutils/libcdio/files/patch-src_cdda-player.c (revision 138984) +++ head/sysutils/libcdio/files/patch-src_cdda-player.c (nonexistent) @@ -1,58 +0,0 @@ - -$FreeBSD$ - ---- src/cdda-player.c.orig -+++ src/cdda-player.c -@@ -381,12 +381,6 @@ - return b_ok; - } - --#define add_cddb_disc_info(format_str, field) \ -- if (p_cddb_disc->field && !strlen(field)) { \ -- snprintf(field, sizeof(field), format_str, p_cddb_disc->field); \ -- b_cdtext_ ## field = false; \ -- } -- - static void - get_cddb_disc_info(CdIo_t *p_cdio) - { -@@ -394,10 +388,12 @@ - b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track, - i_tracks, &i_cddb_matches); - if (b_db) { -- add_cddb_disc_info("%s", artist); -- add_cddb_disc_info("%s", title); -- add_cddb_disc_info("%s", genre); -- add_cddb_disc_info("%4d", year); -+ int i_year; -+ i_year = atoi(year); -+ cddb_disc_set_artist(p_cddb_disc, artist); -+ cddb_disc_set_title(p_cddb_disc, title); -+ cddb_disc_set_genre(p_cddb_disc, genre); -+ cddb_disc_set_year(p_cddb_disc, i_year); - } - #endif - return; -@@ -687,11 +683,6 @@ - - } - --#define add_cddb_track_info(format_str, field) \ -- if (t->field) \ -- snprintf(cd_info[i_track].field, sizeof(cd_info[i_track].field)-1, \ -- format_str, t->field); -- - static void - get_cddb_track_info(track_t i_track) - { -@@ -699,8 +690,8 @@ - cddb_track_t *t = cddb_disc_get_track(p_cddb_disc, - i_track - i_first_track); - if (t) { -- add_cddb_track_info("%s", title); -- add_cddb_track_info("%s", artist); -+ cddb_track_set_title(t, title); -+ cddb_track_set_artist(t, artist); - } - - #else Property changes on: head/sysutils/libcdio/files/patch-src_cdda-player.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/sysutils/libcdio/files/patch-src_cddb.c =================================================================== --- head/sysutils/libcdio/files/patch-src_cddb.c (revision 138984) +++ head/sysutils/libcdio/files/patch-src_cddb.c (nonexistent) @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- src/cddb.c.orig -+++ src/cddb.c -@@ -117,13 +117,14 @@ - } - for(i = 0; i < i_tracks; i++) { - cddb_track_t *t = cddb_track_new(); -- t->frame_offset = cdio_get_track_lba(p_cdio, i+i_first_track); -+ cddb_track_set_frame_offset(t, -+ cdio_get_track_lba(p_cdio, i+i_first_track)); - cddb_disc_add_track(*pp_cddb_disc, t); - } - -- (*pp_cddb_disc)->length = -+ cddb_disc_set_length(*pp_cddb_disc, - cdio_get_track_lba(p_cdio, CDIO_CDROM_LEADOUT_TRACK) -- / CDIO_CD_FRAMES_PER_SEC; -+ / CDIO_CD_FRAMES_PER_SEC); - - if (!cddb_disc_calc_discid(*pp_cddb_disc)) { - errmsg("libcddb calc discid failed."); Property changes on: head/sysutils/libcdio/files/patch-src_cddb.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/sysutils/libcdio/pkg-plist =================================================================== --- head/sysutils/libcdio/pkg-plist (revision 138984) +++ head/sysutils/libcdio/pkg-plist (revision 138985) @@ -1,42 +1,42 @@ bin/cd-drive bin/cd-info 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/sector.h include/cdio/scsi_mmc.h include/cdio/track.h include/cdio/types.h include/cdio/util.h include/cdio/version.h include/cdio/xa.h lib/libcdio.a lib/libcdio.so -lib/libcdio.so.5 +lib/libcdio.so.6 lib/libiso9660.a lib/libiso9660.so lib/libiso9660.so.4 libdata/pkgconfig/libcdio.pc libdata/pkgconfig/libcdio_cdda.pc libdata/pkgconfig/libcdio_paranoia.pc libdata/pkgconfig/libiso9660.pc @dirrm include/cdio Property changes on: head/sysutils/libcdio/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property