Date: Monday, September 12, 2011 @ 08:45:56
Author: pierre
Revision: 137917
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cdrdao/repos/extra-i686/PKGBUILD
(from rev 137916, cdrdao/trunk/PKGBUILD)
cdrdao/repos/extra-i686/cdrdao-1.2.3-autoconf-update.patch
(from rev 137916, cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch)
cdrdao/repos/extra-i686/cdrdao-1.2.3-k3b.patch
(from rev 137916, cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
cdrdao/repos/extra-i686/cdrdao-1.2.3-stat.patch
(from rev 137916, cdrdao/trunk/cdrdao-1.2.3-stat.patch)
cdrdao/repos/extra-i686/gcdmaster.install
(from rev 137916, cdrdao/trunk/gcdmaster.install)
cdrdao/repos/extra-x86_64/PKGBUILD
(from rev 137916, cdrdao/trunk/PKGBUILD)
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
(from rev 137916, cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch)
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch
(from rev 137916, cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-stat.patch
(from rev 137916, cdrdao/trunk/cdrdao-1.2.3-stat.patch)
cdrdao/repos/extra-x86_64/gcdmaster.install
(from rev 137916, cdrdao/trunk/gcdmaster.install)
Deleted:
cdrdao/repos/extra-i686/PKGBUILD
cdrdao/repos/extra-i686/cdrdao-1.2.3-autoconf-update.patch
cdrdao/repos/extra-i686/cdrdao-1.2.3-k3b.patch
cdrdao/repos/extra-i686/cdrdao-1.2.3-stat.patch
cdrdao/repos/extra-i686/gcdmaster.install
cdrdao/repos/extra-x86_64/PKGBUILD
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-stat.patch
cdrdao/repos/extra-x86_64/gcdmaster.install
-------------------------------------------------+
extra-i686/PKGBUILD | 118 +++++++++++-----------
extra-i686/cdrdao-1.2.3-autoconf-update.patch | 104 +++++++++----------
extra-i686/cdrdao-1.2.3-k3b.patch | 22 ++--
extra-i686/cdrdao-1.2.3-stat.patch | 26 ++--
extra-i686/gcdmaster.install | 44 ++++----
extra-x86_64/PKGBUILD | 118 +++++++++++-----------
extra-x86_64/cdrdao-1.2.3-autoconf-update.patch | 104 +++++++++----------
extra-x86_64/cdrdao-1.2.3-k3b.patch | 22 ++--
extra-x86_64/cdrdao-1.2.3-stat.patch | 26 ++--
extra-x86_64/gcdmaster.install | 44 ++++----
10 files changed, 314 insertions(+), 314 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-12 12:44:01 UTC (rev 137916)
+++ extra-i686/PKGBUILD 2011-09-12 12:45:56 UTC (rev 137917)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Daniel J Griffiths <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-# Contributor: dorphell <[email protected]>
-
-pkgbase=('cdrdao')
-pkgname=('cdrdao' 'gcdmaster')
-pkgver=1.2.3
-pkgrel=5
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://cdrdao.sourceforge.net/";
-makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- cdrdao-1.2.3-autoconf-update.patch
- cdrdao-1.2.3-k3b.patch
- cdrdao-1.2.3-stat.patch)
-md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
- '8e53dfc174f7c0882194caa05e68b85e'
- '696f6ca01e1eeb9b6a5be88e535d9398'
- '0fce05542ebad283f36fa1c4d62992a0')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch"
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch"
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
-
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --with-xdao --with-lame \
- --with-ogg-support --with-mp3-support
- make
-}
-
-package_cdrdao() {
- pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode'
- depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- for dir in trackdb utils paranoia dao
- do
- make -C ${dir} DESTDIR="${pkgdir}" install
- done
-}
-
-package_gcdmaster() {
- pkgdesc='GUI frontend for creating audio CDs using cdrdao'
- depends=('libgnomeuimm' "cdrdao=${pkgver}")
- install=gcdmaster.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
DESTDIR="${pkgdir}" install
-
- mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/"
- rmdir "${pkgdir}/etc"
-}
Copied: cdrdao/repos/extra-i686/PKGBUILD (from rev 137916,
cdrdao/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-12 12:45:56 UTC (rev 137917)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Daniel J Griffiths <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: dorphell <[email protected]>
+
+pkgbase=('cdrdao')
+pkgname=('cdrdao' 'gcdmaster')
+pkgver=1.2.3
+pkgrel=6
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://cdrdao.sourceforge.net/";
+makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";
+ 'cdrdao-1.2.3-autoconf-update.patch'
+ 'cdrdao-1.2.3-k3b.patch'
+ 'cdrdao-1.2.3-stat.patch')
+md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
+ '8e53dfc174f7c0882194caa05e68b85e'
+ '696f6ca01e1eeb9b6a5be88e535d9398'
+ '0fce05542ebad283f36fa1c4d62992a0')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch"
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch"
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
+
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --with-xdao --with-lame \
+ --with-ogg-support --with-mp3-support
+ make
+}
+
+package_cdrdao() {
+ pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode'
+ depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ for dir in trackdb utils paranoia dao
+ do
+ make -C ${dir} DESTDIR="${pkgdir}" install
+ done
+}
+
+package_gcdmaster() {
+ pkgdesc='GUI frontend for creating audio CDs using cdrdao'
+ depends=('libgnomeuimm' "cdrdao=${pkgver}")
+ install=gcdmaster.install
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
DESTDIR="${pkgdir}" install
+
+ mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/"
+ rmdir "${pkgdir}/etc"
+}
Deleted: extra-i686/cdrdao-1.2.3-autoconf-update.patch
===================================================================
--- extra-i686/cdrdao-1.2.3-autoconf-update.patch 2011-09-12 12:44:01 UTC
(rev 137916)
+++ extra-i686/cdrdao-1.2.3-autoconf-update.patch 2011-09-12 12:45:56 UTC
(rev 137917)
@@ -1,52 +0,0 @@
---- 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
Copied: cdrdao/repos/extra-i686/cdrdao-1.2.3-autoconf-update.patch (from rev
137916, cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch)
===================================================================
--- extra-i686/cdrdao-1.2.3-autoconf-update.patch
(rev 0)
+++ extra-i686/cdrdao-1.2.3-autoconf-update.patch 2011-09-12 12:45:56 UTC
(rev 137917)
@@ -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
Deleted: extra-i686/cdrdao-1.2.3-k3b.patch
===================================================================
--- extra-i686/cdrdao-1.2.3-k3b.patch 2011-09-12 12:44:01 UTC (rev 137916)
+++ extra-i686/cdrdao-1.2.3-k3b.patch 2011-09-12 12:45:56 UTC (rev 137917)
@@ -1,11 +0,0 @@
---- 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 <[email protected]>",
-+ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
- VERSION);
-
- std::list<std::string> list;
Copied: cdrdao/repos/extra-i686/cdrdao-1.2.3-k3b.patch (from rev 137916,
cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
===================================================================
--- extra-i686/cdrdao-1.2.3-k3b.patch (rev 0)
+++ extra-i686/cdrdao-1.2.3-k3b.patch 2011-09-12 12:45:56 UTC (rev 137917)
@@ -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 <[email protected]>",
++ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
+ VERSION);
+
+ std::list<std::string> list;
Deleted: extra-i686/cdrdao-1.2.3-stat.patch
===================================================================
--- extra-i686/cdrdao-1.2.3-stat.patch 2011-09-12 12:44:01 UTC (rev 137916)
+++ extra-i686/cdrdao-1.2.3-stat.patch 2011-09-12 12:45:56 UTC (rev 137917)
@@ -1,13 +0,0 @@
-diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc
---- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000
+0100
-+++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100
-@@ -19,6 +19,9 @@
-
- #include <config.h>
-
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
Copied: cdrdao/repos/extra-i686/cdrdao-1.2.3-stat.patch (from rev 137916,
cdrdao/trunk/cdrdao-1.2.3-stat.patch)
===================================================================
--- extra-i686/cdrdao-1.2.3-stat.patch (rev 0)
+++ extra-i686/cdrdao-1.2.3-stat.patch 2011-09-12 12:45:56 UTC (rev 137917)
@@ -0,0 +1,13 @@
+diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc
+--- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000
+0100
++++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100
+@@ -19,6 +19,9 @@
+
+ #include <config.h>
+
++#include <sys/types.h>
++#include <sys/stat.h>
++
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <unistd.h>
Deleted: extra-i686/gcdmaster.install
===================================================================
--- extra-i686/gcdmaster.install 2011-09-12 12:44:01 UTC (rev 137916)
+++ extra-i686/gcdmaster.install 2011-09-12 12:45:56 UTC (rev 137917)
@@ -1,22 +0,0 @@
-pkgname=gcdmaster
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- update-mime-database usr/share/mime
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- update-mime-database usr/share/mime
-}
Copied: cdrdao/repos/extra-i686/gcdmaster.install (from rev 137916,
cdrdao/trunk/gcdmaster.install)
===================================================================
--- extra-i686/gcdmaster.install (rev 0)
+++ extra-i686/gcdmaster.install 2011-09-12 12:45:56 UTC (rev 137917)
@@ -0,0 +1,22 @@
+pkgname=gcdmaster
+
+post_install() {
+ usr/sbin/gconfpkg --install ${pkgname}
+ update-mime-database usr/share/mime
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+ update-mime-database usr/share/mime
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-12 12:44:01 UTC (rev 137916)
+++ extra-x86_64/PKGBUILD 2011-09-12 12:45:56 UTC (rev 137917)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Daniel J Griffiths <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-# Contributor: dorphell <[email protected]>
-
-pkgbase=('cdrdao')
-pkgname=('cdrdao' 'gcdmaster')
-pkgver=1.2.3
-pkgrel=5
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://cdrdao.sourceforge.net/";
-makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- cdrdao-1.2.3-autoconf-update.patch
- cdrdao-1.2.3-k3b.patch
- cdrdao-1.2.3-stat.patch)
-md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
- '8e53dfc174f7c0882194caa05e68b85e'
- '696f6ca01e1eeb9b6a5be88e535d9398'
- '0fce05542ebad283f36fa1c4d62992a0')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch"
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch"
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
-
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --with-xdao --with-lame \
- --with-ogg-support --with-mp3-support
- make
-}
-
-package_cdrdao() {
- pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode'
- depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- for dir in trackdb utils paranoia dao
- do
- make -C ${dir} DESTDIR="${pkgdir}" install
- done
-}
-
-package_gcdmaster() {
- pkgdesc='GUI frontend for creating audio CDs using cdrdao'
- depends=('libgnomeuimm' "cdrdao=${pkgver}")
- install=gcdmaster.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
DESTDIR="${pkgdir}" install
-
- mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/"
- rmdir "${pkgdir}/etc"
-}
Copied: cdrdao/repos/extra-x86_64/PKGBUILD (from rev 137916,
cdrdao/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-12 12:45:56 UTC (rev 137917)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Daniel J Griffiths <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: dorphell <[email protected]>
+
+pkgbase=('cdrdao')
+pkgname=('cdrdao' 'gcdmaster')
+pkgver=1.2.3
+pkgrel=6
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://cdrdao.sourceforge.net/";
+makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";
+ 'cdrdao-1.2.3-autoconf-update.patch'
+ 'cdrdao-1.2.3-k3b.patch'
+ 'cdrdao-1.2.3-stat.patch')
+md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
+ '8e53dfc174f7c0882194caa05e68b85e'
+ '696f6ca01e1eeb9b6a5be88e535d9398'
+ '0fce05542ebad283f36fa1c4d62992a0')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch"
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch"
+ patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
+
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --with-xdao --with-lame \
+ --with-ogg-support --with-mp3-support
+ make
+}
+
+package_cdrdao() {
+ pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode'
+ depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ for dir in trackdb utils paranoia dao
+ do
+ make -C ${dir} DESTDIR="${pkgdir}" install
+ done
+}
+
+package_gcdmaster() {
+ pkgdesc='GUI frontend for creating audio CDs using cdrdao'
+ depends=('libgnomeuimm' "cdrdao=${pkgver}")
+ install=gcdmaster.install
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
DESTDIR="${pkgdir}" install
+
+ mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/"
+ rmdir "${pkgdir}/etc"
+}
Deleted: extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-autoconf-update.patch 2011-09-12 12:44:01 UTC
(rev 137916)
+++ extra-x86_64/cdrdao-1.2.3-autoconf-update.patch 2011-09-12 12:45:56 UTC
(rev 137917)
@@ -1,52 +0,0 @@
---- 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
Copied: cdrdao/repos/extra-x86_64/cdrdao-1.2.3-autoconf-update.patch (from rev
137916, cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch)
===================================================================
--- extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
(rev 0)
+++ extra-x86_64/cdrdao-1.2.3-autoconf-update.patch 2011-09-12 12:45:56 UTC
(rev 137917)
@@ -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
Deleted: extra-x86_64/cdrdao-1.2.3-k3b.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-k3b.patch 2011-09-12 12:44:01 UTC (rev 137916)
+++ extra-x86_64/cdrdao-1.2.3-k3b.patch 2011-09-12 12:45:56 UTC (rev 137917)
@@ -1,11 +0,0 @@
---- 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 <[email protected]>",
-+ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
- VERSION);
-
- std::list<std::string> list;
Copied: cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch (from rev 137916,
cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
===================================================================
--- extra-x86_64/cdrdao-1.2.3-k3b.patch (rev 0)
+++ extra-x86_64/cdrdao-1.2.3-k3b.patch 2011-09-12 12:45:56 UTC (rev 137917)
@@ -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 <[email protected]>",
++ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
+ VERSION);
+
+ std::list<std::string> list;
Deleted: extra-x86_64/cdrdao-1.2.3-stat.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-stat.patch 2011-09-12 12:44:01 UTC (rev
137916)
+++ extra-x86_64/cdrdao-1.2.3-stat.patch 2011-09-12 12:45:56 UTC (rev
137917)
@@ -1,13 +0,0 @@
-diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc
---- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000
+0100
-+++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100
-@@ -19,6 +19,9 @@
-
- #include <config.h>
-
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
Copied: cdrdao/repos/extra-x86_64/cdrdao-1.2.3-stat.patch (from rev 137916,
cdrdao/trunk/cdrdao-1.2.3-stat.patch)
===================================================================
--- extra-x86_64/cdrdao-1.2.3-stat.patch (rev 0)
+++ extra-x86_64/cdrdao-1.2.3-stat.patch 2011-09-12 12:45:56 UTC (rev
137917)
@@ -0,0 +1,13 @@
+diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc
+--- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000
+0100
++++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100
+@@ -19,6 +19,9 @@
+
+ #include <config.h>
+
++#include <sys/types.h>
++#include <sys/stat.h>
++
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <unistd.h>
Deleted: extra-x86_64/gcdmaster.install
===================================================================
--- extra-x86_64/gcdmaster.install 2011-09-12 12:44:01 UTC (rev 137916)
+++ extra-x86_64/gcdmaster.install 2011-09-12 12:45:56 UTC (rev 137917)
@@ -1,22 +0,0 @@
-pkgname=gcdmaster
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- update-mime-database usr/share/mime
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- update-mime-database usr/share/mime
-}
Copied: cdrdao/repos/extra-x86_64/gcdmaster.install (from rev 137916,
cdrdao/trunk/gcdmaster.install)
===================================================================
--- extra-x86_64/gcdmaster.install (rev 0)
+++ extra-x86_64/gcdmaster.install 2011-09-12 12:45:56 UTC (rev 137917)
@@ -0,0 +1,22 @@
+pkgname=gcdmaster
+
+post_install() {
+ usr/sbin/gconfpkg --install ${pkgname}
+ update-mime-database usr/share/mime
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+ update-mime-database usr/share/mime
+}
