Updated several ebuilds

This commit is contained in:
layman
2017-12-31 16:32:20 +01:00
parent e647113a19
commit 9409bc4498
11 changed files with 641 additions and 0 deletions
@@ -0,0 +1,23 @@
diff -Naur libcdio-1.0.0.orig/src/cdda-player.c libcdio-1.0.0/src/cdda-player.c
--- libcdio-1.0.0.orig/src/cdda-player.c 2017-11-22 02:39:49.000000000 +0100
+++ libcdio-1.0.0/src/cdda-player.c 2017-11-24 16:16:39.652704315 +0100
@@ -531,8 +531,8 @@
get_cddb_disc_info(CdIo_t *p_cdio)
{
#ifdef HAVE_CDDB
- b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track,
- i_tracks, &i_cddb_matches);
+ b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global,
+ i_tracks_global, &i_cddb_matches);
if (b_db) {
int i_year;
i_year = atoi(year);
@@ -831,7 +831,7 @@
{
#ifdef HAVE_CDDB
cddb_track_t *t = cddb_disc_get_track(p_cddb_disc,
- i_track - i_first_track);
+ i_track - i_first_track_global);
if (t) {
cddb_track_set_title(t, title);
cddb_track_set_artist(t, artist);
@@ -0,0 +1,16 @@
--- libcdio-1.0.0/configure.ac
+++ libcdio-1.0.0/configure.ac
@@ -32,7 +32,12 @@
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
-LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
+# Broken by design. See also
+# https://savannah.gnu.org/bugs/?52491
+# and
+# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4
+#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
+LIBCDIO_VERSION_NUM=10000
AC_SUBST(LIBCDIO_VERSION_NUM)
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)