[arch-commits] Commit in cdrdao/trunk (8 files)
Jan de Groot
jgc at archlinux.org
Sun Aug 16 17:30:12 UTC 2009
Date: Sunday, August 16, 2009 @ 13:30:12
Author: jgc
Revision: 49838
upgpkg: cdrdao 1.2.3rc2-1
Update to 1.2.3rc2:
Use native ata layer instead of schily scsilib
Add patches from gentoo that fix regressions or bugs in 1.2.3rc2
Make it build with gcc 4.4/glibc 2.10
Added:
cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch
cdrdao/trunk/cdrdao-1.2.3-gcc44.patch
cdrdao/trunk/cdrdao-1.2.3-k3b.patch
cdrdao/trunk/cdrdao-1.2.3-pkg-config.patch
cdrdao/trunk/cdrdao-1.2.3-toc2cue.patch
cdrdao/trunk/cdrdao-1.2.3-tocparser.patch
Modified:
cdrdao/trunk/PKGBUILD
Deleted:
cdrdao/trunk/gcc4.patch
------------------------------------+
PKGBUILD | 35 ++++++++++++++++++-----
cdrdao-1.2.3-autoconf-update.patch | 52 +++++++++++++++++++++++++++++++++++
cdrdao-1.2.3-gcc44.patch | 23 +++++++++++++++
cdrdao-1.2.3-k3b.patch | 11 +++++++
cdrdao-1.2.3-pkg-config.patch | 15 ++++++++++
cdrdao-1.2.3-toc2cue.patch | 12 ++++++++
cdrdao-1.2.3-tocparser.patch | 17 +++++++++++
gcc4.patch | 23 ---------------
8 files changed, 158 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-08-16 16:56:46 UTC (rev 49837)
+++ PKGBUILD 2009-08-16 17:30:12 UTC (rev 49838)
@@ -1,19 +1,40 @@
# $Id$
# Maintainer: dorphell <dorphell at archlinux.org>
pkgname=cdrdao
-pkgver=1.2.2
-pkgrel=2
+pkgver=1.2.3rc2
+pkgrel=1
pkgdesc="Records audio/data CD-Rs in disk-at-once (DAO) mode"
arch=(i686 x86_64)
license=('GPL')
url="http://cdrdao.sourceforge.net/"
depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('f0cbf36907406cb4f4c568f9e6669a34')
+source=(ftp://ftp.archlinux.org/other/cdrdao/${pkgname}-${pkgver}.tar.bz2
+ cdrdao-1.2.3-autoconf-update.patch
+ cdrdao-1.2.3-gcc44.patch
+ cdrdao-1.2.3-k3b.patch
+ cdrdao-1.2.3-pkg-config.patch
+ cdrdao-1.2.3-toc2cue.patch
+ cdrdao-1.2.3-tocparser.patch)
+md5sums=('862f35eeb1c148db8bea99abb4a643fc'
+ '8e53dfc174f7c0882194caa05e68b85e'
+ '0e09ec11d6804d8db2eccaeb539f3f83'
+ '696f6ca01e1eeb9b6a5be88e535d9398'
+ '829ff219a1c98a0fcccd9ab3ced0cbd1'
+ '6982de2c8ae02169ef5756b5ca1d03a8'
+ 'e4afe12b00f686562056b66b29a7e6e4')
build() {
- cd $startdir/src/$pkgname-$pkgver
- ./configure --prefix=/usr --with-lame
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch" || return 1
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-gcc44.patch" || return 1
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch" || return 1
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-pkg-config.patch" || return 1
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-toc2cue.patch" || return 1
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-tocparser.patch" || return 1
+ aclocal || return 1
+ autoconf || return 1
+ automake || return 1
+ ./configure --prefix=/usr --with-lame || return 1
make || return 1
- make DESTDIR=$startdir/pkg install
+ make DESTDIR="${pkgdir}" install || return 1
}
Added: cdrdao-1.2.3-autoconf-update.patch
===================================================================
--- cdrdao-1.2.3-autoconf-update.patch (rev 0)
+++ cdrdao-1.2.3-autoconf-update.patch 2009-08-16 17:30:12 UTC (rev 49838)
@@ -0,0 +1,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
Added: cdrdao-1.2.3-gcc44.patch
===================================================================
--- cdrdao-1.2.3-gcc44.patch (rev 0)
+++ cdrdao-1.2.3-gcc44.patch 2009-08-16 17:30:12 UTC (rev 49838)
@@ -0,0 +1,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;
+
Added: cdrdao-1.2.3-k3b.patch
===================================================================
--- cdrdao-1.2.3-k3b.patch (rev 0)
+++ cdrdao-1.2.3-k3b.patch 2009-08-16 17:30:12 UTC (rev 49838)
@@ -0,0 +1,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 at daneb.de>",
++ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
+ VERSION);
+
+ std::list<std::string> list;
Added: cdrdao-1.2.3-pkg-config.patch
===================================================================
--- cdrdao-1.2.3-pkg-config.patch (rev 0)
+++ cdrdao-1.2.3-pkg-config.patch 2009-08-16 17:30:12 UTC (rev 49838)
@@ -0,0 +1,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)
Added: cdrdao-1.2.3-toc2cue.patch
===================================================================
--- cdrdao-1.2.3-toc2cue.patch (rev 0)
+++ cdrdao-1.2.3-toc2cue.patch 2009-08-16 17:30:12 UTC (rev 49838)
@@ -0,0 +1,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;
Added: cdrdao-1.2.3-tocparser.patch
===================================================================
--- cdrdao-1.2.3-tocparser.patch (rev 0)
+++ cdrdao-1.2.3-tocparser.patch 2009-08-16 17:30:12 UTC (rev 49838)
@@ -0,0 +1,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;
++ }
+ }
+ >>
+ ;
Deleted: gcc4.patch
===================================================================
--- gcc4.patch 2009-08-16 16:56:46 UTC (rev 49837)
+++ gcc4.patch 2009-08-16 17:30:12 UTC (rev 49838)
@@ -1,23 +0,0 @@
---- cdrdao-1.2.0/trackdb/FormatConverter.h 2005-06-30 13:35:59.000000000 +0200
-+++ cdrdao-1.2.0.az/trackdb/FormatConverter.h 2005-06-30 13:34:18.000000000 +0200
-@@ -95,7 +95,7 @@
-
- // Convert all files contained in a given Toc object, and update the
- // Toc accordingly. This is a big time blocking call.
-- FormatSupport::Status convert(Toc* toc);
-+ FormatSupport::Status convert(class Toc* toc);
-
- // Dynamic allocator.
- FormatSupport* newConverter(const char* src);
---- cdrdao-1.2.0/trackdb/CueParser.cc 2005-06-30 13:36:09.000000000 +0200
-+++ cdrdao-1.2.0.az/trackdb/CueParser.cc 2005-06-30 13:36:22.000000000 +0200
-@@ -23,7 +23,7 @@
-
- #include "Cue2Toc.h"
-
--extern Toc *parseToc(const char* tocBuffer, const char *filename);
-+extern class Toc *parseToc(const char* tocBuffer, const char *filename);
-
- Toc *parseCue(FILE *fp, const char *filename)
- {
-
More information about the arch-commits
mailing list