rpms/qmmp/F-12 qmmp-0.3.1-projectM20.patch, NONE, 1.1 qmmp.spec, 1.17, 1.18
Karel Volný
kvolny at fedoraproject.org
Tue Jan 5 15:39:57 UTC 2010
Author: kvolny
Update of /cvs/pkgs/rpms/qmmp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17207
Modified Files:
qmmp.spec
Added Files:
qmmp-0.3.1-projectM20.patch
Log Message:
added patch wrt bug #551855
qmmp-0.3.1-projectM20.patch:
CMakeLists.txt | 5 +++
projectm.pro | 2 +
projectmplugin.cpp | 1
projectmplugin.h | 1
projectmwidget.cpp | 9 +++++
translations/projectm_plugin_cs.ts | 32 ++++++++++----------
translations/projectm_plugin_de.ts | 54 +++++++++++++++++-----------------
translations/projectm_plugin_it.ts | 36 +++++++++++-----------
translations/projectm_plugin_lt.ts | 36 +++++++++++-----------
translations/projectm_plugin_pl.ts | 32 ++++++++++----------
translations/projectm_plugin_ru.ts | 32 ++++++++++----------
translations/projectm_plugin_tr.ts | 32 ++++++++++----------
translations/projectm_plugin_uk_UA.ts | 32 ++++++++++----------
translations/projectm_plugin_zh_CN.ts | 32 ++++++++++----------
translations/projectm_plugin_zh_TW.ts | 32 ++++++++++----------
15 files changed, 191 insertions(+), 177 deletions(-)
--- NEW FILE qmmp-0.3.1-projectM20.patch ---
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/CMakeLists.txt qmmp-svn/src/plugins/Visual/projectm/CMakeLists.txt
--- qmmp-0.3.1/src/plugins/Visual/projectm/CMakeLists.txt 2009-07-13 12:39:08.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/CMakeLists.txt 2010-01-05 15:39:59.000000000 +0100
@@ -31,6 +31,11 @@
# projectM
pkg_search_module(PROJECTM libprojectM)
+pkg_search_module(PROJECTM_20 libprojectM>=2.0.0)
+
+IF(PROJECTM_20_FOUND)
+ADD_DEFINITIONS(-DPROJECTM_20)
+ENDIF(PROJECTM_20_FOUND)
SET(libprojectm_SRCS
projectmwidget.cpp
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/projectmplugin.cpp qmmp-svn/src/plugins/Visual/projectm/projectmplugin.cpp
--- qmmp-0.3.1/src/plugins/Visual/projectm/projectmplugin.cpp 2009-05-30 09:13:19.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/projectmplugin.cpp 2009-08-24 14:54:09.000000000 +0200
@@ -29,7 +29,6 @@
#include <libprojectM/projectM.hpp>
#include <qmmp/buffer.h>
-#include <qmmp/constants.h>
#include <qmmp/output.h>
#include "projectmwidget.h"
#include "projectmplugin.h"
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/projectmplugin.h qmmp-svn/src/plugins/Visual/projectm/projectmplugin.h
--- qmmp-0.3.1/src/plugins/Visual/projectm/projectmplugin.h 2009-02-28 18:17:07.000000000 +0100
+++ qmmp-svn/src/plugins/Visual/projectm/projectmplugin.h 2009-08-24 14:54:09.000000000 +0200
@@ -22,7 +22,6 @@
#include <QWidget>
#include <qmmp/visual.h>
-#include <qmmp/constants.h>
class QTimer;
class Buffer;
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/projectm.pro qmmp-svn/src/plugins/Visual/projectm/projectm.pro
--- qmmp-0.3.1/src/plugins/Visual/projectm/projectm.pro 2009-07-27 08:48:53.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/projectm.pro 2010-01-05 15:39:59.000000000 +0100
@@ -1,5 +1,7 @@
include(../../plugins.pri)
+#DEFINES += PROJECTM_20
+
TARGET =$$PLUGINS_PREFIX/Visual/projectm
QMAKE_CLEAN =$$PLUGINS_PREFIX/Visual/libprojectm.so
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/projectmwidget.cpp qmmp-svn/src/plugins/Visual/projectm/projectmwidget.cpp
--- qmmp-0.3.1/src/plugins/Visual/projectm/projectmwidget.cpp 2009-05-29 13:07:06.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/projectmwidget.cpp 2010-01-05 15:39:59.000000000 +0100
@@ -90,9 +90,18 @@
QStringList filters;
filters << "*.prjm" << "*.milk";
QFileInfoList l = presetDir.entryInfoList(filters);
+#ifdef PROJECTM_20
+ RatingList list;
+ list.push_back(3);
+ list.push_back(3);
+#endif
foreach (QFileInfo info, l)
{
+#if PROJECTM_20
+ m_projectM->addPresetURL (info.absoluteFilePath().toStdString(), info.fileName().toStdString(), list);
+#else
m_projectM->addPresetURL (info.absoluteFilePath().toStdString(), info.fileName().toStdString(), 1);
+#endif
}
createActions();
updateTitle();
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_cs.ts qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_cs.ts
--- qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_cs.ts 2009-10-04 19:04:50.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_cs.ts 2010-01-05 15:39:59.000000000 +0100
@@ -12,82 +12,82 @@
<context>
<name>ProjectMWidget</name>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>&Help</source>
<translation>&Nápověda</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>&Show Song Title</source>
<translation>&Zobrazit název skladby</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>F2</source>
<translation>F2</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>&Show Preset Name</source>
<translation>Zobrazit název &předvoleb</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>F3</source>
<translation>F3</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>&Next Preset</source>
<translation>&Další předvolby</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>N</source>
<translation>N</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>&Previous Preset</source>
<translation>Př&edchozí předvolby</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>P</source>
<translation>P</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>&Random Preset</source>
<translation>Ná&hodné předvolby</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>R</source>
<translation>R</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>&Lock Preset</source>
<translation>U&zamknout předvolby</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>L</source>
<translation>L</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>&Fullscreen</source>
<translation>&Celá obrazovka</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>F</source>
<translation>F</translation>
</message>
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_de.ts qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_de.ts
--- qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_de.ts 2009-10-04 19:04:50.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_de.ts 2010-01-05 15:39:59.000000000 +0100
@@ -12,84 +12,84 @@
<context>
<name>ProjectMWidget</name>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>&Help</source>
<translation>&Hilfe</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>&Show Song Title</source>
- <translation type="unfinished">Na&me des Titels anzeigen</translation>
+ <translation>Na&me des Titels anzeigen</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>F2</source>
<translation>F2</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>&Show Preset Name</source>
- <translation type="unfinished">N&ame der Voreinstellung anzeigen</translation>
+ <translation>N&ame der Voreinstellung anzeigen</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>F3</source>
<translation>F3</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>&Next Preset</source>
- <translation type="unfinished">&Nächste Voreinstellung</translation>
+ <translation>&Nächste Voreinstellung</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>N</source>
<translation>N</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>&Previous Preset</source>
- <translation type="unfinished">&Vorherige Voreinstellung</translation>
+ <translation>Vor&herige Voreinstellung</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>P</source>
- <translation type="unfinished">P</translation>
+ <translation>H</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>&Random Preset</source>
- <translation type="unfinished">&Zufällige Voreinstellung</translation>
+ <translation>&Zufällige Voreinstellung</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>R</source>
- <translation type="unfinished">Z</translation>
+ <translation>Z</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>&Lock Preset</source>
- <translation type="unfinished">V&oreinstellung sperren</translation>
+ <translation>V&oreinstellung sperren</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>L</source>
- <translation type="unfinished">O</translation>
+ <translation>O</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>&Fullscreen</source>
- <translation type="unfinished">&Vollbild</translation>
+ <translation>&Vollbild</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>F</source>
- <translation type="unfinished">V</translation>
+ <translation>V</translation>
</message>
</context>
<context>
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_it.ts qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_it.ts
--- qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_it.ts 2009-10-04 19:04:50.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_it.ts 2010-01-05 15:39:59.000000000 +0100
@@ -6,88 +6,88 @@
<message>
<location filename="../projectmplugin.cpp" line="40"/>
<source>ProjectM</source>
- <translation type="unfinished">Visualizzatore musicale ProjectM</translation>
+ <translation>Visualizzatore musicale ProjectM</translation>
</message>
</context>
<context>
<name>ProjectMWidget</name>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>&Help</source>
<translation>Aiuto</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>&Show Song Title</source>
<translation>Mostra il titolo del brano</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>F2</source>
<translation>F2</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>&Show Preset Name</source>
<translation>Mostra nome del brano programmato</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>F3</source>
<translation>F3</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>&Next Preset</source>
<translation>Brano programmato successivo</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>N</source>
<translation>N</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>&Previous Preset</source>
<translation>>Brano programmato precedente</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>P</source>
<translation>P</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>&Random Preset</source>
<translation>Brano programmato casuale</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>R</source>
<translation>R</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>&Lock Preset</source>
<translation>Blocca programmazione</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>L</source>
<translation>L</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>&Fullscreen</source>
<translation>&Schermo intero</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>F</source>
<translation>F</translation>
</message>
@@ -107,7 +107,7 @@
<message>
<location filename="../visualprojectmfactory.cpp" line="50"/>
<source>Qmmp ProjectM Visual Plugin</source>
- <translation type="unfinished"></translation>
+ <translation>Modulo Visulaizzatore Projectm per Qmmp</translation>
</message>
<message>
<location filename="../visualprojectmfactory.cpp" line="51"/>
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_lt.ts qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_lt.ts
--- qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_lt.ts 2009-10-04 19:04:50.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_lt.ts 2010-01-05 15:39:59.000000000 +0100
@@ -6,88 +6,88 @@
<message>
<location filename="../projectmplugin.cpp" line="40"/>
<source>ProjectM</source>
- <translation type="unfinished"></translation>
+ <translation>ProjectM</translation>
</message>
</context>
<context>
<name>ProjectMWidget</name>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>&Help</source>
<translation>&Pagalba</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>F1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>&Show Song Title</source>
<translation>&Rodyti dainos pavadinimą</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>F2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>&Show Preset Name</source>
<translation>&Rodyti vizualizacijos pavadinimą</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>F3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>&Next Preset</source>
<translation>&Sekanti</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>N</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>&Previous Preset</source>
<translation>&Atgal</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>P</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>&Random Preset</source>
<translation>&Atsitiktinė</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>&Lock Preset</source>
<translation>&Užrakinti</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>&Fullscreen</source>
<translation>&Visas ekranas</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>F</source>
<translation type="unfinished"></translation>
</message>
@@ -97,7 +97,7 @@
<message>
<location filename="../visualprojectmfactory.cpp" line="29"/>
<source>ProjectM</source>
- <translation type="unfinished"></translation>
+ <translation>ProjectM</translation>
</message>
<message>
<location filename="../visualprojectmfactory.cpp" line="49"/>
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_pl.ts qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_pl.ts
--- qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_pl.ts 2009-10-04 19:04:50.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_pl.ts 2010-01-05 15:39:59.000000000 +0100
@@ -12,82 +12,82 @@
<context>
<name>ProjectMWidget</name>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>&Help</source>
<translation>&Pomoc</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>F1</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>&Show Song Title</source>
<translation>Pokaż &tytuł utworu</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>F2</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>&Show Preset Name</source>
<translation>Pokaż nazwę &Wizualizacji</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>F3</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>&Next Preset</source>
<translation>&Następna animacja</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>N</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>&Previous Preset</source>
<translation>&Poprzednia animacja</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>P</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>&Random Preset</source>
<translation>&Losowa animacja</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>R</source>
<translation>R</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>&Lock Preset</source>
<translation>&Zablokuj animację</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>L</source>
<translation>L</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>&Fullscreen</source>
<translation>P&ełny ekran</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>F</source>
<translation></translation>
</message>
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_ru.ts qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_ru.ts
--- qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_ru.ts 2009-10-04 19:04:50.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_ru.ts 2010-01-05 15:39:59.000000000 +0100
@@ -12,82 +12,82 @@
<context>
<name>ProjectMWidget</name>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>&Help</source>
<translation>&Справка</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>F1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>&Show Song Title</source>
<translation>&Показать название песни</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>F2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>&Show Preset Name</source>
<translation>&Показать имя предустановки</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>F3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>&Next Preset</source>
<translation>&Следующая предустановка</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>N</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>&Previous Preset</source>
<translation>&Предыдущая предустановка</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>P</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>&Random Preset</source>
<translation>&Случайная предустановка</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>&Lock Preset</source>
<translation>&Заблокировать предустановку</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>&Fullscreen</source>
<translation>&Полноэкранный режим</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>F</source>
<translation type="unfinished"></translation>
</message>
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_tr.ts qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_tr.ts
--- qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_tr.ts 2009-10-04 19:04:50.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_tr.ts 2010-01-05 15:39:59.000000000 +0100
@@ -12,82 +12,82 @@
<context>
<name>ProjectMWidget</name>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>&Help</source>
<translation>&Yardım</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>&Show Song Title</source>
<translation>&Şarkı Başlığını Göster</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>F2</source>
<translation>F2</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>&Show Preset Name</source>
<translation>&Preset Adını Göster</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>F3</source>
<translation>F3</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>&Next Preset</source>
<translation>&Sonraki Preset</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>N</source>
<translation>N</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>&Previous Preset</source>
<translation>&Önceki Preset</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>P</source>
<translation>P</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>&Random Preset</source>
<translation>&Rastgele Preset</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>R</source>
<translation>R</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>&Lock Preset</source>
<translation>Preset &Kilitle</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>L</source>
<translation>L</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>&Fullscreen</source>
<translation>&Tam Ekran</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>F</source>
<translation>F</translation>
</message>
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_uk_UA.ts qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_uk_UA.ts
--- qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_uk_UA.ts 2009-10-04 19:04:50.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_uk_UA.ts 2010-01-05 15:39:59.000000000 +0100
@@ -12,82 +12,82 @@
<context>
<name>ProjectMWidget</name>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>&Help</source>
<translation>&Довідка</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>F1</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>&Show Song Title</source>
<translation>&Показати назву пісні</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>F2</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>&Show Preset Name</source>
<translation>&Показати ім'я предустановки</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>F3</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>&Next Preset</source>
<translation>&Наступна предустановка</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>N</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>&Previous Preset</source>
<translation>&Попередня предустановка</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>P</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>&Random Preset</source>
<translation>&Випадкова предустановка</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>R</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>&Lock Preset</source>
<translation>&Заблокувати предустановку</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>L</source>
<translation></translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>&Fullscreen</source>
<translation>&Повноекранний режим</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>F</source>
<translation></translation>
</message>
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_zh_CN.ts qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_zh_CN.ts
--- qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_zh_CN.ts 2009-10-04 19:04:50.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_zh_CN.ts 2010-01-05 15:39:59.000000000 +0100
@@ -12,82 +12,82 @@
<context>
<name>ProjectMWidget</name>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>&Help</source>
<translation>帮助(&H)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>&Show Song Title</source>
<translation>显示歌曲标题(&S)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>F2</source>
<translation>F2</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>&Show Preset Name</source>
<translation>显示边框形式名称(&S)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>F3</source>
<translation>F3</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>&Next Preset</source>
<translation>下一边框形式(&N)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>N</source>
<translation>N</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>&Previous Preset</source>
<translation>上一边框形式(&P)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>P</source>
<translation>P</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>&Random Preset</source>
<translation>随意边框形式(&R)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>R</source>
<translation>R</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>&Lock Preset</source>
<translation>锁定边框形式(&L)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>L</source>
<translation>L</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>&Fullscreen</source>
<translation>全屏(&F)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>F</source>
<translation>F</translation>
</message>
diff -Naur qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_zh_TW.ts qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_zh_TW.ts
--- qmmp-0.3.1/src/plugins/Visual/projectm/translations/projectm_plugin_zh_TW.ts 2009-10-04 19:04:50.000000000 +0200
+++ qmmp-svn/src/plugins/Visual/projectm/translations/projectm_plugin_zh_TW.ts 2010-01-05 15:39:59.000000000 +0100
@@ -12,82 +12,82 @@
<context>
<name>ProjectMWidget</name>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>&Help</source>
<translation>幫助(&H)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="125"/>
+ <location filename="../projectmwidget.cpp" line="134"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>&Show Song Title</source>
<translation>顯示曲目標題(&S)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="126"/>
+ <location filename="../projectmwidget.cpp" line="135"/>
<source>F2</source>
<translation>F2</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>&Show Preset Name</source>
<translation>顯示邊框形式名稱(&S)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="127"/>
+ <location filename="../projectmwidget.cpp" line="136"/>
<source>F3</source>
<translation>F3</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>&Next Preset</source>
<translation>下一邊框形式(&N)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="129"/>
+ <location filename="../projectmwidget.cpp" line="138"/>
<source>N</source>
<translation>N</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>&Previous Preset</source>
<translation>上一邊框形式(&P)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="130"/>
+ <location filename="../projectmwidget.cpp" line="139"/>
<source>P</source>
<translation>P</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>&Random Preset</source>
<translation>隨意邊框形式(&R)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="131"/>
+ <location filename="../projectmwidget.cpp" line="140"/>
<source>R</source>
<translation>R</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>&Lock Preset</source>
<translation>鎖定邊框形式(&L)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="132"/>
+ <location filename="../projectmwidget.cpp" line="141"/>
<source>L</source>
<translation>L</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>&Fullscreen</source>
<translation>全屏(&F)</translation>
</message>
<message>
- <location filename="../projectmwidget.cpp" line="134"/>
+ <location filename="../projectmwidget.cpp" line="143"/>
<source>F</source>
<translation>F</translation>
</message>
Index: qmmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/F-12/qmmp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- qmmp.spec 18 Nov 2009 11:20:56 -0000 1.17
+++ qmmp.spec 5 Jan 2010 15:39:57 -0000 1.18
@@ -1,6 +1,6 @@
Name: qmmp
Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Qt-based multimedia player
Group: Applications/Multimedia
@@ -10,6 +10,8 @@ Source: http://qmmp.ylsoftware.com/file
Source2: qmmp-filter-provides.sh
%define _use_internal_dependency_generator 0
%define __find_provides %{SOURCE2}
+# Patch to support libprojectM-2.0 WRT bug #551855
+Patch: qmmp-0.3.1-projectM20.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -67,6 +69,8 @@ QMMP is Qt-based audio player. This pack
%prep
%setup -q
+# Patch to support libprojectM-2.0 WRT bug #551855
+%patch -p1
%build
%cmake \
@@ -123,6 +127,9 @@ fi
%changelog
+* Tue Jan 05 2010 Karel Volný <kvolny at redhat.com> 0.3.1-2
+- patch to support libprojectM-2.0 WRT bug #551855
+
* Wed Nov 04 2009 Karel Volný <kvolny at redhat.com> 0.3.1-1
- new version
More information about the fedora-extras-commits
mailing list