Hello community,
here is the log from the commit of package cdemu-daemon for openSUSE:Factory
checked in at 2014-09-23 10:42:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cdemu-daemon (Old)
and /work/SRC/openSUSE:Factory/.cdemu-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cdemu-daemon"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cdemu-daemon/cdemu-daemon.changes
2014-07-17 17:31:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cdemu-daemon.new/cdemu-daemon.changes
2014-09-23 10:43:20.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Sep 22 22:32:54 UTC 2014 - jeng...@inai.de
+
+- Request matching libmirage version for build
+
+-------------------------------------------------------------------
Old:
----
cdemu-daemon-3.0.0.tar.bz2
New:
----
cdemu-daemon-3.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cdemu-daemon.spec ++++++
--- /var/tmp/diff_new_pack.1ik2Bj/_old 2014-09-23 10:43:21.000000000 +0200
+++ /var/tmp/diff_new_pack.1ik2Bj/_new 2014-09-23 10:43:21.000000000 +0200
@@ -17,7 +17,7 @@
Name: cdemu-daemon
-Version: 3.0.0
+Version: 3.0.1
Release: 0
Summary: Device daemon for cdemu, a virtual CD-ROM device emulator
License: GPL-2.0+
@@ -37,7 +37,7 @@
BuildRequires: pkgconfig(gmodule-2.0) >= 2.28
BuildRequires: pkgconfig(gobject-2.0) >= 2.28
BuildRequires: pkgconfig(gthread-2.0) >= 2.28
-BuildRequires: pkgconfig(libmirage) >= 3.0.0
+BuildRequires: pkgconfig(libmirage) >= %version
%description
cdemu-daemon receives SCSI commands from kernel module thorugh the
++++++ cdemu-daemon-3.0.0.tar.bz2 -> cdemu-daemon-3.0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdemu-daemon-3.0.0/CMakeLists.txt
new/cdemu-daemon-3.0.1/CMakeLists.txt
--- old/cdemu-daemon-3.0.0/CMakeLists.txt 2014-06-29 15:25:04.000000000
+0200
+++ new/cdemu-daemon-3.0.1/CMakeLists.txt 2014-07-25 22:15:44.000000000
+0200
@@ -4,7 +4,7 @@
project (cdemu-daemon C)
# Versioning
-set (CDEMU_DAEMON_VERSION 3.0.0)
+set (CDEMU_DAEMON_VERSION 3.0.1)
set (CDEMU_DAEMON_INTERFACE_VERSION_MAJOR 7)
set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdemu-daemon-3.0.0/README
new/cdemu-daemon-3.0.1/README
--- old/cdemu-daemon-3.0.0/README 2014-06-29 15:25:04.000000000 +0200
+++ new/cdemu-daemon-3.0.1/README 2014-07-25 22:15:44.000000000 +0200
@@ -1,5 +1,5 @@
CDEmu Daemon
-3.0.0
+3.0.1
~~~~~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdemu-daemon-3.0.0/src/device-mode-pages.c
new/cdemu-daemon-3.0.1/src/device-mode-pages.c
--- old/cdemu-daemon-3.0.0/src/device-mode-pages.c 2014-06-29
15:25:04.000000000 +0200
+++ new/cdemu-daemon-3.0.1/src/device-mode-pages.c 2014-07-25
22:15:44.000000000 +0200
@@ -140,8 +140,9 @@
CDEMU_DEBUG(self, DAEMON_DEBUG_MMC, "%s: subheader: %02hX %02hX %02hX
%02hX\n", __debug__, new_page->subheader[0], new_page->subheader[1],
new_page->subheader[2], new_page->subheader[3]);
CDEMU_DEBUG(self, DAEMON_DEBUG_MMC, "\n");
- /* At the moment, we do not support incremental/packet recording */
- if (new_page->write_type == 0x00) {
+ /* At the moment, we do not support incremental/packet recording, nor
+ layer-jump recording */
+ if (new_page->write_type == 0x00 || new_page->write_type == 0x04) {
return FALSE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdemu-daemon-3.0.0/src/device-recording.c
new/cdemu-daemon-3.0.1/src/device-recording.c
--- old/cdemu-daemon-3.0.0/src/device-recording.c 2014-06-29
15:25:04.000000000 +0200
+++ new/cdemu-daemon-3.0.1/src/device-recording.c 2014-07-25
22:15:44.000000000 +0200
@@ -820,7 +820,7 @@
CDEMU_DEBUG(self, DAEMON_DEBUG_RECORDING, "%s: sector %d\n",
__debug__, address);
/* In RAW SAO mode, the host sends us lead-in */
- if (address < -150 && self->priv->sao_leadin_format != 0x01) {
+ if (address < -150 && self->priv->sao_leadin_format & 0xC0) {
CDEMU_DEBUG(self, DAEMON_DEBUG_RECORDING, "%s: lead-in sector for
RAW SAO\n", __debug__, address);
main_format_ptr =
sao_main_formats_find(self->priv->sao_leadin_format);
@@ -1057,7 +1057,7 @@
/* Set track flags from CTL */
mirage_track_set_ctl(track, ctl);
- if (self->priv->sao_leadin_format != 0x01) {
+ if (self->priv->sao_leadin_format & 0xC0) {
/* In raw SAO, we set track's sector type to
MIRAGE_SECTOR_RAW_SCRAMBLED;
however, we can use CTL field to deduce if a track is
an audio track and set MIRAGE_SECTOR_AUDIO directly */
@@ -1252,10 +1252,12 @@
static gboolean cdemu_device_dao_recording_write_sectors (CdemuDevice *self,
gint start_address, gint num_sectors)
{
/* At this point, the track should already be open due to a call to
- RESERVE TRACK */
+ RESERVE TRACK... if not, open one by reserving a track of length 0 */
if (!self->priv->open_track) {
- CDEMU_DEBUG(self, DAEMON_DEBUG_WARNING, "%s: no open track; there
should be one opened by a call to RESERVE TRACK!\n", __debug__);
- return FALSE;
+ if (!cdemu_device_dao_recording_reserve_track(self, 0)) {
+ CDEMU_DEBUG(self, DAEMON_DEBUG_WARNING, "%s: failed to open
track!\n", __debug__);
+ return FALSE;
+ }
}
/* DVD recording has only Mode 1 data, so data block type in mode
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
