[cdrkit] update to 1.1.10

4 files changed, 26 insertions, 169 deletions

diff --git a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/cdrkit-1.1.9-glibc-2.10-3.patch b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/cdrkit-1.1.9-glibc-2.10-3.patch
deleted file mode 100644
index 9e2f508..0000000
--- a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/cdrkit-1.1.9-glibc-2.10-3.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -puNr cdrkit-1.1.9.orig/include/schily.h cdrkit-1.1.9/include/schily.h
---- cdrkit-1.1.9.orig/include/schily.h	2006-11-25 01:20:20.000000000 +0100
-+++ cdrkit-1.1.9/include/schily.h	2009-03-11 20:31:53.000000000 +0100
-@@ -116,7 +116,7 @@ extern	int	fexecl(const char *, FILE *, 
- extern	int	fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...);
- 		/* 6th arg not const, fexecv forces av[ac] = NULL */
- extern	int	fexecv(const char *, FILE *, FILE *, FILE *, int, char **);
--extern	int	fexecve(const char *, FILE *, FILE *, FILE *, char * const *, 
-+extern	int	f_execve(const char *, FILE *, FILE *, FILE *, char * const *, 
- 							  char * const *);
- extern	int	fspawnv(FILE *, FILE *, FILE *, int, char * const *);
- extern	int	fspawnl(FILE *, FILE *, FILE *, const char *, const char *, ...);
-@@ -190,7 +190,7 @@ extern	int	schily_error(const char *, ..
- extern	char	*fillbytes(void *, int, char);
- extern	char	*findbytes(const void *, int, char);
- extern	int	findline(const char *, char, const char *, int, char **, int);
--extern	int	getline(char *, int);
-+extern	int	get_line(char *, int);
- extern	int	getstr(char *, int);
- extern	int	breakline(char *, char, char **, int);
- extern	int	getallargs(int *, char * const**, const char *, ...);
-diff -puNr cdrkit-1.1.9.orig/librols/fexec.c cdrkit-1.1.9/librols/fexec.c
---- cdrkit-1.1.9.orig/librols/fexec.c	2008-02-25 12:14:07.000000000 +0100
-+++ cdrkit-1.1.9/librols/fexec.c	2009-03-11 20:31:53.000000000 +0100
-@@ -170,7 +170,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);
-@@ -184,11 +184,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 cdrkit-1.1.9.orig/librols/stdio/fgetline.c cdrkit-1.1.9/librols/stdio/fgetline.c
---- cdrkit-1.1.9.orig/librols/stdio/fgetline.c	2006-09-05 10:39:04.000000000 +0200
-+++ cdrkit-1.1.9/librols/stdio/fgetline.c	2009-03-11 20:31:53.000000000 +0100
-@@ -76,7 +76,7 @@ fgetline(f, buf, len)
- }
- 
- EXPORT int
--getline(buf, len)
-+get_line(buf, len)
- 	char	*buf;
- 	int	len;
- {
-diff -puNr cdrkit-1.1.9.orig/libusal/scsitransp.c cdrkit-1.1.9/libusal/scsitransp.c
---- cdrkit-1.1.9.orig/libusal/scsitransp.c	2008-02-25 12:14:07.000000000 +0100
-+++ cdrkit-1.1.9/libusal/scsitransp.c	2009-03-11 20:31:53.000000000 +0100
-@@ -301,7 +301,7 @@ usal_yes(char *msg)
- 
- 	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 cdrkit-1.1.9.orig/readom/io.c cdrkit-1.1.9/readom/io.c
---- cdrkit-1.1.9.orig/readom/io.c	2006-12-08 14:38:43.000000000 +0100
-+++ cdrkit-1.1.9/readom/io.c	2009-03-11 20:31:53.000000000 +0100
-@@ -130,7 +130,7 @@ BOOL getvalue(char *s, long *lp, long mi
- 		(*prt)(s, *lp, mini, maxi, dp);
- 		flush();
- 		line[0] = '\0';
--		if (getline(line, 80) == EOF)
-+		if (get_line(line, 80) == EOF)
- 			exit(EX_BAD);
- 
- 		linep = skipwhite(line);
-@@ -178,7 +178,7 @@ again:
- 	vprintf(form, args);
- 	va_end(args);
- 	flush();
--	if (getline(okbuf, sizeof(okbuf)) == EOF)
-+	if (get_line(okbuf, sizeof(okbuf)) == EOF)
- 		exit(EX_BAD);
- 	if (okbuf[0] == '?') {
- 		printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");
-diff -puNr cdrkit-1.1.9.orig/readom/readom.c cdrkit-1.1.9/readom/readom.c
---- cdrkit-1.1.9.orig/readom/readom.c	2007-04-03 00:43:29.000000000 +0200
-+++ cdrkit-1.1.9/readom/readom.c	2009-03-11 20:31:53.000000000 +0100
-@@ -1605,7 +1605,7 @@ read_generic(SCSI *usalp, parm_t *parmp,
- 		fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n",
- 					usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
- 		fprintf(stderr, "Enter filename [%s]: ", defname); flush();
--		(void) getline(filename, sizeof (filename));
-+		(void) get_line(filename, sizeof (filename));
- 	}
- 
- 	if (askrange) {
-@@ -1772,7 +1772,7 @@ write_disk(SCSI *usalp, parm_t *parmp)
- 		fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n",
- 					usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
- 		fprintf(stderr, "Enter filename [%s]: ", defname); flush();
--		(void) getline(filename, sizeof (filename));
-+		(void) get_line(filename, sizeof (filename));
- 		fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n");
- 
- 		getlong("Enter starting sector for copy:", &addr, 0L, end-1);
-diff -puNr cdrkit-1.1.9.orig/wodim/cue.c cdrkit-1.1.9/wodim/cue.c
---- cdrkit-1.1.9.orig/wodim/cue.c	2006-12-08 14:38:43.000000000 +0100
-+++ cdrkit-1.1.9/wodim/cue.c	2009-03-11 20:32:18.000000000 +0100
-@@ -253,7 +253,7 @@ static	char	*skipwhite(const char *s);
- static	char	*peekword(void);
- static	char	*lineend(void);
- static	char	*markword(char *delim);
--static	char	getdelim(void);
-+static	char	get_delim(void);
- static	char	*getnextitem(char *delim);
- static	char	*neednextitem(char *delim);
- static	char	*nextword(void);
-@@ -746,7 +746,7 @@ parse_track(track_t trackp[], state_t *s
- 	if (kp == NULL)
- 		cueabort("Unknown filetype '%s'", word);
- 
--	if (getdelim() == '/') {
-+	if (get_delim() == '/') {
- 		word = needitem();
- 		if (*astol(++word, &secsize) != '\0')
- 			cueabort("Not a number '%s'", word);
-@@ -1128,7 +1128,7 @@ linelen--;
- }
- 
- static char 
--getdelim()
-+get_delim()
- {
- 	return (wordendc);
- }
diff --git a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/xconfig.patch b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit/xconfig.patch
index 5af1a37..866b602 100644
--- a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/xconfig.patch
+++ b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit/xconfig.patch
@@ -13,3 +13,13 @@
  #define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
  #define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
  
+--- cdrkit-1.1.9/include/CMakeLists.txt.orig	2010-09-27 23:17:34.000000000 +0000
++++ cdrkit-1.1.9/include/CMakeLists.txt	2010-09-27 23:17:58.000000000 +0000
+@@ -35,7 +35,6 @@
+ INCLUDE(TestBigEndian)
+ TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
+ 
+-TRY_RUN(BITFIELDS_HTOL TEST_DUMMY ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_BITFIELDS_HTOL.c)
+ 
+ INCLUDE(CheckIncludeFiles)
+ 
diff --git a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.10.bb b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.10.bb
new file mode 100644
index 0000000..220781a
--- /dev/null
+++ b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.10.bb
@@ -0,0 +1,16 @@
+SUMMARY = "A set of tools for CD recording"
+HOMEPAGE = "http://www.cdrkit.org"
+DEPENDS = "libcap bzip2"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8"
+PR = "r1"
+
+SRC_URI = " \
+	http://cdrkit.org/releases/${P}.tar.gz;name=archive \
+	file://xconfig.patch \
+"
+
+inherit cmake
+
+SRC_URI[archive.md5sum] = "3c25505d567113c269dc6e71640646d8"
+SRC_URI[archive.sha256sum] = "8b6e90b4068cac6f3a75a501d7a85aba6583b2dc34f434e3eb62d29104b107e5"
diff --git a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.9.bb b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.9.bb
deleted file mode 100755
index 0d2dc01..0000000
--- a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.9.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="A set of tools for CD recording"
-HOMEPAGE="http://www.cdrkit.org"
-
-LICENSE="GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8"
-
-DEPENDS = "libcap2 bzip2"
-
-PR = "r3"
-
-SRC_URI="http://cdrkit.org/releases/cdrkit-${PV}.tar.gz \
-	 file://xconfig.patch;patch=1 \
-	 file://cdrkit-1.1.9-glibc-2.10-3.patch;patch=1 \
-	"
-
-S="${WORKDIR}/cdrkit-${PV}"
-
-inherit cmake 
-
-do_install() {
-	oe_runmake install DESTDIR="${D}"
-}
-
-RC_URI[md5sum] = "cbc0647e5d85f0e8fb3a692ba1d42edd"
-SRC_URI[sha256sum] = "d5d58ab4c7bef036a53ef9742b4e57621f61310cd0cd28f558ba0b88c354efa2"
-