August 2015 - openSUSE Commits - openSUSE Mailing Lists

commit perl-Image-ExifTool for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package perl-Image-ExifTool for openSUSE:Factory checked in at 2015-08-29 20:04:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Image-ExifTool (Old) and /work/SRC/openSUSE:Factory/.perl-Image-ExifTool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Image-ExifTool" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Image-ExifTool/perl-Image-ExifTool.changes 2015-04-27 07:47:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Image-ExifTool.new/perl-Image-ExifTool.changes 2015-08-29 20:04:36.000000000 +0200 @@ -1,0 +2,98 @@ +Tue Aug 18 14:51:38 UTC 2015 - sor.alexei(a)meowr.ru + +- Update to 10.00 (changes since 9.93): + * Add Geotag support for Bramor gEO log files. + * Add support for iCalendar ICS files. + * Add support for Leica M Monochrom (Type 246) maker notes. + * Add new "Preview" group for all embedded preview images. + * Add a new PentaxModelID. + * Add a new Canon LensType. + * Add tag name to "Invalid EXIF text encoding" warning. + * Decode ColorData for Canon EOS 5DS and EOS 5DS R. + * Change ListItem option so that it also applies when copying + tags. + * Enhance FileTypeExtension to return an uppercase extension when + the print conversion is disabled (eg. the -n option). + * Fix incorrect FileTypeExtension for virtual device drivers. + * Fix an improperly formatted warning for duplicate PDF entries. + * Fix bug creating extended XMP in JPEG images when deleting all + XMP and adding back in the same step. + * Add a few new Minolta/Sony lenses. + * Add config_files/photoshop_paths.config to the full + distribution. + * Avoid rebuilding maker notes when using -tagsFromFile with + -fast2 option. + * Validate tag names when redirecting (ie. "-DSTTAG<SRCTAG"). + * Add support for CanonVRD version 4 information and DR4 files. + * Add two new Canon LensType values. + * Add two new Olympus LensType values. + * Add a new Minolta/Sony LensType and fixed another one. + * Add a new Nikon LensID. + * Add a few new QuickTime tags. + * Add a new PentaxModelID and a new Pentax PictureMode. + * Add a few new XMP-aux tags. + * Decode a couple more DPX tags. + * Decode NikonCustom tags for D810 firmware version 1.02. + * Improve -htmlDump output for extended XMP and some other JPEG + segments. + * Improve a Canon lens name. + * Document the -userParam command-line option. + * Change default behaviour to ignore extended XMP with an + incorrect GUID (as per the XMP specification). + * Change the case of a few tag names for consistency. + * Patch problem with Sony cameras giving incorrect LensInfo for + some third party lenses, leading to an incorrect LensID by + ExifTool. + * Patch problem where GPS minutes or seconds could round up to 60. + * Fix picasa_faces.config to rotate regions if necessary for RAW + file types. + * Add a new Pentax Quality value. + * Add a new Panasonic AdvancedSceneMode. + * Minor improvement to lens identification logic based on XMP + information. + * Change a few DR4 tag names. + * Fix improper scoping of XMP namespace prefixes (so conflicting + prefixes are now properly resolved). + * Add read support for DSS and DS2 file formats. + * Add write support for XMP-mwg-rs:Rotation (seen in XMP from + LR6). + * Add a new Sigma LensType. + * Decode Pentax DiffractionCorrection. + * Decode Olympus ID3 XOLY frame. + * Decode a few more Sony tags. + * Improve reliability of decoding Nikon D810 ShotInfo and custom + settings. + * Change name of Pentax VignettingCorrection to + PeripheralIlluminationCorr. + * Fix problem with user parameters in tag name expressions when + copying. + * Add support for the Leica Q (Typ 116) maker notes. + * Add two new SonyModelID's. + * Add two new Sony LensType2. + * Add a new Pentax LensType. + * Extract a number of new File System tags when SystemTags API + option is set. + * Decode a new FujiFilm tag. + * Decode a number of new Sony tags. + * Disable writing of XMP to PostScript-format Adobe Illustrator + files. + * SourceFile values in -csv and -json input/output are now + converted to/from filename character set (set by -charset + filename option) when reading/writing. + * Rename Flash:FileAttributes to FlashAttributes. + * Rename FujiFilm:AFPointSet to AFMode and improved decoding. + * Fix problem where a partial command could be executed if the + -stay_open option was used and the command is aborted due to an + error in arguments. + * Add a few new CanonModelID's. + * Add a few new Nikon LensID's. + * Add a new Canon LensType. + * Decode a number of new Sony tags. + * Decode a couple more RIFF tags and extract Unknown RIFF tags. + * Change -b option to avoid splitting PDF List-type tag values. + * API Changes: + + add ExtendedXMP option; + + add SystemTags option; + + add NoPDFList option. + +------------------------------------------------------------------- Old: ---- Image-ExifTool-9.93.tar.gz New: ---- Image-ExifTool-10.00.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Image-ExifTool.spec ++++++ --- /var/tmp/diff_new_pack.AGbvVo/_old 2015-08-29 20:04:37.000000000 +0200 +++ /var/tmp/diff_new_pack.AGbvVo/_new 2015-08-29 20:04:37.000000000 +0200 @@ -18,7 +18,7 @@ %define cpan_name Image-ExifTool Name: perl-Image-ExifTool -Version: 9.93 +Version: 10.00 Release: 0 Summary: Perl module to read and write meta information License: GPL-1.0+ or Artistic-1.0 ++++++ Image-ExifTool-9.93.tar.gz -> Image-ExifTool-10.00.tar.gz ++++++ ++++ 59352 lines of diff (skipped)

1 0

commit aegisub for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package aegisub for openSUSE:Factory checked in at 2015-08-29 20:04:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aegisub (Old) and /work/SRC/openSUSE:Factory/.aegisub.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aegisub" Changes: -------- --- /work/SRC/openSUSE:Factory/aegisub/aegisub.changes 2015-07-03 00:01:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aegisub.new/aegisub.changes 2015-08-29 20:04:33.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 13 08:56:28 UTC 2015 - dvaleev(a)suse.com + +- Disable build on Power, there is no luajit yet + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aegisub.spec ++++++ --- /var/tmp/diff_new_pack.Y79TyT/_old 2015-08-29 20:04:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Y79TyT/_new 2015-08-29 20:04:34.000000000 +0200 @@ -53,6 +53,7 @@ %if %{with ffms2} BuildRequires: pkgconfig(ffms2) %endif +ExcludeArch: ppc ppc64 ppc64le %description Aegisub is an advanced subtitle editor for Windows, and UNIX-like systems, such

1 0

commit mkvtoolnix for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package mkvtoolnix for openSUSE:Factory checked in at 2015-08-29 20:04:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkvtoolnix (Old) and /work/SRC/openSUSE:Factory/.mkvtoolnix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkvtoolnix" Changes: -------- --- /work/SRC/openSUSE:Factory/mkvtoolnix/mkvtoolnix.changes 2015-06-02 10:03:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkvtoolnix.new/mkvtoolnix.changes 2015-08-29 20:04:30.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 5 08:36:57 UTC 2015 - rpm(a)fthiessen.de + +- Update to version 8.2.0: +* Fix mkvmerge codec identification for MP2 audio. + A LOT more bugfixes especially in the GUI. See ChangeLog: + https://bunkus.org/videotools/mkvtoolnix/doc/ChangeLog + +------------------------------------------------------------------- Old: ---- mkvtoolnix-7.9.0.tar.xz New: ---- mkvtoolnix-8.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.yVdjC8/_old 2015-08-29 20:04:31.000000000 +0200 +++ /var/tmp/diff_new_pack.yVdjC8/_new 2015-08-29 20:04:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: mkvtoolnix -Version: 7.9.0 +Version: 8.2.0 Release: 0 Summary: Tools to Create, Alter, and Inspect Matroska Files License: GPL-2.0+ @@ -94,7 +94,6 @@ %{_bindir}/mkvpropedit %{_datadir}/applications/mkvinfo.desktop %{_datadir}/applications/mkvmergeGUI.desktop -%{_datadir}/applications/mkvtoolnix-gui.desktop %{_datadir}/icons/hicolor/*/apps/mkvextract.png %{_datadir}/icons/hicolor/*/apps/mkvinfo.png %{_datadir}/icons/hicolor/*/apps/mkvmerge.png @@ -104,7 +103,6 @@ %{_mandir}/man1/mkvextract.1%{ext_man} %{_mandir}/man1/mkvinfo.1%{ext_man} %{_mandir}/man1/mkvmerge.1%{ext_man} -%{_mandir}/man1/mkvtoolnix-gui.1%{ext_man} %{_mandir}/man1/mmg.1%{ext_man} %{_mandir}/man1/mkvpropedit.1%{ext_man} ++++++ mkvtoolnix-7.9.0.tar.xz -> mkvtoolnix-8.2.0.tar.xz ++++++ ++++ 242760 lines of diff (skipped)

