[SCM] projectm/master: Refresh all patches
ximion-guest at users.alioth.debian.org
ximion-guest at users.alioth.debian.org
Tue Jul 5 11:44:23 UTC 2011
The following commit has been merged in the master branch:
commit 4fcc50c5bdffd9d55197bb1493cc76b679b01882
Author: Matthias Klumpp <matthias at nlinux.org>
Date: Tue Jul 5 13:44:10 2011 +0200
Refresh all patches
This will fix some strange issues with
the patches which only appear on some machines.
(Patches won't apply etc.)
diff --git a/.gitignore b/.gitignore
index 224e7f0..8d2c5eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
.pc/
+.directory
diff --git a/debian/patches/02_pulseaudio_cmakelist.patch b/debian/patches/02_pulseaudio_cmakelist.patch
index e52fa9b..8118cfc 100644
--- a/debian/patches/02_pulseaudio_cmakelist.patch
+++ b/debian/patches/02_pulseaudio_cmakelist.patch
@@ -5,10 +5,8 @@ Forwarded: yes
Author: Matthias Klumpp <matthias at nlinux.org>
Last-Update: 2010-06-25
-Index: projectm-2.0.1/src/projectM-pulseaudio/CMakeLists.txt
-===================================================================
---- projectm-2.0.1.orig/src/projectM-pulseaudio/CMakeLists.txt 2010-05-04 21:48:09.739838192 +0200
-+++ projectm-2.0.1/src/projectM-pulseaudio/CMakeLists.txt 2010-05-04 21:48:38.417337441 +0200
+--- a/src/projectM-pulseaudio/CMakeLists.txt
++++ b/src/projectM-pulseaudio/CMakeLists.txt
@@ -81,6 +81,7 @@
endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
diff --git a/debian/patches/04_pulseaudio_stat.patch b/debian/patches/04_pulseaudio_stat.patch
index cbc6857..c69bc1c 100644
--- a/debian/patches/04_pulseaudio_stat.patch
+++ b/debian/patches/04_pulseaudio_stat.patch
@@ -2,9 +2,8 @@ Description: Add stat.h to projectM-pulseaudio fix FTBFS in some cases.
Origin: fedora, http://cvs.fedoraproject.org/viewvc/rpms/projectM-pulseaudio/devel/projectM-pulseaudio-stat.patch?view=log
Last-Update: 2010-06-25
-diff -Naur projectM-pulseaudio-2.0.1-orig/qprojectM-pulseaudio.cpp projectM-pulseaudio-2.0.1/qprojectM-pulseaudio.cpp
---- projectm-2.0.1.orig/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp 2010-01-26 11:52:18.000000000 -0500
-+++ projectm-2.0.1/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp 2010-01-26 12:09:43.000000000 -0500
+--- a/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
++++ b/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
@@ -68,6 +68,7 @@
#include <unistd.h>
#include <string.h>
@@ -12,4 +11,4 @@ diff -Naur projectM-pulseaudio-2.0.1-orig/qprojectM-pulseaudio.cpp projectM-puls
+#include <sys/stat.h>
//#include <pulsecore/gccmacro.h>
-
+
diff --git a/debian/patches/06_lprojectm_fonts.patch b/debian/patches/06_lprojectm_fonts.patch
index 92f10d7..2d3a7b4 100644
--- a/debian/patches/06_lprojectm_fonts.patch
+++ b/debian/patches/06_lprojectm_fonts.patch
@@ -5,12 +5,23 @@ Last-Update: 2010-06-26
--- a/src/libprojectM/config.inp.in
+++ b/src/libprojectM/config.inp.in
+@@ -4,8 +4,8 @@
+ Texture Size = 1024 # Size of internal rendering texture
+ Mesh X = 32 # Width of PerPixel Equation mesh
+ Mesh Y = 24 # Height of PerPixel Equation mesh
+-FPS = 35 # Frames Per Second
+-Fullscreen = false
++FPS = 35 # Frames Per Second
++Fullscreen = false
+ Window Width = 512 # startup window width
+ Window Height = 512 # startup window height
+
@@ -17,6 +17,5 @@
- Aspect Correction = true # Custom Shape Aspect Correction
-
- Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
--Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
--Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
--
-+Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-+Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
+ Aspect Correction = true # Custom Shape Aspect Correction
+
+ Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
+-Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
+-Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
+-
++Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
++Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
diff --git a/debian/patches/07_cg-profile-setting.patch b/debian/patches/07_cg-profile-setting.patch
index ec4f8b8..cec6116 100644
--- a/debian/patches/07_cg-profile-setting.patch
+++ b/debian/patches/07_cg-profile-setting.patch
@@ -4,8 +4,8 @@ Forwarded: yes
Author: Carmelo Piccione <carmelo.piccione at gmail.com>
Last-Update: 2010-07-28
---- trunk/src/libprojectM/Renderer/ShaderEngine.cpp 2009/08/04 02:27:16 1260
-+++ trunk/src/libprojectM/Renderer/ShaderEngine.cpp 2010/07/26 23:46:19 1335
+--- a/src/libprojectM/Renderer/ShaderEngine.cpp
++++ b/src/libprojectM/Renderer/ShaderEngine.cpp
@@ -376,7 +376,10 @@
cgSetParameterSettingMode(myCgContext, CG_DEFERRED_PARAMETER_SETTING);
diff --git a/debian/patches/08_qprojectm-openglcontext.patch b/debian/patches/08_qprojectm-openglcontext.patch
index 0db1c4c..6835587 100644
--- a/debian/patches/08_qprojectm-openglcontext.patch
+++ b/debian/patches/08_qprojectm-openglcontext.patch
@@ -5,8 +5,8 @@ Forwarded: yes
Author: Carmelo Piccione <carmelo.piccione at gmail.com>
Last-Update: 2010-07-28
---- trunk/src/projectM-qt/qprojectm_mainwindow.cpp 2009/10/04 14:44:41 1291
-+++ trunk/src/projectM-qt/qprojectm_mainwindow.cpp 2010/07/27 23:17:44 1338
+--- a/src/projectM-qt/qprojectm_mainwindow.cpp
++++ b/src/projectM-qt/qprojectm_mainwindow.cpp
@@ -104,6 +104,14 @@
this, SLOT ( postProjectM_Initialize() ) );
diff --git a/debian/patches/10_lprojectm_userfonts.patch b/debian/patches/10_lprojectm_userfonts.patch
index 86f1247..e2192b2 100644
--- a/debian/patches/10_lprojectm_userfonts.patch
+++ b/debian/patches/10_lprojectm_userfonts.patch
@@ -18,6 +18,111 @@ Last-Update: 2010-09-25
#endif
#ifdef WIN32
+@@ -216,7 +216,7 @@
+ _settings.shuffleEnabled = config.read<bool> ( "Shuffle Enabled", true);
+
+ _settings.easterEgg = config.read<float> ( "Easter Egg Parameter", 0.0);
+- _settings.softCutRatingsEnabled =
++ _settings.softCutRatingsEnabled =
+ config.read<float> ( "Soft Cut Ratings Enabled", false);
+
+ projectM_init ( _settings.meshX, _settings.meshY, _settings.fps,
+@@ -298,9 +298,9 @@
+ void projectM::renderFrame()
+ {
+ #ifdef SYNC_PRESET_SWITCHES
+- pthread_mutex_lock(&preset_mutex);
+- #endif
+-
++ pthread_mutex_lock(&preset_mutex);
++ #endif
++
+ #ifdef DEBUG
+ char fname[1024];
+ FILE *f = NULL;
+@@ -361,7 +361,7 @@
+ if ( timeKeeper->IsSmoothing() && timeKeeper->SmoothRatio() <= 1.0 && !m_presetChooser->empty() )
+ {
+
+-
++
+ // printf("start thread\n");
+ assert ( m_activePreset2.get() );
+
+@@ -392,7 +392,7 @@
+
+ pipeline.drawables.clear();
+
+- /*
++ /*
+ while (!pipeline.drawables.empty()) {
+ delete(pipeline.drawables.back());
+ pipeline.drawables.pop_back();
+@@ -447,9 +447,9 @@
+ #endif /** !WIN32 */
+
+ #ifdef SYNC_PRESET_SWITCHES
+- pthread_mutex_unlock(&preset_mutex);
+- #endif
+-
++ pthread_mutex_unlock(&preset_mutex);
++ #endif
++
+ }
+
+ void projectM::projectM_reset()
+@@ -494,9 +494,9 @@
+
+ #ifdef USE_THREADS
+ pthread_mutex_init(&mutex, NULL);
+-
++
+ #ifdef SYNC_PRESET_SWITCHES
+- pthread_mutex_init(&preset_mutex, NULL);
++ pthread_mutex_init(&preset_mutex, NULL);
+ #endif
+
+ pthread_cond_init(&condition, NULL);
+@@ -772,19 +772,19 @@
+ timeKeeper->StartPreset();
+ }
+ presetSwitchedEvent(hardCut, **m_presetPos);
+-
+-
++
++
+ }
+
+ /**
+- *
+- * @param targetPreset
++ *
++ * @param targetPreset
+ */
+ void projectM::switchPreset(std::auto_ptr<Preset> & targetPreset) {
+
+- #ifdef SYNC_PRESET_SWITCHES
+- pthread_mutex_lock(&preset_mutex);
+- #endif
++ #ifdef SYNC_PRESET_SWITCHES
++ pthread_mutex_lock(&preset_mutex);
++ #endif
+
+ targetPreset = m_presetPos->allocate();
+
+@@ -792,9 +792,9 @@
+ renderer->setPresetName(targetPreset->name());
+ renderer->SetPipeline(targetPreset->pipeline());
+
+- #ifdef SYNC_PRESET_SWITCHES
+- pthread_mutex_unlock(&preset_mutex);
+- #endif
++ #ifdef SYNC_PRESET_SWITCHES
++ pthread_mutex_unlock(&preset_mutex);
++ #endif
+ }
+
+ void projectM::setPresetLock ( bool isLocked )
--- a/src/libprojectM/Renderer/Renderer.cpp
+++ b/src/libprojectM/Renderer/Renderer.cpp
@@ -6,6 +6,7 @@
diff --git a/debian/patches/11_lprojectm_change-texture-size.patch b/debian/patches/11_lprojectm_change-texture-size.patch
index e20db93..a1fb06e 100644
--- a/debian/patches/11_lprojectm_change-texture-size.patch
+++ b/debian/patches/11_lprojectm_change-texture-size.patch
@@ -1,34 +1,30 @@
Description: Add API to change projectM texture size
Forwarded: no
Last-Update: 2010-10-19
-Index: projectm-2.0.1+dfsg/src/libprojectM/projectM.cpp
-===================================================================
---- projectm-2.0.1+dfsg.orig/src/libprojectM/projectM.cpp 2010-10-15 20:32:50.717456717 +0000
-+++ projectm-2.0.1+dfsg/src/libprojectM/projectM.cpp 2010-10-15 20:35:51.629456716 +0000
-@@ -898,3 +898,12 @@
- }
-
-
-+void projectM::changeTextureSize(int size) {
-+ _settings.textureSize = size;
-+
-+ delete renderer;
-+ renderer = new Renderer(_settings.windowWidth, _settings.windowHeight,
-+ _settings.meshX, _settings.meshY,
-+ _settings.textureSize, beatDetect, _settings.presetURL,
-+ _settings.titleFontURL, _settings.menuFontURL);
-+}
-Index: projectm-2.0.1+dfsg/src/libprojectM/projectM.hpp
-===================================================================
---- projectm-2.0.1+dfsg.orig/src/libprojectM/projectM.hpp 2010-10-15 20:35:58.809456716 +0000
-+++ projectm-2.0.1+dfsg/src/libprojectM/projectM.hpp 2010-10-15 20:36:53.469456717 +0000
-@@ -153,8 +153,7 @@
-
- virtual ~projectM();
-
--
--
-+ void changeTextureSize(int size);
-
-
- const Settings & settings() const {
+--- a/src/libprojectM/projectM.cpp
++++ b/src/libprojectM/projectM.cpp
+@@ -898,3 +898,12 @@
+ }
+
+
++void projectM::changeTextureSize(int size) {
++ _settings.textureSize = size;
++
++ delete renderer;
++ renderer = new Renderer(_settings.windowWidth, _settings.windowHeight,
++ _settings.meshX, _settings.meshY,
++ _settings.textureSize, beatDetect, _settings.presetURL,
++ _settings.titleFontURL, _settings.menuFontURL);
++}
+--- a/src/libprojectM/projectM.hpp
++++ b/src/libprojectM/projectM.hpp
+@@ -153,8 +153,7 @@
+
+ virtual ~projectM();
+
+-
+-
++ void changeTextureSize(int size);
+
+
+ const Settings & settings() const {
diff --git a/debian/patches/12_lprojectm_change-preset-duration.patch b/debian/patches/12_lprojectm_change-preset-duration.patch
index cfb02f8..ce91498 100644
--- a/debian/patches/12_lprojectm_change-preset-duration.patch
+++ b/debian/patches/12_lprojectm_change-preset-duration.patch
@@ -1,41 +1,35 @@
Description: Add API to change projectM preset duration
Forwarded: no
Last-Update: 2010-10-19
-Index: projectm-2.0.1+dfsg/src/libprojectM/TimeKeeper.hpp
-===================================================================
---- projectm-2.0.1+dfsg.orig/src/libprojectM/TimeKeeper.hpp 2010-10-15 20:55:31.549456718 +0000
-+++ projectm-2.0.1+dfsg/src/libprojectM/TimeKeeper.hpp 2010-10-15 20:56:15.177456716 +0000
-@@ -37,6 +37,8 @@
-
- double sampledPresetDuration();
-
-+ void ChangePresetDuration(int seconds) { _presetDuration = seconds; }
-+
- #ifndef WIN32
- /* The first ticks value of the application */
- struct timeval startTime;
-Index: projectm-2.0.1+dfsg/src/libprojectM/projectM.cpp
-===================================================================
---- projectm-2.0.1+dfsg.orig/src/libprojectM/projectM.cpp 2010-10-15 20:55:31.561456716 +0000
-+++ projectm-2.0.1+dfsg/src/libprojectM/projectM.cpp 2010-10-15 20:56:47.921456714 +0000
-@@ -907,3 +907,7 @@
- _settings.textureSize, beatDetect, _settings.presetURL,
- _settings.titleFontURL, _settings.menuFontURL);
- }
-+
-+void projectM::changePresetDuration(int seconds) {
-+ timeKeeper->ChangePresetDuration(seconds);
-+}
-Index: projectm-2.0.1+dfsg/src/libprojectM/projectM.hpp
-===================================================================
---- projectm-2.0.1+dfsg.orig/src/libprojectM/projectM.hpp 2010-10-15 20:55:31.573456716 +0000
-+++ projectm-2.0.1+dfsg/src/libprojectM/projectM.hpp 2010-10-15 20:57:20.233456715 +0000
-@@ -154,7 +154,7 @@
- virtual ~projectM();
-
- void changeTextureSize(int size);
--
-+ void changePresetDuration(int seconds);
-
- const Settings & settings() const {
- return _settings;
+--- a/src/libprojectM/TimeKeeper.hpp
++++ b/src/libprojectM/TimeKeeper.hpp
+@@ -37,6 +37,8 @@
+
+ double sampledPresetDuration();
+
++ void ChangePresetDuration(int seconds) { _presetDuration = seconds; }
++
+ #ifndef WIN32
+ /* The first ticks value of the application */
+ struct timeval startTime;
+--- a/src/libprojectM/projectM.cpp
++++ b/src/libprojectM/projectM.cpp
+@@ -907,3 +907,7 @@
+ _settings.textureSize, beatDetect, _settings.presetURL,
+ _settings.titleFontURL, _settings.menuFontURL);
+ }
++
++void projectM::changePresetDuration(int seconds) {
++ timeKeeper->ChangePresetDuration(seconds);
++}
+--- a/src/libprojectM/projectM.hpp
++++ b/src/libprojectM/projectM.hpp
+@@ -154,7 +154,7 @@
+ virtual ~projectM();
+
+ void changeTextureSize(int size);
+-
++ void changePresetDuration(int seconds);
+
+ const Settings & settings() const {
+ return _settings;
diff --git a/debian/patches/15-gcc46.patch b/debian/patches/15-gcc46.patch
index 0e3761b..c1c27ca 100644
--- a/debian/patches/15-gcc46.patch
+++ b/debian/patches/15-gcc46.patch
@@ -8,9 +8,9 @@ Forwarded: yes
src/projectM-libvisual/actor_projectM.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- projectm.orig/src/projectM-libvisual/actor_projectM.cpp
-+++ projectm/src/projectM-libvisual/actor_projectM.cpp
-@@ -209,7 +209,7 @@ extern "C" int lv_projectm_events (VisPl
+--- a/src/projectM-libvisual/actor_projectM.cpp
++++ b/src/projectM-libvisual/actor_projectM.cpp
+@@ -209,7 +209,7 @@
* we aren't with projectm, so just ignore :) */
extern "C" VisPalette *lv_projectm_palette (VisPluginData *plugin)
{
diff --git a/debian/patches/16_lprojectm-parser.patch b/debian/patches/16_lprojectm-parser.patch
index 7668f95..9638fcd 100644
--- a/debian/patches/16_lprojectm-parser.patch
+++ b/debian/patches/16_lprojectm-parser.patch
@@ -2,8 +2,8 @@ Description: Fix token parser in projectM
Forwarded: yes
Author: Adam Guthrie <asguthrie at gmail.com>
Last-Update: 2011-05-24
---- projectm-2.0.1+dfsg/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2010-07-20 14:55:09.000000000 +0100
-+++ projectm-2.0.1+dfsg.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2011-05-21 19:33:40.789751928 +0100
+--- a/src/libprojectM/MilkdropPresetFactory/Parser.cpp
++++ b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
@@ -70,7 +70,7 @@
token_t Parser::parseToken(std::istream & fs, char * string)
{
--
projectm packaging
More information about the pkg-multimedia-commits
mailing list