[weasel-commit] Source: cdrdao=1.2.3_rc2-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Mon, 14 Jun 2010 06:50:54 -0400
================================
cdrdao:source=1.2.3_rc2-1
cvc rdiff cdrdao -1 /weasel.rpath.org@wgl:3-devel/1.2.3_rc2-1
================================
1.2.3_rc2-1 Filip Brcic (brcha@xxxxxxxxxxxx) Mon Jun 14 06:50:02 2010
cdrdao 1.2.3_rc2
cdrdao-1.2.3-toc2cue.patch: new
--- /dev/null
+++ cdrdao-1.2.3-toc2cue.patch
@@ -0,0 +12 @@
+diff -Naur cdrdao-1.2.2/trackdb/TocParser.g
cdrdao-1.2.2-cclpatch/trackdb/TocParser.g
+--- cdrdao-1.2.2/trackdb/TocParser.g 2008-10-06 08:50:48.000000000 -0700
++++ cdrdao-1.2.2-cclpatch/trackdb/TocParser.g 2008-10-06 08:50:48.000000000
-0700
+@@ -774,7 +774,7 @@
+ << if (item != NULL) {
+ int type = item->packType();
+
+- if (isTrack && ((type >= 0x86 && type <= 0x89) || type == 0x8f)) {
++ if (isTrack && ((type > 0x86 && type <= 0x89) || type == 0x8f)) {
+ log_message(-2, "%s:%d: Invalid CD-TEXT item for a track.",
+ filename_, lineNr);
+ error_ = 1;
cdrdao-1.2.3rc2.tar.bz2: new
cdrdao.recipe: new
--- /dev/null
+++ cdrdao.recipe
@@ -0,0 +69 @@
+#
+# Copyright (c) 2010 Weasel GNU/Linux [Filip Brcic (brcha@xxxxxxxxxxxx)]
+# Distributed under the terms of the GNU General Public License v3
+#
+
+class Cdrdao(AutoPackageRecipe):
+ name = 'cdrdao'
+ version = '1.2.3_rc2'
+
+ buildRequires = [
+ 'cdrtools:devel', 'lame:devel', 'libmad:devel', 'libao:devel',
+ 'libvorbis:devel', 'pccts:devel', 'pccts:runtime',
+ 'libstdc++:devel', 'gcc-c++:runtime',
+ 'autoconf-wrapper:runtime', 'autoconf25:runtime',
+ 'automake-wrapper:runtime', 'automake110:runtime',
+ 'libtool:runtime', 'libtool:devel', 'm4:runtime',
+ 'pkg-config:devel'
+ ]
+ runtimeRequires = [
+ 'cdrtools:runtime', 'lame:runtime',
+ ]
+ buildRequires.extend(runtimeRequires)
+
+ shortDesc = 'Burn CDs in disk-at-once mode'
+ longDesc = """
+Cdrdao records audio or data CD-Rs in disk-at-once (DAO) mode based on
+a textual description of the CD contents (toc-file).
+"""
+ url = 'http://cdrdao.sourceforge.net/'
+ licenses = [ 'GPL-2' ]
+ categories = [ 'Applications/CDR' ]
+
+ def unpack(r):
+ if r.version.find('_rc') != -1:
+ r.macros.archive_version = r.version.replace('_', '')
+ r.addArchive('http://www.poolshark.org/src/')
+ else:
+ r.addArchive('mirror://sourceforge/cdrdao/')
+
+ for p in [
+ # Fix ERROR: CD/cdda.toc:36: Invalid CD-TEXT item for a track
+ 'cdrdao-1.2.3-toc2cue.patch',
+ # Undo upstream removal of automatic reading of the track lengths
in TOC
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440419
+ 'cdrdao-1.2.3-tocparser.patch',
+
+ 'cdrdao-1.2.3-gcc44.patch',
+ 'cdrdao-1.2.3-pkg-config.patch',
+ 'cdrdao-1.2.3-autoconf-update.patch',
+
+ 'cdrdao-1.2.3-k3b.patch',
+ ]:
+ r.addPatch(p)
+
+ r.Autoreconf()
+
+ def configure(r):
+ r.Configure(
+ ' --without-xdao' # TODO: needs gtk-- and company
+ ' --with-encode'
+ ' --with-mp3-support'
+ ' --with-ogg-support'
+ ' --disable-dependency-tracking'
+ )
+ r.disableParallelMake()
+
+ def policy(r):
+ for req in r.runtimeRequires:
+ r.Requires(req, '%(bindir)s/')
cdrdao-1.2.3-tocparser.patch: new
--- /dev/null
+++ cdrdao-1.2.3-tocparser.patch
@@ -0,0 +17 @@
+--- cdrdao-1.2.3.orig/trackdb/TocParser.g 2009/02/21 21:40:56 1.14
++++ cdrdao-1.2.3/trackdb/TocParser.g 2009/05/04 15:49:52 1.15
+@@ -511,8 +511,12 @@
+ >>
+ )
+ << if ($st != NULL && $st->length() == 0) {
+- // try to determine length
+- $st->determineLength();
++ // try to determine length
++ if ($st->determineLength() != 0) {
++ log_message(-2, "%s:%d: Cannot determine length of track data
specification.",
++ filename_, $lineNr);
++ error_ = 1;
++ }
+ }
+ >>
+ ;
cdrdao-1.2.3-gcc44.patch: new
--- /dev/null
+++ cdrdao-1.2.3-gcc44.patch
@@ -0,0 +23 @@
+--- cdrdao-1.2.3rc2/trackdb/TempFileManager.cc~ 2008-02-17
14:05:05.000000000 +0100
++++ cdrdao-1.2.3rc2/trackdb/TempFileManager.cc 2009-04-07 09:05:41.000000000
+0200
+@@ -20,6 +20,7 @@
+ #include "TempFileManager.h"
+ #include "log.h"
+
++#include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+--- cdrdao-1.2.3rc2/dao/CdrDriver.cc~ 2009-02-21 11:01:32.000000000 +0100
++++ cdrdao-1.2.3rc2/dao/CdrDriver.cc 2009-04-07 09:07:14.000000000 +0200
+@@ -2114,8 +2114,8 @@
+ ret = 1;
+ }
+ else {
+- if ((caps & CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW) != 0)
+- ret = 1;
++ if ((caps & (CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW)) != 0)
++ ret = 1;
+ }
+ break;
+
cdrdao-1.2.3-k3b.patch: new
--- /dev/null
+++ cdrdao-1.2.3-k3b.patch
@@ -0,0 +11 @@
+--- cdrdao/dao/main.cc~ 2009-04-16 15:34:27.000000000 +0200
++++ cdrdao/dao/main.cc 2009-04-16 15:34:38.000000000 +0200
+@@ -207,7 +207,7 @@
+
+ static void printVersion()
+ {
+- log_message(2, "Cdrdao version %s - (C) Andreas Mueller <andreas@xxxxxxxx>",
++ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas@xxxxxxxx>",
+ VERSION);
+
+ std::list<std::string> list;
cdrdao-1.2.3-autoconf-update.patch: new
--- /dev/null
+++ cdrdao-1.2.3-autoconf-update.patch
@@ -0,0 +52 @@
+--- cdrdao-1.2.3rc2/acinclude.m4.orig 2009-02-21 11:30:02.000000000 +0100
++++ cdrdao-1.2.3rc2/acinclude.m4 2009-05-22 22:38:15.448770972 +0200
+@@ -1,5 +1,49 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install
schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema
installation])
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
++
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema
files])
++
++ AC_ARG_ENABLE(schemas-install,
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
++ [case ${enableval} in
++ yes|no) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install])
;;
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" !=
no])
++])
+ # Configure paths for GTK--
+ # Erik Andersen 30 May 1998
+ # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
+
+ dnl Check and configure include and link paths for lame library
cdrdao-1.2.3-pkg-config.patch: new
--- /dev/null
+++ cdrdao-1.2.3-pkg-config.patch
@@ -0,0 +15 @@
+diff -NrU5 cdrdao-1.2.3rc2.orig/configure.ac cdrdao-1.2.3rc2/configure.ac
+--- cdrdao-1.2.3rc2.orig/configure.ac 2009-05-19 16:03:03.616292795 +0200
++++ cdrdao-1.2.3rc2/configure.ac 2009-05-19 16:04:55.826318499 +0200
+@@ -32,10 +32,11 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AC_CHECK_PROG(AR,ar,ar)
+ AC_PROG_MAKE_SET
++PKG_PROG_PKG_CONFIG
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(fcntl.h getopt.h malloc.h unistd.h sys/mman.h sched.h)
Committed by: brcha
Other related posts:
