Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libcdio-paranoia for
openSUSE:Factory checked in at 2021-07-12 01:24:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcdio-paranoia (Old)
and /work/SRC/openSUSE:Factory/.libcdio-paranoia.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcdio-paranoia"
Mon Jul 12 01:24:40 2021 rev:11 rq:904645 version:10.2+2.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcdio-paranoia/libcdio-paranoia.changes
2019-02-04 21:10:19.331892506 +0100
+++
/work/SRC/openSUSE:Factory/.libcdio-paranoia.new.2625/libcdio-paranoia.changes
2021-07-12 01:24:42.901379648 +0200
@@ -0,0 +1,16 @@
+-------------------------------------------------------------------
+Wed Jul 7 18:45:07 UTC 2021 - Callum Farmer <[email protected]>
+
+- version 10.2+2.0.1 (2019-09-16)
+ * cdda toc routines now included
+ * "make distcheck" broken in 2.0.0 works properly again
+ * Remove some gcc/clang warnings
+- Use %find_lang
+- Use correct License
+
+-------------------------------------------------------------------
+Fri Jun 18 14:29:43 UTC 2021 - Jan Engelhardt <[email protected]>
+
+- Drop --with-pic (no effect with --disable-static)
+- Trim old rpm macros/constructs
+- Update descriptions
Old:
----
libcdio-paranoia-10.2+2.0.0.tar.bz2
libcdio-paranoia-10.2+2.0.0.tar.bz2.sig
New:
----
libcdio-paranoia-10.2+2.0.1.tar.bz2
libcdio-paranoia-10.2+2.0.1.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcdio-paranoia.spec ++++++
--- /var/tmp/diff_new_pack.jKpYJC/_old 2021-07-12 01:24:43.453375405 +0200
+++ /var/tmp/diff_new_pack.jKpYJC/_new 2021-07-12 01:24:43.453375405 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libcdio-paranoia
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,55 +17,53 @@
%define sonum 2
-
Name: libcdio-paranoia
-Version: 10.2+2.0.0
+Version: 10.2+2.0.1
Release: 0
-Summary: CDDA reader
-License: GPL-3.0-only
+Summary: CD-DA reader
+License: GPL-3.0-or-later
Group: Productivity/Multimedia/Other
-Url: http://savannah.gnu.org/projects/libcdio
+URL: http://savannah.gnu.org/projects/libcdio
Source0:
http://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-%{version}.tar.bz2
Source1:
http://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-%{version}.tar.bz2.sig
Source2:
https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=libcdio&download=1#/%{name}.keyring
Source3: baselibs.conf
-Patch1: libcdio-paranoia.libcdio_cddda-libs.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Patch0: libcdio-paranoia.libcdio_cddda-libs.patch
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libcdio)
%description
-This CDDA reader distribution ('libcdio-cdparanoia') reads audio from
-he CDROM directly as data, with no analog step between, and writes
-the data to a file or pipe as .wav, .aifc or as raw 16 bit linear PCM.
+This CD-DA reader distribution ("libcdio-cdparanoia") reads audio from
+CD-ROMs directly as data, with no analog step between, and writes
+the data to a file or pipe as .wav, .aifc or as raw 16-bit linear PCM.
%package -n cd-paranoia
Summary: CDDA reader
Group: Productivity/Multimedia/Other
%description -n cd-paranoia
-This CDDA reader distribution ('libcdio-cdparanoia') reads audio from
-he CDROM directly as data, with no analog step between, and writes
-the data to a file or pipe as .wav, .aifc or as raw 16 bit linear PCM.
+This CD-DA reader distribution ("libcdio-cdparanoia") reads audio from
+CD-ROMs directly as data, with no analog step between, and writes
+the data to a file or pipe as .wav, .aifc or as raw 16-bit linear PCM.
%package -n libcdio_cdda%{sonum}
-Summary: CDDA reader
+Summary: CD-DA reading library
Group: System/Libraries
%description -n libcdio_cdda%{sonum}
-This CDDA reader distribution ('libcdio-cdparanoia') reads audio from
-he CDROM directly as data, with no analog step between, and writes
-the data to a file or pipe as .wav, .aifc or as raw 16 bit linear PCM.
+This CD-DA reader distribution ("libcdio-cdparanoia") reads audio from
+CD-ROMs directly as data, with no analog step between, and writes
+the data to a file or pipe as .wav, .aifc or as raw 16-bit linear PCM.
%package -n libcdio_paranoia%{sonum}
-Summary: CDDA reader
+Summary: Error correction library for CD-DA data blocks
Group: System/Libraries
%description -n libcdio_paranoia%{sonum}
-This CDDA reader distribution ('libcdio-cdparanoia') reads audio from
-he CDROM directly as data, with no analog step between, and writes
-the data to a file or pipe as .wav, .aifc or as raw 16 bit linear PCM.
+This CD-DA reader distribution ("libcdio-cdparanoia") reads audio from
+CD-ROMs directly as data, with no analog step between, and writes
+the data to a file or pipe as .wav, .aifc or as raw 16-bit linear PCM.
%package devel
Summary: Development files for %{name}
@@ -79,22 +77,22 @@
developing applications that use %{name}.
%prep
-%setup -q
-%patch1 -p1
-%define buildir ${PWD}
+%autosetup -p1
%build
-%configure --disable-static --with-pic
-make -e %{?_smp_mflags}
+%configure --disable-static
+%make_build -e
%install
-make install DESTDIR=%{buildroot}
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+%make_install
+find %{buildroot} -name '*.la' -delete
mv %{buildroot}%{_mandir}/jp %{buildroot}%{_mandir}/ja
# I have no idea WTF upstream is trying to do. But most software currently
# expects the headers to be in %%{_includedir}/cdio/, not in
%%{_includedir}/cdio/paranoia/
ln -s paranoia/cdda.h %{buildroot}%{_includedir}/cdio/cdda.h
ln -s paranoia/paranoia.h %{buildroot}%{_includedir}/cdio/paranoia.h
+ln -s paranoia/toc.h %{buildroot}%{_includedir}/cdio/toc.h
+%find_lang cd-paranoia --with-man
%post -n libcdio_cdda%{sonum} -p /sbin/ldconfig
@@ -104,24 +102,19 @@
%post -n libcdio_paranoia%{sonum} -p /sbin/ldconfig
-%files -n cd-paranoia
-%defattr (-, root, root)
-%doc README* NEWS NEWS AUTHORS
+%files -n cd-paranoia -f cd-paranoia.lang
+%doc README.md NEWS.md AUTHORS
%license COPYING
%{_bindir}/cd-paranoia
-%doc %{_mandir}/ja/man1/cd-paranoia.1.gz
-%doc %{_mandir}/man1/cd-paranoia.1.gz
+%doc %{_mandir}/man1/cd-paranoia.1%{?ext_man}
%files -n libcdio_cdda%{sonum}
-%defattr (-, root, root)
%{_libdir}/libcdio_cdda.so.*
%files -n libcdio_paranoia%{sonum}
-%defattr (-, root, root)
%{_libdir}/libcdio_paranoia.so.*
%files devel
-%defattr (-, root, root)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
++++++ libcdio-paranoia-10.2+2.0.0.tar.bz2 ->
libcdio-paranoia-10.2+2.0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcdio-paranoia-10.2+2.0.0/ChangeLog
new/libcdio-paranoia-10.2+2.0.1/ChangeLog
--- old/libcdio-paranoia-10.2+2.0.0/ChangeLog 2019-01-26 19:12:39.000000000
+0100
+++ new/libcdio-paranoia-10.2+2.0.1/ChangeLog 2019-09-16 18:38:23.000000000
+0200
@@ -1,3 +1,27 @@
+2019-09-16 R. Bernstein <[email protected]>
+
+ * Makefile.am, NEWS => NEWS.md, configure.ac,
+ test/check_start_track_not_one.sh.in: Get ready for release
+ release-10.2+0.2.0.1
+
+2019-09-16 R. Bernstein <[email protected]>
+
+ * .circleci/config.yml: CircleCI acting up
+
+2019-09-16 R. Bernstein <[email protected]>
+
+ * src/cd-paranoia.c: Silence a compile warning
+
+2019-09-16 R. Bernstein <[email protected]>
+
+ * include/cdio/paranoia/Makefile.am, include/cdio/paranoia/toc.h,
+ lib/cdda_interface/toc.c: Correct names on toc.c defnitions and add
+ header Fixes #21
+
+2019-01-26 R. Bernstein <[email protected]>
+
+ * configure.ac: Get ready for release release-10.2+0.2.0.0
+
2019-01-26 R. Bernstein <[email protected]>
* .gitignore, NEWS, configure.ac, doc/how-to-make-a-release.txt,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcdio-paranoia-10.2+2.0.0/Makefile.am
new/libcdio-paranoia-10.2+2.0.1/Makefile.am
--- old/libcdio-paranoia-10.2+2.0.0/Makefile.am 2019-01-13 00:08:38.000000000
+0100
+++ new/libcdio-paranoia-10.2+2.0.1/Makefile.am 2019-09-16 16:52:39.000000000
+0200
@@ -9,6 +9,7 @@
EXTRA_DIST = \
THANKS \
+ NEWS.md \
README.md \
make-check-filter.rb \
example/README \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcdio-paranoia-10.2+2.0.0/Makefile.in
new/libcdio-paranoia-10.2+2.0.1/Makefile.in
--- old/libcdio-paranoia-10.2+2.0.0/Makefile.in 2019-01-26 19:12:30.000000000
+0100
+++ new/libcdio-paranoia-10.2+2.0.1/Makefile.in 2019-09-16 16:53:10.000000000
+0200
@@ -198,7 +198,7 @@
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libcdio_cdda.pc.in $(srcdir)/libcdio_paranoia.pc.in \
$(top_srcdir)/doc/doxygen/Doxyfile.in AUTHORS COPYING \
- ChangeLog INSTALL NEWS THANKS compile config.guess config.sub \
+ ChangeLog INSTALL THANKS compile config.guess config.sub \
depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -390,6 +390,7 @@
AUTOMAKE_OPTIONS = dist-bzip2
EXTRA_DIST = \
THANKS \
+ NEWS.md \
README.md \
make-check-filter.rb \
example/README \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcdio-paranoia-10.2+2.0.0/NEWS
new/libcdio-paranoia-10.2+2.0.1/NEWS
--- old/libcdio-paranoia-10.2+2.0.0/NEWS 2019-01-26 19:01:59.000000000
+0100
+++ new/libcdio-paranoia-10.2+2.0.1/NEWS 1970-01-01 01:00:00.000000000
+0100
@@ -1,45 +0,0 @@
-version 10.2+0.95
-2019-01-26
-
-- Now works with audio CD's that start on a track greater than 1.
- This work was done by Edd Barrett and Thomas Schmitt
-- OpenBSD tolerance
-- typos in manual page and README
-- Do not attempt to call a NULL callback (issue #15) from mskamp
-
-version 10.2+0.94+2
-2017-08-22
-
-- Add --force-overread
- Force overreading into the lead-out portion of the disc. This option
- is only applicable when using the "-O" option with a positive sample
- offset value. Many drives are not capable of reading into this
- portion of the disc and attempting to do so on those drives will
- produce read errors and possibly hard lockups
-
-version 10.2+0.94+1
-2017-03-25
-
-- Fix problem where end of span seems to default to last track. Savannah bug
43444
-- Fix NULL pointer dereference that occurs when byte swapping is
- needed. MR #4
-- Re-silence recently added gcc -Wunused-result warnings
-- Use @LIBS@ figured out by autoconf when linking (for -lrt on Linux).
-- Incorrect track was getting used in matching. See
- Savannah bug 49831 and MR #7, #8 and #10
-
-version 10.2+0.93+1
-2014-09-29
-
-- Add cdio_cddap_free_messages function
-- Start using Coverty Static analysis
-- Update OS versions we recognize
-- Upgrade libcdio-paranoia to paranoia version 10.2
-- Bug fixes on MS Windows and other bug fixes
-- Redo license so everything is GPL3
-
-version 10.2+0.90
-2012-12-24
-
-Split off from libcdio to allow more flexible licensing and to be compatible
-with cdparanoia-III-10.2's license. And also, libcdio is just too large.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcdio-paranoia-10.2+2.0.0/NEWS.md
new/libcdio-paranoia-10.2+2.0.1/NEWS.md
--- old/libcdio-paranoia-10.2+2.0.0/NEWS.md 1970-01-01 01:00:00.000000000
+0100
+++ new/libcdio-paranoia-10.2+2.0.1/NEWS.md 2019-09-16 17:02:16.000000000
+0200
@@ -0,0 +1,60 @@
+10.2+2.0.1
+---------
+2019-09-16
+
+- cdda toc routines now included (fixes #21)
+- "make distcheck" broken in 2.0.0 works properly again
+- Remove some gcc/clang warnings
+
+
+10.2+2.0.0
+---------
+2019-01-26
+
+ This work was done by Edd Barrett and Thomas Schmitt
+- OpenBSD tolerance
+- typos in manual page and README
+- Do not attempt to call a NULL callback (issue #15) from mskamp
+- Switch to semantic versioning number in libcdio portion and match
+ up with libcdio version
+
+10.2+0.94+2
+-----------
+2017-08-22
+
+- Add `--force-overread`
+ Force overreading into the lead-out portion of the disc. This option
+ is only applicable when using the `-O` option with a positive sample
+ offset value. Many drives are not capable of reading into this
+ portion of the disc and attempting to do so on those drives will
+ produce read errors and possibly hard lockups
+
+10.2+0.94+1
+-----------
+2017-03-25
+
+- Fix problem where end of span seems to default to last track. Savannah bug
43444
+- Fix NULL pointer dereference that occurs when byte swapping is
+ needed. MR #4
+- Re-silence recently added gcc -Wunused-result warnings
+- Use `@LIBS@` figured out by autoconf when linking (for `-lrt` on Linux).
+- Incorrect track was getting used in matching. See
+ Savannah bug 49831 and MR #7, #8 and #10
+
+10.2+0.93+1
+-----------
+2014-09-29
+
+- Add `cdio_cddap_free_messages` function
+- Start using Coverty Static analysis
+- Update OS versions we recognize
+- Upgrade libcdio-paranoia to paranoia version 10.2
+- Bug fixes on MS Windows and other bug fixes
+- Redo license so everything is GPL3
+
+10.2+0.90
+---------
+2012-12-24
+
+Split off from libcdio to allow more flexible licensing and to be compatible
+with cdparanoia-III-10.2's license. And also, libcdio is just too large.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcdio-paranoia-10.2+2.0.0/configure
new/libcdio-paranoia-10.2+2.0.1/configure
--- old/libcdio-paranoia-10.2+2.0.0/configure 2019-01-26 19:12:31.000000000
+0100
+++ new/libcdio-paranoia-10.2+2.0.1/configure 2019-09-16 16:40:46.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libcdio-paranoia 10.2+2.0.0.
+# Generated by GNU Autoconf 2.69 for libcdio-paranoia 10.2+2.0.1.
#
# Report bugs to <[email protected]>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='libcdio-paranoia'
PACKAGE_TARNAME='libcdio-paranoia'
-PACKAGE_VERSION='10.2+2.0.0'
-PACKAGE_STRING='libcdio-paranoia 10.2+2.0.0'
+PACKAGE_VERSION='10.2+2.0.1'
+PACKAGE_STRING='libcdio-paranoia 10.2+2.0.1'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''
@@ -1385,7 +1385,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libcdio-paranoia 10.2+2.0.0 to adapt to many kinds of
systems.
+\`configure' configures libcdio-paranoia 10.2+2.0.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1457,7 +1457,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libcdio-paranoia 10.2+2.0.0:";;
+ short | recursive ) echo "Configuration of libcdio-paranoia 10.2+2.0.1:";;
esac
cat <<\_ACEOF
@@ -1591,7 +1591,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libcdio-paranoia configure 10.2+2.0.0
+libcdio-paranoia configure 10.2+2.0.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2081,7 +2081,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libcdio-paranoia $as_me 10.2+2.0.0, which was
+It was created by libcdio-paranoia $as_me 10.2+2.0.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2945,7 +2945,7 @@
# Define the identity of the package.
PACKAGE='libcdio-paranoia'
- VERSION='10.2+2.0.0'
+ VERSION='10.2+2.0.1'
cat >>confdefs.h <<_ACEOF
@@ -18658,7 +18658,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libcdio-paranoia $as_me 10.2+2.0.0, which was
+This file was extended by libcdio-paranoia $as_me 10.2+2.0.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18724,7 +18724,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libcdio-paranoia config.status 10.2+2.0.0
+libcdio-paranoia config.status 10.2+2.0.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcdio-paranoia-10.2+2.0.0/configure.ac
new/libcdio-paranoia-10.2+2.0.1/configure.ac
--- old/libcdio-paranoia-10.2+2.0.0/configure.ac 2019-01-26
19:11:33.000000000 +0100
+++ new/libcdio-paranoia-10.2+2.0.1/configure.ac 2019-09-16
16:30:01.000000000 +0200
@@ -14,7 +14,7 @@
dnl You should have received a copy of the GNU General Public License
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
-define(RELEASE_NUM, 2.0.0)
+define(RELEASE_NUM, 2.0.1)
define(PARANOIA_VERSION, 10.2)
define(LIBCDIO_PARANOIA_VERSION_STR, $1+$2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcdio-paranoia-10.2+2.0.0/include/cdio/paranoia/Makefile.am
new/libcdio-paranoia-10.2+2.0.1/include/cdio/paranoia/Makefile.am
--- old/libcdio-paranoia-10.2+2.0.0/include/cdio/paranoia/Makefile.am
2012-10-29 03:43:07.000000000 +0100
+++ new/libcdio-paranoia-10.2+2.0.1/include/cdio/paranoia/Makefile.am
2019-09-16 13:08:34.000000000 +0200
@@ -4,7 +4,7 @@
#
cdio_paranoia_includedir=$(includedir)/cdio/paranoia
-dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h
+dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h toc.h
EXTRA_DIST = version.h.in
BUILT_SOURCES = version.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcdio-paranoia-10.2+2.0.0/include/cdio/paranoia/Makefile.in
new/libcdio-paranoia-10.2+2.0.1/include/cdio/paranoia/Makefile.in
--- old/libcdio-paranoia-10.2+2.0.0/include/cdio/paranoia/Makefile.in
2019-01-26 19:12:30.000000000 +0100
+++ new/libcdio-paranoia-10.2+2.0.1/include/cdio/paranoia/Makefile.in
2019-09-16 16:40:47.000000000 +0200
@@ -322,7 +322,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
cdio_paranoia_includedir = $(includedir)/cdio/paranoia
-dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h
+dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h toc.h
EXTRA_DIST = version.h.in
BUILT_SOURCES = version.h
all: $(BUILT_SOURCES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcdio-paranoia-10.2+2.0.0/include/cdio/paranoia/toc.h
new/libcdio-paranoia-10.2+2.0.1/include/cdio/paranoia/toc.h
--- old/libcdio-paranoia-10.2+2.0.0/include/cdio/paranoia/toc.h 1970-01-01
01:00:00.000000000 +0100
+++ new/libcdio-paranoia-10.2+2.0.1/include/cdio/paranoia/toc.h 2019-09-16
12:47:38.000000000 +0200
@@ -0,0 +1,62 @@
+/*
+ Copyright (C) 2019
+ Rocky Bernstein <[email protected]>
+*/
+
+/** \file toc.h
+ *
+ * \brief Information from a CDROM TOC relevant to CD-DA disks
+ ******************************************************************/
+
+#ifndef CDIO__PARANOIA__TOC_H_
+#define CDIO__PARANOIA__TOC_H_
+
+#include <cdio/cdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+ /** cdrom_paranoia is an opaque structure which is used in all of the
+ library operations.
+ */
+ typedef struct cdrom_paranoia_s cdrom_paranoia_t;
+ typedef struct cdrom_drive_s cdrom_drive_t;
+
+ /*! Return the track containing the given LSN. If the LSN is before
+ the first track (in the pregap), 0 is returned. If there was an
+ error or the LSN after the LEADOUT (beyond the end of the CD), then
+ CDIO_INVALID_TRACK is returned.
+ */
+ extern int cdio_cddap_sector_gettrack(cdrom_drive_t *d, lsn_t lsn);
+
+ /*! Return the number of channels in track: 2 or 4; -2 if not
+ implemented or -1 for error.
+ Not meaningful if track is not an audio track.
+ */
+ extern int cdio_cddap_track_channels(cdrom_drive_t *d, track_t i_track);
+
+ /*! Return 1 is track is an audio track, 0 otherwise. */
+ extern int cdio_cddap_track_audiop(cdrom_drive_t *d, track_t i_track);
+
+ /*! Return 1 is track has copy permit set, 0 otherwise. */
+ extern int cdio_cddap_track_copyp(cdrom_drive_t *d, track_t i_track);
+
+ /*! Return 1 is audio track has linear preemphasis set, 0 otherwise.
+ Only makes sense for audio tracks.
+ */
+ extern int cdio_cddap_track_preemp(cdrom_drive_t *d, track_t i_track);
+
+ /*! Get first lsn of the first audio track. -1 is returned on error. */
+ extern lsn_t cdio_cddap_disc_firstsector(cdrom_drive_t *d);
+
+ /*! Get last lsn of the last audio track. The last lsn is generally one
+ less than the start of the next track after the audio track. -1 is
+ returned on error. */
+ extern lsn_t cdio_cddap_disc_lastsector(cdrom_drive_t *d);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*CDIO__PARANOIA__TOC_H_*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcdio-paranoia-10.2+2.0.0/lib/cdda_interface/toc.c
new/libcdio-paranoia-10.2+2.0.1/lib/cdda_interface/toc.c
--- old/libcdio-paranoia-10.2+2.0.0/lib/cdda_interface/toc.c 2019-01-12
23:57:15.000000000 +0100
+++ new/libcdio-paranoia-10.2+2.0.1/lib/cdda_interface/toc.c 2019-09-16
13:08:50.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2005, 2008, 2013 Rocky Bernstein <[email protected]>
+ Copyright (C) 2005, 2008, 2013, 2019 Rocky Bernstein <[email protected]>
Copyright (C) 1998-2008 Monty [email protected]
derived from code (C) 1994-1996 Heiko Eissfeldt
@@ -27,6 +27,7 @@
#include "low_interface.h"
#include "utils.h"
+#include <cdio/paranoia/toc.h>
/*! Return the lsn for the start of track i_track or CDIO_LEADOUT_TRACK */
lsn_t
@@ -165,7 +166,7 @@
CDIO_INVALID_TRACK is returned.
*/
int
-cdda_sector_gettrack(cdrom_drive_t *d, lsn_t lsn)
+cdio_cddap_sector_gettrack(cdrom_drive_t *d, lsn_t lsn)
{
if (!d->opened) {
cderror(d,"400: Device not open\n");
@@ -182,23 +183,23 @@
implemented or -1 for error.
Not meaningful if track is not an audio track.
*/
-int
-cdda_track_channels(cdrom_drive_t *d, track_t i_track)
+extern int
+cdio_cddap_track_channels(cdrom_drive_t *d, track_t i_track)
{
return(cdio_get_track_channels(d->p_cdio, i_track));
}
/*! Return 1 is track is an audio track, 0 otherwise. */
-int
-cdda_track_audiop(cdrom_drive_t *d, track_t i_track)
+extern int
+cdio_cddap_track_audiop(cdrom_drive_t *d, track_t i_track)
{
track_format_t track_format = cdio_get_track_format(d->p_cdio, i_track);
return TRACK_FORMAT_AUDIO == track_format ? 1 : 0;
}
/*! Return 1 is track is an audio track, 0 otherwise. */
-int
-cdda_track_copyp(cdrom_drive_t *d, track_t i_track)
+extern int
+cdio_cddap_track_copyp(cdrom_drive_t *d, track_t i_track)
{
track_flag_t track_flag = cdio_get_track_copy_permit(d->p_cdio, i_track);
return CDIO_TRACK_FLAG_TRUE == track_flag ? 1 : 0;
@@ -207,8 +208,8 @@
/*! Return 1 is audio track has linear preemphasis set, 0 otherwise.
Only makes sense for audio tracks.
*/
-int
-cdda_track_preemp(cdrom_drive_t *d, track_t i_track)
+extern int
+cdio_cddap_track_preemp(cdrom_drive_t *d, track_t i_track)
{
track_flag_t track_flag = cdio_get_track_preemphasis(d->p_cdio, i_track);
return CDIO_TRACK_FLAG_TRUE == track_flag ? 1 : 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libcdio-paranoia-10.2+2.0.0/src/cd-paranoia.c
new/libcdio-paranoia-10.2+2.0.1/src/cd-paranoia.c
--- old/libcdio-paranoia-10.2+2.0.0/src/cd-paranoia.c 2019-01-12
23:57:15.000000000 +0100
+++ new/libcdio-paranoia-10.2+2.0.1/src/cd-paranoia.c 2019-09-16
13:20:16.000000000 +0200
@@ -1487,7 +1487,10 @@
" \r%s%s\n",
mes?mes:"",err?err:"");
- if(err)free(err);if(mes)free(mes);
+ if (err)
+ free(err);
+ if (mes)
+ free(mes);
if(readbuf==NULL){
skipped_flag=1;
report("\nparanoia_read: Unrecoverable error reading through "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcdio-paranoia-10.2+2.0.0/test/check_start_track_not_one.sh
new/libcdio-paranoia-10.2+2.0.1/test/check_start_track_not_one.sh
--- old/libcdio-paranoia-10.2+2.0.0/test/check_start_track_not_one.sh
2019-01-26 19:12:39.000000000 +0100
+++ new/libcdio-paranoia-10.2+2.0.1/test/check_start_track_not_one.sh
2019-09-16 16:40:58.000000000 +0200
@@ -14,6 +14,7 @@
fi
test_dir=$abs_top_srcdir/test
+test_build_dir=$abs_top_builddir/test
set -e
@@ -26,11 +27,11 @@
orig_cdda=$test_dir/data/cdda.bin
# First we make a longer CDDA image.
-cdda=$test_dir/$base.bin
+cdda=$test_build_dir/$base.bin
cat $orig_cdda $orig_cdda $orig_cdda > $cdda
# And a CUE file with a non-one start track.
-cue=$test_dir/$base.cue
+cue=$test_build_dir/$base.cue
cat << EOF > $cue
FILE "$cdda" BINARY
TRACK 07 AUDIO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libcdio-paranoia-10.2+2.0.0/test/check_start_track_not_one.sh.in
new/libcdio-paranoia-10.2+2.0.1/test/check_start_track_not_one.sh.in
--- old/libcdio-paranoia-10.2+2.0.0/test/check_start_track_not_one.sh.in
2019-01-13 00:48:12.000000000 +0100
+++ new/libcdio-paranoia-10.2+2.0.1/test/check_start_track_not_one.sh.in
2019-09-16 16:39:35.000000000 +0200
@@ -14,6 +14,7 @@
fi
test_dir=$abs_top_srcdir/test
+test_build_dir=$abs_top_builddir/test
set -e
@@ -26,11 +27,11 @@
orig_cdda=$test_dir/data/cdda.bin
# First we make a longer CDDA image.
-cdda=$test_dir/$base.bin
+cdda=$test_build_dir/$base.bin
cat $orig_cdda $orig_cdda $orig_cdda > $cdda
# And a CUE file with a non-one start track.
-cue=$test_dir/$base.cue
+cue=$test_build_dir/$base.cue
cat << EOF > $cue
FILE "$cdda" BINARY
TRACK 07 AUDIO
