[packages/cdrdao] up to 1.2.4
atler
atler at pld-linux.org
Mon Mar 2 00:03:34 CET 2020
commit 3b5bb78da59632ff38749b402d96aed8309325f3
Author: Jan Palus <atler at pld-linux.org>
Date: Mon Mar 2 00:02:39 2020 +0100
up to 1.2.4
cdrdao-gcc4.patch | 4 +--
cdrdao-glibc.patch | 71 -----------------------------------------------------
cdrdao-nolibs.patch | 8 +++---
cdrdao.spec | 14 +++++------
4 files changed, 12 insertions(+), 85 deletions(-)
---
diff --git a/cdrdao.spec b/cdrdao.spec
index eaf1184..365bbca 100644
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -8,19 +8,18 @@ Summary: Tools for burning CDRs in Disk At Once mode
Summary(pl.UTF-8): Narzędzia do wypalania płyt w trybie Disk At Once
Summary(pt_BR.UTF-8): Cdrdao - Escreve CD-Rs de áudio em modo "disk-at-once"
Name: cdrdao
-Version: 1.2.3
-Release: 7
+Version: 1.2.4
+Release: 1
License: GPL v2+
Group: Applications/System
Source0: http://downloads.sourceforge.net/cdrdao/%{name}-%{version}.tar.bz2
-# Source0-md5: 8d15ba6280bb7ba2f4d6be31d28b3c0c
+# Source0-md5: 2ada887d1b30b440867b8df0d3023cf7
Source1: %{name}.desktop
# http://cdrdao.sourceforge.net/drives.html#dt
Source2: %{name}.drivers
Patch0: %{name}-nolibs.patch
Patch1: %{name}-pccts-antlr.patch
Patch2: %{name}-gcc4.patch
-Patch3: %{name}-glibc.patch
URL: http://cdrdao.sourceforge.net/
BuildRequires: GConf2-devel
BuildRequires: autoconf
@@ -85,14 +84,13 @@ niedestruktywne cięcie danych audio.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%{__sed} -i -e 's#/usr/src/linux/include##g' scsilib/DEFAULT*/Defaults.linux
%if !%{with gnome}
-%{__sed} -i -e 's/^en_xdao=yes$/en_xdao=no/' configure.ac
+%{__sed} -i -e 's/^en_gcdmaster=yes$/en_gcdmaster=no/' configure.ac
%endif
-install %{SOURCE1} xdao/gcdmaster.desktop
+install %{SOURCE1} gcdmaster/gcdmaster.desktop
%build
%{__aclocal}
@@ -105,7 +103,7 @@ PKG_CONFIG=%{_bindir}/pkg-config \
--with-pcctsinc=%{_libdir}/pccts/h \
--with-scglib-inc=%{_includedir}/schily \
--with-scglib-lib=%{_libdir} \
- --with%{!?with_gnome:out}-xdao \
+ --with%{!?with_gnome:out}-gcdmaster \
--with%{!?with_mp3:out}-mp3-support \
--with%{!?with_ogg:out}-ogg-support
diff --git a/cdrdao-gcc4.patch b/cdrdao-gcc4.patch
index c82e4e2..432abdd 100644
--- a/cdrdao-gcc4.patch
+++ b/cdrdao-gcc4.patch
@@ -40,8 +40,8 @@ diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatMp3.cc cdrdao-1.2.2/trackdb/FormatMp
#include <sys/stat.h>
#include <sys/mman.h>
diff -Naurp cdrdao-1.2.2.orig/xdao/AudioCDProject.cc cdrdao-1.2.2/xdao/AudioCDProject.cc
---- cdrdao-1.2.2.orig/xdao/AudioCDProject.cc 2006-09-18 10:42:26.000000000 +0000
-+++ cdrdao-1.2.2/xdao/AudioCDProject.cc 2008-03-07 11:15:26.000000000 +0000
+--- cdrdao-1.2.2.orig/gcdmaster/AudioCDProject.cc 2006-09-18 10:42:26.000000000 +0000
++++ cdrdao-1.2.2/gcdmaster/AudioCDProject.cc 2008-03-07 11:15:26.000000000 +0000
@@ -18,6 +18,7 @@
*/
diff --git a/cdrdao-glibc.patch b/cdrdao-glibc.patch
deleted file mode 100644
index 04809b3..0000000
--- a/cdrdao-glibc.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -puNr cdrdao-1.2.2.orig/scsilib/include/schily.h cdrdao-1.2.2/scsilib/include/schily.h
---- cdrdao-1.2.2.orig/scsilib/include/schily.h 2004-03-05 01:30:40.000000000 +0100
-+++ cdrdao-1.2.2/scsilib/include/schily.h 2009-03-11 21:55:15.000000000 +0100
-@@ -108,7 +108,7 @@ extern int fexecle __PR((const char *, F
- /* 6th arg not const, fexecv forces av[ac] = NULL */
- extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
- char **));
--extern int fexecve __PR((const char *, FILE *, FILE *, FILE *,
-+extern int f_execve __PR((const char *, FILE *, FILE *, FILE *,
- char * const *, char * const *));
- extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
- extern int fspawnl __PR((FILE *, FILE *, FILE *,
-@@ -187,7 +187,7 @@ extern char *fillbytes __PR((void *, int
- extern char *findbytes __PR((const void *, int, char));
- extern int findline __PR((const char *, char, const char *,
- int, char **, int));
--extern int getline __PR((char *, int));
-+extern int get_line __PR((char *, int));
- extern int getstr __PR((char *, int));
- extern int breakline __PR((char *, char, char **, int));
- extern int getallargs __PR((int *, char * const**, const char *, ...));
-diff -puNr cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c cdrdao-1.2.2/scsilib/libscg/scsitransp.c
---- cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c 2004-06-17 22:20:27.000000000 +0200
-+++ cdrdao-1.2.2/scsilib/libscg/scsitransp.c 2009-03-11 21:54:24.000000000 +0100
-@@ -323,7 +323,7 @@ scg_yes(msg)
-
- js_printf("%s", msg);
- flush();
-- if (getline(okbuf, sizeof (okbuf)) == EOF)
-+ if (get_line(okbuf, sizeof (okbuf)) == EOF)
- exit(EX_BAD);
- if (streql(okbuf, "y") || streql(okbuf, "yes") ||
- streql(okbuf, "Y") || streql(okbuf, "YES"))
-diff -puNr cdrdao-1.2.2.orig/scsilib/libschily/fexec.c cdrdao-1.2.2/scsilib/libschily/fexec.c
---- cdrdao-1.2.2.orig/scsilib/libschily/fexec.c 2004-06-06 13:50:24.000000000 +0200
-+++ cdrdao-1.2.2/scsilib/libschily/fexec.c 2009-03-11 21:55:06.000000000 +0100
-@@ -159,7 +159,7 @@ fexecle(name, in, out, err, va_alist)
- } while (p != NULL);
- va_end(args);
-
-- ret = fexecve(name, in, out, err, av, env);
-+ ret = f_execve(name, in, out, err, av, env);
- if (av != xav)
- free(av);
- return (ret);
-@@ -173,11 +173,11 @@ fexecv(name, in, out, err, ac, av)
- char *av[];
- {
- av[ac] = NULL; /* force list to be null terminated */
-- return (fexecve(name, in, out, err, av, environ));
-+ return (f_execve(name, in, out, err, av, environ));
- }
-
- EXPORT int
--fexecve(name, in, out, err, av, env)
-+f_execve(name, in, out, err, av, env)
- const char *name;
- FILE *in, *out, *err;
- char * const av[], * const env[];
-diff -puNr cdrdao-1.2.2.orig/scsilib/libschily/stdio/fgetline.c cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c
---- cdrdao-1.2.2.orig/scsilib/libschily/stdio/fgetline.c 2004-08-08 13:02:05.000000000 +0200
-+++ cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c 2009-03-11 21:54:04.000000000 +0100
-@@ -64,7 +64,7 @@ fgetline(f, buf, len)
- }
-
- EXPORT int
--getline(buf, len)
-+get_line(buf, len)
- char *buf;
- int len;
- {
diff --git a/cdrdao-nolibs.patch b/cdrdao-nolibs.patch
index 67df418..6e8fbbc 100644
--- a/cdrdao-nolibs.patch
+++ b/cdrdao-nolibs.patch
@@ -4,10 +4,10 @@
AC_CHECK_FUNC(sched_setscheduler,AC_DEFINE(HAVE_SCHED_SETSCHEDULER,1,""),
AC_CHECK_LIB(posix4,sched_setscheduler,[use_libposix4=yes;AC_DEFINE(HAVE_SCHED_SETSCHEDULER,1,"")]))
--AC_CHECK_LIB(socket,socket,[use_libsocket=yes])
--AC_CHECK_LIB(socket,connect,[use_libsocket=yes])
-+AC_CHECK_FUNC(socket, , [AC_CHECK_LIB(socket,socket,[use_libsocket=yes])])
-+AC_CHECK_FUNC(connect, , [AC_CHECK_LIB(socket,connect,[use_libsocket=yes])])
+-AC_CHECK_LIB([socket],[socket],[use_libsocket=yes])
+-AC_CHECK_LIB([socket],[connect],[use_libsocket=yes])
++AC_CHECK_FUNC(socket, , [AC_CHECK_LIB([socket],[socket],[use_libsocket=yes])])
++AC_CHECK_FUNC(connect, , [AC_CHECK_LIB([socket],[connect],[use_libsocket=yes])])
dnl Add 'libsocket' if required
if test "$use_libsocket" = yes; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cdrdao.git/commitdiff/3b5bb78da59632ff38749b402d96aed8309325f3
More information about the pld-cvs-commit
mailing list