[SCM] projectm/master: Drop all patches: Applied upstream
ximion-guest at users.alioth.debian.org
ximion-guest at users.alioth.debian.org
Mon May 21 12:07:31 UTC 2012
The following commit has been merged in the master branch:
commit cdf7627b7bc0174cc47ab461f10d4ae024e12344
Author: Matthias Klumpp <matthias at nlinux.org>
Date: Mon May 21 12:52:20 2012 +0200
Drop all patches: Applied upstream
diff --git a/debian/patches/01_pulseaudio-check.patch b/debian/patches/01_pulseaudio-check.patch
deleted file mode 100644
index bd76023..0000000
--- a/debian/patches/01_pulseaudio-check.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Check for PulseAudio connection
- Only write device name when pulse connection is established
-
-Forwarded: yes
-Author: Carmelo Piccione <carmelo.piccione at gmail.com>
-Last-Update: 2010-07-29
---- a/src/projectM-pulseaudio/QPulseAudioDeviceChooser.cpp
-+++ b/src/projectM-pulseaudio/QPulseAudioDeviceChooser.cpp
-@@ -30,7 +30,8 @@
- QSettings settings ( "projectM", "qprojectM-pulseaudio" );
- settings.setValue ( "tryFirstAvailablePlaybackMonitor",
- this->tryFirstPlayBackMonitorCheckBox->checkState() == Qt::Checked );
-- if (_qpulseAudioThread->sourcePosition() != _qpulseAudioThread->devices().end())
-+
-+ if ( _qpulseAudioThread != 0 && (_qpulseAudioThread->devices().size() > 0) && _qpulseAudioThread->sourcePosition() != _qpulseAudioThread->devices().end())
- settings.setValue("pulseAudioDeviceName", *_qpulseAudioThread->sourcePosition());
-
- }
-@@ -63,6 +64,7 @@
- devicesListView->setEnabled(state != Qt::Checked);
-
- if (state == Qt::Checked) {
-+ if (_qpulseAudioThread != 0)
- _qpulseAudioThread->connectDevice();
- }
- }
---- a/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
-+++ b/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
-@@ -118,7 +118,8 @@
-
- //QApplication::connect(mainWindow, SIGNAL(shuttingDown()), pulseThread, SLOT(cleanup()), Qt::DirectConnection);
- int ret = app.exec();
-- devChooser.writeSettings();
-+ if (pulseThread != 0)
-+ devChooser.writeSettings();
-
- if (mainWindow)
- mainWindow->unregisterSettingsAction(&pulseAction);
diff --git a/debian/patches/02_pulseaudio_cmakelist.patch b/debian/patches/02_pulseaudio_cmakelist.patch
deleted file mode 100644
index 2c46c03..0000000
--- a/debian/patches/02_pulseaudio_cmakelist.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBSF cause moc files are not found
- This patch modifies the CMakeList of projectM-pulseaudio
- (Makes compiling out-of-source possible)
-Forwarded: yes
-Author: Matthias Klumpp <matthias at tenstral.net>
-Last-Update: 2010-06-25
-
---- a/src/projectM-pulseaudio/CMakeLists.txt
-+++ b/src/projectM-pulseaudio/CMakeLists.txt
-@@ -81,6 +81,7 @@
- endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
-
- INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${LIBPULSE_INCLUDEDIR})
-+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/projectM-pulseaudio)
-
- LINK_DIRECTORIES(${PROJECTM_LINK} ${PULSEAUDIO_LDFLAGS})
-
diff --git a/debian/patches/03_desktop-files.patch b/debian/patches/03_desktop-files.patch
deleted file mode 100644
index 8cf01a4..0000000
--- a/debian/patches/03_desktop-files.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Update .desktop files of projectM
- * Remove encoding keys from .desktop files.
- * Add more meaningful descriptions
-Forwarded: yes
-Author: Matthias Klumpp <matthias at tenstral.net>
-Last-Update: 2010-06-28
-
---- a/src/projectM-jack/projectM-jack.desktop
-+++ b/src/projectM-jack/projectM-jack.desktop
-@@ -1,10 +1,9 @@
- [Desktop Entry]
--Name=projectM-jack
--GenericName=JACK Audio Visualization
--Comment=A milkdrop based music visualizer using jack audio with a Qt4 gui
-+Name=projectM Jack Audio Visualization
-+GenericName=JACK Audio Stream Visualization
-+Comment=A milkdrop based music visualizer visualizing JackAudio streams on a Qt4 GUI
- Exec=/usr/bin/projectM-jack
- Icon=prjm16-transparent.svg
- Type=Application
- Categories=AudioVideo;Audio;
--Encoding=UTF-8
- Terminal=false
---- a/src/projectM-pulseaudio/projectM-pulseaudio.desktop
-+++ b/src/projectM-pulseaudio/projectM-pulseaudio.desktop
-@@ -1,8 +1,7 @@
- [Desktop Entry]
--Encoding=UTF-8
--Name=projectM-pulseaudio
--GenericName=PulseAudio Visualization
--Comment=projectM for Pulse Audio
-+Name=projectM PulseAudio Visualization
-+GenericName=PulseAudio Stream Visualization
-+Comment=Visualization of PulseAudio streams with projectM
- Exec=projectM-pulseaudio
- Icon=prjm16-transparent
- Terminal=false
diff --git a/debian/patches/04_pulseaudio_stat.patch b/debian/patches/04_pulseaudio_stat.patch
deleted file mode 100644
index c69bc1c..0000000
--- a/debian/patches/04_pulseaudio_stat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-
---- a/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
-+++ b/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
-@@ -68,6 +68,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <sys/stat.h>
-
- //#include <pulsecore/gccmacro.h>
-
diff --git a/debian/patches/05_lprojectm_fix-cmakelists.patch b/debian/patches/05_lprojectm_fix-cmakelists.patch
deleted file mode 100644
index 934d084..0000000
--- a/debian/patches/05_lprojectm_fix-cmakelists.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Description: Make some changes on libprojectMs CMakeLists.txt
- * Set right upstream version in library
- * Remove the USE_THREADS option pending an update from upstream
- * Exclude fonts from build
- * Correctly set LIB_INSTALl_DIR variable (Closes: #591011)
-Forwarded: no
-Author: Matthias Klumpp <matthias at tenstral.net>
-Last-Update: 2010-06-26
-
---- a/src/libprojectM/CMakeLists.txt
-+++ b/src/libprojectM/CMakeLists.txt
-@@ -5,13 +5,11 @@
- INCLUDE(cmake/CPack-projectM.cmake)
-
-
--
--
- cmake_policy(SET CMP0005 OLD)
-
-
- set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
-- ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
-
- OPTION (USE_DEVIL "Use devIL for image loading rather than the builtin SOIL library" OFF)
-
-@@ -34,8 +32,18 @@
- OPTION (DISABLE_NATIVE_PRESETS "Turn off support for native (C++ style) presets" OFF)
- OPTION (DISABLE_MILKDROP_PRESETS "Turn off support for Milkdrop (.milk / .prjm) presets" OFF)
-
-+SET(LIB_SUFFIX ""
-+ CACHE STRING "Define suffix of directory name (32/64)"
-+ FORCE)
-+
-+ADD_DEFINITIONS(-DLIB_SUFFIX="\\\"${LIB_SUFFIX}\\\"")
-+
- ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
-
-+SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
-+ CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})"
-+ FORCE)
-+
- if (USE_NATIVE_GLEW)
- ADD_DEFINITIONS(-DUSE_NATIVE_GLEW)
- SET(GLEW_SOURCES glew.h glew.c)
-@@ -110,9 +118,9 @@
- ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
- endif(BUILD_PROJECTM_STATIC)
-
--SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2)
-+SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2)
-
--ADD_DEFINITIONS(-DUSE_THREADS)
-+#ADD_DEFINITIONS(-DUSE_THREADS)
-
- if (APPLE)
- ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
-@@ -123,7 +131,8 @@
- ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS)
- else(WIN32)
- set (RESOURCE_PREFIX "share/projectM")
--ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
-+#ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
-+ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS)
- endif(WIN32)
- endif(APPLE)
-
-@@ -190,8 +199,6 @@
-
- FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
- INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
--FILE(GLOB fonts "fonts/*.ttf")
--INSTALL(FILES ${fonts} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/fonts)
- INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
diff --git a/debian/patches/06_lprojectm_fonts.patch b/debian/patches/06_lprojectm_fonts.patch
deleted file mode 100644
index 2ce4b07..0000000
--- a/debian/patches/06_lprojectm_fonts.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Make projectM load system fonts.
-Forwarded: not-needed
-Author: Matthias Klumpp <matthias at tenstral.net>
-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
diff --git a/debian/patches/07_cg-profile-setting.patch b/debian/patches/07_cg-profile-setting.patch
deleted file mode 100644
index cec6116..0000000
--- a/debian/patches/07_cg-profile-setting.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Don't set optimal settings on the cg profile
- This resolves issues with buggy new ati drivers
-Forwarded: yes
-Author: Carmelo Piccione <carmelo.piccione at gmail.com>
-Last-Update: 2010-07-28
-
---- a/src/libprojectM/Renderer/ShaderEngine.cpp
-+++ b/src/libprojectM/Renderer/ShaderEngine.cpp
-@@ -376,7 +376,10 @@
- cgSetParameterSettingMode(myCgContext, CG_DEFERRED_PARAMETER_SETTING);
-
- myCgProfile = cgGLGetLatestProfile(CG_GL_FRAGMENT);
-- cgGLSetOptimalOptions(myCgProfile);
-+
-+ // HACK breaks with buggy ati video drivers such as my own
-+ // -carmelo.piccione at gmail.com 7/26/2010
-+ //cgGLSetOptimalOptions(myCgProfile);
- checkForCgError("selecting fragment profile");
-
- profileName = cgGetProfileString(myCgProfile);
diff --git a/debian/patches/08_qprojectm-openglcontext.patch b/debian/patches/08_qprojectm-openglcontext.patch
deleted file mode 100644
index 6835587..0000000
--- a/debian/patches/08_qprojectm-openglcontext.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Check OpenGLContext
- Check if opengl context is valid, quit if we can't open one
- with an error message.
-Forwarded: yes
-Author: Carmelo Piccione <carmelo.piccione at gmail.com>
-Last-Update: 2010-07-28
-
---- a/src/projectM-qt/qprojectm_mainwindow.cpp
-+++ b/src/projectM-qt/qprojectm_mainwindow.cpp
-@@ -104,6 +104,14 @@
- this, SLOT ( postProjectM_Initialize() ) );
-
- //connect(this, SIGNAL(dockLocationChanged ( Qt::DockWidgetArea)), SLOT(dockLocationChanged(Qt::DockWidgetArea)));
-+ if (!m_QProjectMWidget->isValid()) {
-+ int ret = QMessageBox::warning(this, tr("projectM cannot be started."),
-+ tr("Your graphics driver or configuration is not supported by projectM. Please contact the developers (carmelo.piccione+projectM at gmail.com or psperl+projectM at gmail.com) with your card and driver information so we can help you get it working."),
-+ QMessageBox::Ok);
-+ exit(-1);
-+ }
-+
-+
- m_QProjectMWidget->makeCurrent();
- m_QProjectMWidget->setFocus();
- setCentralWidget ( m_QProjectMWidget );
diff --git a/debian/patches/09_error-handling.patch b/debian/patches/09_error-handling.patch
deleted file mode 100644
index 4154884..0000000
--- a/debian/patches/09_error-handling.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-Description: Error handling
- * Guard against reinitializing the builtin milkdrop functions.
- Hides a deeper issue where something is double loading the preset factories, most
- likely.
- * Playlist file / directory error handling fixes, resize playlist refresh fix
-
-Forwarded: yes
-Author: Carmelo Piccione <carmelo.piccione at gmail.com>
-Last-Update: 2010-07-29
---- a/src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.cpp
-+++ b/src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.cpp
-@@ -29,7 +29,7 @@
- /* Create new function */
- func = new Func(name, func_ptr, num_args);
-
-- if (func == NULL)
-+ if (func == 0)
- return PROJECTM_OUTOFMEM_ERROR;
-
- retval = insert_func( func );
-@@ -115,12 +115,18 @@
- return PROJECTM_SUCCESS;
- }
-
-+volatile bool BuiltinFuncs::initialized = false;
-
- /* Initialize the builtin function database.
- Should only be necessary once */
- int BuiltinFuncs::init_builtin_func_db() {
- int retval;
-
-+ if (initialized) {
-+ return 0;
-+ } else
-+ initialized = true;
-+
- retval = load_all_builtin_func();
- return retval;
- }
-@@ -134,7 +140,7 @@
- traverse<TraverseFunctors::Delete<Func> >(builtin_func_tree);
-
- builtin_func_tree.clear();
--
-+initialized = false;
- return PROJECTM_SUCCESS;
- }
-
-@@ -142,13 +148,24 @@
- int BuiltinFuncs::insert_func( Func *func ) {
-
- assert(func);
-- std::pair<std::map<std::string, Func*>::iterator, bool> inserteePair =
-- builtin_func_tree.insert(std::make_pair(std::string(func->getName()), func));
-
-+ if (func == 0) {
-+ std::cerr << "Received a null function object, ignoring...." << std::endl;
-+ return PROJECTM_ERROR;
-+ }
-+
-+// //std::cout << "inserting function " << func->getName() << std::endl;
-+
-+ const std::pair<std::string, Func*> pair = std::make_pair(std::string(func->getName()), func);
-+
-+ assert(pair.second);
-+
-+ const std::pair<std::map<std::string, Func*>::iterator, bool> inserteePair =
-+ builtin_func_tree.insert(pair);
-+
- if (!inserteePair.second) {
- std::cerr << "Failed to insert builtin function \"" << func->getName() << "\" into collection! Bailing..." << std::endl;
- abort();
--
- }
-
- return PROJECTM_SUCCESS;
---- a/src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.hpp
-+++ b/src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.hpp
-@@ -229,6 +229,7 @@
- static Func *find_func( const std::string & name );
- private:
- static std::map<std::string, Func*> builtin_func_tree;
-+ static volatile bool initialized;
- };
-
- #endif
---- a/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp
-+++ b/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp
-@@ -26,7 +26,7 @@
- Eval::init_infix_ops();
-
- _presetOutputs = createPresetOutputs(gx,gy);
-- _presetOutputs2 = createPresetOutputs(gx, gy);
-+ _presetOutputs2 = createPresetOutputs(gx, gy);
- }
-
- MilkdropPresetFactory::~MilkdropPresetFactory() {
-@@ -37,13 +37,13 @@
- BuiltinFuncs::destroy_builtin_func_db();
- std::cerr << "[~MilkdropPresetFactory] delete preset out puts" << std::endl;
- delete(_presetOutputs);
-- delete(_presetOutputs2);
-+ delete(_presetOutputs2);
- std::cerr << "[~MilkdropPresetFactory] done" << std::endl;
-
- }
-
- /* Reinitializes the engine variables to a default (conservative and sane) value */
--void resetPresetOutputs(PresetOutputs *presetOutputs)
-+void resetPresetOutputs(PresetOutputs * presetOutputs)
- {
-
- presetOutputs->zoom=1.0;
---- a/src/libprojectM/PresetFactoryManager.cpp
-+++ b/src/libprojectM/PresetFactoryManager.cpp
-@@ -20,7 +20,7 @@
- #endif
-
- #include <sstream>
--PresetFactoryManager::PresetFactoryManager() : _gx(0), _gy(0) {}
-+PresetFactoryManager::PresetFactoryManager() : _gx(0), _gy(0), initialized(false) {}
-
- PresetFactoryManager::~PresetFactoryManager() {
- for (std::vector<PresetFactory *>::iterator pos = _factoryList.begin();
-@@ -29,11 +29,20 @@
- delete(*pos);
- }
-
--
-+ initialized = false;
- }
-+
- void PresetFactoryManager::initialize(int gx, int gy) {
- _gx = gx;
- _gy = gy;
-+
-+ if (!initialized) {
-+ initialized = true;
-+ } else {
-+ std::cout << "already initialized " << std::endl;
-+ return;
-+ }
-+
- PresetFactory * factory;
-
- #ifndef DISABLE_MILKDROP_PRESETS
---- a/src/libprojectM/PresetFactoryManager.hpp
-+++ b/src/libprojectM/PresetFactoryManager.hpp
-@@ -21,7 +21,7 @@
- virtual ~PresetFactoryException() throw() {}
- const std::string & message() const { return _message; }
-
-- private:
-+ private:
- std::string _message;
- };
-
-@@ -54,6 +54,6 @@
- mutable std::map<std::string, PresetFactory *> _factoryMap;
- mutable std::vector<PresetFactory *> _factoryList;
- void registerFactory(const std::string & extension, PresetFactory * factory);
--
-+ volatile bool initialized;
- };
- #endif
---- a/src/libprojectM/projectM.cpp
-+++ b/src/libprojectM/projectM.cpp
-@@ -222,7 +222,6 @@
- projectM_init ( _settings.meshX, _settings.meshY, _settings.fps,
- _settings.textureSize, _settings.windowWidth,_settings.windowHeight);
-
--
- _settings.beatSensitivity = beatDetect->beat_sensitivity = config.read<float> ( "Hard Cut Sensitivity", 10.0 );
-
- if ( config.read ( "Aspect Correction", true ) )
---- a/src/projectM-pulseaudio/QPulseAudioThread.cpp
-+++ b/src/projectM-pulseaudio/QPulseAudioThread.cpp
-@@ -296,9 +296,7 @@
- {
- assert ( mainloop_api );
- mainloop_api->quit ( mainloop_api, ret );
-- if (*s_qprojectM_MainWindowPtr)
-- delete(*s_qprojectM_MainWindowPtr);
-- *s_qprojectM_MainWindowPtr = 0;
-+
- }
-
-
-@@ -315,7 +313,8 @@
- {
- fprintf ( stderr, "pa_stream_peek() failed: %s\n", pa_strerror ( pa_context_errno ( context ) ) );
- pulseQuit ( 1 );
-- return;
-+ return
-+;
- }
-
- if ((!s_qprojectM_MainWindowPtr) || (!*s_qprojectM_MainWindowPtr))
-@@ -352,16 +351,16 @@
- switch ( pa_stream_get_state ( s ) )
- {
- case PA_STREAM_UNCONNECTED:
--// qDebug() << "UNCONNECTED";
-+ qDebug() << "UNCONNECTED";
- break;
- case PA_STREAM_CREATING:
--// qDebug() << "CREATED";
-+ qDebug() << "CREATED";
- break;
- case PA_STREAM_TERMINATED:
--// qDebug() << "TERMINATED";
-+ qDebug() << "TERMINATED";
- break;
- case PA_STREAM_READY:
--// qDebug() << "READY";
-+ qDebug() << "READY";
- if ( verbose )
- {
- const pa_buffer_attr *a;
---- a/src/projectM-qt/qplaylisttableview.hpp
-+++ b/src/projectM-qt/qplaylisttableview.hpp
-@@ -93,14 +93,14 @@
- }
-
- inline void resizeEvent(QResizeEvent * event) {
--
-+ QTableView::resizeEvent(event);
- emit(resized(event));
- }
-
- inline void mousePressEvent(QMouseEvent * event) {
- QAbstractItemView::mousePressEvent(event);
- if (event->button() == Qt::RightButton) {
-- emit(mousePressed(event, selectedIndexes()));
-+ emit(mousePressed(event, selectedIndexes()));
- }
- else
- ;
---- a/src/projectM-qt/qprojectm_mainwindow.cpp
-+++ b/src/projectM-qt/qprojectm_mainwindow.cpp
-@@ -98,7 +98,8 @@
-
- connect(ui->tableView, SIGNAL(resized(QResizeEvent *)), this, SLOT(refreshHeaders(QResizeEvent*)));
-
-- connect(ui->tableView, SIGNAL(mousePressed(QMouseEvent*, const QModelIndexList &)), this, SLOT(popupPlaylistContextMenu(QMouseEvent*, const QModelIndexList &)));
-+ connect(ui->tableView, SIGNAL(mousePressed(QMouseEvent*, const QModelIndexList &)), this,
-+ SLOT(popupPlaylistContextMenu(QMouseEvent*, const QModelIndexList &)));
-
- connect ( m_QProjectMWidget, SIGNAL ( projectM_Initialized(QProjectM*) ),
- this, SLOT ( postProjectM_Initialize() ) );
-@@ -662,7 +663,7 @@
- // Add 1 to skip the Name column
- hHeader->setResizeMode (i+1, QHeaderView::ResizeToContents);
- sizeTotal += hHeader->sectionSize(i+1);
-- }
-+ }
- hHeader->resizeSection(0, ui->tableView->size().width()-20-sizeTotal);
-
-
-@@ -883,11 +884,13 @@
- QString url = m_QPlaylistFileDialog->selectedFiles() [0];
-
-
-- if ( !playlistModel->readPlaylist ( url ) ) {
-+ const bool loadedOk = playlistModel->readPlaylist ( url );
-+
-+ if (!loadedOk) {
- qDebug() << "could not open playlist";
- url = QString();
--
-- }
-+ }
-+
- qDebug() << "url: " << url;
- updatePlaylistUrl(url);
-
---- a/src/projectM-qt/qprojectmwidget.hpp
-+++ b/src/projectM-qt/qprojectmwidget.hpp
-@@ -22,6 +22,7 @@
- #ifndef QPROJECTM_WIDGET_HPP
- #define QPROJECTM_WIDGET_HPP
-
-+#include <iostream>
- #include "qprojectm.hpp"
- #include <QGLWidget>
- #include <QMutex>
-@@ -111,7 +112,7 @@
-
- void resetProjectM()
- {
--
-+ std::cout << "reseting" << std::endl;
- qDebug() << "reset start";
-
- emit ( projectM_BeforeDestroy() );
-@@ -246,8 +247,10 @@
- void initializeGL()
- {
-
-- this->m_projectM = new QProjectM ( m_config_file );
-- projectM_Initialized ( m_projectM );
-+ if (m_projectM == 0) {
-+ this->m_projectM = new QProjectM ( m_config_file );
-+ projectM_Initialized ( m_projectM );
-+ }
- }
-
- inline void paintGL()
diff --git a/debian/patches/10_lprojectm_userfonts.patch b/debian/patches/10_lprojectm_userfonts.patch
deleted file mode 100644
index 1491962..0000000
--- a/debian/patches/10_lprojectm_userfonts.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-Description: Set correct font paths in user-specific settings too.
- This makes projectM always use system fonts and prevents it
- from crashing if a font was not found.
-Forwarded: not-needed
-Author: Matthias Klumpp <matthias at tenstral.net>
-Last-Update: 2010-09-25
---- a/src/libprojectM/projectM.cpp
-+++ b/src/libprojectM/projectM.cpp
-@@ -200,9 +200,9 @@
-
- #ifdef LINUX
- _settings.titleFontURL = config.read<string>
-- ( "Title Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/Vera.ttf" );
-+ ( "Title Font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf" );
- _settings.menuFontURL = config.read<string>
-- ( "Menu Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/VeraMono.ttf" );
-+ ( "Menu Font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf" );
- #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 @@
- #include "TextureManager.hpp"
- #include <iostream>
- #include <algorithm>
-+#include <sys/stat.h>
- #include <cassert>
- #include "omptl/omptl"
- #include "omptl/omptl_algorithm"
-@@ -45,7 +46,18 @@
- this->beatDetect = beatDetect;
-
- #ifdef USE_FTGL
-- /**f Load the standard fonts */
-+ /**f Load the standard fonts if they do exist */
-+
-+ struct stat buffer;
-+
-+ if (stat( title_fontURL.c_str(), &buffer )) {
-+ std::cout << "Could not open font file: " << title_fontURL << std::endl;
-+ exit(1);
-+ }
-+ if (stat( menu_fontURL.c_str(), &buffer )) {
-+ std::cout << "Could not open font file: " << menu_fontURL << std::endl;
-+ exit(1);
-+ }
-
- title_font = new FTGLPixmapFont(title_fontURL.c_str());
- other_font = new FTGLPixmapFont(menu_fontURL.c_str());
diff --git a/debian/patches/11_lprojectm_change-texture-size.patch b/debian/patches/11_lprojectm_change-texture-size.patch
deleted file mode 100644
index a1fb06e..0000000
--- a/debian/patches/11_lprojectm_change-texture-size.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Add API to change projectM texture size
-Forwarded: no
-Last-Update: 2010-10-19
---- 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
deleted file mode 100644
index ce91498..0000000
--- a/debian/patches/12_lprojectm_change-preset-duration.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Add API to change projectM preset duration
-Forwarded: no
-Last-Update: 2010-10-19
---- 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/13_lprojectm_cmake_freetype.patch b/debian/patches/13_lprojectm_cmake_freetype.patch
deleted file mode 100644
index 0ef30d6..0000000
--- a/debian/patches/13_lprojectm_cmake_freetype.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Description: Patch to make projectM find Freetype
- Use FindFreetype from cmake itself instead using the buggy
- cmake script which is shipped with projectM.
-Forwarded: no
-Author: Matthias Klumpp <matthias at tenstral.net>
-Last-Update: 2011-03-22
---- a/src/libprojectM/CMakeLists.txt
-+++ b/src/libprojectM/CMakeLists.txt
-@@ -9,7 +9,7 @@
-
-
- set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
-- ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
-
- OPTION (USE_DEVIL "Use devIL for image loading rather than the builtin SOIL library" OFF)
-
-@@ -42,8 +42,8 @@
-
- SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
- CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})"
-- FORCE)
--
-+ FORCE)
-+
- if (USE_NATIVE_GLEW)
- ADD_DEFINITIONS(-DUSE_NATIVE_GLEW)
- SET(GLEW_SOURCES glew.h glew.c)
-@@ -102,8 +102,8 @@
- if(USE_FTGL)
- ADD_DEFINITIONS(-DUSE_FTGL)
-
--find_package( Freetype2 REQUIRED)
--include_directories( ${FREETYPE2_INCLUDE_DIR} )
-+find_package( Freetype REQUIRED)
-+include_directories( ${FREETYPE_INCLUDE_DIRS} )
-
- endif(USE_FTGL)
-
-@@ -138,7 +138,7 @@
-
- add_subdirectory(Renderer)
-
--#ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
-+#ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
-
- FIND_PACKAGE(OpenGL)
-
-@@ -153,23 +153,23 @@
- if (FTGL_FOUND)
- MESSAGE(STATUS "[projectM] FTGL font support was detected and enabled.")
- else (FTGL_FOUND)
-- MESSAGE(STATUS
-+ MESSAGE(STATUS
- "[projectM] Warning! FTGL has been enabled but not detected. Your compilation will probably break. Turn off FTGL support by setting USE_FTGL to false, or visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.")
- endif (FTGL_FOUND)
--
-+
- ADD_DEFINITIONS(-DUSE_FTGL)
--
-+
- set (FTGL_INCUDE_DIRS ${FTGL_INCLUDE_DIRS} ${CMAKE_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR})
- set (FTGL_LINK_DIRS ${FTGL_LIBRARY_DIRS} )
- set (FTGL_LINK_TARGETS ftgl freetype)
--
-+
- ELSE (USE_FTGL)
- IF (FTGL_FOUND)
- MESSAGE(STATUS "[projectM] Warning: FTGL font support was detected but NOT enabled. You can enable it by setting USE_FTGL=true")
- ELSE (FTGL_FOUND)
- MESSAGE(STATUS "[projectM] Warning: FTGL font support was not detected. Visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.")
- ENDIF(FTGL_FOUND)
--
-+
- # todo: change this because its obscure and probably not being used
- set (FTGL_INCLUDE_DIRS "/opt/local/include")
- set (FTGL_LINK_DIRS )
diff --git a/debian/patches/14_lprojectm_set-numeric.patch b/debian/patches/14_lprojectm_set-numeric.patch
deleted file mode 100644
index 91b882e..0000000
--- a/debian/patches/14_lprojectm_set-numeric.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Set LC_NUMERIC to "C" in libprojectM
- This is a workaround for some strange behaviour appearing on
- some systems with a different numeric format.
-Bug-Ubuntu: https://bugslaunchpad.net/ubuntu/+source/projectm/+bug/737915
-Forwarded: no
-Author: Matthias Klumpp <matthias at tenstral.net>
-Last-Update: 2011-03-24
---- a/src/libprojectM/projectM.cpp
-+++ b/src/libprojectM/projectM.cpp
-@@ -461,11 +461,14 @@
-
- this->fpsstart = 0;
-
-+ setlocale(LC_NUMERIC, "C");
-+
- projectM_resetengine();
- }
-
- void projectM::projectM_init ( int gx, int gy, int fps, int texsize, int width, int height )
- {
-+ setlocale(LC_NUMERIC, "C");
-
- /** Initialise start time */
- timeKeeper = new TimeKeeper(_settings.presetDuration,_settings.smoothPresetDuration, _settings.easterEgg);
diff --git a/debian/patches/15-gcc46.patch b/debian/patches/15-gcc46.patch
deleted file mode 100644
index c1c27ca..0000000
--- a/debian/patches/15-gcc46.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Force cast to type (VisPalette *) to avoid FTBFS with GCC4.6.
-Author: Alessio Treglia <alessio at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624898
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/771045
-Bug: http://sourceforge.net/support/tracker.php?aid=3298221
-Forwarded: yes
----
- src/projectM-libvisual/actor_projectM.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- 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)
- {
-- return NULL;
-+ return (VisPalette *) NULL;
- }
-
- /* This is where the real rendering happens! This function is what we call, many times
diff --git a/debian/patches/16_lprojectm-parser.patch b/debian/patches/16_lprojectm-parser.patch
deleted file mode 100644
index 9638fcd..0000000
--- a/debian/patches/16_lprojectm-parser.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix token parser in projectM
-Forwarded: yes
-Author: Adam Guthrie <asguthrie at gmail.com>
-Last-Update: 2011-05-24
---- 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)
- {
-
-- char c;
-+ int c;
- int i;
-
- if (string != NULL)
diff --git a/debian/patches/17_lprojectm-linkinflibs.patch b/debian/patches/17_lprojectm-linkinflibs.patch
deleted file mode 100644
index 541a193..0000000
--- a/debian/patches/17_lprojectm-linkinflibs.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- a/src/libprojectM/CMakeLists.txt
-+++ b/src/libprojectM/CMakeLists.txt
-@@ -46,11 +46,11 @@
-
- if (USE_NATIVE_GLEW)
- ADD_DEFINITIONS(-DUSE_NATIVE_GLEW)
--SET(GLEW_SOURCES glew.h glew.c)
--SET(GLEW_LINK_TARGETS )
-+ SET(GLEW_SOURCES glew.h glew.c)
-+ SET(GLEW_LIBRARY "")
- else(USE_NATIVE_GLEW)
--SET(GLEW_SOURCES )
--SET (GLEW_LINK_TARGETS GLEW)
-+ set (GLEW_SOURCES "")
-+ find_package (GLEW)
- endif(USE_NATIVE_GLEW)
-
- SET(projectM_SOURCES projectM.cpp PCM.cpp Preset.cpp fftsg.cpp KeyHandler.cpp
-@@ -118,6 +118,8 @@
- ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
- endif(BUILD_PROJECTM_STATIC)
-
-+set_property(TARGET projectM PROPERTY LINK_INTERFACE_LIBRARIES "")
-+set_property(TARGET projectM PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES "")
- SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2)
-
- #ADD_DEFINITIONS(-DUSE_THREADS)
-@@ -186,10 +188,10 @@
- LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR})
-
- if(BUILD_PROJECTM_STATIC)
-- TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+ TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LIBRARY} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES})
- else(BUILD_PROJECTM_STATIC)
-
--TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LIBRARY} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} )
-
- endif(BUILD_PROJECTM_STATIC)
-
---- /dev/null
-+++ b/src/libprojectM/cmake/FindGLEW.cmake
-@@ -0,0 +1,23 @@
-+# - Try to find GLEW
-+# Once done this will define
-+#
-+# GLEW_FOUND - system has GLEW
-+# GLEW_INCLUDE_DIR - the GLEW include directory
-+# GLEW_LIBRARY - Link these to use GLEW
-+#
-+
-+ FIND_PATH( GLEW_INCLUDE_DIR glew.h wglew.h
-+ PATHS /usr/local /usr c:/glew "C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK" "C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK"
-+ PATH_SUFFIXES include include/gl include/GL Include Include/gl Include/GL )
-+ FIND_LIBRARY( GLEW_LIBRARY
-+ NAMES glew32 glew GLEW
-+ PATHS /usr /usr/local c:/glew "C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK" "C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK"
-+ PATH_SUFFIXES lib Lib
-+ )
-+
-+IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
-+ SET(GLEW_FOUND TRUE)
-+ SET( GLEW_LIBRARY_DIR ${GLEW_LIBRARY} )
-+ELSE (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
-+ SET( GLEW_FOUND FALSE )
-+ENDIF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
---- a/src/projectM-qt/CMakeLists.txt
-+++ b/src/projectM-qt/CMakeLists.txt
-@@ -6,6 +6,7 @@
- include(cmake/CPack-projectM.cmake)
-
- include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
-+
- include(FindPkgConfig.cmake)
- if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
- set(LIBPROJECTM_FOUND true)
-@@ -34,7 +35,7 @@
-
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM-qt.pc.in" "${CMAKE_CURRENT_SOURCE_DIR}/libprojectM-qt.pc" @ONLY)
-
--ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"')
-+ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX="\"${PROJECTM_PREFIX}\"")
- ADD_DEFINITIONS(${QT_DEFINITIONS})
- ADD_DEFINITIONS(-DQT_PLUGIN)
- ADD_DEFINITIONS(-DQT_NO_DEBUG)
-@@ -97,7 +98,7 @@
-
- if(COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
--endif(COMMAND cmake_policy)
-+endif(COMMAND cmake_policy)
-
- if (BUILD_PROJECTM_QT_STATIC)
- ADD_LIBRARY(projectM-qt STATIC ${projectM-qt_SRCS} ${projectM-qt_RC_SRCS} ${projectM-qt_MOC_SRCS} ${projectM-qt_UIS_H})
-@@ -105,6 +106,8 @@
- ADD_LIBRARY(projectM-qt SHARED ${projectM-qt_SRCS} ${projectM-qt_RC_SRCS} ${projectM-qt_MOC_SRCS} ${projectM-qt_UIS_H})
- endif(BUILD_PROJECTM_QT_STATIC)
-
-+set_property(TARGET projectM-qt PROPERTY LINK_INTERFACE_LIBRARIES "")
-+set_property(TARGET projectM-qt PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES "")
- SET_TARGET_PROPERTIES(projectM-qt PROPERTIES VERSION 1.10 SOVERSION 1)
-
- if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
-@@ -120,7 +123,7 @@
- include_directories(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${CMAKE_CURRENT_LIBRARY_DIR})
-
- # link the "qprojectM" target against the Qt libraries. which libraries exactly, is defined by the "include(${QT_USE_FILE})" line above, which sets up this variable.
--target_link_libraries(projectM-qt projectM ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})
-+target_link_libraries(projectM-qt projectM GLEW GL ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})
-
- install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt)
- install(TARGETS projectM-qt DESTINATION lib${LIB_SUFFIX})
---- a/src/libprojectM/libprojectM.pc.in
-+++ b/src/libprojectM/libprojectM.pc.in
-@@ -9,5 +9,5 @@
- Version: 2.0.0
- Description: projectM - OpenGL Milkdrop
- Requires:
--Libs: -L${libdir} -lprojectM
--Cflags: -I${includedir}
-+Libs: -L${libdir} -lprojectM
-+Cflags: -I${includedir}
---- a/src/libprojectM/Renderer/CMakeLists.txt
-+++ b/src/libprojectM/Renderer/CMakeLists.txt
-@@ -3,8 +3,8 @@
-
- SET(SOIL_SOURCES SOIL/image_DXT.c SOIL/image_helper.c SOIL/SOIL.c SOIL/stb_image_aug.c)
-
--SET(Renderer_SOURCES FBO.cpp MilkdropWaveform.cpp PerPixelMesh.cpp Pipeline.cpp Renderer.cpp ShaderEngine.cpp UserTexture.cpp Waveform.cpp
--Filters.cpp PerlinNoise.cpp PipelineContext.cpp Renderable.cpp BeatDetect.cpp Shader.cpp TextureManager.cpp VideoEcho.cpp
-+SET(Renderer_SOURCES FBO.cpp MilkdropWaveform.cpp PerPixelMesh.cpp Pipeline.cpp Renderer.cpp ShaderEngine.cpp UserTexture.cpp Waveform.cpp
-+Filters.cpp PerlinNoise.cpp PipelineContext.cpp Renderable.cpp BeatDetect.cpp Shader.cpp TextureManager.cpp VideoEcho.cpp
- RenderItemDistanceMetric.cpp RenderItemMatcher.cpp ${SOIL_SOURCES})
-
- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-@@ -13,4 +13,4 @@
- INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})
- ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
- SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2)
--TARGET_LINK_LIBRARIES(Renderer m)
-+TARGET_LINK_LIBRARIES(Renderer m ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES})
diff --git a/debian/patches/18_pulseaudio_remove_unused_header.patch b/debian/patches/18_pulseaudio_remove_unused_header.patch
deleted file mode 100644
index 76a35e3..0000000
--- a/debian/patches/18_pulseaudio_remove_unused_header.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Remove unused and not-existing PA header
-Forwarded: yes
-Author: Matthias Klumpp <matthias at tenstral.net>
-Last-Update: 2011-10-10
---- a/src/projectM-pulseaudio/QPulseAudioThread.hpp
-+++ b/src/projectM-pulseaudio/QPulseAudioThread.hpp
-@@ -34,7 +34,6 @@
- {
- #include <pulse/introspect.h>
- #include <pulse/pulseaudio.h>
--#include <pulse/browser.h>
- }
-
- #include "qprojectm_mainwindow.hpp"
diff --git a/debian/patches/19_fix-qprojectm-hppinclude.patch b/debian/patches/19_fix-qprojectm-hppinclude.patch
deleted file mode 100644
index 89ef9c7..0000000
--- a/debian/patches/19_fix-qprojectm-hppinclude.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/src/projectM-qt/qprojectm_mainwindow.hpp
-+++ b/src/projectM-qt/qprojectm_mainwindow.hpp
-@@ -1,5 +1,5 @@
- /**
-- * projectM-qt -- Qt4 based projectM GUI
-+ * projectM-qt -- Qt4 based projectM GUI
- * Copyright (C)2003-2004 projectM Team
- *
- * This library is free software; you can redistribute it and/or
-@@ -31,7 +31,7 @@
- #include <QtDebug>
- #include <QMutex>
-
--#include "projectM.hpp"
-+#include "../libprojectM/projectM.hpp"
-
- #include <QModelIndexList>
- class QHeaderView;
-@@ -63,7 +63,7 @@
- signals:
- void shuttingDown();
- public:
--
-+
- projectM * GetProjectM();
-
- typedef struct PlaylistItemMetaData {
-@@ -72,15 +72,15 @@
- url(_url), name(_name), rating(_rating), breedability(_breed), id(_id) {}
-
- QString url;
-- QString name;
-+ QString name;
- int rating;
- int breedability;
- long id;
- inline bool operator==(const PlaylistItemMetaData & data) {
- return data.id == id;
- }
--
--
-+
-+
- inline bool operator==(long rhs_id) {
- return rhs_id == id;
- }
-@@ -89,7 +89,7 @@
-
- void addPCM(float * buffer, unsigned int bufferSize);
-
--
-+
- typedef QVector<long> PlaylistItemVector;
-
- QProjectM_MainWindow(const std::string & config_file, QMutex * audioMutex);
-@@ -146,27 +146,27 @@
- void removePlaylistItems(const QModelIndexList & items);
- void dragAndDropPlaylistItems(const QModelIndexList &, const QModelIndex &);
-
--
-+
- private:
- void readPlaylistSettings();
- bool warnIfPlaylistModified();
--
-+
- void insertPlaylistItem(const PlaylistItemMetaData & data, int targetIndex);
-
- void savePlaylist();
- void updatePlaylistUrl(const QString & url);
- unsigned long playlistItemCounter;
-- QSize _oldPlaylistSize;
-+ QSize _oldPlaylistSize;
- void readConfig(const std::string & configFile);
- void writeConfig();
- void copyPlaylist();
--
-+
- QPresetEditorDialog * m_QPresetEditorDialog;
- QHeaderView * hHeader;
- QHeaderView * vHeader;
- QString m_currentPlaylistUrl;
- QModelIndexList selectedPlaylistIndexes;
--
-+
- QPlaylistModel * playlistModel;
- Ui::QProjectM_MainWindow * ui;
- QProjectMConfigDialog * configDialog;
-@@ -179,7 +179,7 @@
- bool _menuVisible;
- bool _menuAndStatusBarsVisible;
- QTimer * m_timer;
--
-+
- void createActions();
- void createMenus();
- void createToolBars();
-@@ -199,7 +199,7 @@
- QAction *aboutAct;
- QAction *aboutQtAct;
-
-- QString previousFilter;
-+ QString previousFilter;
- Qt::DockWidgetArea dockWidgetArea;
-
- QPresetFileDialog * m_QPresetFileDialog;
diff --git a/debian/patches/20_fix-parser.patch b/debian/patches/20_fix-parser.patch
deleted file mode 100644
index 4cebe74..0000000
--- a/debian/patches/20_fix-parser.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix to parser in cases like 1.0-1.0-2.0
-Forwarded: yes
-Last-Update: 2011-12-20
---- a/src/libprojectM/MilkdropPresetFactory/Parser.cpp
-+++ b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
-@@ -1013,7 +1013,7 @@
- of the item to be inserted is greater than the root's
- precedence, then make gen_expr the root */
-
-- if (infix_op->precedence > (*root)->infix_op->precedence)
-+ if (infix_op->precedence >= (*root)->infix_op->precedence)
- {
- new_root = new TreeExpr(infix_op, NULL, *root, NULL);
- (*root) = new_root;
diff --git a/debian/patches/21_fix-sqr-sigmoid.patch b/debian/patches/21_fix-sqr-sigmoid.patch
deleted file mode 100644
index e908a5b..0000000
--- a/debian/patches/21_fix-sqr-sigmoid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Fix wrong sqr and sigmoid functions
-Forwarded: yes
---- a/src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.hpp
-+++ b/src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.hpp
-@@ -41,11 +41,16 @@
-
-
- static inline float sqr_wrapper(float * arg_list) {
--
--return pow(2, arg_list[0]);
-+ return pow(arg_list[0], 2);
- }
-
-
-+static inline float sigmoid_wrapper(float * arg_list)
-+{
-+ const double t = (1+exp(-arg_list[0]*arg_list[1]));
-+ return (fabs(t) > 0.00001) ? 1.0/t : 0;
-+}
-+
- static inline float sign_wrapper(float * arg_list) {
-
- return -arg_list[0];
-@@ -67,11 +72,6 @@
- return arg_list[1];
- }
-
--/* consult your AI book */
--static inline float sigmoid_wrapper(float * arg_list) {
--return (RR / (1 + exp( -(((float)(arg_list[0])) * arg_list[1]) / R) - R));
--}
--
-
- static inline float bor_wrapper(float * arg_list) {
-
diff --git a/debian/patches/22_unbind_fbo.patch b/debian/patches/22_unbind_fbo.patch
deleted file mode 100644
index ff59729..0000000
--- a/debian/patches/22_unbind_fbo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Unbind framebuffer object when initialization is done
-
---- a/src/libprojectM/Renderer/FBO.cpp
-+++ b/src/libprojectM/Renderer/FBO.cpp
-@@ -141,6 +141,9 @@
- this->textureID[1] = other_tex;
-
- GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-+
-+ glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0);
-+
- if (status == GL_FRAMEBUFFER_COMPLETE_EXT) {
- return;
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 22664a3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,22 +0,0 @@
-01_pulseaudio-check.patch
-02_pulseaudio_cmakelist.patch
-03_desktop-files.patch
-04_pulseaudio_stat.patch
-05_lprojectm_fix-cmakelists.patch
-06_lprojectm_fonts.patch
-07_cg-profile-setting.patch
-08_qprojectm-openglcontext.patch
-09_error-handling.patch
-10_lprojectm_userfonts.patch
-11_lprojectm_change-texture-size.patch
-12_lprojectm_change-preset-duration.patch
-13_lprojectm_cmake_freetype.patch
-14_lprojectm_set-numeric.patch
-15-gcc46.patch
-16_lprojectm-parser.patch
-17_lprojectm-linkinflibs.patch
-18_pulseaudio_remove_unused_header.patch
-19_fix-qprojectm-hppinclude.patch
-20_fix-parser.patch
-21_fix-sqr-sigmoid.patch
-22_unbind_fbo.patch
--
projectm packaging
More information about the pkg-multimedia-commits
mailing list