diff options
Diffstat (limited to 'sysutils/libcdio')
| -rw-r--r-- | sysutils/libcdio/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/libcdio/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/libcdio/files/patch-src_cdda-player.c | 58 | ||||
| -rw-r--r-- | sysutils/libcdio/files/patch-src_cddb.c | 23 | ||||
| -rw-r--r-- | sysutils/libcdio/pkg-plist | 2 |
5 files changed, 4 insertions, 86 deletions
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile index eec50d961956..0efca932189d 100644 --- a/sysutils/libcdio/Makefile +++ b/sysutils/libcdio/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= libcdio -PORTVERSION= 0.74 -PORTREVISION= 1 +PORTVERSION= 0.75 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libcdio diff --git a/sysutils/libcdio/distinfo b/sysutils/libcdio/distinfo index dd7b415a797f..74d0d34413da 100644 --- a/sysutils/libcdio/distinfo +++ b/sysutils/libcdio/distinfo @@ -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 diff --git a/sysutils/libcdio/files/patch-src_cdda-player.c b/sysutils/libcdio/files/patch-src_cdda-player.c deleted file mode 100644 index 1331f1d5d7c3..000000000000 --- a/sysutils/libcdio/files/patch-src_cdda-player.c +++ /dev/null @@ -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 diff --git a/sysutils/libcdio/files/patch-src_cddb.c b/sysutils/libcdio/files/patch-src_cddb.c deleted file mode 100644 index 3ec5ac21ef2d..000000000000 --- a/sysutils/libcdio/files/patch-src_cddb.c +++ /dev/null @@ -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."); diff --git a/sysutils/libcdio/pkg-plist b/sysutils/libcdio/pkg-plist index 3902912b1c16..7602612031e4 100644 --- a/sysutils/libcdio/pkg-plist +++ b/sysutils/libcdio/pkg-plist @@ -31,7 +31,7 @@ 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 |