| 1 |
commit: 9c7e5953cdc545031ed5c83cb671176711931d62 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 27 17:53:48 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 27 17:58:02 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7e5953 |
| 7 |
|
| 8 |
dev-libs/libcdio: Fix build with USE=cddb |
| 9 |
|
| 10 |
Reported-by: Nikolaj Šujskij <skrattaren <AT> yandex.ru> |
| 11 |
Thanks-to: Bernard Cafarelli <voyageur <AT> gentoo.org> |
| 12 |
Closes: https://bugs.gentoo.org/638576 |
| 13 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 14 |
|
| 15 |
dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch | 37 +++++++++++++++++++++++++ |
| 16 |
dev-libs/libcdio/libcdio-1.0.0-r1.ebuild | 6 +++- |
| 17 |
2 files changed, 42 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..b3781d2a7e5 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch |
| 24 |
@@ -0,0 +1,37 @@ |
| 25 |
+From 4305bc1e093e4341aeddb857bd1e6203228000cb Mon Sep 17 00:00:00 2001 |
| 26 |
+From: "R. Bernstein" <rocky@×××.org> |
| 27 |
+Date: Sat, 25 Nov 2017 14:03:37 -0500 |
| 28 |
+Subject: Fix breakage caused by unshadowing i_first_track |
| 29 |
+ |
| 30 |
+Reported and patch by KO Myung-Hun |
| 31 |
+--- |
| 32 |
+ src/cdda-player.c | 6 +++--- |
| 33 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/src/cdda-player.c b/src/cdda-player.c |
| 36 |
+index efeee19..333e1f5 100644 |
| 37 |
+--- a/src/cdda-player.c |
| 38 |
++++ b/src/cdda-player.c |
| 39 |
+@@ -531,8 +531,8 @@ static void |
| 40 |
+ get_cddb_disc_info(CdIo_t *p_cdio) |
| 41 |
+ { |
| 42 |
+ #ifdef HAVE_CDDB |
| 43 |
+- b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track, |
| 44 |
+- i_tracks, &i_cddb_matches); |
| 45 |
++ b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global, |
| 46 |
++ i_tracks_global, &i_cddb_matches); |
| 47 |
+ if (b_db) { |
| 48 |
+ int i_year; |
| 49 |
+ i_year = atoi(year); |
| 50 |
+@@ -831,7 +831,7 @@ get_cddb_track_info(track_t i_track) |
| 51 |
+ { |
| 52 |
+ #ifdef HAVE_CDDB |
| 53 |
+ cddb_track_t *t = cddb_disc_get_track(p_cddb_disc, |
| 54 |
+- i_track - i_first_track); |
| 55 |
++ i_track - i_first_track_global); |
| 56 |
+ if (t) { |
| 57 |
+ cddb_track_set_title(t, title); |
| 58 |
+ cddb_track_set_artist(t, artist); |
| 59 |
+-- |
| 60 |
+cgit v1.0-41-gc330 |
| 61 |
+ |
| 62 |
|
| 63 |
diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild |
| 64 |
index 251281eb241..8f43e92c8f9 100644 |
| 65 |
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild |
| 66 |
+++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild |
| 67 |
@@ -2,6 +2,7 @@ |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
EAPI=6 |
| 71 |
+ |
| 72 |
inherit autotools libtool ltprune multilib-minimal |
| 73 |
|
| 74 |
DESCRIPTION="A library to encapsulate CD-ROM reading and control" |
| 75 |
@@ -33,7 +34,10 @@ MULTILIB_WRAPPED_HEADERS=( |
| 76 |
/usr/include/cdio/version.h |
| 77 |
) |
| 78 |
|
| 79 |
-PATCHES=( "${FILESDIR}/${P}-version.patch" ) |
| 80 |
+PATCHES=( |
| 81 |
+ "${FILESDIR}/${P}-version.patch" |
| 82 |
+ "${FILESDIR}/${P}-cddb.patch" |
| 83 |
+) |
| 84 |
|
| 85 |
src_prepare() { |
| 86 |
default |
Archives