1 0

commit QMPlay2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package QMPlay2 for openSUSE:Factory checked in at 2015-08-29 20:04:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QMPlay2 (Old) and /work/SRC/openSUSE:Factory/.QMPlay2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "QMPlay2" Changes: -------- --- /work/SRC/openSUSE:Factory/QMPlay2/QMPlay2.changes 2015-08-03 17:21:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.QMPlay2.new/QMPlay2.changes 2015-08-29 20:04:28.000000000 +0200 @@ -3,0 +4,7 @@ +- Update to 15.08.12 (changes since 15.07.13): + * deinterlacing fixes in VAApi, + * MPRIS2 bugfix. + +------------------------------------------------------------------- +Mon Jul 13 18:06:19 UTC 2015 - dap.darkness(a)gmail.com + Old: ---- QMPlay2-src-15.07.13.tar.bz2 New: ---- QMPlay2-src-15.08.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QMPlay2.spec ++++++ --- /var/tmp/diff_new_pack.tmehE7/_old 2015-08-29 20:04:29.000000000 +0200 +++ /var/tmp/diff_new_pack.tmehE7/_new 2015-08-29 20:04:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: QMPlay2 -Version: 15.07.13 +Version: 15.08.12 Release: 0 Summary: A Qt based media player, streamer and downloader License: LGPL-3.0+ ++++++ QMPlay2-src-15.07.13.tar.bz2 -> QMPlay2-src-15.08.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/ChangeLog new/QMPlay2-src/ChangeLog --- old/QMPlay2-src/ChangeLog 2015-07-12 23:27:07.000000000 +0200 +++ new/QMPlay2-src/ChangeLog 2015-08-12 16:11:25.000000000 +0200 @@ -1,3 +1,8 @@ +Changes in QMPlay2 build 15.08.12: + - deinterlacing fixes in VAApi, + - minor fixes for Windows, + - MPRIS2 bugfix, + Changes in QMPlay2 build 15.07.13: - fixed problem from previous release with playing video (sometimes video plays at maximum speed), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/README.md new/QMPlay2-src/README.md --- old/QMPlay2-src/README.md 2015-06-26 17:14:40.000000000 +0200 +++ new/QMPlay2-src/README.md 2015-08-12 02:02:21.000000000 +0200 @@ -19,20 +19,6 @@ $ sudo zypper in QMPlay2 QMPlay2-kde-integration ``` -####Easy installation on Ubuntu - -- Just run the following commands: -```sh -$ sudo add-apt-repository ppa:samrog131/ppa -$ sudo apt-get update -$ sudo apt-get install qmplay2 -``` -- If you get dependency issues, do: -```sh -$ sudo apt-get install -f -$ sudo apt-get install qmplay2 -``` - ##Compilation from sources ###You need (devel packages): @@ -69,11 +55,15 @@ ###Linux/BSD: - Install all dependencies using package manager (in devel version) or compile it from sources. -- If you don't want to open Xterm or Konsole - "export NOTERM=1". -- If you want to prepare *.desktop files for system use - "export SYSTEM_BUILD=1". - If you want to compile with qt suffix (for example "qmake-qt5") - "export QT_SUFFIX=-qt5". -- Run "./compile_unix". -- QMPlay2 is in "app" directory, you can move its contents into /usr directory if $SYSTEM_BUILD == 1. +- Compilation only: + - If you don't want to open Xterm or Konsole - "export NOTERM=1". + - If you want to prepare *.desktop files for system use - "export SYSTEM_BUILD=1". + - Run "./compile_unix". + - QMPlay2 is in "app" directory, you can move its contents into "/usr" directory if "$SYSTEM_BUILD == 1". +- Compilation and installation: + - Run "./installer_unix install" (it compiles and uses "sudo" to copy files to "/usr"). + - If you want to uninstall, run "./installer_unix uninstall" (it also uses "sudo"). ###OS X: @@ -86,6 +76,6 @@ - Run "./compile_mac n" where "n" is number of threads (4 by default). Building package RPM, DEB or any other - look at Arch Linux PKGBUILD: ->http://aur.archlinux.org/packages/qm/qmplay2-git/PKGBUILD +>https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=qmplay2 QMPlay2 uses the external software - "youtube-dl", so "youtube-dl" should be as optional package in package manager. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/installer_unix new/QMPlay2-src/installer_unix --- old/QMPlay2-src/installer_unix 1970-01-01 01:00:00.000000000 +0100 +++ new/QMPlay2-src/installer_unix 2015-08-12 17:55:07.000000000 +0200 @@ -0,0 +1,52 @@ +#!/bin/bash + +arch=`uname -m` +if [ -z $arch ] || [ $arch != 'x86_64' ] || [ ! -e /usr/lib64 ]; then + libdir=lib +else + libdir=lib64 +fi + +function copy_files +{ + sudo cp --remove-destination -v app/bin/QMPlay2 /usr/bin || exit 1 + sudo cp --remove-destination -v app/lib/libqmplay2.so /usr/$libdir || exit 1 + sudo cp --remove-destination -v -r app/include /usr || exit 1 + sudo cp --remove-destination -v -r app/share /usr || exit 1 + + sudo strip /usr/bin/QMPlay2 || exit 1 + sudo strip /usr/share/qmplay2/modules/*.so || exit 1 +} + +function remove_files +{ + sudo rm -v /usr/bin/QMPlay2 + sudo rm -v /usr/$libdir/libqmplay2.so + sudo rm -v -r /usr/include/QMPlay2 + sudo rm -v /usr/share/applications/QMPlay2*.desktop + sudo rm -v /usr/share/icons/QMPlay2.png + sudo rm -v /usr/share/icons/hicolor/128x128/apps/QMPlay2.png + if [ -d /usr/share/kde4/apps/solid/actions ]; then + sudo rm -v /usr/share/kde4/apps/solid/actions/qmplay2-opencda.desktop + elif [ -d /usr/share/apps/solid/actions ]; then + sudo rm -v /usr/share/apps/solid/actions/qmplay2-opencda.desktop + fi + sudo rm -v -r /usr/share/qmplay2 +} + +export SYSTEM_BUILD=1 +export NOTERM=1 + +if [ -z $1 ] || ( [ $1 != 'install' ] && [ $1 != 'uninstall' ] ); then + echo "You must specify 'install' or 'uninstall'" + exit 1 +fi + +if [ $1 == 'install' ]; then + ./compile_unix || exit $? + copy_files && echo "Installation complete!" && exit + echo "Installation failed!" + exit 1 +else + remove_files +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/src/gui/AudioThr.cpp new/QMPlay2-src/src/gui/AudioThr.cpp --- old/QMPlay2-src/src/gui/AudioThr.cpp 2015-07-12 19:50:35.000000000 +0200 +++ new/QMPlay2-src/src/gui/AudioThr.cpp 2015-08-04 18:48:59.000000000 +0200 @@ -127,7 +127,7 @@ bool paused = false; tmp_br = tmp_time = 0; #ifdef Q_OS_WIN - canRefresh = false; + canUpdatePos = canUpdateBitrate = false; #endif while ( !br ) { @@ -150,7 +150,7 @@ if ( playC.paused || ( !hasAPackets && !hasBufferedSamples ) || playC.waitForData ) { #ifdef Q_OS_WIN - canRefresh = false; + canUpdatePos = canUpdateBitrate = false; #endif tmp_br = tmp_time = 0; if ( playC.paused && !paused ) @@ -200,13 +200,15 @@ tmp_br += bytes_consumed; } -#ifndef Q_OS_WIN if ( tmp_time >= 1000.0 ) { +#ifdef Q_OS_WIN + canUpdateBitrate = true; +#else emit playC.updateBitrate( round( ( tmp_br << 3 ) / tmp_time ), -1, -1.0 ); tmp_br = tmp_time = 0; - } #endif + } delay = writer->getParam( "delay" ).toDouble(); foreach ( AudioFilter *filter, filters ) @@ -254,7 +256,7 @@ packet.ts += playC.audio_last_delay; #ifdef Q_OS_WIN - canRefresh = true; + canUpdatePos = true; #endif if ( playC.skipAudioFrame <= 0.0 ) @@ -343,13 +345,20 @@ #ifdef Q_OS_WIN void AudioThr::timerEvent( QTimerEvent * ) { - if ( !canRefresh || br || !isRunning() ) + if ( br || !isRunning() ) return; - canRefresh = false; - if ( !playC.vThr && playC.canUpdatePos ) - emit playC.updatePos( round( playC.pos ) ); - emit playC.updateBitrate( round( ( tmp_br << 3 ) / tmp_time ), -1, -1.0 ); - tmp_br = tmp_time = 0; + if ( canUpdatePos ) + { + if ( !playC.vThr && playC.canUpdatePos ) + emit playC.updatePos( round( playC.pos ) ); + canUpdatePos = false; + } + if ( canUpdateBitrate ) + { + emit playC.updateBitrate( round( ( tmp_br << 3 ) / tmp_time ), -1, -1.0 ); + canUpdateBitrate = false; + tmp_time = tmp_br = 0; + } } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/src/gui/AudioThr.hpp new/QMPlay2-src/src/gui/AudioThr.hpp --- old/QMPlay2-src/src/gui/AudioThr.hpp 2015-06-04 17:36:29.000000000 +0200 +++ new/QMPlay2-src/src/gui/AudioThr.hpp 2015-08-04 18:35:20.000000000 +0200 @@ -41,7 +41,7 @@ volatile double doSilence; QMutex silenceChMutex; #ifdef Q_OS_WIN - bool canRefresh; + bool canUpdatePos, canUpdateBitrate; #endif QVector< QMPlay2Extensions * > visualizations; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/src/gui/DemuxerThr.cpp new/QMPlay2-src/src/gui/DemuxerThr.cpp --- old/QMPlay2-src/src/gui/DemuxerThr.cpp 2015-07-12 23:24:59.000000000 +0200 +++ new/QMPlay2-src/src/gui/DemuxerThr.cpp 2015-08-04 18:22:17.000000000 +0200 @@ -256,7 +256,9 @@ forwardPackets -= backwardPackets; } - setPriority( QThread::HighPriority ); + if ( !localStream ) + setPriority( QThread::LowPriority ); //Network streams should have low priority, because slow CPUs have problems with smooth video playing during buffering + while ( !demuxer.isAborted() ) { AVThread *aThr = ( AVThread * )playC.aThr, *vThr = ( AVThread * )playC.vThr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/src/modules/Extensions/MPRIS2.cpp new/QMPlay2-src/src/modules/Extensions/MPRIS2.cpp --- old/QMPlay2-src/src/modules/Extensions/MPRIS2.cpp 2015-06-04 17:36:29.000000000 +0200 +++ new/QMPlay2-src/src/modules/Extensions/MPRIS2.cpp 2015-08-11 19:34:57.000000000 +0200 @@ -85,11 +85,11 @@ MediaPlayer2Player::MediaPlayer2Player( QObject *p ) : QDBusAbstractAdaptor( p ), exportCovers( false ), removeCover( false ), - trackID( QDBusObjectPath( QString( "/org/qmplay2/MediaPlayer2/Track/%1" ).arg( qrand() ) ) ), //is it OK? + trackID( QDBusObjectPath( QString( "/org/qmplay2/MediaPlayer2/Track/0" ) ) ), //I don't use TrackID in QMPlay2 playState( "Stopped" ), can_seek( false ), vol( 1.0 ), r( 1.0 ), - len( 0 ), pos( 0 ) + pos( 0 ) { clearMetaData(); m_data[ "mpris:trackid" ] = QVariant::fromValue< QDBusObjectPath >( trackID ); @@ -201,13 +201,16 @@ } void MediaPlayer2Player::Seek( qint64 Offset ) { - if ( Offset != position() && Offset >= 0 && Offset <= m_data[ "mpris:length" ].toLongLong() ) - QMPlay2Core.processParam( "seek", QString::number( Offset / 1000000LL ) ); + if ( Offset != 0 ) + { + const qint64 Position = position() + Offset; + SetPosition( trackID, Position < 0 ? 0 : Position ); + } } void MediaPlayer2Player::SetPosition( const QDBusObjectPath &TrackId, qint64 Position ) { - if ( trackID == TrackId ) - Seek( Position ); + if ( trackID == TrackId && Position != position() && Position >= 0 && Position <= m_data[ "mpris:length" ].toLongLong() ) + QMPlay2Core.processParam( "seek", QString::number( Position / 1000000LL ) ); } void MediaPlayer2Player::OpenUri( const QString &Uri ) { @@ -217,20 +220,20 @@ void MediaPlayer2Player::updatePlaying( bool play, const QString &title, const QString &artist, const QString &album, int length, bool needCover, const QString &fileName ) { Q_UNUSED( needCover ) - bool tmp = play && length > 0; + const bool tmp = play && length > 0; if ( tmp != can_seek ) propertyChanged( "CanSeek", can_seek = tmp ); if ( !play ) clearMetaData(); else { - m_data[ "mpris:length" ] = len = length * 1000000LL; + m_data[ "mpris:length" ] = length < 0 ? -1 : length * 1000000LL; if ( title.isEmpty() && artist.isEmpty() ) m_data[ "xesam:title" ] = fileName; else { m_data[ "xesam:title" ] = title; - m_data[ "xesam:artist" ] = artist; + m_data[ "xesam:artist" ] = QStringList() << artist; } m_data[ "xesam:album" ] = album; } @@ -286,7 +289,8 @@ QFile::remove( m_data[ "mpris:artUrl" ].toString() ); removeCover = false; } - m_data[ "mpris:artUrl" ] = m_data[ "xesam:title" ] = m_data[ "xesam:artist" ] = m_data[ "xesam:album" ] = QString(); + m_data[ "mpris:artUrl" ] = m_data[ "xesam:title" ] = m_data[ "xesam:album" ] = QString(); + m_data[ "xesam:artist" ] = QStringList() << QString(); m_data[ "mpris:length" ] = qint64(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/src/modules/Extensions/MPRIS2.hpp new/QMPlay2-src/src/modules/Extensions/MPRIS2.hpp --- old/QMPlay2-src/src/modules/Extensions/MPRIS2.hpp 2015-06-04 17:36:29.000000000 +0200 +++ new/QMPlay2-src/src/modules/Extensions/MPRIS2.hpp 2015-08-11 19:15:02.000000000 +0200 @@ -120,7 +120,7 @@ QString playState; bool can_seek; double vol, r; - qint64 len, pos; + qint64 pos; }; /**/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/src/modules/FFMpeg/FFDemux.cpp new/QMPlay2-src/src/modules/FFMpeg/FFDemux.cpp --- old/QMPlay2-src/src/modules/FFMpeg/FFDemux.cpp 2015-07-11 21:07:10.000000000 +0200 +++ new/QMPlay2-src/src/modules/FFMpeg/FFDemux.cpp 2015-08-11 22:24:09.000000000 +0200 @@ -287,10 +287,14 @@ return true; } val += start_time; +#ifndef MP3_FAST_SEEK if ( seekByByteOffset < 0 ) +#endif return av_seek_frame( formatCtx, -1, ( int64_t )val * AV_TIME_BASE, backward ? AVSEEK_FLAG_BACKWARD : 0 ) >= 0; +#ifndef MP3_FAST_SEEK else if ( length() > 0 ) return av_seek_frame( formatCtx, -1, ( int64_t )val * ( avio_size( formatCtx->pb ) - seekByByteOffset ) / length() + seekByByteOffset, AVSEEK_FLAG_BYTE | ( backward ? AVSEEK_FLAG_BACKWARD : 0 ) ) >= 0; +#endif } return false; } @@ -388,12 +392,16 @@ const double time_base = av_q2d( streams[ ff_idx ]->time_base ); +#ifndef MP3_FAST_SEEK if ( seekByByteOffset < 0 ) +#endif encoded.ts.set( packet.dts * time_base, packet.pts * time_base, start_time ); +#ifndef MP3_FAST_SEEK else if ( packet.pos > -1 && length() > 0.0 ) lastTime = encoded.ts = ( ( packet.pos - seekByByteOffset ) * length() ) / ( avio_size( formatCtx->pb ) - seekByByteOffset ); else encoded.ts = lastTime; +#endif if ( packet.duration > 0 ) encoded.duration = packet.duration * time_base; @@ -451,11 +459,17 @@ formatCtx->interrupt_callback.callback = ( int( * )( void * ) )interruptCB; formatCtx->interrupt_callback.opaque = &aborted; +// formatCtx->flags |= AVFMT_FLAG_GENPTS; //Is it necessary (it can slow down demuxing)? +#ifdef MP3_FAST_SEEK + formatCtx->flags |= AVFMT_FLAG_FAST_SEEK; +#endif + if ( avformat_open_input( &formatCtx, url.toUtf8(), NULL, &options ) || !formatCtx || disabledDemuxers.contains( name() ) ) return false; - formatCtx->flags |= AVFMT_FLAG_GENPTS; +#ifndef MP3_FAST_SEEK seekByByteOffset = formatCtx->pb ? avio_tell( formatCtx->pb ) : -1; //formatCtx->data_offset, moved to private since ffmpeg 2.6 +#endif avcodec_mutex.lock(); if ( avformat_find_stream_info( formatCtx, NULL ) < 0 ) @@ -466,10 +480,12 @@ avcodec_mutex.unlock(); isStreamed = !isLocal && formatCtx->duration == QMPLAY2_NOPTS_VALUE; +#ifndef MP3_FAST_SEEK if ( seekByByteOffset > -1 && ( isStreamed || name() != "mp3" ) ) seekByByteOffset = -1; +#endif - isOneStreamOgg = name() == "ogg" && formatCtx->nb_streams == 1; + isOneStreamOgg = name() == "ogg" && formatCtx->nb_streams == 1; //Workaround for some OGG network streams if ( ( start_time = formatCtx->start_time / ( double )AV_TIME_BASE ) < 0.0 ) start_time = 0.0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/src/modules/FFMpeg/FFDemux.hpp new/QMPlay2-src/src/modules/FFMpeg/FFDemux.hpp --- old/QMPlay2-src/src/modules/FFMpeg/FFDemux.hpp 2015-07-11 21:07:10.000000000 +0200 +++ new/QMPlay2-src/src/modules/FFMpeg/FFDemux.hpp 2015-08-11 22:24:06.000000000 +0200 @@ -7,6 +7,10 @@ #include <libavformat/version.h> } +#if LIBAVFORMAT_VERSION_MAJOR >= 56 && LIBAVFORMAT_VERSION_MINOR >= 36 + #define MP3_FAST_SEEK +#endif + struct AVFormatContext; struct AVDictionary; struct AVStream; @@ -55,7 +59,9 @@ bool isLocal, paused, isStreamed, aborted, fix_mkv_ass; mutable bool isMetadataChanged; double lastTime, start_time; +#ifndef MP3_FAST_SEEK qint64 seekByByteOffset; +#endif bool isOneStreamOgg; int lastErr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/src/modules/FFMpeg/VAApiWriter.cpp new/QMPlay2-src/src/modules/FFMpeg/VAApiWriter.cpp --- old/QMPlay2-src/src/modules/FFMpeg/VAApiWriter.cpp 2015-07-11 14:06:52.000000000 +0200 +++ new/QMPlay2-src/src/modules/FFMpeg/VAApiWriter.cpp 2015-08-12 17:33:44.000000000 +0200 @@ -11,11 +11,6 @@ #include <va/va_x11.h> -#ifdef HAVE_VPP - #define VPP_TFF 0 - #define VPP_BFF ( VA_DEINTERLACING_BOTTOM_FIELD | VA_DEINTERLACING_BOTTOM_FIELD_FIRST ) -#endif - VAApiWriter::VAApiWriter( Module &module ) : ok( false ), VADisp( NULL ), @@ -156,12 +151,13 @@ if ( !vpp_second && forward_reference == curr_id ) return data.size(); - if ( do_vpp_deint && !vpp_second ) + if ( do_vpp_deint ) { VAProcFilterParameterBufferDeinterlacing *deint_params = NULL; if ( vaMapBuffer( VADisp, vpp_buffers[ VAProcFilterDeinterlacing ], ( void ** )&deint_params ) == VA_STATUS_SUCCESS ) { - deint_params->flags = field == VA_TOP_FIELD ? VPP_TFF : VPP_BFF; + if ( ( major >= 0 && minor > 37 ) || !vpp_second ) + deint_params->flags = field == VA_TOP_FIELD ? 0 : VA_DEINTERLACING_BOTTOM_FIELD; vaUnmapBuffer( VADisp, vpp_buffers[ VAProcFilterDeinterlacing ] ); } } @@ -274,8 +270,7 @@ clr(); VADisp = vaGetDisplay( ( display = XOpenDisplay( NULL ) ) ); - int minor, major; - if ( vaInitialize( VADisp, &minor, &major ) == VA_STATUS_SUCCESS ) + if ( vaInitialize( VADisp, &major, &minor ) == VA_STATUS_SUCCESS ) { const QString vendor = vaQueryVendorString( VADisp ); isVDPAU = vendor.contains( "VDPAU" ); @@ -542,7 +537,7 @@ } if ( vpp_deint_type != VAProcDeinterlacingNone ) { - VAProcFilterParameterBufferDeinterlacing deint_params = { VAProcFilterDeinterlacing, vpp_deint_type, VPP_TFF }; + VAProcFilterParameterBufferDeinterlacing deint_params = { VAProcFilterDeinterlacing, vpp_deint_type, 0 }; if ( vaCreateBuffer( VADisp, context_vpp, VAProcFilterParameterBufferType, sizeof deint_params, 1, &deint_params, &vpp_buffers[ VAProcFilterDeinterlacing ] ) != VA_STATUS_SUCCESS ) vpp_buffers[ VAProcFilterDeinterlacing ] = VA_INVALID_ID; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/src/modules/FFMpeg/VAApiWriter.hpp new/QMPlay2-src/src/modules/FFMpeg/VAApiWriter.hpp --- old/QMPlay2-src/src/modules/FFMpeg/VAApiWriter.hpp 2015-07-11 13:52:38.000000000 +0200 +++ new/QMPlay2-src/src/modules/FFMpeg/VAApiWriter.hpp 2015-08-12 16:52:35.000000000 +0200 @@ -109,6 +109,7 @@ double aspect_ratio, zoom; VASurfaceID id; int field, X, Y, W, H, outW, outH, deinterlace, Hue, Saturation, Brightness, Contrast; + int minor, major; #ifdef HAVE_VPP //Postprocessing VAContextID context_vpp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src/src/qmplay2/headers/QMPlay2Core.hpp new/QMPlay2-src/src/qmplay2/headers/QMPlay2Core.hpp --- old/QMPlay2-src/src/qmplay2/headers/QMPlay2Core.hpp 2015-07-12 23:02:39.000000000 +0200 +++ new/QMPlay2-src/src/qmplay2/headers/QMPlay2Core.hpp 2015-08-12 17:21:53.000000000 +0200 @@ -1,7 +1,7 @@ #ifndef QMPLAY2CORE_HPP #define QMPLAY2CORE_HPP -#define QMPlay2Version "15.07.13" +#define QMPlay2Version "15.08.12" #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || (__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64) #define QMPLAY2_CPU_X86

1 0

commit log4shib for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package log4shib for openSUSE:Factory checked in at 2015-08-29 20:04:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/log4shib (Old) and /work/SRC/openSUSE:Factory/.log4shib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "log4shib" Changes: -------- New Changes file: --- /dev/null 2015-08-24 19:43:32.284261900 +0200 +++ /work/SRC/openSUSE:Factory/.log4shib.new/log4shib.changes 2015-08-29 20:04:24.000000000 +0200 @@ -0,0 +1,22 @@ +------------------------------------------------------------------- +Wed Aug 5 18:00:37 UTC 2015 - mpluskal(a)suse.com + +- Add gpg signature +- Do not build static libraries +- Do not ship .la files + +------------------------------------------------------------------- +Mon Jul 27 16:18:53 UTC 2015 - kstreitova(a)suse.com + +- use spec-cleaner +- package cleaning +- add log4shib-1.0.9-doxygen_timestamp.patch to remove timestamps + in a documentation generated by Doxygen and avoid RPMLINT warnings + (file-contains-date-and-time). +- remove unused conditionals + +------------------------------------------------------------------- +Fri Jul 24 14:56:33 UTC 2015 - kstreitova(a)suse.com + +- initial revision + New: ---- log4shib-1.0.9-doxygen_timestamp.patch log4shib-1.0.9.tar.gz log4shib-1.0.9.tar.gz.asc log4shib.changes log4shib.keyring log4shib.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4shib.spec ++++++ # # spec file for package log4shib # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define pkgdocdir %{_docdir}/%{name} Name: log4shib Version: 1.0.9 Release: 0 Summary: Log for C++, Shibboleth Edition License: LGPL-2.1 Group: Development/Libraries Url: https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib Source0: http://shibboleth.net/downloads/log4shib/%{version}/%{name}-%{version}.tar.… Source1: http://shibboleth.net/downloads/log4shib/%{version}/%{name}-%{version}.tar.… Source2: %{name}.keyring Patch0: log4shib-1.0.9-doxygen_timestamp.patch BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Log for C++ is a library of classes for flexible logging to files, syslog, and other destinations. It is modeled after the Log for Java library and stays as close to its API as is reasonable. %package -n liblog4shib1 Summary: Log for C++, Shibboleth Edition Group: Development/Libraries Provides: log4shib = %{version}-%{release} Obsoletes: log4shib < %{version}-%{release} %description -n liblog4shib1 Log for C++ is a library of classes for flexible logging to files, syslog, and other destinations. It is modeled after the Log for Java library and stays as close to its API as is reasonable. This package contains just the shared library. %package -n liblog4shib-devel Summary: Development tools for Log for C++ Group: Development/Libraries Requires: liblog4shib1 = %{version}-%{release} Provides: log4shib-devel = %{version}-%{release} Obsoletes: log4shib-devel < %{version}-%{release} %description -n liblog4shib-devel The static libraries and header files needed for development with log4shib. %prep %setup -q %patch0 -p1 %build %configure \ --disable-static \ --enable-doxygen make %{?_smp_mflags} %install make DESTDIR=%{buildroot} apidir=%{buildroot}%{pkgdocdir}/api install # If we use %%doc down below to package the README files from the build tree, # it will blow away the package's docdir folder, and the installed API docs with it. # Instead, copy the README files manually into the platform's docdir. config/install-sh -d %{buildroot}%{pkgdocdir} config/install-sh -m 644 -c AUTHORS COPYING NEWS README THANKS ChangeLog %{buildroot}%{pkgdocdir} # We don't want to ship these find %{buildroot} -type f -name "*.la" -delete -print %post -n liblog4shib1 -p /sbin/ldconfig %post -n liblog4shib-devel if test "x$RPM_INSTALL_PREFIX0" != "x" ; then perl -pi -e"s|^prefix=\"[^\"]*\"|prefix=\"$RPM_INSTALL_PREFIX0\"|" $RPM_INSTALL_PREFIX0/bin/log4shib-config fi %postun -n liblog4shib1 -p /sbin/ldconfig %files -n liblog4shib1 %defattr(-,root,root,755) %{_libdir}/lib*.so.* %files -n liblog4shib-devel %defattr(-,root,root,755) %{_includedir}/* %{_mandir}/man?/* %attr(755,root,root) %{_bindir}/log4shib-config %{_libdir}/*.so %attr(644,root,root) %{_libdir}/pkgconfig/log4shib.pc %dir %{_datadir}/aclocal %attr(644,root,root) %{_datadir}/aclocal/*.m4 %doc %{pkgdocdir} %changelog ++++++ log4shib-1.0.9-doxygen_timestamp.patch ++++++ Index: log4shib-1.0.9/doc/Doxyfile.in =================================================================== --- log4shib-1.0.9.orig/doc/Doxyfile.in +++ log4shib-1.0.9/doc/Doxyfile.in @@ -15,6 +15,7 @@ OUTPUT_DIRECTORY = . HTML_OUTPUT = html/api HTML_HEADER = HTML_FOOTER = +HTML_TIMESTAMP = NO LATEX_OUTPUT = latex MAN_OUTPUT = man

1 0

commit xmltooling for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package xmltooling for openSUSE:Factory checked in at 2015-08-29 20:04:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmltooling (Old) and /work/SRC/openSUSE:Factory/.xmltooling.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xmltooling" Changes: -------- New Changes file: --- /dev/null 2015-08-24 19:43:32.284261900 +0200 +++ /work/SRC/openSUSE:Factory/.xmltooling.new/xmltooling.changes 2015-08-29 20:04:22.000000000 +0200 @@ -0,0 +1,20 @@ +------------------------------------------------------------------- +Thu Jul 30 09:40:32 UTC 2015 - kstreitova(a)suse.com + +- adjust Summary in the specfile +- remove unused conditionals + +------------------------------------------------------------------- +Mon Jul 27 08:33:52 UTC 2015 - kstreitova(a)suse.com + +- use spec-cleaner +- package cleaning +- add xmltooling-1.5.5-doxygen_timestamp.patch to remove timestamps + in a documentation generated by Doxygen and avoid RPMLINT warnings + (file-contains-date-and-time). + +------------------------------------------------------------------- +Fri Jul 24 15:15:45 UTC 2015 - kstreitova(a)suse.com + +- initial revision + New: ---- xmltooling-1.5.5-doxygen_timestamp.patch xmltooling-1.5.5.tar.bz2 xmltooling.changes xmltooling.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmltooling.spec ++++++ # # spec file for package xmltooling # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define pkgdocdir %{_docdir}/%{name} Name: xmltooling Version: 1.5.5 Release: 0 Summary: OpenSAML XML library License: Apache-2.0 Group: Development/Libraries/C and C++ Url: https://wiki.shibboleth.net/confluence/display/OpenSAML/XMLTooling-C Source: http://shibboleth.net/downloads/c++-opensaml/2.5.5/%{name}-%{version}.tar.b… Patch0: xmltooling-1.5.5-doxygen_timestamp.patch BuildRequires: boost-devel >= 1.32.0 BuildRequires: curl-devel >= 7.10.6 BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: liblog4shib-devel >= 1.0.4 BuildRequires: libxerces-c-devel >= 3.1 BuildRequires: libxml-security-c-devel >= 1.7.3 BuildRequires: openssl-devel BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The XMLTooling library contains generic XML parsing and processing classes based on the Xerces-C DOM. It adds more powerful facilities for declaring element- and type-specific API and implementation classes to add value around the DOM, as well as signing and encryption support. %package -n libxmltooling6 Summary: OpenSAML XMLTooling library Group: Development/Libraries/C and C++ Provides: xmltooling = %{version}-%{release} Obsoletes: xmltooling < %{version}-%{release} %description -n libxmltooling6 The XMLTooling library contains generic XML parsing and processing classes based on the Xerces-C DOM. It adds more powerful facilities for declaring element- and type-specific API and implementation classes to add value around the DOM, as well as signing and encryption support. This package contains just the shared library. %package -n libxmltooling-devel Summary: XMLTooling development Headers Group: Development/Libraries/C and C++ Requires: boost-devel >= 1.32.0 Requires: curl-devel >= 7.10.6 Requires: liblog4shib-devel >= 1.0.4 Requires: libxerces-c-devel >= 3.1 Requires: libxml-security-c-devel >= 1.7.3 Requires: libxmltooling6 = %{version}-%{release} Requires: openssl-devel Provides: xmltooling-devel = %{version}-%{release} Obsoletes: xmltooling-devel < %{version}-%{release} %description -n libxmltooling-devel The XMLTooling library contains generic XML parsing and processing classes based on the Xerces-C DOM. It adds more powerful facilities for declaring element- and type-specific API and implementation classes to add value around the DOM, as well as signing and encryption support. This package includes files needed for development with XMLTooling. %package -n xmltooling-schemas Summary: XMLTooling schemas and catalog Group: Development/Libraries/C and C++ %description -n xmltooling-schemas The XMLTooling library contains generic XML parsing and processing classes based on the Xerces-C DOM. It adds more powerful facilities for declaring element- and type-specific API and implementation classes to add value around the DOM, as well as signing and encryption support. This package includes XML schemas and related files. %prep %setup -q %patch0 -p1 %build %configure make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} pkgdocdir=%{pkgdocdir} # Don't package unit tester if present. rm -f %{buildroot}/%{_bindir}/xmltoolingtest %check make %{?_smp_mflags} check %post -n libxmltooling6 -p /sbin/ldconfig %postun -n libxmltooling6 -p /sbin/ldconfig %files -n libxmltooling6 %defattr(-,root,root,-) %{_libdir}/*.so.* %files -n xmltooling-schemas %defattr(-,root,root,-) %dir %{_datadir}/xml/xmltooling %{_datadir}/xml/xmltooling/* %files -n libxmltooling-devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/xmltooling.pc %doc %{pkgdocdir} %changelog ++++++ xmltooling-1.5.5-doxygen_timestamp.patch ++++++ Index: xmltooling-1.5.5/doxygen.cfg =================================================================== --- xmltooling-1.5.5.orig/doxygen.cfg +++ xmltooling-1.5.5/doxygen.cfg @@ -140,6 +140,7 @@ HTML_OUTPUT = html HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = +HTML_TIMESTAMP = NO HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = $(GENERATE_CHM)

1 0

commit spamassassin for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2015-08-29 20:04:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spamassassin" Changes: -------- --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2015-08-25 08:57:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2015-08-29 20:04:06.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 26 14:18:20 UTC 2015 - hsk(a)imb-jena.de + +- disable again "make test" (seems not to like being run offline) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.XV6Qh9/_old 2015-08-29 20:04:07.000000000 +0200 +++ /var/tmp/diff_new_pack.XV6Qh9/_new 2015-08-29 20:04:07.000000000 +0200 @@ -198,10 +198,6 @@ # fails now... FIGURE out why #%#{__make} test -%if 0%{?suse_version} >= 1320 -%{__make} test -%endif - %install ## perl-Mail-SpamAssassin stuff %perl_make_install

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2015-08-29 20:03:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2015-08-21 12:42:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2015-08-29 20:04:01.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Aug 26 19:25:07 UTC 2015 - mfilka(a)suse.com + +- bnc#897129 + - AutoYaST will no longer ignore firewall settings if + keep_install_network is enabled +- 3.1.149 +------------------------------------------------------------------- +Wed Aug 26 15:17:35 UTC 2015 - igonzalezsosa(a)suse.com + +- Add a Mode#auto method + +------------------------------------------------------------------- +Wed Aug 26 15:09:06 CEST 2015 - schubi(a)suse.de + +- Checking cpuinfo_flags correctly while evaluating kernel packages + for i586. (bnc#943297) +- 3.1.148 + +------------------------------------------------------------------- Old: ---- yast2-3.1.147.tar.bz2 New: ---- yast2-3.1.149.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.9KmaOS/_old 2015-08-29 20:04:02.000000000 +0200 +++ /var/tmp/diff_new_pack.9KmaOS/_new 2015-08-29 20:04:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.147 +Version: 3.1.149 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.147.tar.bz2 -> yast2-3.1.149.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.147/library/general/src/modules/Mode.rb new/yast2-3.1.149/library/general/src/modules/Mode.rb --- old/yast2-3.1.147/library/general/src/modules/Mode.rb 2015-08-20 12:26:09.000000000 +0200 +++ new/yast2-3.1.149/library/general/src/modules/Mode.rb 2015-08-27 11:16:08.000000000 +0200 @@ -53,15 +53,15 @@ # # It has these mutually exclusive values and corresponding boolean queries: # <table> - # <tr><th> {#mode} value </th> <th colspan=2> boolean shortcut </th></tr> - # <tr><td> normal </td> <td colspan=2> {#normal} </td></tr> + # <tr><th> {#mode} value </th> <th colspan=3> boolean shortcut </th></tr> + # <tr><td> normal </td> <td colspan=3> {#normal} </td></tr> # <tr><td> installation </td> <td rowspan=3> {#installation} </td></tr> - # <tr><td> autoinstallation </td> <td> {#autoinst} (short!) </td></tr> - # <tr><td> live_installation </td><td> {#live_installation} </td></tr> - # <tr><td> autoinst_config </td> <td colspan=2> {#config} </td></tr> + # <tr><td> live_installation </td><td colspan=2> {#live_installation} </td></tr> + # <tr><td> autoinstallation </td> <td colspan=1> {#autoinst} (short!) </td><td rowspan=2>#auto</td></tr> + # <tr><td> autoupgrade </td> <td colspan=2> {#autoupgrade} </td></tr> + # <tr><td> autoinst_config </td> <td colspan=3> {#config} </td></tr> # <tr><td> update </td> <td rowspan=2> {#update} </td></tr> - # <tr><td> autoupgrade </td> <td> {#autoupgrade} </td></tr> - # <tr><td> repair (obsolete) </td><td colspan=2> {#repair} </td></tr> + # <tr><td> repair (obsolete) </td><td colspan=3> {#repair} </td></tr> # </table> # # # *UI* mode @@ -284,6 +284,11 @@ mode == "autoupgrade" end + # Doing auto-installation or auto-upgrade with AutoYaST. + def auto + autoinst || autoupgrade + end + # Configuration for {#autoinst}, usually in the running system. # # @note also true during the installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.147/library/general/test/mode_test.rb new/yast2-3.1.149/library/general/test/mode_test.rb --- old/yast2-3.1.147/library/general/test/mode_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.149/library/general/test/mode_test.rb 2015-08-27 11:16:08.000000000 +0200 @@ -0,0 +1,377 @@ +#! /usr/bin/env rspec + +require_relative "test_helper" + +Yast.import "Mode" + +describe Yast::Mode do + before do + Yast::Mode.Initialize() + end + + describe "#SetMode" do + it "sets mode to given one" do + Yast::Mode.SetMode("installation") + expect(Yast::Mode.mode).to eq("installation") + end + + context "when given mode does not exist" do + it "changes the mode but logs an error" do + expect(Yast::Builtins).to receive(:y2error).with("Unknown mode %1", "unknown") + Yast::Mode.SetMode("unknown") + expect(Yast::Mode.mode).to eq("unknown") + end + end + end + + describe "#SetTest" do + it "sets test mode to given one" do + Yast::Mode.SetTest("test") + expect(Yast::Mode.testMode).to eq("test") + end + + context "when given test mode does not exist" do + it "changes the test mode but logs an error" do + expect(Yast::Builtins).to receive(:y2error).with("Unknown test mode %1", "unknown") + Yast::Mode.SetTest("unknown") + expect(Yast::Mode.testMode).to eq("unknown") + end + end + end + + describe "#SetUI" do + it "sets the UI mode" do + Yast::Mode.SetUI("dialog") + expect(Yast::Mode.ui).to eq("dialog") + end + + context "when given UI mode is unknown" do + it "changes the UI mode but logs an error" do + expect(Yast::Builtins).to receive(:y2error).with("Unknown UI mode %1", "unknown") + Yast::Mode.SetUI("unknown") + expect(Yast::Mode.ui).to eq("unknown") + end + end + end + + describe "#installation" do + before do + Yast::Mode.SetMode(mode) + end + + context "when mode is 'installation'" do + let(:mode) { "installation" } + + it "returns true" do + expect(Yast::Mode.installation).to eq(true) + end + end + + context "when mode is 'autoinstallation'" do + let(:mode) { "autoinstallation" } + + it "returns true" do + expect(Yast::Mode.installation).to eq(true) + end + end + + context "when mode is 'live_installation'" do + let(:mode) { "live_installation" } + + it "returns true" do + expect(Yast::Mode.installation).to eq(true) + end + end + + context "when mode is not 'installation', 'autoinstallation' nor 'live_installation'" do + let(:mode) { "update" } + + it "returns false" do + expect(Yast::Mode.installation).to eq(false) + end + end + end + + describe "#live_installation" do + before do + Yast::Mode.SetMode(mode) + end + + context "when mode is 'live_installation'" do + let(:mode) { "live_installation" } + + it "returns true" do + expect(Yast::Mode.live_installation).to eq(true) + end + end + + context "when mode is not 'live_installation'" do + let(:mode) { "installation" } + + it "returns false" do + expect(Yast::Mode.live_installation).to eq(false) + end + end + end + + describe "#update" do + before do + Yast::Mode.SetMode(mode) + end + + context "when mode is 'update'" do + let(:mode) { "update" } + + it "returns true" do + expect(Yast::Mode.update).to eq(true) + end + end + + context "when mode is 'autoupgrade'" do + let(:mode) { "autoupgrade" } + + it "returns true" do + expect(Yast::Mode.update).to eq(true) + end + end + + context "when mode is not 'update' nor 'autoupgrade'" do + let(:mode) { "installation" } + + it "returns false" do + expect(Yast::Mode.update).to eq(false) + end + end + end + + describe "#Depeche" do + it "returns true :)" do + expect(Yast::Mode.Depeche).to eq(true) + end + end + + describe "#normal" do + before do + Yast::Mode.SetMode(mode) + end + + context "when mode is 'normal'" do + let(:mode) { "normal" } + + it "returns true" do + expect(Yast::Mode.normal).to eq(true) + end + end + + context "when mode is not 'normal'" do + let(:mode) { "other" } + + it "returns false" do + expect(Yast::Mode.normal).to eq(false) + end + end + end + + describe "#repair" do + before do + Yast::Mode.SetMode(mode) + end + + context "when mode is 'repair'" do + let(:mode) { "repair" } + + it "returns true" do + expect(Yast::Mode.repair).to eq(true) + end + end + + context "when mode is not 'repair'" do + let(:mode) { "other" } + + it "returns false" do + expect(Yast::Mode.repair).to eq(false) + end + end + end + + describe "#autoinst" do + before do + Yast::Mode.SetMode(mode) + end + + context "when mode is 'autoinst'" do + let(:mode) { "autoinstallation" } + + it "returns true" do + expect(Yast::Mode.autoinst).to eq(true) + end + end + + context "when mode is not 'autoinst'" do + let(:mode) { "other" } + + it "returns false" do + expect(Yast::Mode.autoinst).to eq(false) + end + end + end + + describe "#autoupgrade" do + before do + Yast::Mode.SetMode(mode) + end + + context "when mode is 'autoupgrade'" do + let(:mode) { "autoupgrade" } + + it "returns true" do + expect(Yast::Mode.autoupgrade).to eq(true) + end + end + + context "when mode is not 'autoupgrade'" do + let(:mode) { "other" } + + it "returns false" do + expect(Yast::Mode.autoupgrade).to eq(false) + end + end + end + + describe "#auto" do + context "when Mode.autoinst is true" do + before do + allow(Yast::Mode).to receive(:autoinst).and_return(true) + end + + it "returns true" do + expect(Yast::Mode.auto).to eq(true) + end + end + + context "when Mode.autoupgrade is true" do + before do + allow(Yast::Mode).to receive(:autoupgrade).and_return(true) + end + + it "returns true" do + expect(Yast::Mode.auto).to eq(true) + end + end + + context "when Mode.autoinst and Mode.autoupgrade are false" do + before do + allow(Yast::Mode).to receive(:autoinst).and_return(false) + allow(Yast::Mode).to receive(:autoupgrade).and_return(false) + end + + it "returns false" do + expect(Yast::Mode.auto).to eq(false) + end + end + end + + describe "#config" do + before do + Yast::Mode.SetMode(mode) + end + + context "when mode is 'autoinst_config'" do + let(:mode) { "autoinst_config" } + + it "returns true" do + expect(Yast::Mode.config).to eq(true) + end + end + + context "when mode is not 'autoinst_config'" do + let(:mode) { "other" } + + it "returns false" do + expect(Yast::Mode.config).to eq(false) + end + end + end + + describe "#test" do + before do + Yast::Mode.SetTest(mode) + end + + context "when test mode is 'test'" do + let(:mode) { "test" } + + it "returns true" do + expect(Yast::Mode.test).to eq(true) + end + end + + context "when test mode is 'screenshot'" do + let(:mode) { "screenshot" } + + it "returns true" do + expect(Yast::Mode.test).to eq(true) + end + end + + context "when test mode is 'testsuite'" do + let(:mode) { "testsuite" } + + it "returns true" do + expect(Yast::Mode.test).to eq(true) + end + end + + context "when test mode is not 'test', 'screenshot' or 'testsuite'" do + let(:mode) { "other" } + + it "returns false" do + expect(Yast::Mode.test).to eq(false) + end + end + end + + describe "#testsuite" do + before do + Yast::Mode.SetTest(mode) + end + + context "when test mode is 'testsuite'" do + let(:mode) { "testsuite" } + + it "returns true" do + expect(Yast::Mode.testsuite).to eq(true) + end + end + + context "when test mode is not 'testsuite'" do + let(:mode) { "other" } + + it "returns false" do + expect(Yast::Mode.testsuite).to eq(false) + end + end + end + + describe "#commandline" do + before do + Yast::Mode.SetUI(mode) + end + + context "when UI mode is 'commandline'" do + let(:mode) { "commandline" } + + it "returns true" do + expect(Yast::Mode.commandline).to eq(true) + end + end + + context "when UI mode is not 'commandline'" do + let(:mode) { "other" } + + it "returns false" do + expect(Yast::Mode.commandline).to eq(false) + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.147/library/network/src/modules/SuSEFirewall.rb new/yast2-3.1.149/library/network/src/modules/SuSEFirewall.rb --- old/yast2-3.1.147/library/network/src/modules/SuSEFirewall.rb 2015-08-20 12:26:09.000000000 +0200 +++ new/yast2-3.1.149/library/network/src/modules/SuSEFirewall.rb 2015-08-27 11:16:08.000000000 +0200 @@ -1453,10 +1453,10 @@ # # @param map <string, any> with configuration def Import(import_settings) - import_settings = deep_copy(import_settings) - SetModified() - @SETTINGS = deep_copy(import_settings) + @configuration_has_been_read = true + + SetModified() nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.147/library/system/src/modules/Kernel.rb new/yast2-3.1.149/library/system/src/modules/Kernel.rb --- old/yast2-3.1.147/library/system/src/modules/Kernel.rb 2015-08-20 12:26:09.000000000 +0200 +++ new/yast2-3.1.149/library/system/src/modules/Kernel.rb 2015-08-27 11:16:08.000000000 +0200 @@ -362,7 +362,7 @@ cpuflags = [] # bugzilla #303842 - if !cpuflags.nil? + if cpuinfo_flags cpuflags = cpuinfo_flags.empty? ? [] : cpuinfo_flags.split(" ") else Builtins.y2error("Cannot read cpuflags") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.147/library/system/test/kernel_test.rb new/yast2-3.1.149/library/system/test/kernel_test.rb --- old/yast2-3.1.147/library/system/test/kernel_test.rb 2015-08-20 12:26:09.000000000 +0200 +++ new/yast2-3.1.149/library/system/test/kernel_test.rb 2015-08-27 11:16:08.000000000 +0200 @@ -39,6 +39,18 @@ end end + describe "#GetPackages" do + it "returns kernel packages for i386 and no cpu info flags" do + allow(Yast::Arch).to receive(:architecture).and_return("i386") + allow(Yast::Arch).to receive(:is_uml).and_return(false) + allow(Yast::Arch).to receive(:is_xen).and_return(false) + expect(Yast::SCR).to receive(:Read).with(path(".probe.is_xen")).and_return(false) + expect(Yast::SCR).to receive(:Read).with(path(".proc.cpuinfo.value.\"0\".\"flags\"")).and_return(nil) + expect(Yast::SCR).to receive(:Read).with(path(".probe.memory")).and_return(10) + expect(Yast::Kernel.GetPackages).to eq(["kernel-default"]) + end + end + describe "#module_to_be_loaded?" do it "tests whether module is loaded on boot" do ["module-a", "module-b", "user-module-1", "user-module-2", "user-module-3", "user-module-4"].each do |kernel_module| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.147/package/yast2.changes new/yast2-3.1.149/package/yast2.changes --- old/yast2-3.1.147/package/yast2.changes 2015-08-20 12:26:09.000000000 +0200 +++ new/yast2-3.1.149/package/yast2.changes 2015-08-27 11:16:08.000000000 +0200 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Wed Aug 26 19:25:07 UTC 2015 - mfilka(a)suse.com + +- bnc#897129 + - AutoYaST will no longer ignore firewall settings if + keep_install_network is enabled +- 3.1.149 +------------------------------------------------------------------- +Wed Aug 26 15:17:35 UTC 2015 - igonzalezsosa(a)suse.com + +- Add a Mode#auto method + +------------------------------------------------------------------- +Wed Aug 26 15:09:06 CEST 2015 - schubi(a)suse.de + +- Checking cpuinfo_flags correctly while evaluating kernel packages + for i586. (bnc#943297) +- 3.1.148 + +------------------------------------------------------------------- Thu Aug 20 08:18:47 UTC 2015 - lslezak(a)suse.cz - "yast2" script - handle also the reboot flag the same way as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.147/package/yast2.spec new/yast2-3.1.149/package/yast2.spec --- old/yast2-3.1.147/package/yast2.spec 2015-08-20 12:26:09.000000000 +0200 +++ new/yast2-3.1.149/package/yast2.spec 2015-08-27 11:16:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.147 +Version: 3.1.149 Release: 0 Url: https://github.com/yast/yast-yast2

1 0

commit cluster-glue for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2015-08-29 20:03:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old) and /work/SRC/openSUSE:Factory/.cluster-glue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cluster-glue" Changes: -------- --- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes 2015-08-17 17:25:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2015-08-29 20:03:55.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 26 22:30:12 UTC 2015 - kgronlund(a)suse.com + +- high: hb_report: Always prefer syslog if available (bsc#942906) +- low: hb_report: Increase time to wait for the logmark +- low: hb_report: Collect libqb version (bsc#943327) +- Add 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch +- Add 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch +- Add 0005-low-hb_report-collect-libqb-version-bsc-943327.patch + +------------------------------------------------------------------- New: ---- 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch 0005-low-hb_report-collect-libqb-version-bsc-943327.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.yXvVoP/_old 2015-08-29 20:03:56.000000000 +0200 +++ /var/tmp/diff_new_pack.yXvVoP/_new 2015-08-29 20:03:56.000000000 +0200 @@ -56,6 +56,12 @@ Patch6: cluster-glue-gcc5.patch # PATCH-FIX-OPENSUSE: high: hb_report: Prefer pacemaker.log if it exists (bsc#941681) Patch7: 0002-high-hb_report-Prefer-pacemaker.log-if-it-exists-bsc.patch +# PATCH-FIX-OPENSUSE: high: hb_report: Always prefer syslog if available (bsc#942906) +Patch8: 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch +# PATCH-FIX-OPENSUSE: low: hb_report: Increase time to wait for the logmark +Patch9: 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch +# PATCH-FIX-OPENSUSE: low: hb_report: Collect libqb version (bsc#943327) +Patch10: 0005-low-hb_report-collect-libqb-version-bsc-943327.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: OpenIPMI-devel BuildRequires: asciidoc @@ -165,6 +171,9 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 ########################################################### %build ++++++ 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch ++++++ commit 395dad096f401deeec3bca80c3f9db7a38128a53 Author: Kristoffer Grönlund <krig(a)koru.se> Date: Tue Aug 25 14:47:15 2015 +0200 high: hb_report: Always prefer syslog if available (bsc#942906) diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in index 07ab23c..b228665 100755 --- a/hb_report/hb_report.in +++ b/hb_report/hb_report.in @@ -295,10 +295,6 @@ logmark() { # findlog() { local logf="" - if [ -f "$PCMK_LOG" ]; then - echo $PCMK_LOG - return - fi if [ "$HA_LOGFACILITY" ]; then logf=`findmsg $UNIQUE_MSG | awk '{print $1}'` @@ -308,13 +304,16 @@ findlog() { return fi - - collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F if [ -f "$WORKDIR/$JOURNAL_F" ]; then echo $WORKDIR/$JOURNAL_F return fi + if [ -f "$PCMK_LOG" ]; then + echo $PCMK_LOG + return + fi + echo ${HA_DEBUGFILE:-$HA_LOGFILE} [ "${HA_DEBUGFILE:-$HA_LOGFILE}" ] && debug "will try with ${HA_DEBUGFILE:-$HA_LOGFILE}" @@ -1051,6 +1050,9 @@ getlog() { local outf outf=$WORKDIR/$HALOG_F + # collect journal from systemd + collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F + if [ "$HA_LOG" ]; then # log provided by the user? [ -f "$HA_LOG" ] || { # not present is_collector || # warning if not on slave diff --git a/hb_report/utillib.sh b/hb_report/utillib.sh index 1f16967..ff54df8 100644 --- a/hb_report/utillib.sh +++ b/hb_report/utillib.sh @@ -118,22 +118,14 @@ findmsg() { mark=$1 log="" - if [ -f /var/log/pacemaker.log ]; then - log=`grep -l -e "$mark" /var/log/pacemaker.log` - if [ ! "$log" ]; then - log=`grep -l -e "$mark" /var/log/pacemaker.log*` && break - fi - fi + for d in $syslogdirs; do + [ -d $d ] || continue + log=`grep -l -e "$mark" $d/$favourites` && break + test "$log" && break + log=`grep -l -e "$mark" $d/*` && break + test "$log" && break + done 2>/dev/null - if [ ! "$log" ]; then - for d in $syslogdirs; do - [ -d $d ] || continue - log=`grep -l -e "$mark" $d/$favourites` && break - test "$log" && break - log=`grep -l -e "$mark" $d/*` && break - test "$log" && break - done 2>/dev/null - fi [ "$log" ] && ls -t $log | tr '\n' ' ' [ "$log" ] && ++++++ 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch ++++++ commit 77a0a18e5bc82bb66eaf84e29b083cbb804dbda6 Author: Kristoffer Grönlund <krig(a)koru.se> Date: Tue Aug 25 15:05:38 2015 +0200 low: hb_report: Increase time to wait for the logmark diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in index b228665..0817b74 100755 --- a/hb_report/hb_report.in +++ b/hb_report/hb_report.in @@ -1406,7 +1406,7 @@ if is_collector && [ "$HA_LOGFACILITY" ]; then logmark $HA_LOGFACILITY.$HA_LOGLEVEL $UNIQUE_MSG # allow for the log message to get (hopefully) written to the # log file - sleep 1 + sleep 2 fi # ++++++ 0005-low-hb_report-collect-libqb-version-bsc-943327.patch ++++++ commit 890d86e8bbd0bf4f762ebafa0f6dd9f566022788 Author: Kristoffer Grönlund <krig(a)koru.se> Date: Wed Aug 26 18:21:27 2015 +0200 low: hb_report: Collect libqb version (bsc#943327) diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in index 0817b74..342a145 100755 --- a/hb_report/hb_report.in +++ b/hb_report/hb_report.in @@ -1279,7 +1279,7 @@ CORES_DIRS="`2>/dev/null ls -d $HA_VARLIB/cores $PCMK_LIB/cores | uniq`" PACKAGES="pacemaker libpacemaker3 pacemaker-pygui pacemaker-pymgmt pymgmt-client openais libopenais2 libopenais3 corosync libcorosync4 -resource-agents cluster-glue libglue2 ldirectord +resource-agents cluster-glue libglue2 ldirectord libqb0 heartbeat heartbeat-common heartbeat-resources libheartbeat2 ocfs2-tools ocfs2-tools-o2cb ocfs2console ocfs2-kmp-default ocfs2-kmp-pae ocfs2-kmp-xen ocfs2-kmp-debug ocfs2-kmp-trace

1 0

commit sddm for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2015-08-29 20:03:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sddm" Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2015-06-02 10:00:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2015-08-29 20:03:51.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 26 07:45:11 UTC 2015 - herbert(a)graeber-clan.de + +- Added patch from upstream sddm-wait-for-display-script.patch: + avoid a black screen (boo#942815) + +------------------------------------------------------------------- New: ---- sddm-wait-for-display-script.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.XL9uhb/_old 2015-08-29 20:03:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XL9uhb/_new 2015-08-29 20:03:52.000000000 +0200 @@ -42,6 +42,8 @@ # PATCH-FIX-OPENSUSE sddm-service-handle-plymouth.patch -- sddm has some rudimentary support for plymouth handling, which only works with plymouth-quit.service # (the servce is not enabled on openSUSE). For users of sddm.service, we need to issue plymouth quit command by hand in this case Patch4: sddm-service-handle-plymouth.patch +# PATCH-FIX-OPENSUSE sddm-wait-for-display-script.patch -- From upstream: wait for the display script finishing, avoid a black screen (boo#942815) +Patch5: sddm-wait-for-display-script.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -101,6 +103,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %cmake \ ++++++ sddm-wait-for-display-script.patch ++++++ >From 7ed4ab11656c4b75f278b34883f4e28598b2b13a Mon Sep 17 00:00:00 2001 From: Robert Xu <robxu9(a)gmail.com> Date: Wed, 14 Jan 2015 20:00:36 -0600 Subject: [PATCH 1/2] wait for the display script to complete Signed-off-by: Pier Luigi Fiorini <pierluigi.fiorini(a)gmail.com> --- src/daemon/XorgDisplayServer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp index 2b431ca..b0da10f 100644 --- a/src/daemon/XorgDisplayServer.cpp +++ b/src/daemon/XorgDisplayServer.cpp @@ -290,6 +290,7 @@ namespace SDDM { // start display setup script qDebug() << "Running display setup script " << displayCommand; displayScript->start(displayCommand); + displayScript->waitForFinished(-1); } void XorgDisplayServer::changeOwner(const QString &fileName) { -- 2.5.0 >From f083c1e9c7f675bd46589e522e1747e9ee77d2a3 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini <pierluigi.fiorini(a)gmail.com> Date: Wed, 24 Jun 2015 22:13:33 +0200 Subject: [PATCH 2/2] Wait for display setup script no more than 30s Kill the script if it takes long. --- src/daemon/XorgDisplayServer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp index b0da10f..15180e0 100644 --- a/src/daemon/XorgDisplayServer.cpp +++ b/src/daemon/XorgDisplayServer.cpp @@ -290,7 +290,10 @@ namespace SDDM { // start display setup script qDebug() << "Running display setup script " << displayCommand; displayScript->start(displayCommand); - displayScript->waitForFinished(-1); + + // wait for finished + if (!displayScript->waitForFinished(30000)) + displayScript->kill(); } void XorgDisplayServer::changeOwner(const QString &fileName) { -- 2.5.0

1 0