January 2011 - openSUSE Commits - openSUSE Mailing Lists

commit libreoffice-l10n-extras for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-l10n-extras for openSUSE:Factory checked in at Fri Jan 7 12:20:52 CET 2011. -------- --- libreoffice-l10n-extras/libreoffice-l10n-extras.changes 2010-12-01 20:45:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-l10n-extras/libreoffice-l10n-extras.changes 2010-12-21 19:56:52.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-extras-3.3.0.1.tar.bz2 New: ---- libreoffice-extras-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-l10n-extras.spec ++++++ --- /var/tmp/diff_new_pack.LLEaRi/_old 2011-01-07 12:20:28.000000000 +0100 +++ /var/tmp/diff_new_pack.LLEaRi/_new 2011-01-07 12:20:28.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-l10n-extras (Version 3.3.0.1) +# spec file for package libreoffice-l10n-extras (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: libreoffice-l10n-extras -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece extras -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-extras-3.3.0.1.tar.bz2 -> libreoffice-extras-3.3.0.2.tar.bz2 ++++++ libreoffice-l10n-extras/libreoffice-extras-3.3.0.1.tar.bz2 /mounts/work_src_done/STABLE/libreoffice-l10n-extras/libreoffice-extras-3.3.0.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autoyast2 for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at Fri Jan 7 12:20:06 CET 2011. -------- --- autoyast2/autoyast2.changes 2010-05-21 15:10:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2011-01-04 12:11:55.000000000 +0100 @@ -1,0 +2,59 @@ +Tue Jan 4 11:04:33 UTC 2011 - lslezak(a)suse.cz + +- fixed build (wrong mount call params) +- 2.20.3 + +------------------------------------------------------------------- +Wed Nov 24 17:19:09 CET 2010 - ug(a)suse.de + +- clone devices by-path on s390 (bnc#591603) +- 2.20.2 + +------------------------------------------------------------------- +Tue Oct 12 13:32:37 UTC 2010 - lslezak(a)suse.cz + +- don't use obsoleted inst_packages.ycp client, use PackagesUI.ycp + module instead (bnc#471490) +- 2.20.1 + +------------------------------------------------------------------- +Mon Aug 30 15:09:51 CEST 2010 - ug(a)suse.de + +- setting a boolean via <path> does not work (regression from the + fix bnc#572166) + +------------------------------------------------------------------- +Mon Aug 30 13:06:11 CEST 2010 - ug(a)suse.de + +- potential endless reboot during online update fixed + +------------------------------------------------------------------- +Tue Aug 10 15:12:56 CEST 2010 - ug(a)suse.de + +- media_url removed from CDATA + +------------------------------------------------------------------- +Thu Aug 5 10:53:55 CEST 2010 - ug(a)suse.de + +- a new filesystem can be specified for partitioning_advanced + +------------------------------------------------------------------- +Tue Aug 3 11:33:58 CEST 2010 - ug(a)suse.de + +- reusing more partitions than the hardware still could create + fails (bnc#620212). This is a different issue but the same bug + like on Jul 15 14:21:41 below + +------------------------------------------------------------------- +Thu Jul 15 14:21:41 CEST 2010 - ug(a)suse.de + +- speed up partitioning calculation if a lot partitions are + reused (bnc#620212) + +------------------------------------------------------------------- +Fri Jul 9 09:51:51 CEST 2010 - ug(a)suse.de + +- an existing swap partition can accidently be reused + even if AutoYaST is not supposed to touch it (bnc#613366) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- autoyast2-2.19.10.tar.bz2 New: ---- autoyast2-2.20.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.0TKTo7/_old 2011-01-07 12:19:30.000000000 +0100 +++ /var/tmp/diff_new_pack.0TKTo7/_new 2011-01-07 12:19:30.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package autoyast2 (Version 2.19.10) +# spec file for package autoyast2 (Version 2.20.3) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: autoyast2 -Version: 2.19.10 +Version: 2.20.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.19.10.tar.bz2 +Source0: autoyast2-2.20.3.tar.bz2 Prefix: /usr @@ -65,7 +65,7 @@ %package installation License: GPLv2+ -Version: 2.19.10 +Version: 2.20.3 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -82,7 +82,7 @@ generated with the autoyast2 package. %prep -%setup -n autoyast2-2.19.10 +%setup -n autoyast2-2.20.3 %build %{prefix}/bin/y2tool y2autoconf ++++++ autoyast2-2.19.10.tar.bz2 -> autoyast2-2.20.3.tar.bz2 ++++++ ++++ 4842 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.19.10/configure.in new/autoyast2-2.20.3/configure.in --- old/autoyast2-2.19.10/configure.in 2010-05-21 15:07:38.000000000 +0200 +++ new/autoyast2-2.20.3/configure.in 2011-01-04 12:06:12.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.19.10, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.20.3, http://bugs.opensuse.org/, autoyast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.10" +VERSION="2.20.3" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.19.10/src/clients/inst_autoconfigure.ycp new/autoyast2-2.20.3/src/clients/inst_autoconfigure.ycp --- old/autoyast2-2.19.10/src/clients/inst_autoconfigure.ycp 2009-05-04 11:54:37.000000000 +0200 +++ new/autoyast2-2.20.3/src/clients/inst_autoconfigure.ycp 2010-10-12 17:03:24.000000000 +0200 @@ -5,7 +5,7 @@ * Summary: This module finishes auto-installation and configures * the system as described in the profile file. * - * $Id: inst_autoconfigure.ycp 57049 2009-05-04 09:54:36Z ug $ + * $Id: inst_autoconfigure.ycp 62444 2010-08-30 11:06:41Z ug $ */ { @@ -231,7 +231,7 @@ symbol online_update_ret = (symbol)Call::Function("do_online_update_auto", ["Write"]); processWait( "do_online_update", "post-modules" ); if( online_update_ret == `reboot ) { - map script = $[ "filename":"zzz_reboot", "source":"shutdown -r now" ]; + map script = $[ "filename":"zzz_reboot", "source":"chkconfig autoyast off\nshutdown -r now" ]; AutoinstScripts::init = add( AutoinstScripts::init, script ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.19.10/src/clients/software_auto.ycp new/autoyast2-2.20.3/src/clients/software_auto.ycp --- old/autoyast2-2.19.10/src/clients/software_auto.ycp 2010-03-15 13:26:14.000000000 +0100 +++ new/autoyast2-2.20.3/src/clients/software_auto.ycp 2010-10-12 17:03:24.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Anas Nashif (nashif(a)suse.de) * Summary: Handle Package selections and packages * - * $Id: software_auto.ycp 61321 2010-03-15 12:26:13Z ug $ + * $Id: software_auto.ycp 62610 2010-10-12 14:28:59Z lslezak $ */ { @@ -19,6 +19,8 @@ import "PackageAI"; import "AutoInstall"; import "SourceManager"; + import "PackagesUI"; + import "Popup"; include "autoinstall/dialogs.ycp"; @@ -148,7 +150,7 @@ } while ( ret == `again ) { - ret = (symbol)WFM::CallFunction( "inst_packages", [ true, true ] ); + ret = PackagesUI::RunPackageSelector($["mode" : `searchMode]); if ( ret == `accept ) ret = `next; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.19.10/src/dialogs/ask.ycp new/autoyast2-2.20.3/src/dialogs/ask.ycp --- old/autoyast2-2.19.10/src/dialogs/ask.ycp 2010-05-11 15:11:48.000000000 +0200 +++ new/autoyast2-2.20.3/src/dialogs/ask.ycp 2010-10-12 17:03:25.000000000 +0200 @@ -5,7 +5,7 @@ * Summary: ask for some values in the profile * * Changes: - * $Id: ask.ycp 61995 2010-05-11 13:11:47Z ug $ + * $Id: ask.ycp 62449 2010-08-30 13:10:22Z ug $ */ { @@ -227,8 +227,6 @@ any val = UI::QueryWidget(`id(entry_id), `Value); if( ask["type"]:"string" == "integer" ) { val = tointeger((string)val); - } else if( ask["type"]:"string" == "boolean" ) { - val = ( (boolean)val ? "true" : "false" ); } if( ask["password"]:false == true ) { string pass2 = (string)UI::QueryWidget(`id(`pass2), `Value); @@ -249,8 +247,13 @@ }); if( file != "" ) { - if( ! SCR::Write (.target.string, file, sformat("%1",val)) ) - y2milestone("writing answer to %1 failed",file); + if( ask["type"]:"string" == "boolean" ) { + if( ! SCR::Write (.target.string, file, sformat("%1", ( (boolean)val ? "true" : "false" )))) + y2milestone("writing answer to %1 failed",file); + } else { + if( ! SCR::Write (.target.string, file, sformat("%1",val)) ) + y2milestone("writing answer to %1 failed",file); + } } if( script != $[] ) { string scriptName = script["filename"]:"ask_script.sh"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.19.10/src/include/autopart.ycp new/autoyast2-2.20.3/src/include/autopart.ycp --- old/autoyast2-2.19.10/src/include/autopart.ycp 2010-02-22 15:17:13.000000000 +0100 +++ new/autoyast2-2.20.3/src/include/autopart.ycp 2010-10-12 17:03:25.000000000 +0200 @@ -1,7 +1,7 @@ /* -$Id: autopart.ycp 60940 2010-02-22 14:17:12Z ug $ +$Id: autopart.ycp 62330 2010-08-03 09:35:35Z ug $ */ { textdomain "autoinst"; @@ -811,12 +811,18 @@ * extended is not possible and number of requested partitions is less than all * available primaries and logical slots ) */ + +/* + // FIXME: bnc#620212 - this test is buggy. Reusing more partitions than the hardware still could create will fail + // should be size(ps)-NUM_OF_REUSED if( size(g["gap"]:[])>0 && ((g["extended_possible"]:false && // size(g["free_pnr"]:[])>0 && // reusing all 4 primaries will fail with this size(ps)+1 <= size(g["ext_pnr"]:[])+size(g["free_pnr"]:[])) || (!g["extended_possible"]:false && size(ps) <= size(g["ext_pnr"]:[])+size(g["free_pnr"]:[]))) ) +*/ + if( size(g["gap"]:[])>0 ) { map lg = (map) eval(g); @@ -906,7 +912,16 @@ ``{ y2milestone( "start: gap section %1", e ); - if( part["max_cyl"]:0 <= e["end"]:0 && + // speed up partitioning calculation (bnc#620212) + boolean reuseCondition = true; + if( part["create"]:true == false && + (( haskey( part, "partition_nr" ) && part["partition_nr"]:0 != e["nr"]:0 )) ) { + y2milestone("gap can't be used. %1 != %2", part["partition_nr"]:0, e["nr"]:0 ); + reuseCondition = false; + } + + if( reuseCondition && + part["max_cyl"]:0 <= e["end"]:0 && part["cylinders"]:0 <= e["cylinders"]:0 && (!e["extended"]:false && (size(lg["free_pnr"]:[])>0 || ! creation_needed ) || e["extended"]:false && size(lg["ext_pnr"]:[])>0) @@ -1241,12 +1256,14 @@ foreach( list p, e["added"]:[], ``{ index = p[0]:0; + /* bnc#613366 - an existing swap partition can accidently be reused if( e["exists"]:false && ps[index,"mount"]:""=="swap" && e["swap"]:false ) { ret = ret + 100; y2milestone( "weight after swap reuse %1", ret ); } + */ if( ps[index,"want_cyl"]:0>0 ) { integer diff = ps[index,"want_cyl"]:0 - p[2]:0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.19.10/src/include/io.ycp new/autoyast2-2.20.3/src/include/io.ycp --- old/autoyast2-2.19.10/src/include/io.ycp 2010-03-10 13:47:15.000000000 +0100 +++ new/autoyast2-2.20.3/src/include/io.ycp 2011-01-04 12:11:17.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: I/O * Authors: Anas Nashif<nashif(a)suse.de> * - * $Id: io.ycp 61227 2010-03-10 12:47:14Z ug $ + * $Id: io.ycp 63070 2011-01-04 11:11:15Z lslezak $ */ { textdomain "autoinst"; @@ -178,8 +178,8 @@ y2milestone("Starting portmap: %1", SCR::Execute (.target.bash, "/sbin/portmap") ); } - if( !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-o nolock" ) && - !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-t nfs4" ) ) + if( !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-o noatime,nolock" ) && + !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-o noatime -t nfs4" ) ) { y2warning("Mount failed"); // autoyast tried to mount a NFS directory which failed @@ -210,7 +210,7 @@ else if (Scheme == "cifs") // CIFS { if (!(boolean)SCR::Execute(.target.mount, - [ "//" + Host + dirname(Path), mount_point ], "-t cifs -o guest,ro" )) + [ "//" + Host + dirname(Path), mount_point ], "-t cifs -o guest,ro,noatime" )) { y2warning("Mount failed"); // autoyast tried to mount a NFS directory which failed @@ -313,8 +313,8 @@ }); y2milestone("already mounted=%1 mountpoint=%2",already_mounted,mount_point); if( ! already_mounted && - !(boolean)WFM::Execute(.local.mount, [sformat("/dev/%1", Host), - mount_point]) ) { + !(boolean)SCR::Execute(.target.mount, [sformat("/dev/%1", Host), + mount_point], "-o noatime") ) { y2milestone("%1 is not mounted and mount failed", sformat("/dev/%1", Host)); GET_error = sformat(_("%1 is not mounted and mount failed"), sformat("/dev/%1", Host)); continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.19.10/src/include/xml.ycp new/autoyast2-2.20.3/src/include/xml.ycp --- old/autoyast2-2.19.10/src/include/xml.ycp 2010-02-15 15:48:39.000000000 +0100 +++ new/autoyast2-2.20.3/src/include/xml.ycp 2010-10-12 17:03:25.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: XML handling * Authors: Anas Nashif<nashif(a)suse.de> * - * $Id: xml.ycp 60816 2010-02-15 14:48:39Z ug $ + * $Id: xml.ycp 62376 2010-08-10 13:13:26Z ug $ */ { @@ -99,7 +99,7 @@ "net-udev":"rule" ]; - doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "media_url", "location", "script_source"]; + doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "location", "script_source"]; // doc["systemID"] = "/usr/share/autoinstall/dtd/profile.dtd"; doc["rootElement"] = "profile"; doc["nameSpace"] = "http://www.suse.com/1.0/yast2ns"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.19.10/src/modules/AutoinstPartPlan.ycp new/autoyast2-2.20.3/src/modules/AutoinstPartPlan.ycp --- old/autoyast2-2.19.10/src/modules/AutoinstPartPlan.ycp 2009-10-06 10:27:24.000000000 +0200 +++ new/autoyast2-2.20.3/src/modules/AutoinstPartPlan.ycp 2010-12-27 08:07:51.000000000 +0100 @@ -23,7 +23,7 @@ import "StorageDevices"; import "Storage"; import "Partitions"; - + import "Arch"; /** * The general idea with this moduls is that it manages a single @@ -507,7 +507,12 @@ }); } drive["partitions"] = partitions; - drive["device"] = k; + if( Arch::s390() ) { + drive["device"] = "/dev/disk/by-path/" + v["udev_path"]:k; + y2milestone("s390 found. Setting device to by-path: %1", drive["device"]:""); + } else { + drive["device"] = k; + } if( v["type"]:`CT_UNKNOWN==`CT_LVM) { drive["pesize"] = sformat("%1M", v["pesize"]:1 / (1024*1024) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.19.10/src/modules/AutoinstStorage.ycp new/autoyast2-2.20.3/src/modules/AutoinstStorage.ycp --- old/autoyast2-2.19.10/src/modules/AutoinstStorage.ycp 2010-05-21 11:04:28.000000000 +0200 +++ new/autoyast2-2.20.3/src/modules/AutoinstStorage.ycp 2010-10-12 17:03:26.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Storage * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: AutoinstStorage.ycp 62054 2010-05-21 09:04:27Z ug $ + * $Id: AutoinstStorage.ycp 62344 2010-08-05 08:56:14Z ug $ */ { module "AutoinstStorage"; @@ -641,6 +641,8 @@ target_map = Storage::SetPartitionData (target_map, part, "format", p["format"]:false ); target_map = Storage::SetPartitionData (target_map, part, "delete", false); target_map = Storage::SetPartitionData (target_map, part, "create", false); + if( haskey( p, "filesystem" ) ) + target_map = Storage::SetPartitionData (target_map, part, "filesystem", p["filesystem"]:`ext4); if( size(mount_options) > 0 && !haskey(p, "fstopt" ) ) target_map = Storage::SetPartitionData (target_map, part, "fstopt", mount_options); if( haskey(p, "fstopt" ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.19.10/VERSION new/autoyast2-2.20.3/VERSION --- old/autoyast2-2.19.10/VERSION 2010-05-21 15:06:52.000000000 +0200 +++ new/autoyast2-2.20.3/VERSION 2011-01-04 12:04:27.000000000 +0100 @@ -1 +1 @@ -2.19.10 +2.20.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dosfstools for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package dosfstools for openSUSE:Factory checked in at Fri Jan 7 12:19:08 CET 2011. -------- --- dosfstools/dosfstools.changes 2010-11-01 13:27:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/dosfstools/dosfstools.changes 2010-12-20 15:11:46.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 20 15:12:52 CET 2010 - pgajdos(a)suse.cz + +- fixed dosfslabel crashing and improved label handling in mkdosfs + and dosfslabel [bnc#657011] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dosfstools-label.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosfstools.spec ++++++ --- /var/tmp/diff_new_pack.WlP5AR/_old 2011-01-07 12:18:37.000000000 +0100 +++ /var/tmp/diff_new_pack.WlP5AR/_new 2011-01-07 12:18:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dosfstools (Version 3.0.10) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,11 +25,12 @@ AutoReqProv: on Summary: Utilities for Making and Checking MS-DOS FAT File Systems on Linux Version: 3.0.10 -Release: 2 +Release: 3 Url: http://freshmeat.net/projects/dosfstools Source: %{name}_%{version}.orig.tar.bz2 Patch0: %{name}-suse-dirs.patch Patch1: %{name}-mdraid-partition.patch +Patch2: %{name}-label.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Supplements: filesystem(vfat) @@ -50,6 +51,7 @@ %setup %patch0 -p1 %patch1 +%patch2 -p1 %build make OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $RPM_OPT_FLAGS" ++++++ dosfstools-label.patch ++++++ Index: dosfstools-3.0.10/src/dosfslabel.c =================================================================== --- dosfstools-3.0.10.orig/src/dosfslabel.c +++ dosfstools-3.0.10/src/dosfslabel.c @@ -29,6 +29,7 @@ #include <stdlib.h> #include <unistd.h> #include <getopt.h> +#include <ctype.h> #include "common.h" #include "dosfsck.h" @@ -89,7 +90,14 @@ int main(int argc, char *argv[]) rw = 0; char *device = NULL; - char *label = NULL; + char label[11]; + + int i; + + loff_t offset; + DIR_ENT de; + + memset(&fs, 0, sizeof(fs)); check_atari(); @@ -105,19 +113,31 @@ int main(int argc, char *argv[]) device = argv[1]; if (argc == 3) { - label = argv[2]; - if (strlen(label) > 11) { + if (strlen(argv[2]) > 11) { fprintf(stderr, "dosfslabel: labels can be no longer than 11 characters\n"); exit(1); } + strncpy(label, argv[2], 11); + for (i = 0; i < 11; i++) + if (islower(label[i])) + { + fprintf(stderr, + "dosfslabel: labels cannot contain lower case characters\n"); + exit(1); + } rw = 1; } fs_open(device, rw); read_boot(&fs); + read_fat(&fs); if (!rw) { - fprintf(stdout, "%s\n", fs.label); + offset = find_volume_de(&fs, &de); + if (offset == 0) + fprintf(stdout, "%s\n", fs.label); + else + fprintf(stdout, "%.8s%.3s\n", de.name, de.ext); exit(0); } Index: dosfstools-3.0.10/src/mkdosfs.c =================================================================== --- dosfstools-3.0.10.orig/src/mkdosfs.c +++ dosfstools-3.0.10/src/mkdosfs.c @@ -105,6 +105,7 @@ #define HARD_SECTOR_SIZE 512 #define SECTORS_PER_BLOCK ( BLOCK_SIZE / HARD_SECTOR_SIZE ) +#define NO_NAME "NO NAME " /* Macro definitions */ @@ -285,7 +286,7 @@ static int verbose = 0; /* Default to v static long volume_id; /* Volume ID number */ static time_t create_time; /* Creation time */ static struct timeval create_timeval; /* Creation time */ -static char volume_name[] = " "; /* Volume name */ +static char volume_name[] = NO_NAME; /* Volume name */ static unsigned long long blocks; /* Number of blocks in filesystem */ static int sector_size = 512; /* Size of a logical sector */ static int sector_size_set = 0; /* User selected sector size */ @@ -1248,7 +1249,7 @@ setup_tables (void) } printf ("Volume ID is %08lx, ", volume_id & (atari_format ? 0x00ffffff : 0xffffffff)); - if ( strcmp(volume_name, " ") ) + if ( strcmp(volume_name, NO_NAME) ) printf("volume label %s.\n", volume_name); else printf("no volume label.\n"); @@ -1287,7 +1288,7 @@ setup_tables (void) } memset(root_dir, 0, size_root_dir); - if ( memcmp(volume_name, " ", 11) ) + if ( memcmp(volume_name, NO_NAME, 11) ) { struct msdos_dir_entry *de = &root_dir[0]; memcpy(de->name, volume_name, 8); @@ -1630,6 +1631,8 @@ main (int argc, char **argv) case 'n': /* n : Volume name */ sprintf(volume_name, "%-11.11s", optarg); + for (i = 0; i < 11; i++) + volume_name[i] = toupper(volume_name[i]); break; case 'r': /* r : Root directory entries */ Index: dosfstools-3.0.10/src/boot.c =================================================================== --- dosfstools-3.0.10.orig/src/boot.c +++ dosfstools-3.0.10/src/boot.c @@ -34,6 +34,7 @@ #include "fat.h" #include "io.h" #include "boot.h" +#include "check.h" #define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0) @@ -453,7 +454,7 @@ static void write_boot_label(DOS_FS *fs, fs_write(fs->backupboot_start, sizeof(b), &b); } -static loff_t find_volume_de(DOS_FS *fs, DIR_ENT *de) +loff_t find_volume_de(DOS_FS *fs, DIR_ENT *de) { unsigned long cluster; loff_t offset; @@ -492,7 +493,10 @@ static void write_volume_label(DOS_FS *f offset = find_volume_de(fs, &de); if (offset == 0) - return; + { + offset = alloc_rootdir_entry(fs, &de, label); + /*return 0;*/ + } memcpy(de.name, label, 11); de.time = CT_LE_W((unsigned short)((mtime->tm_sec >> 1) + @@ -501,7 +505,16 @@ static void write_volume_label(DOS_FS *f de.date = CT_LE_W((unsigned short)(mtime->tm_mday + ((mtime->tm_mon+1) << 5) + ((mtime->tm_year-80) << 9))); - fs_write(offset, sizeof(DIR_ENT), &de); + de.attr = ATTR_VOLUME; + de.ctime_ms = 0; + de.ctime = de.time; + de.cdate = de.date; + de.adate = de.date; + de.starthi = CT_LE_W(0); + de.start = CT_LE_W(0); + de.size = CT_LE_L(0); + + fs_write(offset, sizeof(DIR_ENT), &de); } void write_label(DOS_FS *fs, char *label) Index: dosfstools-3.0.10/src/check.c =================================================================== --- dosfstools-3.0.10.orig/src/check.c +++ dosfstools-3.0.10/src/check.c @@ -133,8 +133,8 @@ loff_t alloc_rootdir_entry(DOS_FS *fs, D while (1) { char expanded[12]; sprintf(expanded, pattern, curr_num); - memcpy(de->name+4, expanded, 4); - memcpy(de->ext, expanded+4, 3); + memcpy(de->name, expanded, 8); + memcpy(de->ext, expanded+8, 3); clu_num = fs->root_cluster; i = 0; offset2 = cluster_start(fs,clu_num); Index: dosfstools-3.0.10/src/boot.h =================================================================== --- dosfstools-3.0.10.orig/src/boot.h +++ dosfstools-3.0.10/src/boot.h @@ -25,6 +25,7 @@ void read_boot(DOS_FS *fs); void write_label(DOS_FS *fs, char *label); +loff_t find_volume_de(DOS_FS *fs, DIR_ENT *de); /* Reads the boot sector from the currently open device and initializes *FS */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-base for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-base for openSUSE:Factory checked in at Fri Jan 7 12:18:13 CET 2011. -------- --- libreoffice-base/libreoffice-base.changes 2010-12-01 20:44:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-base/libreoffice-base.changes 2010-12-21 19:55:17.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-base-3.3.0.1.tar.bz2 New: ---- libreoffice-base-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-base.spec ++++++ --- /var/tmp/diff_new_pack.7ZUrBX/_old 2011-01-07 12:15:44.000000000 +0100 +++ /var/tmp/diff_new_pack.7ZUrBX/_new 2011-01-07 12:15:44.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-base (Version 3.3.0.1) +# spec file for package libreoffice-base (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: libreoffice-base -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece base -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-base-3.3.0.1.tar.bz2 -> libreoffice-base-3.3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-base-3.3.0.1/ChangeLog new/libreoffice-base-3.3.0.2/ChangeLog --- old/libreoffice-base-3.3.0.1/ChangeLog 2010-12-01 16:36:22.000000000 +0100 +++ new/libreoffice-base-3.3.0.2/ChangeLog 2010-12-18 20:56:17.000000000 +0100 @@ -1,3 +1,8 @@ +2010-12-18 Petr Mladek <pmladek(a)suse.cz> [2a86e29b6da4a70cf10e21ad24cf23c4f5462227] + +Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2) + + 2010-12-01 Petr Mladek <pmladek(a)suse.cz> [027091a237a4d90c0361fc6beb176fd72d32a55a] Version 3.3.0.1, tag LIBREOFFICE_3_3_0_1 (3.3-rc1) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-branding-upstream for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-branding-upstream for openSUSE:Factory checked in at Fri Jan 7 12:15:31 CET 2011. -------- --- libreoffice-branding-upstream/libreoffice-branding-upstream.changes 2010-12-01 20:44:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-branding-upstream/libreoffice-branding-upstream.changes 2010-12-21 19:55:34.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.R8enfz/_old 2011-01-07 12:14:58.000000000 +0100 +++ /var/tmp/diff_new_pack.R8enfz/_new 2011-01-07 12:14:58.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-branding-upstream (Version 3.3.0.1) +# spec file for package libreoffice-branding-upstream (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,10 @@ Name: libreoffice-branding-upstream -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice %define ooo_basis_dir basis3.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdc1394 for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libdc1394 for openSUSE:Factory checked in at Fri Jan 7 12:15:16 CET 2011. -------- --- libdc1394/libdc1394.changes 2010-11-19 19:11:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/libdc1394/libdc1394.changes 2011-01-03 08:40:07.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Jan 3 10:27:58 MSK 2011 - matwey.kornilov(a)gmail.com +- Update to 2.1.3. + - Bug fixes: + Fix for usb writes larger than 1 quadlet + On MAC OS, add needed frameworks to link line + Update firewire-{cdev,constants}.h to latest version and license + Change dequeue/enqueue to return error code if usb transfer haserror + dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN define +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libdc1394-2.1.2.tar.bz2 New: ---- libdc1394-2.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdc1394.spec ++++++ --- /var/tmp/diff_new_pack.qZjKlS/_old 2011-01-07 12:14:46.000000000 +0100 +++ /var/tmp/diff_new_pack.qZjKlS/_new 2011-01-07 12:14:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libdc1394 (Version 2.1.2) +# spec file for package libdc1394 (Version 2.1.3) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: libdc1394 %define libdc1394_12_version 1.2.2 -%define libdc1394_version 2.1.2 +%define libdc1394_version 2.1.3 BuildRequires: libraw1394-devel %if 0%{?suse_version} > 1100 # no IIDC-over-USB support for openSUSE 11.0 @@ -32,7 +32,7 @@ Group: Hardware/Camera AutoReqProv: on Version: %{libdc1394_version} -Release: 18 +Release: 1 Url: http://sourceforge.net/projects/libdc1394/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: 1394-Based Digital Camera Control Library @@ -70,7 +70,7 @@ Summary: 1394-Based Digital Camera Control Library Group: Hardware/Camera Version: %{libdc1394_12_version} -Release: 18 +Release: 19 %description -n libdc1394_control12 This library provides functionality for controlling any camera that @@ -97,7 +97,7 @@ Summary: 1394-Based Digital Camera Control Library Group: Development/Libraries/C and C++ Version: %{libdc1394_12_version} -Release: 18 +Release: 19 Requires: libdc1394_control12 = %{libdc1394_12_version} libraw1394-devel %description -n libdc1394_control12-devel ++++++ libdc1394-2.1.2.tar.bz2 -> libdc1394-2.1.3.tar.bz2 ++++++ ++++ 5310 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/AUTHORS new/libdc1394-2.1.3/AUTHORS --- old/libdc1394-2.1.2/AUTHORS 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/AUTHORS 2011-01-03 05:05:00.000000000 +0100 @@ -3,6 +3,7 @@ Christophe Achard AgBr +Shane Anderson Simon Andersson Peter Antoniac Samuel Audet diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/ChangeLog new/libdc1394-2.1.3/ChangeLog --- old/libdc1394-2.1.2/ChangeLog 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/ChangeLog 2011-01-03 05:09:14.000000000 +0100 @@ -1,3 +1,17 @@ +2011-01-02 David Moore <david.moore(a)gmail.com> + * dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN + * Update NEWS, README, AUTHORS and version for release 2.1.3. + +2010-04-18 David Moore <david.moore(a)gmail.com> + * Change dequeue/enqueue to return error code if usb transfer has error. + +2010-04-17 David Moore <david.moore(a)gmail.com> + * Updated firewire-{cdev,constants}.h to latest version and MIT license. + * On Mac OS, add needed frameworks to link line (found by Holger Rapp) + +2009-09-19 David Moore <dcm(a)acm.org> + * Fix for usb writes larger than 1 quadlet found by Shane Anderson. + 2009-06-10 David Moore <dcm(a)acm.org> * Update NEWS and version for release 2.1.2. * Revert 5cf24a2051fc77b35dacb6bf33bc500acd533488, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/configure.in new/libdc1394-2.1.3/configure.in --- old/libdc1394-2.1.2/configure.in 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/configure.in 2011-01-03 05:12:36.000000000 +0100 @@ -1,6 +1,6 @@ # process this file with autoconf to get a configure script AC_PREREQ([2.6.0]) -AC_INIT([libdc1394],[2.1.2],[libdc1394-devel(a)lists.sf.net]) +AC_INIT([libdc1394],[2.1.3],[libdc1394-devel(a)lists.sf.net]) AC_CONFIG_SRCDIR([dc1394/control.c]) AC_CANONICAL_SYSTEM @@ -55,6 +55,8 @@ AC_CHECK_LIB(IOKit, IOMasterPort, [AC_DEFINE(HAVE_MACOSX,[],[Defined if IOKitLib is present]) have_macosx=true], [AC_MSG_ERROR(IOKitLib not found.)]) + platform_LDFLAGS="-framework CoreServices -framework CoreFoundation -framework Carbon" + AC_SUBST(platform_LDFLAGS) ;; *-*-cygwin* | *-*-mingw*) have_windows=true @@ -115,7 +117,7 @@ dnl 4. If the interface has removed or changed elements, set AGE to 0. dnl --------------------------------------------------------------------------- lt_current=23 -lt_revision=4 +lt_revision=5 lt_age=1 AC_SUBST(lt_current) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/dc1394/conversions.h new/libdc1394-2.1.3/dc1394/conversions.h --- old/libdc1394-2.1.2/dc1394/conversions.h 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/dc1394/conversions.h 2010-12-16 16:54:10.000000000 +0100 @@ -62,7 +62,7 @@ DC1394_STEREO_METHOD_INTERLACED=0, DC1394_STEREO_METHOD_FIELD } dc1394stereo_method_t; -#define DC1394_STEREO_METHOD_MIN DC1394_STEREO_METHOD_INTERLACE +#define DC1394_STEREO_METHOD_MIN DC1394_STEREO_METHOD_INTERLACED #define DC1394_STEREO_METHOD_MAX DC1394_STEREO_METHOD_FIELD #define DC1394_STEREO_METHOD_NUM (DC1394_STEREO_METHOD_MAX-DC1394_STEREO_METHOD_MIN+1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/dc1394/juju/firewire-cdev.h new/libdc1394-2.1.3/dc1394/juju/firewire-cdev.h --- old/libdc1394-2.1.2/dc1394/juju/firewire-cdev.h 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/dc1394/juju/firewire-cdev.h 2010-04-18 07:45:14.000000000 +0200 @@ -1,21 +1,26 @@ /* * Char device interface. * - * Copyright (C) 2005-2006 Kristian Hoegsberg <krh(a)bitplanet.net> + * Copyright (C) 2005-2007 Kristian Hoegsberg <krh(a)bitplanet.net> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ #ifndef _LINUX_FIREWIRE_CDEV_H @@ -138,7 +143,24 @@ * This event is sent when the controller has completed an &fw_cdev_iso_packet * with the %FW_CDEV_ISO_INTERRUPT bit set. In the receive case, the headers * stripped of all packets up until and including the interrupt packet are - * returned in the @header field. + * returned in the @header field. The amount of header data per packet is as + * specified at iso context creation by &fw_cdev_create_iso_context.header_size. + * + * In version 1 of this ABI, header data consisted of the 1394 isochronous + * packet header, followed by quadlets from the packet payload if + * &fw_cdev_create_iso_context.header_size > 4. + * + * In version 2 of this ABI, header data consist of the 1394 isochronous + * packet header, followed by a timestamp quadlet if + * &fw_cdev_create_iso_context.header_size > 4, followed by quadlets from the + * packet payload if &fw_cdev_create_iso_context.header_size > 8. + * + * Behaviour of ver. 1 of this ABI is no longer available since ABI ver. 2. + * + * Format of 1394 iso packet header: 16 bits len, 2 bits tag, 6 bits channel, + * 4 bits tcode, 4 bits sy, in big endian byte order. Format of timestamp: + * 16 bits invalid, 3 bits cycleSeconds, 13 bits cycleCount, in big endian byte + * order. */ struct fw_cdev_event_iso_interrupt { __u64 closure; @@ -157,8 +179,6 @@ * @handle: Reference by which an allocated resource can be deallocated * @channel: Isochronous channel which was (de)allocated, if any * @bandwidth: Bandwidth allocation units which were (de)allocated, if any - * @channels_available: Last known availability of channels - * @bandwidth_available: Last known availability of bandwidth * * An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED event is sent after an isochronous * resource was allocated at the IRM. The client has to check @channel and @@ -208,35 +228,45 @@ }; /* available since kernel version 2.6.22 */ -#define FW_CDEV_IOC_GET_INFO _IOWR('#', 0x00, struct fw_cdev_get_info) -#define FW_CDEV_IOC_SEND_REQUEST _IOW('#', 0x01, struct fw_cdev_send_request) -#define FW_CDEV_IOC_ALLOCATE _IOWR('#', 0x02, struct fw_cdev_allocate) -#define FW_CDEV_IOC_DEALLOCATE _IOW('#', 0x03, struct fw_cdev_deallocate) -#define FW_CDEV_IOC_SEND_RESPONSE _IOW('#', 0x04, struct fw_cdev_send_response) -#define FW_CDEV_IOC_INITIATE_BUS_RESET _IOW('#', 0x05, struct fw_cdev_initiate_bus_reset) -#define FW_CDEV_IOC_ADD_DESCRIPTOR _IOWR('#', 0x06, struct fw_cdev_add_descriptor) -#define FW_CDEV_IOC_REMOVE_DESCRIPTOR _IOW('#', 0x07, struct fw_cdev_remove_descriptor) -#define FW_CDEV_IOC_CREATE_ISO_CONTEXT _IOWR('#', 0x08, struct fw_cdev_create_iso_context) -#define FW_CDEV_IOC_QUEUE_ISO _IOWR('#', 0x09, struct fw_cdev_queue_iso) -#define FW_CDEV_IOC_START_ISO _IOW('#', 0x0a, struct fw_cdev_start_iso) -#define FW_CDEV_IOC_STOP_ISO _IOW('#', 0x0b, struct fw_cdev_stop_iso) +#define FW_CDEV_IOC_GET_INFO _IOWR('#', 0x00, struct fw_cdev_get_info) +#define FW_CDEV_IOC_SEND_REQUEST _IOW('#', 0x01, struct fw_cdev_send_request) +#define FW_CDEV_IOC_ALLOCATE _IOWR('#', 0x02, struct fw_cdev_allocate) +#define FW_CDEV_IOC_DEALLOCATE _IOW('#', 0x03, struct fw_cdev_deallocate) +#define FW_CDEV_IOC_SEND_RESPONSE _IOW('#', 0x04, struct fw_cdev_send_response) +#define FW_CDEV_IOC_INITIATE_BUS_RESET _IOW('#', 0x05, struct fw_cdev_initiate_bus_reset) +#define FW_CDEV_IOC_ADD_DESCRIPTOR _IOWR('#', 0x06, struct fw_cdev_add_descriptor) +#define FW_CDEV_IOC_REMOVE_DESCRIPTOR _IOW('#', 0x07, struct fw_cdev_remove_descriptor) +#define FW_CDEV_IOC_CREATE_ISO_CONTEXT _IOWR('#', 0x08, struct fw_cdev_create_iso_context) +#define FW_CDEV_IOC_QUEUE_ISO _IOWR('#', 0x09, struct fw_cdev_queue_iso) +#define FW_CDEV_IOC_START_ISO _IOW('#', 0x0a, struct fw_cdev_start_iso) +#define FW_CDEV_IOC_STOP_ISO _IOW('#', 0x0b, struct fw_cdev_stop_iso) /* available since kernel version 2.6.24 */ -#define FW_CDEV_IOC_GET_CYCLE_TIMER _IOR('#', 0x0c, struct fw_cdev_get_cycle_timer) +#define FW_CDEV_IOC_GET_CYCLE_TIMER _IOR('#', 0x0c, struct fw_cdev_get_cycle_timer) /* available since kernel version 2.6.30 */ #define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE _IOWR('#', 0x0d, struct fw_cdev_allocate_iso_resource) #define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE _IOW('#', 0x0e, struct fw_cdev_deallocate) #define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE _IOW('#', 0x0f, struct fw_cdev_allocate_iso_resource) #define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE _IOW('#', 0x10, struct fw_cdev_allocate_iso_resource) -#define FW_CDEV_IOC_GET_SPEED _IOR('#', 0x11, struct fw_cdev_get_speed) +#define FW_CDEV_IOC_GET_SPEED _IO('#', 0x11) /* returns speed code */ #define FW_CDEV_IOC_SEND_BROADCAST_REQUEST _IOW('#', 0x12, struct fw_cdev_send_request) +#define FW_CDEV_IOC_SEND_STREAM_PACKET _IOW('#', 0x13, struct fw_cdev_send_stream_packet) -/* FW_CDEV_VERSION History - * - * 1 Feb 18, 2007: Initial version. +/* available since kernel version 2.6.34 */ +#define FW_CDEV_IOC_GET_CYCLE_TIMER2 _IOWR('#', 0x14, struct fw_cdev_get_cycle_timer2) + +/* + * FW_CDEV_VERSION History + * 1 (2.6.22) - initial version + * 2 (2.6.30) - changed &fw_cdev_event_iso_interrupt.header if + * &fw_cdev_create_iso_context.header_size is 8 or more + * (2.6.32) - added time stamp to xmit &fw_cdev_event_iso_interrupt + * (2.6.33) - IR has always packet-per-buffer semantics now, not one of + * dual-buffer or packet-per-buffer depending on hardware + * 3 (2.6.34) - made &fw_cdev_get_cycle_timer reliable */ -#define FW_CDEV_VERSION 1 +#define FW_CDEV_VERSION 3 /** * struct fw_cdev_get_info - General purpose information ioctl @@ -322,6 +352,9 @@ * The @closure field is passed back to userspace in the response event. * The @handle field is an out parameter, returning a handle to the allocated * range to be used for later deallocation of the range. + * + * The address range is allocated on all local nodes. The address allocation + * is exclusive except for the FCP command and response registers. */ struct fw_cdev_allocate { __u64 offset; @@ -359,7 +392,7 @@ * @immediate: If non-zero, immediate key to insert before pointer * @key: Upper 8 bits of root directory pointer * @data: Userspace pointer to contents of descriptor block - * @length: Length of descriptor block data, in bytes + * @length: Length of descriptor block data, in quadlets * @handle: Handle to the descriptor, written by the kernel * * Add a descriptor block and optionally a preceding immediate key to the local @@ -373,9 +406,14 @@ * If not 0, the @immediate field specifies an immediate key which will be * inserted before the root directory pointer. * + * @immediate, @key, and @data array elements are CPU-endian quadlets. + * * If successful, the kernel adds the descriptor and writes back a handle to the * kernel-side object to be used for later removal of the descriptor block and * immediate key. + * + * This ioctl affects the configuration ROMs of all local nodes. + * The ioctl only succeeds on device files which represent a local node. */ struct fw_cdev_add_descriptor { __u32 immediate; @@ -391,7 +429,7 @@ * descriptor was added * * Remove a descriptor block and accompanying immediate key from the local - * node's configuration ROM. + * nodes' configuration ROMs. */ struct fw_cdev_remove_descriptor { __u32 handle; @@ -405,7 +443,7 @@ * @type: %FW_CDEV_ISO_CONTEXT_TRANSMIT or %FW_CDEV_ISO_CONTEXT_RECEIVE * @header_size: Header size to strip for receive contexts * @channel: Channel to bind to - * @speed: Speed to transmit at + * @speed: Speed for transmit contexts * @closure: To be returned in &fw_cdev_event_iso_interrupt * @handle: Handle to context, written back by kernel * @@ -417,6 +455,12 @@ * * If a context was successfully created, the kernel writes back a handle to the * context, which must be passed in for subsequent operations on that context. + * + * For receive contexts, @header_size must be at least 4 and must be a multiple + * of 4. + * + * Note that the effect of a @header_size > 4 depends on + * &fw_cdev_get_info.version, as documented at &fw_cdev_event_iso_interrupt. */ struct fw_cdev_create_iso_context { __u32 type; @@ -445,10 +489,34 @@ * * &struct fw_cdev_iso_packet is used to describe isochronous packet queues. * - * Use the FW_CDEV_ISO_ macros to fill in @control. The sy and tag fields are - * specified by IEEE 1394a and IEC 61883. + * Use the FW_CDEV_ISO_ macros to fill in @control. * - * FIXME - finish this documentation + * For transmit packets, the header length must be a multiple of 4 and specifies + * the numbers of bytes in @header that will be prepended to the packet's + * payload; these bytes are copied into the kernel and will not be accessed + * after the ioctl has returned. The sy and tag fields are copied to the iso + * packet header (these fields are specified by IEEE 1394a and IEC 61883-1). + * The skip flag specifies that no packet is to be sent in a frame; when using + * this, all other fields except the interrupt flag must be zero. + * + * For receive packets, the header length must be a multiple of the context's + * header size; if the header length is larger than the context's header size, + * multiple packets are queued for this entry. The sy and tag fields are + * ignored. If the sync flag is set, the context drops all packets until + * a packet with a matching sy field is received (the sync value to wait for is + * specified in the &fw_cdev_start_iso structure). The payload length defines + * how many payload bytes can be received for one packet (in addition to payload + * quadlets that have been defined as headers and are stripped and returned in + * the &fw_cdev_event_iso_interrupt structure). If more bytes are received, the + * additional bytes are dropped. If less bytes are received, the remaining + * bytes in this part of the payload buffer will not be written to, not even by + * the next packet, i.e., packets received in consecutive frames will not + * necessarily be consecutive in memory. If an entry has queued multiple + * packets, the payload length is divided equally among them. + * + * When a packet with the interrupt flag set has been completed, the + * &fw_cdev_event_iso_interrupt event will be sent. An entry that has queued + * multiple receive packets is completed when its last packet is completed. */ struct fw_cdev_iso_packet { __u32 control; @@ -465,7 +533,7 @@ * Queue a number of isochronous packets for reception or transmission. * This ioctl takes a pointer to an array of &fw_cdev_iso_packet structs, * which describe how to transmit from or receive into a contiguous region - * of a mmap()'ed payload buffer. As part of the packet descriptors, + * of a mmap()'ed payload buffer. As part of transmit packet descriptors, * a series of headers can be supplied, which will be prepended to the * payload during DMA. * @@ -515,11 +583,18 @@ /** * struct fw_cdev_get_cycle_timer - read cycle timer register * @local_time: system time, in microseconds since the Epoch - * @cycle_timer: isochronous cycle timer, as per OHCI 1.1 clause 5.13 + * @cycle_timer: Cycle Time register contents * * The %FW_CDEV_IOC_GET_CYCLE_TIMER ioctl reads the isochronous cycle timer - * and also the system clock. This allows to express the receive time of an - * isochronous packet as a system time with microsecond accuracy. + * and also the system clock (%CLOCK_REALTIME). This allows to express the + * receive time of an isochronous packet as a system time. + * + * @cycle_timer consists of 7 bits cycleSeconds, 13 bits cycleCount, and + * 12 bits cycleOffset, in host byte order. Cf. the Cycle Time register + * per IEEE 1394 or Isochronous Cycle Timer register per OHCI-1394. + * + * In version 1 and 2 of the ABI, this ioctl returned unreliable (non- + * monotonic) @cycle_timer values on certain controllers. */ struct fw_cdev_get_cycle_timer { __u64 local_time; @@ -527,6 +602,25 @@ }; /** + * struct fw_cdev_get_cycle_timer2 - read cycle timer register + * @tv_sec: system time, seconds + * @tv_nsec: system time, sub-seconds part in nanoseconds + * @clk_id: input parameter, clock from which to get the system time + * @cycle_timer: Cycle Time register contents + * + * The %FW_CDEV_IOC_GET_CYCLE_TIMER2 works like + * %FW_CDEV_IOC_GET_CYCLE_TIMER but lets you choose a clock like with POSIX' + * clock_gettime function. Supported @clk_id values are POSIX' %CLOCK_REALTIME + * and %CLOCK_MONOTONIC and Linux' %CLOCK_MONOTONIC_RAW. + */ +struct fw_cdev_get_cycle_timer2 { + __s64 tv_sec; + __s32 tv_nsec; + __s32 clk_id; + __u32 cycle_timer; +}; + +/** * struct fw_cdev_allocate_iso_resource - (De)allocate a channel or bandwidth * @closure: Passed back to userspace in correponding iso resource events * @channels: Isochronous channels of which one is to be (de)allocated @@ -555,17 +649,17 @@ * * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE ioctl works like * %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE except that resources are freed - * instead of allocated. At most one channel may be specified in this ioctl. + * instead of allocated. * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation. * - * To summarize, %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE allocates iso resources - * for the lifetime of the fd or handle. + * To summarize, %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE allocates iso resources + * for the lifetime of the fd or @handle. * In contrast, %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE allocates iso resources * for the duration of a bus generation. * - * @channels is a host-endian bitfield with the most significant bit - * representing channel 0 and the least significant bit representing channel 63: - * 1ULL << (63 - c) + * @channels is a host-endian bitfield with the least significant bit + * representing channel 0 and the most significant bit representing channel 63: + * 1ULL << c for each channel c that is a candidate for (de)allocation. * * @bandwidth is expressed in bandwidth allocation units, i.e. the time to send * one quadlet of data (payload or header data) at speed S1600. @@ -578,12 +672,30 @@ }; /** - * struct fw_cdev_get_speed - Query maximum speed to or from this device - * @max_speed: Speed code; minimum of the device's link speed, the local node's - * link speed, and all PHY port speeds between the two links + * struct fw_cdev_send_stream_packet - send an asynchronous stream packet + * @length: Length of outgoing payload, in bytes + * @tag: Data format tag + * @channel: Isochronous channel to transmit to + * @sy: Synchronization code + * @closure: Passed back to userspace in the response event + * @data: Userspace pointer to payload + * @generation: The bus generation where packet is valid + * @speed: Speed to transmit at + * + * The %FW_CDEV_IOC_SEND_STREAM_PACKET ioctl sends an asynchronous stream packet + * to every device which is listening to the specified channel. The kernel + * writes an &fw_cdev_event_response event which indicates success or failure of + * the transmission. */ -struct fw_cdev_get_speed { - __u32 max_speed; +struct fw_cdev_send_stream_packet { + __u32 length; + __u32 tag; + __u32 channel; + __u32 sy; + __u64 closure; + __u64 data; + __u32 generation; + __u32 speed; }; #endif /* _LINUX_FIREWIRE_CDEV_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/dc1394/juju/firewire-constants.h new/libdc1394-2.1.3/dc1394/juju/firewire-constants.h --- old/libdc1394-2.1.2/dc1394/juju/firewire-constants.h 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/dc1394/juju/firewire-constants.h 2010-04-18 07:45:02.000000000 +0200 @@ -1,3 +1,28 @@ +/* + * IEEE 1394 constants. + * + * Copyright (C) 2005-2007 Kristian Hoegsberg <krh(a)bitplanet.net> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + #ifndef _LINUX_FIREWIRE_CONSTANTS_H #define _LINUX_FIREWIRE_CONSTANTS_H @@ -21,7 +46,7 @@ #define EXTCODE_WRAP_ADD 0x6 #define EXTCODE_VENDOR_DEPENDENT 0x7 -/* Juju specific tcodes */ +/* Linux firewire-core (Juju) specific tcodes */ #define TCODE_LOCK_MASK_SWAP (0x10 | EXTCODE_MASK_SWAP) #define TCODE_LOCK_COMPARE_SWAP (0x10 | EXTCODE_COMPARE_SWAP) #define TCODE_LOCK_FETCH_ADD (0x10 | EXTCODE_FETCH_ADD) @@ -36,7 +61,7 @@ #define RCODE_TYPE_ERROR 0x6 #define RCODE_ADDRESS_ERROR 0x7 -/* Juju specific rcodes */ +/* Linux firewire-core (Juju) specific rcodes */ #define RCODE_SEND_ERROR 0x10 #define RCODE_CANCELLED 0x11 #define RCODE_BUSY 0x12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/dc1394/usb/capture.c new/libdc1394-2.1.3/dc1394/usb/capture.c --- old/libdc1394-2.1.2/dc1394/usb/capture.c 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/dc1394/usb/capture.c 2010-04-18 23:53:21.000000000 +0200 @@ -41,15 +41,18 @@ return; } - if (transfer->status != LIBUSB_TRANSFER_COMPLETED) - dc1394_log_error ("usb: Bulk transfer %d failed with code %d", - f->frame.id, transfer->status); - dc1394_log_debug ("usb: Bulk transfer %d complete, %d of %d bytes", f->frame.id, transfer->actual_length, transfer->length); int status = BUFFER_FILLED; if (transfer->actual_length < transfer->length) status = BUFFER_CORRUPT; + + if (transfer->status != LIBUSB_TRANSFER_COMPLETED) { + dc1394_log_error ("usb: Bulk transfer %d failed with code %d", + f->frame.id, transfer->status); + status = BUFFER_ERROR; + } + pthread_mutex_lock (&craw->mutex); f->status = status; craw->frames_ready++; @@ -131,6 +134,7 @@ craw->num_frames = num_dma_buffers; craw->current = -1; craw->frames_ready = 0; + craw->queue_broken = 0; craw->buffer_size = proto.total_bytes * num_dma_buffers; craw->buffer = malloc (craw->buffer_size); if (craw->buffer == NULL) { @@ -311,15 +315,18 @@ pthread_mutex_lock (&craw->mutex); status = f->status; pthread_mutex_unlock (&craw->mutex); - if (status != BUFFER_FILLED && status != BUFFER_CORRUPT) + if (status == BUFFER_EMPTY) return DC1394_SUCCESS; } + if (craw->queue_broken) + return DC1394_FAILURE; + char ch; read (craw->notify_pipe[0], &ch, 1); pthread_mutex_lock (&craw->mutex); - if (f->status != BUFFER_FILLED && f->status != BUFFER_CORRUPT) { + if (f->status == BUFFER_EMPTY) { dc1394_log_error ("usb: Expected filled buffer"); pthread_mutex_unlock (&craw->mutex); return DC1394_FAILURE; @@ -332,6 +339,9 @@ *frame_return = &f->frame; + if (f->status == BUFFER_ERROR) + return DC1394_FAILURE; + return DC1394_SUCCESS; } @@ -347,13 +357,16 @@ return DC1394_INVALID_ARGUMENT_VALUE; } - if (f->status != BUFFER_FILLED && f->status != BUFFER_CORRUPT) { + if (f->status == BUFFER_EMPTY) { dc1394_log_error ("usb: Frame is not enqueuable"); return DC1394_FAILURE; } f->status = BUFFER_EMPTY; - libusb_submit_transfer (f->transfer); + if (libusb_submit_transfer (f->transfer) != LIBUSB_SUCCESS) { + craw->queue_broken = 1; + return DC1394_FAILURE; + } return DC1394_SUCCESS; } @@ -373,7 +386,7 @@ { struct usb_frame * f = (struct usb_frame *) frame; - if (f->status == BUFFER_CORRUPT) + if (f->status == BUFFER_CORRUPT || f->status == BUFFER_ERROR) return DC1394_TRUE; return DC1394_FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/dc1394/usb/control.c new/libdc1394-2.1.3/dc1394/usb/control.c --- old/libdc1394-2.1.2/dc1394/usb/control.c 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/dc1394/usb/control.c 2009-09-19 20:40:21.000000000 +0200 @@ -200,10 +200,10 @@ int i; /* Convert from host-endian to little-endian */ for (i = 0; i < num_quads; i++) { - buf[4*i] = quads[0] & 0xff; - buf[4*i+1] = (quads[0] >> 8) & 0xff; - buf[4*i+2] = (quads[0] >> 16) & 0xff; - buf[4*i+3] = (quads[0] >> 24) & 0xff; + buf[4*i] = quads[i] & 0xff; + buf[4*i+1] = (quads[i] >> 8) & 0xff; + buf[4*i+2] = (quads[i] >> 16) & 0xff; + buf[4*i+3] = (quads[i] >> 24) & 0xff; } /* IEEE 1394 address writes are mapped to USB control transfers as * shown here. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/dc1394/usb/usb.h new/libdc1394-2.1.3/dc1394/usb/usb.h --- old/libdc1394-2.1.2/dc1394/usb/usb.h 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/dc1394/usb/usb.h 2010-04-18 23:51:36.000000000 +0200 @@ -44,6 +44,7 @@ unsigned int num_frames; int current; int frames_ready; + int queue_broken; uint8_t bus; uint8_t addr; @@ -64,6 +65,7 @@ BUFFER_EMPTY, BUFFER_FILLED, BUFFER_CORRUPT, + BUFFER_ERROR, } usb_frame_status; struct usb_frame { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/NEWS new/libdc1394-2.1.3/NEWS --- old/libdc1394-2.1.2/NEWS 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/NEWS 2011-01-03 05:04:36.000000000 +0100 @@ -1,6 +1,14 @@ Release information and news: ----------------------------- +-- 2.1.3: + - Bug fixes: + - Fix for usb writes larger than 1 quadlet + - On MAC OS, add needed frameworks to link line + - Update firewire-{cdev,constants}.h to latest version and license + - Change dequeue/enqueue to return error code if usb transfer has error + - dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN define + -- 2.1.2: - Fix broken ABI caused by new Format7 modes in release 2.1.1. Reverted for now. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.2/README new/libdc1394-2.1.3/README --- old/libdc1394-2.1.2/README 2009-06-11 06:05:47.000000000 +0200 +++ new/libdc1394-2.1.3/README 2011-01-03 05:07:36.000000000 +0100 @@ -57,7 +57,7 @@ make install Obviously, you need to be root when executing the last statement if you wish to -do a system-wide installation. To compile and install libdc1394 from an SVN +do a system-wide installation. To compile and install libdc1394 from a git source tree do the following: autoreconf -i -s @@ -65,11 +65,10 @@ make make install -Details on getting a source tree from the SVN repository is beyond the scope of +Details on getting a source tree from the git repository is beyond the scope of this small readme but the following command should give you the latest trunk: -svn co https://libdc1394.svn.sourceforge.net/svnroot/libdc1394/trunk/libdc1394/ - +git clone git://libdc1394.git.sourceforge.net/gitroot/libdc1394/libdc1394 -- 2000-01-13 Gord Peters ++++++ libdc1394.ac.patch ++++++ --- /var/tmp/diff_new_pack.qZjKlS/_old 2011-01-07 12:14:47.000000000 +0100 +++ /var/tmp/diff_new_pack.qZjKlS/_new 2011-01-07 12:14:47.000000000 +0100 @@ -1,5 +1,5 @@ ---- a/libdc1394-2.1.2/configure.in 2009-11-23 10:11:16.000000000 +0300 -+++ b/libdc1394-2.1.2/configure.in 2009-11-23 10:11:51.000000000 +0300 +--- a/libdc1394-2.1.3/configure.in 2009-11-23 10:11:16.000000000 +0300 ++++ b/libdc1394-2.1.3/configure.in 2009-11-23 10:11:51.000000000 +0300 @@ -5,12 +5,6 @@ AC_CANONICAL_SYSTEM ++++++ libdc1394.no-x11.patch ++++++ --- /var/tmp/diff_new_pack.qZjKlS/_old 2011-01-07 12:14:47.000000000 +0100 +++ /var/tmp/diff_new_pack.qZjKlS/_new 2011-01-07 12:14:47.000000000 +0100 @@ -13,9 +13,9 @@ grab_gray_image_SOURCES = grab_gray_image.c grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 ---- a/libdc1394-2.1.2/configure.in -+++ b/libdc1394-2.1.2/configure.in -@@ -79,21 +79,30 @@ +--- a/libdc1394-2.1.3/configure.in ++++ b/libdc1394-2.1.3/configure.in +@@ -76,21 +76,30 @@ # check for Xv extensions (necessary for examples/dc1394_multiview) # imported from Coriander ++++++ libdc1394-swab_fix.patch ++++++ --- /var/tmp/diff_new_pack.qZjKlS/_old 2011-01-07 12:14:47.000000000 +0100 +++ /var/tmp/diff_new_pack.qZjKlS/_new 2011-01-07 12:14:47.000000000 +0100 @@ -2,8 +2,8 @@ libdc1394-2.0.2/dc1394/conversions.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---- a/libdc1394-2.1.2/dc1394/conversions.c -+++ b/libdc1394-2.1.2/dc1394/conversions.c +--- a/libdc1394-2.1.3/dc1394/conversions.c ++++ b/libdc1394-2.1.3/dc1394/conversions.c @@ -22,11 +22,10 @@ #include <string.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-help-en-US for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-help-en-US for openSUSE:Factory checked in at Fri Jan 7 12:14:42 CET 2011. -------- --- libreoffice-help-en-US/libreoffice-help-en-US.changes 2010-12-01 20:44:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-help-en-US/libreoffice-help-en-US.changes 2010-12-21 19:56:09.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- libreoffice-help-group1.changes: same change libreoffice-help-group2.changes: same change libreoffice-help-group3.changes: same change libreoffice-help-group4.changes: same change libreoffice-help-group5.changes: same change calling whatdependson for head-i586 Old: ---- libreoffice-help-3.3.0.1.tar.bz2 New: ---- libreoffice-help-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.ThWk5e/_old 2011-01-07 12:14:21.000000000 +0100 +++ /var/tmp/diff_new_pack.ThWk5e/_new 2011-01-07 12:14:21.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-help-en-US (Version 3.3.0.1) +# spec file for package libreoffice-help-en-US (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,11 @@ ## Generated by: ## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US ################################################################### -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece help -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_langs "en-US" %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice ++++++ libreoffice-help-group1.spec ++++++ --- /var/tmp/diff_new_pack.ThWk5e/_old 2011-01-07 12:14:21.000000000 +0100 +++ /var/tmp/diff_new_pack.ThWk5e/_new 2011-01-07 12:14:21.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-help-group1 (Version 3.3.0.1) +# spec file for package libreoffice-help-group1 (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,11 @@ ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece help -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice %define ooo_basis_dir basis3.3 libreoffice-help-group2.spec: same change libreoffice-help-group3.spec: same change libreoffice-help-group4.spec: same change libreoffice-help-group5.spec: same change ++++++ libreoffice-help-3.3.0.1.tar.bz2 -> libreoffice-help-3.3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.3.0.1/ChangeLog new/libreoffice-help-3.3.0.2/ChangeLog --- old/libreoffice-help-3.3.0.1/ChangeLog 2010-12-01 16:33:11.000000000 +0100 +++ new/libreoffice-help-3.3.0.2/ChangeLog 2010-12-18 20:53:12.000000000 +0100 @@ -1,3 +1,8 @@ +2010-12-18 Petr Mladek <pmladek(a)suse.cz> [336f3ee6df6c030b527bd4bc74930ec49e2130f9] + +Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2) + + 2010-12-01 Petr Mladek <pmladek(a)suse.cz> [b095f7f56c1ef1ab0919b482038be4085ade3de7] Version 3.3.0.1, tag LIBREOFFICE_3_3_0_1 (3.3-rc1) ++++++ libreoffice-help-en-US.spec.in ++++++ --- /var/tmp/diff_new_pack.ThWk5e/_old 2011-01-07 12:14:22.000000000 +0100 +++ /var/tmp/diff_new_pack.ThWk5e/_new 2011-01-07 12:14:22.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-help-en-US @DO_NOT_EDIT_COMMENT@ -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece help -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_langs "en-US" %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice ++++++ libreoffice-help-groupX.spec.in ++++++ --- /var/tmp/diff_new_pack.ThWk5e/_old 2011-01-07 12:14:22.000000000 +0100 +++ /var/tmp/diff_new_pack.ThWk5e/_new 2011-01-07 12:14:22.000000000 +0100 @@ -19,11 +19,11 @@ Name: libreoffice-help-group@GROUP_NUMBER@ @DO_NOT_EDIT_COMMENT@ -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece help -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_home libreoffice %define ooo_basis_dir basis3.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-calc for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-calc for openSUSE:Factory checked in at Fri Jan 7 12:12:44 CET 2011. -------- --- libreoffice-calc/libreoffice-calc.changes 2010-12-01 20:44:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-calc/libreoffice-calc.changes 2010-12-21 19:55:43.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-calc-3.3.0.1.tar.bz2 New: ---- libreoffice-calc-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-calc.spec ++++++ --- /var/tmp/diff_new_pack.yWl6BO/_old 2011-01-07 12:11:46.000000000 +0100 +++ /var/tmp/diff_new_pack.yWl6BO/_new 2011-01-07 12:11:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-calc (Version 3.3.0.1) +# spec file for package libreoffice-calc (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: libreoffice-calc -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece calc -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-calc-3.3.0.1.tar.bz2 -> libreoffice-calc-3.3.0.2.tar.bz2 ++++++ libreoffice-calc/libreoffice-calc-3.3.0.1.tar.bz2 /mounts/work_src_done/STABLE/libreoffice-calc/libreoffice-calc-3.3.0.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-impress for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-impress for openSUSE:Factory checked in at Fri Jan 7 12:11:31 CET 2011. -------- --- libreoffice-impress/libreoffice-impress.changes 2010-12-01 20:45:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-impress/libreoffice-impress.changes 2010-12-21 19:56:21.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-impress-3.3.0.1.tar.bz2 New: ---- libreoffice-impress-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-impress.spec ++++++ --- /var/tmp/diff_new_pack.uRpU3D/_old 2011-01-07 12:11:10.000000000 +0100 +++ /var/tmp/diff_new_pack.uRpU3D/_new 2011-01-07 12:11:10.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-impress (Version 3.3.0.1) +# spec file for package libreoffice-impress (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: libreoffice-impress -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece impress -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-impress-3.3.0.1.tar.bz2 -> libreoffice-impress-3.3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/ChangeLog new/libreoffice-impress-3.3.0.2/ChangeLog --- old/libreoffice-impress-3.3.0.1/ChangeLog 2010-12-01 16:32:19.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/ChangeLog 2010-12-18 20:52:21.000000000 +0100 @@ -1,3 +1,50 @@ +2010-12-18 Petr Mladek <pmladek(a)suse.cz> [3c9f9794be7290a5e3e9c9ce05dfa1820481a39e] + +Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2) + + +2010-12-15 Thorsten Behrens <tbehrens(a)novell.com> [7074930f8c7ea96345120eee9b66d83849546570] + +This surely shouldn't need executable flag + + +2010-12-15 Christian Lippka ORACLE <christian.lippka(a)oracle.com> [b0be7f2318e1043f0d3c6ebfc3c264040b009c98] + +impress207: #i115993# do not insert objects as presentation objects on master pages(cherry picked from commit 056b298538918df97390c645a1a0fb690a89468e) + + +2010-12-15 Christian Lippka ORACLE <christian.lippka(a)oracle.com> [1bcfdb91f4a74eacc51d28c3ccc47f6842b5dad7] + +impress206: #i115898# use updated anchor for group shapes to work around ms office 2010 bug(cherry picked from commit 7736d7e159d0e69ee817def98fefdb216f711ca3) + + +2010-12-15 Christian Lippka ORACLE <christian.lippka(a)oracle.com> [9252273081649088bb72b1b4b1e82a45021ee3a8] + +impress206: #i115898# take into account new presentation shapes(cherry picked from commit c8c648474da56e2ecdbdcc11c269366716fe88c9) + + +2010-12-15 Christian Lippka <christian.lippka(a)oracle.com> [8f62cd85de50a5023a6065455677971193f0e699] + +impress206: fixed compiler warning(cherry picked from commit 8df4a00b9bc1739289e45d9f4485f355298a35eb) + + +2010-12-13 camille <camille.moulin(a)free.fr> [ea09dfb1e2f59f2bb78901342bd1475fc3d99355] + +Grey as default color for native tables in Impress + +Default color for native tables in Impress is blue. Most people I +heard from are unhappy with it, because it doesn't match the +corporate colors, and it's not neutral. To make it worse, if you +change the color of the whole table (to white for instance) and +insert a new line, it's blue again because it doesn't inherit +from the row above. The colors are hardcoded, and, AFAIKT, can't +be overriden by a configuration extension. IBM's Symphony has +changed this default to white with black borders, which confirms +my impression that there is a problem indeed with blue by +default. + +Signed-off-by: Thorsten Behrens <tbehrens(a)novell.com> + 2010-12-01 Petr Mladek <pmladek(a)suse.cz> [bf86cb573d06dfb1f50e942a73fbe47744300d47] Version 3.3.0.1, tag LIBREOFFICE_3_3_0_1 (3.3-rc1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/core/drawdoc4.cxx new/libreoffice-impress-3.3.0.2/sd/source/core/drawdoc4.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/core/drawdoc4.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/core/drawdoc4.cxx 2010-12-14 17:01:30.000000000 +0100 @@ -662,11 +662,11 @@ // ---- default -------------------------------------------------- - Any aBlue1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue1") ), aDefaultCellStyleName, RGB_COLORDATA(153,204,255))); - Any aBlue2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue2") ), aDefaultCellStyleName, RGB_COLORDATA(0,153,255))); - Any aBlue3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue3") ), aDefaultCellStyleName, RGB_COLORDATA(0,102,204))); + Any aGray1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray1") ), aDefaultCellStyleName, RGB_COLORDATA(230,230,230))); + Any aGray2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray2") ), aDefaultCellStyleName, RGB_COLORDATA(204,204,204))); + Any aGray3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray3") ), aDefaultCellStyleName, RGB_COLORDATA(179,179,179))); - implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("default")), aBlue1, aBlue3, aBlue2 ); + implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("default") ), aGray1, aGray3, aGray2 ); // ---- BW ------------------------------------------------ @@ -694,11 +694,11 @@ // ---- Gray ------------------------------------------------ - Any aGray1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray1") ), aDefaultCellStyleName, RGB_COLORDATA(230,230,230))); - Any aGray2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray2") ), aDefaultCellStyleName, RGB_COLORDATA(204,204,204))); - Any aGray3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray3") ), aDefaultCellStyleName, RGB_COLORDATA(179,179,179))); + Any aBlue1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue1") ), aDefaultCellStyleName, RGB_COLORDATA(153,204,255))); + Any aBlue2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue2") ), aDefaultCellStyleName, RGB_COLORDATA(0,153,255))); + Any aBlue3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue3") ), aDefaultCellStyleName, RGB_COLORDATA(0,102,204))); - implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("gray") ), aGray1, aGray3, aGray2 ); + implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("blue")), aBlue1, aBlue3, aBlue2 ); // ---- Sun ------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/filter/eppt/epptso.cxx new/libreoffice-impress-3.3.0.2/sd/source/filter/eppt/epptso.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/filter/eppt/epptso.cxx 2010-11-16 20:30:15.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/filter/eppt/epptso.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -3063,7 +3063,7 @@ continue; } else if ( ( mType == "drawing.OLE2" ) || ( mType == "presentation.OLE2" ) - || ( mType == "presentation.Chart" ) || ( mType == "presentation.Table" ) + || ( mType == "presentation.Chart" ) || ( mType == "presentation.Calc" ) || ( mType == "presentation.OrgChart" ) ) { mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -3253,7 +3253,7 @@ } } } - else if ( mType == "drawing.Table" ) + else if ( (mType == "drawing.Table") || (mType == "presentation.Table") ) { SvMemoryStream* pTmp = NULL; if ( bEffect && !mbUseNewAnimations ) @@ -3442,7 +3442,10 @@ ImplFlipBoundingBox( aPropOpt ); aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); - mpPptEscherEx->AddClientAnchor( maRect ); + if ( GetCurrentGroupLevel() > 0 ) + mpPptEscherEx->AddChildAnchor( maRect ); + else + mpPptEscherEx->AddClientAnchor( maRect ); if ( pClientData ) { @@ -3512,7 +3515,10 @@ aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); - mpPptEscherEx->AddClientAnchor( maRect ); + if ( GetCurrentGroupLevel() > 0 ) + mpPptEscherEx->AddChildAnchor( maRect ); + else + mpPptEscherEx->AddClientAnchor( maRect ); *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) << (sal_uInt32)pClientTextBox->Tell(); @@ -3659,11 +3665,10 @@ aPropOpt.CreateShapeProperties( rXShape ); aPropOpt.Commit( *mpStrm ); aPropOpt2.Commit( *mpStrm, 3, ESCHER_UDefProp ); - mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - *mpStrm << (sal_Int16)maRect.Top() - << (sal_Int16)maRect.Left() - << (sal_Int16)( maRect.GetWidth() + maRect.Left() ) - << (sal_Int16)( maRect.GetHeight() + maRect.Top() ); + if ( GetCurrentGroupLevel() > 0 ) + mpPptEscherEx->AddChildAnchor( maRect ); + else + mpPptEscherEx->AddClientAnchor( maRect ); mpPptEscherEx->CloseContainer(); uno::Reference< table::XCellRange > xCellRange( xTable, uno::UNO_QUERY_THROW ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/filter/eppt/escherex.cxx new/libreoffice-impress-3.3.0.2/sd/source/filter/eppt/escherex.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/filter/eppt/escherex.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/filter/eppt/escherex.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -269,9 +269,21 @@ else { AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | HaveAnchor - AddAtom( 8, ESCHER_ClientAnchor ); - PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() ); - *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom(); + if ( mnGroupLevel == 1 ) + { + AddAtom( 8, ESCHER_ClientAnchor ); + PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() ); + *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom(); + } + else + { + AddAtom( 16, ESCHER_ChildAnchor ); + PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); + *mpOutStrm << (sal_Int32)aRect.Left() + << (sal_Int32)aRect.Top() + << (sal_Int32)aRect.Right() + << (sal_Int32)aRect.Bottom(); + } } if ( pClientData ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/filter/ppt/propread.cxx new/libreoffice-impress-3.3.0.2/sd/source/filter/ppt/propread.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/filter/ppt/propread.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/filter/ppt/propread.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -100,7 +100,7 @@ if (nSize > STRING_MAXLEN) nSize = STRING_MAXLEN; - return nSize; + return static_cast< xub_StrLen >( nSize ); } BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/ui/view/sdview4.cxx new/libreoffice-impress-3.3.0.2/sd/source/ui/view/sdview4.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/ui/view/sdview4.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/ui/view/sdview4.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -100,6 +100,7 @@ SdrGrafObj* pNewGrafObj = NULL; SdrPageView* pPV = GetSdrPageView(); SdrObject* pPickObj = pObj; + const bool bOnMaster = pPV && pPV->GetPage() && pPV->GetPage()->IsMasterPage(); if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView)) { @@ -116,7 +117,7 @@ if( mnAction == DND_ACTION_LINK && pPickObj && pPV ) { const bool bIsGraphic = pPickObj->ISA( SdrGrafObj ); - if( bIsGraphic || pObj->IsEmptyPresObj() ) + if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) ) { if( IsUndoEnabled() ) BegUndo(String(SdResId(STR_INSERTGRAPHIC))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/ui/view/sdview5.cxx new/libreoffice-impress-3.3.0.2/sd/source/ui/view/sdview5.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/ui/view/sdview5.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/ui/view/sdview5.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -61,7 +61,7 @@ if( pPV ) { SdPage* pPage = static_cast< SdPage* >( pPV->GetPage() ); - if( pPage ) + if( pPage && !pPage->IsMasterPage() ) { // first try selected shape if ( AreObjectsMarked() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/slideshow/source/engine/shapes/shapeimporter.cxx new/libreoffice-impress-3.3.0.2/slideshow/source/engine/shapes/shapeimporter.cxx --- old/libreoffice-impress-3.3.0.1/slideshow/source/engine/shapes/shapeimporter.cxx 2010-11-11 20:08:58.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/slideshow/source/engine/shapes/shapeimporter.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -286,7 +286,9 @@ rtl::OUString const& shapeType ) const { if( shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") )) + RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") ) || + shapeType.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.MediaShape") ) ) { // Media shape (video etc.). This is a special object return createMediaShape(xCurrShape, @@ -338,7 +340,9 @@ mrContext ); } else if( shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") )) + RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") ) || + shapeType.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.OLE2Shape") ) ) { // #i46224# Mark OLE shapes as foreign content - scan them for // unsupported actions, and fallback to bitmap, if necessary @@ -350,7 +354,10 @@ } else if( shapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.drawing.GraphicObjectShape") )) + "com.sun.star.drawing.GraphicObjectShape") ) || + shapeType.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( + "com.sun.star.presentation.GraphicObjectShape") ) ) { GraphicObject aGraphicObject; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-writer for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-writer for openSUSE:Factory checked in at Fri Jan 7 12:10:55 CET 2011. -------- --- libreoffice-writer/libreoffice-writer.changes 2010-12-01 20:47:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-writer/libreoffice-writer.changes 2010-12-21 19:59:30.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-writer-3.3.0.1.tar.bz2 New: ---- libreoffice-writer-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-writer.spec ++++++ --- /var/tmp/diff_new_pack.X6kd89/_old 2011-01-07 12:10:39.000000000 +0100 +++ /var/tmp/diff_new_pack.X6kd89/_new 2011-01-07 12:10:39.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-writer (Version 3.3.0.1) +# spec file for package libreoffice-writer (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: libreoffice-writer -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece writer -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-writer-3.3.0.1.tar.bz2 -> libreoffice-writer-3.3.0.2.tar.bz2 ++++++ libreoffice-writer/libreoffice-writer-3.3.0.1.tar.bz2 /mounts/work_src_done/STABLE/libreoffice-writer/libreoffice-writer-3.3.0.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0