Mailinglist Archive: opensuse-commit (1138 mails)
| < Previous | Next > |
commit cdrdao
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 23 Jan 2007 14:58:14 +0100
- Message-id: <20070123135815.2FC25678179@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package cdrdao
checked in at Tue Jan 23 14:58:14 CET 2007.
--------
--- cdrdao/cdrdao.changes 2006-10-05 17:57:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/cdrdao/cdrdao.changes 2007-01-23 11:49:09.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Jan 23 11:48:31 CET 2007 - nadvornik@xxxxxxx
+
+- build with libusal from cdrkit
+
+-------------------------------------------------------------------
New:
----
cdrdao-1.2.2-usal.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cdrdao.spec ++++++
--- /var/tmp/diff_new_pack.H15138/_old 2007-01-23 14:57:39.000000000 +0100
+++ /var/tmp/diff_new_pack.H15138/_new 2007-01-23 14:57:39.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cdrdao (Version 1.2.2)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,16 +12,17 @@
Name: cdrdao
BuildRequires: gcc-c++ libao-devel libgnomeuimm-devel libvorbis-devel update-desktop-files wodim-devel
-License: GPL
+License: GNU General Public License (GPL)
Group: Productivity/Multimedia/CD/Record
Autoreqprov: on
Version: 1.2.2
-Release: 1
+Release: 35
Summary: Write CD-Rs in Disk-At-Once Mode
URL: http://cdrdao.sourceforge.net
Source: cdrdao-%{version}.tar.bz2
Patch1: cdrdao-build.patch
Patch2: cdrdao-%{version}-scan.patch
+Patch3: cdrdao-%{version}-usal.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -55,6 +56,7 @@
%setup -q
%patch1
%patch2
+%patch3
%build
autoreconf -f -i
@@ -109,6 +111,8 @@
/usr/share/mime/packages/gcdmaster.xml
%changelog -n cdrdao
+* Tue Jan 23 2007 - nadvornik@xxxxxxx
+- build with libusal from cdrkit
* Thu Oct 05 2006 - nadvornik@xxxxxxx
- update to 1.2.2:
* bugfixes, compilation fixes
@@ -151,7 +155,7 @@
- scan for ATA devices
* Wed Feb 18 2004 - nadvornik@xxxxxxx
- updated to 1.1.8
-- ported to gnome2
+ - ported to gnome2
* Mon Feb 02 2004 - nadvornik@xxxxxxx
- fixed a crash caused by wrong assert [#32701]
- fixed the fallback driver patch [#33646]
++++++ cdrdao-1.2.2-usal.patch ++++++
--- acinclude.m4
+++ acinclude.m4
@@ -128,7 +128,7 @@
AC_MSG_CHECKING(for libscg/schily version >= $1)
CFLAGS="$scsilib_incl"
- LIBS="$scsilib_libs"
+ LIBS="$scsilib_libs -lscg -lschily"
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
@@ -161,3 +161,48 @@
]
)
+AC_DEFUN([AC_LIBUSAL],
+[dnl
+dnl Get libusal version
+dnl
+
+ AC_LANG_SAVE
+ AC_LANG_C
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+
+ AC_MSG_CHECKING(for libusal/rols version >= $1)
+ CFLAGS="$scsilib_incl"
+ LIBS="$scsilib_libs -lusal -lrols"
+
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+#include <stdio.h>
+#include <standard.h>
+#include <usal/usalcmd.h>
+#include <usal/scsitransp.h>
+]],[[
+ int maj1, maj2, min1, min2;
+ const char* v1 = "$1";
+ const char* v2 = usal_version(0, SCG_VERSION);
+ maj1 = atoi(v1);
+ maj2 = atoi(v2);
+ if (maj2 < maj1) {
+ return -1;
+ }
+ if (!strchr(v1, '.') || !strchr(v2, '.'))
+ return -1;
+
+ min1 = atoi(strchr(v1, '.') + 1);
+ min2 = atoi(strchr(v2, '.') + 1);
+ if (min2 < min1) {
+ return -1;
+ }
+
+]])],[AC_MSG_RESULT(yes); $2],[AC_MSG_RESULT(no); $3],[AC_MSG_RESULT(skipped); $2])
+
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ AC_LANG_RESTORE
+]
+)
+
--- configure.ac
+++ configure.ac
@@ -257,6 +257,7 @@
[sgsysinc=yes; scsilib_incl="-I/usr/include/schily"])
AC_CHECK_FILE(/usr/local/include/schily/schily.h,
[sgsysinc=yes; scsilib_incl="-I/usr/local/include/schily"])
+ AC_CHECK_LIB(usal, usal_version, [sgsyslib=yes], , -lrols)
else
scsilib_incl="-I$scglib_inc"
scsilib_libs="-L$scglib_lib"
@@ -273,7 +274,6 @@
en_scsilib="yes"
fi
- scsilib_libs="$scsilib_libs -lscg -lschily"
scsilib_objs="ScsiIf-lib.o"
case "$host" in
@@ -317,13 +317,30 @@
dnl If we're using custom libsch/schily libs, make sure it'll compile
if test "$en_custom_libscg" = yes; then
- AC_LIBSCG(0.5,[have_scg05=yes],[AC_MSG_ERROR([No cdrtools libraries found. You need to install cdrtools version >= 1.10 (a.k.a. cdrecord-devel). To build the included fallback scsi library, please use --with-scglib=pkg (see INSTALL file)])])
+ AC_LIBSCG(0.5,[have_scg05=yes],[])
+ AC_LIBUSAL(1.1,[have_usal=yes],[])
+
+ if test ! "$have_scg05" = yes -a ! "$have_usal" = yes; then
+ AC_MSG_ERROR([No cdrtools libraries found. You need to install cdrtools version >= 1.10 (a.k.a. cdrecord-devel). To build the included fallback scsi library, please use --with-scglib=pkg (see INSTALL file)])
+ fi
+
AC_LIBSCG(0.7,[have_scg07=yes], [])
+ if test "$have_scg05" = yes; then
+ scsilib_libs="$scsilib_libs -lscg -lschily"
+ fi
+
dnl Special case when we're compiling with cdrtools 1.10
if test "$have_scg05" = yes -a ! "$have_scg07" = yes; then
AC_DEFINE(USE_OLDSCGLIB,1,"")
fi
+ if test "$have_usal" = yes; then
+ AC_DEFINE(USE_LIBUSAL,1,"")
+ scsilib_libs="$scsilib_libs -lusal -lrols"
+ fi
+else
+ dnl internal libscg
+ scsilib_libs="$scsilib_libs -lscg -lschily"
fi
dnl Selection of buffer code
--- dao/ScsiIf-lib.cc
+++ dao/ScsiIf-lib.cc
@@ -30,10 +30,30 @@
#include "xconfig.h"
#include "standard.h"
+#if USE_LIBUSAL
+#include "usal/usalcmd.h"
+#include "usal/scsitransp.h"
+#include "usal/scsireg.h"
+#define scg_open usal_open
+#define scg_close usal_close
+#define scg_bufsize usal_bufsize
+#define scg_getbuf usal_getbuf
+#define scg_cmd usal_cmd
+#define scg_printerr usal_printerr
+#define scg_help usal_help
+#define scg_sense_key usal_sense_key
+#define scg_isatapi usal_isatapi
+#define scg_scsibus usal_scsibus
+#define scg_target usal_target
+#define scg_lun usal_lun
+#define scg_havebus usal_havebus
+#define scg_settarget usal_settarget
+#define scg_version usal_version
+#else
#include "scg/scgcmd.h"
#include "scg/scsitransp.h"
#include "scg/scsireg.h"
-
+#endif /* USE_LIBUSAL */
// schily/standard.h define these, i don't know what they smoked the
// day they came up with those defines.
#undef vendor
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |