[packages/libcdio] - removed, applied upstream

[hawk]

commit 72fdfcadf3e0ce71c471721106e25a70e5dc901d
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Fri Mar 16 11:44:19 2018 +0000

    - removed, applied upstream

 libcdio-cddb-fix.patch    | 37 -------------------------------------
 libcdio-version-fix.patch | 31 -------------------------------
 2 files changed, 68 deletions(-)
---
diff --git a/libcdio-cddb-fix.patch b/libcdio-cddb-fix.patch
deleted file mode 100644
index b3781d2..0000000
--- a/libcdio-cddb-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4305bc1e093e4341aeddb857bd1e6203228000cb Mon Sep 17 00:00:00 2001
-From: "R. Bernstein" <rocky at gnu.org>
-Date: Sat, 25 Nov 2017 14:03:37 -0500
-Subject: Fix breakage caused by unshadowing i_first_track
-
-Reported and patch by KO Myung-Hun
----
- src/cdda-player.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/cdda-player.c b/src/cdda-player.c
-index efeee19..333e1f5 100644
---- a/src/cdda-player.c
-+++ b/src/cdda-player.c
-@@ -531,8 +531,8 @@ static void
- 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 @@ get_cddb_track_info(track_t i_track)
- {
- #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);
--- 
-cgit v1.0-41-gc330
-
diff --git a/libcdio-version-fix.patch b/libcdio-version-fix.patch
deleted file mode 100644
index 11be98f..0000000
--- a/libcdio-version-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2d22ae18571caf29460a456340ff0603f04af6b4 Mon Sep 17 00:00:00 2001
-From: "R. Bernstein" <rocky at gnu.org>
-Date: Thu, 23 Nov 2017 18:26:07 -0500
-Subject: Set LIBCDIO_VERSION in a more consistent way
-
-we'll use the convention
-x.y.zjunk => x*10000 + y*100 + z
-
-Savannah bug #52491
----
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 51beb59..5dd57c6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,9 @@ AC_CONFIG_MACRO_DIR([m4])
- 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`
-+# FIXME: write a m4 macro to conver x.y.zjunk to x*10000 + y*100 + z
-+# 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)
--- 
-cgit v1.0-41-gc330
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libcdio.git/commitdiff/e4dbfdb265020db911ea2d89e531ac17540adcf0