Hello community, here is the log from the commit of package libkdegames for openSUSE:Factory checked in at 2015-01-08 23:18:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdegames (Old) and /work/SRC/openSUSE:Factory/.libkdegames.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkdegames" Changes: -------- --- /work/SRC/openSUSE:Factory/libkdegames/libkdegames.changes 2014-11-19 20:24:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkdegames.new/libkdegames.changes 2015-01-08 23:19:02.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 17 20:41:22 UTC 2014 - [email protected] + +- Update to KDE Applications 14.12.0 + * KDE Applications 14.12.0 + * See https://www.kde.org/announcements/announce-applications-14.12.0.php + +------------------------------------------------------------------- Old: ---- libkdegames-4.14.3.tar.xz New: ---- libkdegames-14.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdegames.spec ++++++ --- /var/tmp/diff_new_pack.xOHTAP/_old 2015-01-08 23:19:03.000000000 +0100 +++ /var/tmp/diff_new_pack.xOHTAP/_new 2015-01-08 23:19:03.000000000 +0100 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 4.14.3 +Version: 14.12.0 Release: 0 Source0: libkdegames-%{version}.tar.xz Patch1: libkdegames-bnc793185.patch ++++++ libkdegames-4.14.3.tar.xz -> libkdegames-14.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdegames-4.14.3/CMakeLists.txt new/libkdegames-14.12.0/CMakeLists.txt --- old/libkdegames-4.14.3/CMakeLists.txt 2014-10-25 09:16:37.000000000 +0200 +++ new/libkdegames-14.12.0/CMakeLists.txt 2014-10-29 01:19:45.000000000 +0100 @@ -15,10 +15,10 @@ endif(NOT COMPILING_KDEGAMES) macro_optional_find_package(OpenAL) -macro_log_feature(OPENAL_FOUND "OpenAL" "OpenAL (Open Audio Library) is a free software cross-platform audio API." "http://connect.creativelabs.com/openal"; FALSE "" "Phonon is used as a fallback, but low-latency sound output is only available with OpenAL/SndFile.") +macro_log_feature(OPENAL_FOUND "OpenAL" "OpenAL (Open Audio Library) is a free software cross-platform audio API." "http://connect.creativelabs.com/openal"; TRUE "" "") macro_optional_find_package(SndFile) -macro_log_feature(SNDFILE_FOUND "SndFile" "libsndfile is a C library written by Erik de Castro Lopo for reading and writing audio files." "http://www.mega-nerd.com/libsndfile/"; FALSE "" "Phonon is used as a fallback, but low-latency sound output is only available with OpenAL/SndFile.") +macro_log_feature(SNDFILE_FOUND "SndFile" "libsndfile is a C library written by Erik de Castro Lopo for reading and writing audio files." "http://www.mega-nerd.com/libsndfile/"; TRUE "" "") find_package(KDeclarative) macro_log_feature(KDECLARATIVE_FOUND "KDeclarative" "KDeclarative is a KDE library for KDE specific QML support." "http://kde.org"; TRUE "" "KDeclarative library is required for QML support in KDE Games.") @@ -58,19 +58,12 @@ endif (NOT SNDFILE_WORKS) endif (SNDFILE_FOUND AND USE_OPENAL_SNDFILE) -if (OPENAL_FOUND AND SNDFILE_FOUND AND SNDFILE_WORKS) - message (STATUS "INCLUDES FOR SOUND: " ${OPENAL_INCLUDE_DIR} " " ${SNDFILE_INCLUDE_DIR}) - message (STATUS "LIBRARIES FOR SOUND: " ${OPENAL_LIBRARY} " " ${SNDFILE_LIBRARIES}) - include_directories(${OPENAL_INCLUDE_DIR} ${SNDFILE_INCLUDE_DIR}) - set(KGAUDIO_LINKLIBS ${OPENAL_LIBRARY} ${SNDFILE_LIBRARIES}) - set(KGAUDIO_BACKEND openal) - set(KGAUDIO_BACKEND_OPENAL TRUE) # for configure_file() below -else (OPENAL_FOUND AND SNDFILE_FOUND AND SNDFILE_WORKS) - message (STATUS "FALLBACK LIBRARY FOR SOUND: " ${KDE4_PHONON_LIBS}) - set(KGAUDIO_LINKLIBS ${KDE4_PHONON_LIBS}) - set(KGAUDIO_BACKEND phonon) - set(KGAUDIO_BACKEND_PHONON TRUE) # for configure_file() below -endif (OPENAL_FOUND AND SNDFILE_FOUND AND SNDFILE_WORKS) +message (STATUS "INCLUDES FOR SOUND: " ${OPENAL_INCLUDE_DIR} " " ${SNDFILE_INCLUDE_DIR}) +message (STATUS "LIBRARIES FOR SOUND: " ${OPENAL_LIBRARY} " " ${SNDFILE_LIBRARIES}) +include_directories(${OPENAL_INCLUDE_DIR} ${SNDFILE_INCLUDE_DIR}) +set(KGAUDIO_LINKLIBS ${OPENAL_LIBRARY} ${SNDFILE_LIBRARIES}) +set(KGAUDIO_BACKEND openal) +set(KGAUDIO_BACKEND_OPENAL TRUE) # for configure_file() below configure_file(libkdegames_capabilities.h.in ${CMAKE_CURRENT_BINARY_DIR}/libkdegames_capabilities.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdegames-4.14.3/audio/kgaudioscene-phonon.cpp new/libkdegames-14.12.0/audio/kgaudioscene-phonon.cpp --- old/libkdegames-4.14.3/audio/kgaudioscene-phonon.cpp 2014-10-25 09:16:37.000000000 +0200 +++ new/libkdegames-14.12.0/audio/kgaudioscene-phonon.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -/*************************************************************************** - * Copyright 2011 Stefan Majewsky <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Library General Public License * - * version 2 as published by the Free Software Foundation * - * * - * 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 Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include "kgaudioscene.h" - -#include <Phonon/AudioOutput> - -KgAudioScene::Capabilities KgAudioScene::capabilities() -{ - return 0; -} - -QPointF KgAudioScene::listenerPos() -{ - return QPointF(0.0, 0.0); -} - -void KgAudioScene::setListenerPos(const QPointF& pos) -{ - Q_UNUSED(pos) -} - -qreal KgAudioScene::volume() -{ - return Phonon::AudioOutput(Phonon::GameCategory).volume(); -} - -void KgAudioScene::setVolume(qreal volume) -{ - Phonon::AudioOutput(Phonon::GameCategory).setVolume(volume); -} - -bool KgAudioScene::hasError() -{ - return false; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdegames-4.14.3/audio/kgsound-openal.cpp new/libkdegames-14.12.0/audio/kgsound-openal.cpp --- old/libkdegames-4.14.3/audio/kgsound-openal.cpp 2014-10-25 09:16:37.000000000 +0200 +++ new/libkdegames-14.12.0/audio/kgsound-openal.cpp 2014-10-29 01:19:45.000000000 +0100 @@ -19,7 +19,7 @@ #include "kgsound.h" #include "kgopenalruntime_p.h" -#include <sndfile.hh> //TODO: use Phonon instead of libsndfile for decoding +#include <sndfile.hh> #include <KDE/KDebug> class KgSound::Private diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdegames-4.14.3/audio/kgsound-phonon.cpp new/libkdegames-14.12.0/audio/kgsound-phonon.cpp --- old/libkdegames-4.14.3/audio/kgsound-phonon.cpp 2014-10-25 09:16:37.000000000 +0200 +++ new/libkdegames-14.12.0/audio/kgsound-phonon.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,168 +0,0 @@ -/*************************************************************************** - * Copyright 2011 Stefan Majewsky <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Library General Public License * - * version 2 as published by the Free Software Foundation * - * * - * 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 Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include "kgsound.h" - -#include <Phonon/MediaObject> -#include <QDateTime> - -class KgSound::Private -{ - public: - qreal m_volume; - bool m_valid; - qint64 m_lastPlayedTime; - int m_nextSource; - Phonon::MediaObject* m_sound1; - Phonon::MediaObject* m_sound2; - - Private() : m_volume(1.0), m_valid(false), m_lastPlayedTime(0), m_nextSource(1), m_sound1(NULL), m_sound2(NULL) {} - - ~Private() - { - delete m_sound1; - delete m_sound2; - m_sound1 = 0; - m_sound2 = 0; - } -}; - -KgSound::KgSound(const QString& file, QObject* parent) - : QObject(parent) - , d(new Private) -{ - d->m_sound1 = Phonon::createPlayer(Phonon::GameCategory); - d->m_sound1->setCurrentSource(file); - d->m_sound2 = Phonon::createPlayer(Phonon::GameCategory); - d->m_sound2->setCurrentSource(file); - d->m_valid = d->m_sound1->isValid() && d->m_sound2->isValid(); -} - -KgSound::~KgSound() -{ - delete d; -} - -bool KgSound::isValid() const -{ - return d->m_valid; -} - -KgSound::PlaybackType KgSound::playbackType() const -{ - return KgSound::AmbientPlayback; -} - -void KgSound::setPlaybackType(KgSound::PlaybackType type) -{ - Q_UNUSED(type) -} - -QPointF KgSound::pos() const -{ - return QPointF(0.0, 0.0); -} - -void KgSound::setPos(const QPointF& pos) -{ - Q_UNUSED(pos) -} - -qreal KgSound::volume() const -{ - //FIXME - return 1.0; -} - -void KgSound::setVolume(qreal volume) -{ - //FIXME -} - -bool KgSound::hasError() const -{ - if (d->m_sound1 && d->m_sound1->state() == Phonon::ErrorState) - { - return true; - } - if (d->m_sound2 && d->m_sound2->state() == Phonon::ErrorState) - { - return true; - } - return false; -} - -void KgSound::start() -{ - if(!d->m_sound1 || !d->m_sound2) - { - return; - } - - QDateTime now = QDateTime::currentDateTime(); - qint64 timeNow = now.toTime_t() * 1000 + now.time().msec(); - - if(timeNow - d->m_lastPlayedTime > 20) - { - if(d->m_nextSource == 1) - { - if(d->m_sound1->state() == Phonon::StoppedState) - { - d->m_nextSource = 2; - d->m_sound1->play(); - } - else - { - d->m_sound1->stop(); - } - } - else - { - if(d->m_sound2->state() == Phonon::StoppedState) - { - d->m_nextSource = 1; - d->m_sound2->play(); - } - else - { - d->m_sound2->stop(); - } - } - d->m_lastPlayedTime = timeNow; - } -} - -void KgSound::start(const QPointF& pos) -{ - Q_UNUSED(pos) - //ignore parameter - start(); -} - -void KgSound::stop() -{ - if(!d->m_sound1 || !d->m_sound2) - { - return; - } - - d->m_sound1->stop(); - d->m_sound2->stop(); -} - -#include "kgsound.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdegames-4.14.3/libkdegames_capabilities.h.in new/libkdegames-14.12.0/libkdegames_capabilities.h.in --- old/libkdegames-4.14.3/libkdegames_capabilities.h.in 2014-10-25 09:16:37.000000000 +0200 +++ new/libkdegames-14.12.0/libkdegames_capabilities.h.in 2014-10-29 01:19:45.000000000 +0100 @@ -21,6 +21,5 @@ #define KGAUDIO_BACKEND "@KGAUDIO_BACKEND@" #cmakedefine KGAUDIO_BACKEND_OPENAL -#cmakedefine KGAUDIO_BACKEND_PHONON #endif // LIBKDEGAMES_CAPABILITIES_H -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
