mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Update LMMS from V0.4.15 to V1.1.3

Browse Source 
Sponsored by:	Essen Linuxhotel Hackathon 2016
This commit is contained in:
Rodrigo Osorio 2016-05-07 10:54:23 +00:00
parent 3068d574eb
commit cea8a0786f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=414769
52 changed files with 1236 additions and 739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
audio/lmms/Makefile
View File

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= lmms
PORTVERSION= 0.4.15
PORTVERSION= 1.1.3
DISTVERSIONPREFIX= v
PORTREVISION= 5
PORTEPOCH= 2
CATEGORIES= audio
@ -20,7 +19,9 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
libsndfile.so:audio/libsndfile \
libvorbis.so:audio/libvorbis \
libfftw3.so:math/fftw3 \
libfftw3f.so:math/fftw3-float
libfftw3f.so:math/fftw3-float \
libsamplerate.so:audio/libsamplerate \
libfltk.so:x11-toolkits/fltk
RUN_DEPENDS= ${LOCALBASE}/share/ladspa/rdf/caps.rdf:audio/caps-plugins \
${LOCALBASE}/lib/ladspa/cmt.so:audio/cmt \
${LOCALBASE}/share/ladspa/rdf/swh-plugins.rdf:audio/swhplugins \
@ -45,7 +46,7 @@ CMAKE_ARGS= -DWANT_ALSA:BOOL=OFF \
-DWANT_VST:BOOL=OFF \
-DHAVE_STRTOLL=ON
DOS2UNIX_FILES= plugins/midi_import/portsmf/allegrowr.cpp plugins/midi_import/portsmf/mfmidi.cpp CMakeLists.txt
DOS2UNIX_FILES= CMakeLists.txt
JACK_LIB_DEPENDS= libjack.so:audio/jack
JACK_CMAKE_OFF= -DWANT_JACK:BOOL=OFF

4
audio/lmms/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (LMMS-lmms-v0.4.15_GH0.tar.gz) = b516f89d2dba3a34ec57668291ba537d70a2b9fd29a872407ce1d9df4b02df77
SIZE (LMMS-lmms-v0.4.15_GH0.tar.gz) = 15828961
SHA256 (LMMS-lmms-v1.1.3_GH0.tar.gz) = 59338e7b90e02fe18db73114aefe479c0e6d1e0e366185d71ea5c1a1e0f9e6bc
SIZE (LMMS-lmms-v1.1.3_GH0.tar.gz) = 16843533

44
audio/lmms/files/patch-CMakeLists.txt
View File

@ -1,20 +1,30 @@
--- CMakeLists.txt.orig 2011-07-02 13:14:01.000000000 +0000
+++ CMakeLists.txt 2011-10-23 07:48:40.000000000 +0000
@@ -356,7 +356,7 @@
--- CMakeLists.txt.orig 2016-04-24 11:28:57 UTC
+++ CMakeLists.txt
@@ -325,6 +325,7 @@ ENDIF(LMMS_BUILD_WIN32)
# check for libsamplerate
PKG_CHECK_MODULES(SAMPLERATE REQUIRED samplerate>=0.1.8)
+link_directories(${SAMPLERATE_LIBRARY_DIRS})
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsconfig.h.in" "${CMAKE_BINARY_DIR}/lmmsconfig.h")
@@ -333,10 +334,7 @@ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmms
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in" "${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc")
# set compiler flags
#SET(CMAKE_BUILD_TYPE relwithdebug)
SET(CMAKE_C_FLAGS "-O2 -g -Wall ${CMAKE_C_FLAGS}")
-SET(CMAKE_CXX_FLAGS "-O2 -g -fno-exceptions -Wall ${CMAKE_CXX_FLAGS}")
+SET(CMAKE_CXX_FLAGS "-O2 -g -fno-exceptions -Wall -Wno-unused ${CMAKE_CXX_FLAGS}")
#SET(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS}")
#SET(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS}")
-SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
-IF(NOT LMMS_BUILD_APPLE)
- SET(WERROR_FLAGS "${WERROR_FLAGS} -Werror")
-ENDIF()
+SET(WERROR_FLAGS "-Wall -Wno-sign-compare -Wno-strict-overflow")
@@ -462,7 +462,7 @@
ENDIF(NOT LMMS_BUILD_APPLE)
INSTALL(TARGETS lmms RUNTIME DESTINATION bin)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/lmms.1.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ INSTALL(FILES ${CMAKE_BINARY_DIR}/lmms.1.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
ENDIF(LMMS_BUILD_WIN32)
# Due to a regression in gcc-4.8.X, we need to disable array-bounds check
IF (CMAKE_COMPILER_IS_GNUCXX AND ((CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "4.8.0") OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.8.0")))
@@ -639,6 +637,7 @@ MESSAGE(
"running cmake again!\n"
"-----------------------------------------------------------------\n"
"\n\n")
+message(STATUS "using link directories: ${FFTW3F_LIBRARY_DIRS} ${AUDIO_LIBRARY_DIRS} ${ZLIB_LIBRARY_DIRS} ${FFTW_LIBRARY_DIRS} ${MXML_LIBRARY_DIRS} ${FLTK_LIBRARY_DIRS}")
INCLUDE(InstallRequiredSystemLibraries)
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LMMS - easy music production for everyone!")

11
audio/lmms/files/patch-_plugins_zynaddsubfx_src_Samples_Sample.cpp
View File

@ -1,11 +0,0 @@
--- plugins/zynaddsubfx/src/Samples/Sample.cpp 2011-07-02 13:14:01.000000000 +0000
+++ plugins/zynaddsubfx/src/Samples/Sample.cpp.new 2011-09-30 21:17:49.000000000 +0000
@@ -116,7 +116,7 @@
void Sample::resize(unsigned int nsize)
{
- if(bufferSize == nsize)
+ if(bufferSize == (int)nsize)
return;
else {//resampling occurs here
float ratio = (nsize * 1.0) / (bufferSize * 1.0);

14
audio/lmms/files/patch-include_debug.h Normal file
View File

@ -0,0 +1,14 @@
--- include/debug.h.orig 2015-03-08 02:47:14 UTC
+++ include/debug.h
@@ -30,10 +30,10 @@
// set whether debug-stuff (like messages on the console, asserts and other
// additional range-checkings) should be compiled
-
#ifdef LMMS_DEBUG
#include <assert.h>
#else
+ #undef assert
#define assert(x) ((void)(x))
#endif
#include <cstdio>

27
audio/lmms/files/patch-include_lmms__math.h Normal file
View File

@ -0,0 +1,27 @@
--- include/lmms_math.h.orig 2016-05-05 22:56:00 UTC
+++ include/lmms_math.h
@@ -26,15 +26,14 @@
#ifndef LMMS_MATH_H
#define LMMS_MATH_H
+#include <math.h>
#include <stdint.h>
#include "lmms_constants.h"
#include "lmmsconfig.h"
#include <QtCore/QtGlobal>
-#include <cmath>
using namespace std;
-#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE)
#ifndef isnanf
#define isnanf(x) isnan(x)
#endif
@@ -53,7 +52,6 @@ using namespace std;
#ifndef exp10f
#define exp10f(x) powf( 10, x )
#endif
-#endif
#ifdef __INTEL_COMPILER

9
audio/lmms/files/patch-plugins_Amplifier_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/Amplifier/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/Amplifier/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(amplifier Amplifier.cpp AmplifierControls.cpp AmplifierControlDialog.cpp MOCFILES AmplifierControls.h AmplifierControlDialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_BassBooster_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/BassBooster/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/BassBooster/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(bassbooster BassBooster.cpp BassBoosterControls.cpp BassBoosterControlDialog.cpp MOCFILES BassBoosterControls.h BassBoosterControlDialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_DualFilter_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/DualFilter/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/DualFilter/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(dualfilter DualFilter.cpp DualFilterControls.cpp DualFilterControlDialog.cpp MOCFILES DualFilterControls.h DualFilterControlDialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

8
audio/lmms/files/patch-plugins_HydrogenImport_CMakeLists.txt Normal file
View File

@ -0,0 +1,8 @@
--- plugins/HydrogenImport/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/HydrogenImport/CMakeLists.txt
@@ -2,3 +2,5 @@ INCLUDE(BuildPlugin)
BUILD_PLUGIN(hydrogenimport HydrogenImport.cpp HydrogenImport.h local_file_mgr.cpp LocalFileMng.h)
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_LadspaEffect_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/LadspaEffect/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/LadspaEffect/CMakeLists.txt
@@ -24,3 +24,6 @@ INCLUDE(BuildPlugin)
BUILD_PLUGIN(ladspaeffect LadspaEffect.cpp LadspaControls.cpp LadspaControlDialog.cpp LadspaSubPluginFeatures.cpp LadspaEffect.h LadspaControls.h LadspaControlDialog.h LadspaSubPluginFeatures.h MOCFILES LadspaEffect.h LadspaControls.h LadspaControlDialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_MidiImport_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/MidiImport/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/MidiImport/CMakeLists.txt
@@ -6,3 +6,6 @@ BUILD_PLUGIN(midiimport MidiImport.cpp M
portsmf/mfmidi.cpp portsmf/mfmidi.h portsmf/strparse.cpp
portsmf/strparse.h portsmf/algrd_internal.h portsmf/algsmfrd_internal.h
portsmf/trace.h MOCFILES MidiImport.h)
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

10
audio/lmms/files/patch-plugins_MidiImport_portsmf_allegro.h Normal file
View File

@ -0,0 +1,10 @@
--- plugins/MidiImport/portsmf/allegro.h.orig 2015-03-08 02:47:14 UTC
+++ plugins/MidiImport/portsmf/allegro.h
@@ -904,6 +904,7 @@ public:
void insert_silence(double t, double len);
Alg_track_ptr copy_track(int track_num, double t, double len, bool all);
Alg_seq *copy(double start, double len, bool all);
+ using Alg_track::paste;
void paste(double start, Alg_seq *seq);
virtual void clear(double t, double len, bool all);
virtual void merge(double t, Alg_event_list_ptr seq);

9
audio/lmms/files/patch-plugins_audio__file__processor_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/audio_file_processor/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/audio_file_processor/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(audiofileprocessor audio_file_processor.cpp audio_file_processor.h MOCFILES audio_file_processor.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_bit__invader_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/bit_invader/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/bit_invader/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(bitinvader bit_invader.cpp bit_invader.h MOCFILES bit_invader.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_delay_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/delay/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/delay/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(delay delayeffect.cpp delaycontrols.cpp delaycontrolsdialog.cpp lfo.cpp stereodelay.cpp MOCFILES delaycontrols.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_dynamics__processor_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/dynamics_processor/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/dynamics_processor/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(dynamicsprocessor dynamics_processor.cpp dynamics_processor_controls.cpp dynamics_processor_control_dialog.cpp MOCFILES dynamics_processor_controls.h dynamics_processor_control_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_flp__import_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/flp_import/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/flp_import/CMakeLists.txt
@@ -3,3 +3,6 @@ INCLUDE(BuildPlugin)
INCLUDE_DIRECTORIES(unrtf)
BUILD_PLUGIN(flpimport FlpImport.cpp unrtf.cpp FlpImport.h)
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_kicker_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/kicker/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/kicker/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(kicker kicker.cpp kicker.h MOCFILES kicker.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_ladspa__browser_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/ladspa_browser/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/ladspa_browser/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(ladspabrowser ladspa_browser.cpp ladspa_browser.h ladspa_description.cpp ladspa_description.h ladspa_port_dialog.cpp ladspa_port_dialog.h MOCFILES ladspa_browser.h ladspa_description.h ladspa_port_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_lb302_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/lb302/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/lb302/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(lb302 lb302.cpp lb302.h MOCFILES lb302.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

241
audio/lmms/files/patch-plugins_midi_import_portsmf_allegrord.cpp
View File

@ -1,241 +0,0 @@
--- plugins/midi_import/portsmf/allegrord.cpp 2011-07-02 13:14:01.000000000 +0000
+++ plugins/midi_import/portsmf/allegrord.cpp.new 2011-09-30 11:37:34.000000000 +0000
@@ -109,19 +109,19 @@
if (attributes) {
Alg_parameters_ptr a;
bool in_seconds = seq->get_units_are_seconds();
- if (a = Alg_parameters::remove_key(&attributes, "tempor")) {
+ if ((a = Alg_parameters::remove_key(&attributes, (char *)"tempor"))) {
double tempo = a->parm.r;
seq->insert_tempo(tempo, seq->get_time_map()->time_to_beat(time));
}
- if (a = Alg_parameters::remove_key(&attributes, "beatr")) {
+ if ((a = Alg_parameters::remove_key(&attributes, (char *)"beatr"))) {
double beat = a->parm.r;
seq->insert_beat(time, beat);
}
- if (a = Alg_parameters::remove_key(&attributes, "timesig_numr")) {
+ if ((a = Alg_parameters::remove_key(&attributes, (char *)"timesig_numr"))) {
tsnum = a->parm.r;
ts_flag = true;
}
- if (a = Alg_parameters::remove_key(&attributes, "timesig_denr")) {
+ if ((a = Alg_parameters::remove_key(&attributes, (char *)"timesig_denr"))) {
tsden = a->parm.r;
ts_flag = true;
}
@@ -210,56 +210,56 @@
}
if (first == 'V') {
if (voice_flag) {
- parse_error(field, 0, "Voice specified twice");
+ parse_error(field, 0, (char *)"Voice specified twice");
} else {
voice = parse_chan(field);
}
voice_flag = true;
} else if (first == 'T') {
if (time_flag) {
- parse_error(field, 0, "Time specified twice");
+ parse_error(field, 0, (char *)"Time specified twice");
} else {
time = parse_dur(field, 0.0);
}
time_flag = true;
} else if (first == 'N') {
if (next_flag) {
- parse_error(field, 0, "Next specified twice");
+ parse_error(field, 0, (char *)"Next specified twice");
} else {
next = parse_dur(field, time);
}
next_flag = true;
} else if (first == 'K') {
if (new_key_flag) {
- parse_error(field, 0, "Key specified twice");
+ parse_error(field, 0, (char *)"Key specified twice");
} else {
new_key = parse_key(field);
new_key_flag = true;
}
} else if (first == 'L') {
if (loud_flag) {
- parse_error(field, 0, "Loudness specified twice");
+ parse_error(field, 0, (char *)"Loudness specified twice");
} else {
loud = parse_loud(field);
}
loud_flag = true;
} else if (first == 'P') {
if (new_pitch_flag) {
- parse_error(field, 0, "Pitch specified twice");
+ parse_error(field, 0, (char *)"Pitch specified twice");
} else {
new_pitch = parse_pitch(field);
new_pitch_flag = true;
}
} else if (first == 'U') {
if (dur_flag) {
- parse_error(field, 0, "Dur specified twice");
+ parse_error(field, 0, (char *)"Dur specified twice");
} else {
dur = parse_dur(field, time);
dur_flag = true;
}
} else if (strchr("SIQHW", first)) {
if (dur_flag) {
- parse_error(field, 0, "Dur specified twice");
+ parse_error(field, 0, (char *)"Dur specified twice");
} else {
// prepend 'U' to field, copy EOS too
field.insert(0, 1, 'U');
@@ -268,7 +268,7 @@
}
} else if (strchr("ABCDEFG", first)) {
if (new_pitch_flag) {
- parse_error(field, 0, "Pitch specified twice");
+ parse_error(field, 0, (char *)"Pitch specified twice");
} else {
// prepend 'P' to field
field.insert(0, 1, 'P');
@@ -283,7 +283,7 @@
parm.s = NULL; // protect string from deletion by destructor
}
} else {
- parse_error(field, 0, "Unknown field");
+ parse_error(field, 0, (char *)"Unknown field");
}
if (error_flag) {
@@ -404,11 +404,11 @@
long Alg_reader::parse_chan(string &field)
{
const char *int_string = field.c_str() + 1;
- char *msg = "Integer or - expected";
+ char *msg = (char *)"Integer or - expected";
const char *p = int_string;
char c;
// check that all chars in int_string are digits or '-':
- while (c = *p++) {
+ while ((c = *p++)) {
if (!isdigit(c) && c != '-') {
parse_error(field, p - field.c_str() - 1, msg);
return 0;
@@ -431,8 +431,8 @@
long Alg_reader::parse_int(string &field)
{
const char *int_string = field.c_str() + 1;
- char *msg = "Integer expected";
- const char *p = int_string;
+ char *msg = (char *)"Integer expected";
+ const char *p = int_string;
char c;
// check that all chars in int_string are digits:
while (c = *p++) {
@@ -472,7 +472,7 @@
double Alg_reader::parse_real(string &field)
{
- char *msg = "Real expected";
+ char *msg = (char *)"Real expected";
int last = find_real_in(field, 1);
string real_string = field.substr(1, last - 1);
if (last <= 1 || last < (int) field.length()) {
@@ -501,8 +501,8 @@
double Alg_reader::parse_dur(string &field, double base)
{
- char *msg = "Duration expected";
- char *durs = "SIQHW";
+ char *msg = (char *)"Duration expected";
+ char *durs = (char *)"SIQHW";
char *p;
int last;
double dur;
@@ -516,7 +516,7 @@
// convert dur from seconds to beats
dur = seq->get_time_map()->time_to_beat(base + dur) -
seq->get_time_map()->time_to_beat(base);
- } else if (p = strchr(durs, toupper(field[1]))) {
+ } else if ((p = strchr(durs, toupper(field[1])))) {
dur = duration_lookup[p - durs];
last = 2;
} else {
@@ -554,12 +554,12 @@
a_string, seq->get_time_map()->beat_to_time(
seq->get_time_map()->time_to_beat(base) + dur));
}
- parse_error(field, n, "Unexpected character in duration");
+ parse_error(field, n, (char *)"Unexpected character in duration");
return dur;
}
struct loud_lookup_struct {
- char *str;
+ char const *str;
int val;
} loud_lookup[] = { {"FFF", 127}, {"FF", 120}, {"F", 110}, {"MF", 100},
{"MP", 90}, {"P", 80}, {"PP", 70}, {"PPP", 60},
@@ -568,7 +568,7 @@
double Alg_reader::parse_loud(string &field)
{
- char *msg = "Loudness expected";
+ char *msg = (char *)"Loudness expected";
if (isdigit(field[1])) {
return parse_int(field);
} else {
@@ -594,14 +594,14 @@
//
long Alg_reader::parse_key(string &field)
{
- char *msg = "Pitch expected";
- char *pitches = "ABCDEFG";
+ char *msg = (char *)"Pitch expected";
+ char *pitches = (char *)"ABCDEFG";
char *p;
if (isdigit(field[1])) {
// This routine would not have been called if field = "P<number>"
// so it must be "K<number>" so <number> must be an integer.
return parse_int(field);
- } else if (p = strchr(pitches, toupper(field[1]))) {
+ } else if ((p = strchr(pitches, toupper(field[1])))) {
long key = key_lookup[p - pitches];
key = parse_after_key(key, field, 2);
return key;
@@ -629,7 +629,7 @@
int oct = atoi(octave.c_str());
return parse_after_key(key + oct * 12, field, last);
}
- parse_error(field, n, "Unexpected character in pitch");
+ parse_error(field, n, (char *)"Unexpected character in pitch");
return key;
}
@@ -654,7 +654,7 @@
param->set_attr(symbol_table.insert_string(attr.c_str()));
parse_val(param, field, i + 1);
} else {
- parse_error(field, 0, "attribute needs to end with typecode: i,a,r,s, or l");
+ parse_error(field, 0, (char *)"attribute needs to end with typecode: i,a,r,s, or l");
}
return !error_flag;
}
@@ -708,7 +708,7 @@
} else if (!period && s[pos] == '.') {
period = true;
} else {
- parse_error(s, pos, "Unexpected char in number");
+ parse_error(s, pos, (char *)"Unexpected char in number");
return false;
}
pos = pos + 1;
@@ -729,7 +729,7 @@
}
}
} else {
- parse_error(s, i, "invalid value");
+ parse_error(s, i, (char *)"invalid value");
return false;
}
return true;

25
audio/lmms/files/patch-plugins_midi_import_portsmf_allegrosmfrd.cpp
View File

@ -1,25 +0,0 @@
--- plugins/midi_import/portsmf/allegrosmfrd.cpp 2011-07-02 13:14:01.000000000 +0000
+++ plugins/midi_import/portsmf/allegrosmfrd.cpp.new 2011-09-30 21:07:19.000000000 +0000
@@ -327,7 +327,7 @@
void Alg_midifile_reader::Mf_arbitrary(int len, char *msg)
{
- Mf_error("arbitrary data ignored");
+ Mf_error((char *)"arbitrary data ignored");
}
@@ -341,11 +341,11 @@
void Alg_midifile_reader::Mf_seqnum(int n)
{
- Mf_error("seqnum data ignored");
+ Mf_error((char *)"seqnum data ignored");
}
-static char *fpsstr[4] = {"24", "25", "29.97", "30"};
+static char *fpsstr[4] = {(char *)"24", (char *)"25", (char *)"29.97", (char *)"30"};
void Alg_midifile_reader::Mf_smpte(int hours, int mins, int secs,
int frames, int subframes)

11
audio/lmms/files/patch-plugins_midi_import_portsmf_allegrowr.cpp
View File

@ -1,11 +0,0 @@
--- plugins/midi_import/portsmf/allegrowr.cpp.orig 2011-10-03 12:30:46.000000000 +0000
+++ plugins/midi_import/portsmf/allegrowr.cpp 2011-10-03 12:30:46.000000000 +0000
@@ -41,7 +41,7 @@
break;
case 's': {
string str;
- string_escape(str, p->s, "\"");
+ string_escape(str, p->s, (char *)"\"");
file << str;
break;
}

69
audio/lmms/files/patch-plugins_midi_import_portsmf_mfmidi.cpp
View File

@ -1,69 +0,0 @@
--- plugins/midi_import/portsmf/mfmidi.cpp.orig 2011-10-03 12:30:46.000000000 +0000
+++ plugins/midi_import/portsmf/mfmidi.cpp 2011-10-03 12:30:46.000000000 +0000
@@ -28,7 +28,7 @@
ntrks = readheader();
if (midifile_error) return;
if (ntrks <= 0) {
- mferror("No tracks!");
+ mferror((char *)"No tracks!");
/* no need to return since midifile_error is set */
}
while (ntrks-- > 0 && !midifile_error) readtrack();
@@ -42,13 +42,13 @@
char b[4];
char buff[32];
int c;
- char *errmsg = "expecting ";
+ char static * errmsg = (char *)"expecting ";
retry:
while ( nread<4 ) {
c = Mf_getc();
if ( c == EOF ) {
- errmsg = "EOF while expecting ";
+ errmsg = (char *)"EOF while expecting ";
goto err;
}
b[nread++] = c;
@@ -78,7 +78,7 @@
int c = Mf_getc();
if ( c == EOF ) {
- mferror("premature EOF");
+ mferror((char *)"premature EOF");
return EOF;
}
Mf_toberead--;
@@ -90,7 +90,7 @@
{
int format, ntrks, division;
- if ( readmt("MThd",Mf_skipinit) == EOF )
+ if ( readmt((char *)"MThd",Mf_skipinit) == EOF )
return(0);
Mf_toberead = read32bit();
@@ -127,7 +127,7 @@
int status = 0; /* (possibly running) status byte */
int needed;
- if ( readmt("MTrk",0) == EOF )
+ if ( readmt((char *)"MTrk",0) == EOF )
return;
Mf_toberead = read32bit();
@@ -147,12 +147,12 @@
if (midifile_error) return;
if ( sysexcontinue && c != 0xf7 ) {
- mferror("didn't find expected continuation of a sysex");
+ mferror((char *)"didn't find expected continuation of a sysex");
return;
}
if ( (c & 0x80) == 0 ) { /* running status? */
if ( status == 0 ) {
- mferror("unexpected running status");
+ mferror((char *)"unexpected running status");
return;
}
running = 1;

9
audio/lmms/files/patch-plugins_monstro_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/monstro/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/monstro/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(monstro Monstro.cpp Monstro.h MOCFILES Monstro.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_nes_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/nes/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/nes/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(nes Nes.cpp Nes.h MOCFILES Nes.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_opl2_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/opl2/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/opl2/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(OPL2 opl2instrument.cpp opl2instrument.h opl.h fmopl.c fmopl.h temuopl.cpp temuopl.h MOCFILES opl2instrument.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_organic_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/organic/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/organic/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(organic organic.cpp organic.h MOCFILES organic.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_papu_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/papu/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/papu/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(papu papu_instrument.cpp papu_instrument.h Basic_Gb_Apu.cpp Basic_Gb_Apu.h gb_apu/Gb_Oscs.cpp gb_apu/Gb_Apu.h gb_apu/Blip_Buffer.cpp gb_apu/Gb_Apu.cpp gb_apu/Gb_Oscs.h gb_apu/blargg_common.h gb_apu/Blip_Buffer.h gb_apu/Multi_Buffer.cpp gb_apu/blargg_source.h gb_apu/Blip_Synth.h gb_apu/Multi_Buffer.h MOCFILES papu_instrument.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_patman_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/patman/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/patman/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(patman patman.cpp patman.h MOCFILES patman.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_peak__controller__effect_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/peak_controller_effect/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/peak_controller_effect/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(peakcontrollereffect peak_controller_effect.cpp peak_controller_effect_controls.cpp peak_controller_effect_control_dialog.cpp peak_controller_effect.h peak_controller_effect_controls.h peak_controller_effect_control_dialog.h MOCFILES peak_controller_effect_controls.h peak_controller_effect_control_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_sfxr_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/sfxr/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/sfxr/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(sfxr sfxr.cpp sfxr.h MOCFILES sfxr.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_sid_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/sid/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/sid/CMakeLists.txt
@@ -2,4 +2,5 @@ INCLUDE(BuildPlugin)
BUILD_PLUGIN(sid sid_instrument.cpp sid_instrument.h envelope.h extfilt.h filter.h pot.h siddefs.h sid.h spline.h voice.h wave.h envelope.cc extfilt.cc filter.cc pot.cc sid.cc version.cc voice.cc wave6581_PS_.cc wave6581_PST.cc wave6581_P_T.cc wave6581__ST.cc wave8580_PS_.cc wave8580_PST.cc wave8580_P_T.cc wave8580__ST.cc wave.cc MOCFILES sid_instrument.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
-
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

8
audio/lmms/files/patch-plugins_stereo__enhancer_CMakeLists.txt Normal file
View File

@ -0,0 +1,8 @@
--- plugins/stereo_enhancer/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/stereo_enhancer/CMakeLists.txt
@@ -2,3 +2,5 @@ INCLUDE(BuildPlugin)
BUILD_PLUGIN(stereoenhancer stereo_enhancer.cpp stereoenhancer_controls.cpp stereoenhancer_control_dialog.cpp stereo_enhancer.h stereoenhancer_controls.h stereoenhancer_control_dialog.h MOCFILES stereoenhancer_controls.h stereoenhancer_control_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

8
audio/lmms/files/patch-plugins_stereo__matrix_CMakeLists.txt Normal file
View File

@ -0,0 +1,8 @@
--- plugins/stereo_matrix/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/stereo_matrix/CMakeLists.txt
@@ -2,3 +2,5 @@ INCLUDE(BuildPlugin)
BUILD_PLUGIN(stereomatrix stereo_matrix.cpp stereomatrix_controls.cpp stereomatrix_control_dialog.cpp stereo_matrix.h stereomatrix_controls.h stereomatrix_control_dialog.h MOCFILES stereomatrix_controls.h stereomatrix_control_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_triple__oscillator_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/triple_oscillator/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/triple_oscillator/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(tripleoscillator TripleOscillator.cpp TripleOscillator.h MOCFILES TripleOscillator.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_vibed_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/vibed/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/vibed/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(vibedstrings vibed.cpp nine_button_selector.cpp string_container.cpp vibrating_string.cpp vibed.h nine_button_selector.h string_container.h vibrating_string.h MOCFILES vibed.h nine_button_selector.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_watsyn_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/watsyn/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/watsyn/CMakeLists.txt
@@ -3,3 +3,6 @@ INCLUDE(BuildPlugin)
LINK_DIRECTORIES(${SAMPLERATE_LIBRARY_DIRS})
LINK_LIBRARIES(${SAMPLERATE_LIBRARIES})
BUILD_PLUGIN(watsyn Watsyn.cpp Watsyn.h MOCFILES Watsyn.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

9
audio/lmms/files/patch-plugins_waveshaper_CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
--- plugins/waveshaper/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/waveshaper/CMakeLists.txt
@@ -1,3 +1,6 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(waveshaper waveshaper.cpp waveshaper_controls.cpp waveshaper_control_dialog.cpp MOCFILES waveshaper_controls.h waveshaper_control_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})

20
audio/lmms/files/patch-plugins_zynaddsubfx_CMakeList.txt
View File

@ -1,20 +0,0 @@
--- plugins/zynaddsubfx/CMakeLists.txt 2011-07-02 13:14:01.000000000 +0000
+++ plugins/zynaddsubfx/CMakeLists.txt.new 2011-09-27 22:40:14.000000000 +0000
@@ -75,7 +75,7 @@
add_subdirectory(src/Samples)
ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp)
-TARGET_LINK_LIBRARIES(ZynAddSubFxCore ${ZASF_CORE_LIBS} ${FFTW3F_LIBRARIES} ${QT_LIBRARIES} -lz -lpthread)
+TARGET_LINK_LIBRARIES(ZynAddSubFxCore ${ZASF_CORE_LIBS} ${FFTW3F_LIBRARIES} ${QT_LIBRARIES} -lz -lpthread -L/usr/local/lib )
IF(LMMS_BUILD_WIN32)
TARGET_LINK_LIBRARIES(ZynAddSubFxCore -lws2_32)
INSTALL(TARGETS ZynAddSubFxCore RUNTIME DESTINATION ${PLUGIN_DIR})
@@ -112,7 +112,7 @@
IF(LMMS_BUILD_LINUX)
FIND_PACKAGE(X11)
FIND_PACKAGE(Freetype)
- TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -ldl ${X11_LIBRARIES} ${X11_Xft_LIB} ${X11_Xinerama_LIB} ${FREETYPE_LIBRARY} -lfontconfig)
+ TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${X11_LIBRARIES} ${X11_Xft_LIB} ${X11_Xinerama_LIB} ${FREETYPE_LIBRARY} -lfontconfig -L/usr/local/lib )
ENDIF(LMMS_BUILD_LINUX)

22
audio/lmms/files/patch-plugins_zynaddsubfx_CMakeLists.txt Normal file
View File

@ -0,0 +1,22 @@
--- plugins/zynaddsubfx/CMakeLists.txt.orig 2015-03-08 02:47:14 UTC
+++ plugins/zynaddsubfx/CMakeLists.txt
@@ -49,6 +49,7 @@ INCLUDE_DIRECTORIES("${FLTK_INCLUDE_DIR}
"${CMAKE_BINARY_DIR}")
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/zynaddsubfx/src/UI)
+link_directories(${FFTW3F_LIBRARY_DIRS})
ADD_DEFINITIONS(-DPLUGINVERSION) # removes exit confirmation dialogs etc. in MasterUI.fl
add_subdirectory(zynaddsubfx/src/Nio)
@@ -137,11 +138,6 @@ IF(LMMS_BUILD_WIN32)
TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES})
ENDIF(LMMS_BUILD_WIN32)
-# FLTK needs X
-IF(LMMS_BUILD_LINUX)
- TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -ldl)
-ENDIF(LMMS_BUILD_LINUX)
-
IF(LMMS_BUILD_WIN32)
ADD_CUSTOM_COMMAND(TARGET ZynAddSubFxCore POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_CURRENT_BINARY_DIR}/libZynAddSubFxCore.dll\"")

11
audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt
View File

@ -1,11 +0,0 @@
--- plugins/zynaddsubfx/fltk/CMakeLists.txt.orig 2013-06-11 17:46:42.000000000 +0200
+++ plugins/zynaddsubfx/fltk/CMakeLists.txt 2015-10-21 10:24:19.901416000 +0200
@@ -139,7 +139,7 @@
find_file(HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h)
find_file(HAVE_DIRENT_H dirent.h)
find_file(HAVE_DLFCN_H dlfcn.h)
-find_file(HAVE_FREETYPE_H freetype.h PATH_SUFFIXES freetype2)
+find_file(HAVE_FREETYPE_H ft2build.h PATH_SUFFIXES freetype2)
find_file(HAVE_GL_GL_H GL/gl.h)
find_file(HAVE_GL_GLU_H GL/glu.h)
find_file(HAVE_LIBPNG_PNG_H libpng/png.h)

10
audio/lmms/files/patch-plugins_zynaddsubfx_fltk_FL_Fl_Widget.H
View File

@ -1,10 +0,0 @@
--- plugins/zynaddsubfx/fltk/FL/Fl_Widget.H 2013-06-11 22:57:16.000000000 +0200
+++ plugins/zynaddsubfx/fltk/FL/Fl_Widget.H 2013-07-19 13:58:16.000000000 +0200
@@ -108,6 +108,7 @@
*/
class FL_EXPORT Fl_Widget {
friend class Fl_Group;
+ friend class Fl_X;
Fl_Group* parent_;
Fl_Callback* callback_;

18
audio/lmms/files/patch-plugins_zynaddsubfx_fltk_configh.cmake.in
View File

@ -1,18 +0,0 @@
--- plugins/zynaddsubfx/fltk/configh.cmake.in 2011-06-09 08:34:59.000000000 +0000
+++ plugins/zynaddsubfx/fltk/configh.cmake.in.new 2011-08-08 07:55:59.000000000 +0000
@@ -306,15 +306,6 @@
# define FLTK_LLCAST (long)
#endif /* HAVE_LONG_LONG */
-/*
- * Do we have the strtoll() function?
- */
-
-#cmakedefine HAVE_STRTOLL @HAVE_STRTOLL@
-
-#ifndef HAVE_STRTOLL
-# define strtoll(nptr,endptr,base) strtol((nptr), (endptr), (base))
-#endif /* !HAVE_STRTOLL */
/*
* Do we have the dlsym() function and header?

24
audio/lmms/files/patch-plugins_zynaddsubfx_fltk_src_numericsort.c
View File

@ -1,24 +0,0 @@
--- plugins/zynaddsubfx/fltk/src/numericsort.c 2011-09-27 12:20:36.000000000 +0000
+++ plugins/zynaddsubfx/fltk/src/numericsort.c.new 2011-09-27 12:26:57.000000000 +0000
@@ -34,20 +34,7 @@
#include <sys/types.h>
#if !defined(WIN32) || defined(__CYGWIN__)
-# ifdef HAVE_DIRENT_H
-# include <dirent.h>
-# else
-# define dirent direct
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# if HAVE_NDIR_H
-# include <ndir.h>
-# endif /* HAVE_NDIR_H */
-# endif /* HAVE_DIRENT_H */
+# include <dirent.h>
#else /* For WIN32 variants */
# include <FL/filename.H>
#endif /* !WIN32 || __CYGWIN__ */

27
audio/lmms/files/patch-plugins_zynaddsubfx_fltk_src_scandir.c
View File

@ -1,27 +0,0 @@
--- plugins/zynaddsubfx/fltk/src/scandir.c 2011-06-09 08:34:59.000000000 +0000
+++ plugins/zynaddsubfx/fltk/src/scandir.c.new 2011-08-08 11:43:43.000000000 +0000
@@ -28,22 +28,8 @@
# include <sys/types.h>
# include <errno.h>
-# if HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-# else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-# include <ndir.h>
-# endif
-# endif
+# include <dirent.h>
+# define NAMLEN(dirent) strlen((dirent)->d_name)
int
fl_scandir(const char *dir, struct dirent ***namelist,

20
audio/lmms/files/patch-plugins_zynaddsubfx_src_Effects_Alienwah.cpp
View File

@ -1,20 +0,0 @@
--- plugins/zynaddsubfx/src/Effects/Alienwah.cpp.orig 2014-02-25 15:16:26.000000000 +0200
+++ plugins/zynaddsubfx/src/Effects/Alienwah.cpp 2014-02-25 15:17:00.000000000 +0200
@@ -67,7 +67,7 @@
tmp = clfol * x + oldclfol * x1;
out = tmp * oldl[oldk];
- out.real() += (1 - fabs(fb)) * smp.l[i] * (1.0 - panning);
+ out += (1 - fabs(fb)) * smp.l[i] * (1.0 - panning);
oldl[oldk] = out;
REALTYPE l = out.real() * 10.0 * (fb + 0.1);
@@ -76,7 +76,7 @@
tmp = clfor * x + oldclfor * x1;
out = tmp * oldr[oldk];
- out.real() += (1 - fabs(fb)) * smp.r[i] * (1.0 - panning);
+ out += (1 - fabs(fb)) * smp.r[i] * (1.0 - panning);
oldr[oldk] = out;
REALTYPE r = out.real() * 10.0 * (fb + 0.1);

11
audio/lmms/files/patch-plugins_zynaddsubfx_src_Misc_Util.cpp
View File

@ -1,11 +0,0 @@
--- plugins/zynaddsubfx/src/Misc/Util.cpp.orig 2011-10-04 13:23:12.000000000 +0000
+++ plugins/zynaddsubfx/src/Misc/Util.cpp 2011-10-04 13:23:28.000000000 +0000
@@ -115,7 +115,7 @@
void invSignal(REALTYPE *sig, size_t len)
{
- for(int i = 0; i < len; i++)
+ for(unsigned int i = 0; i < len; i++)
sig[i] *= -1.0f;
}

20
audio/lmms/files/patch-plugins_zynaddsubfx_src_Params_PresetsStore.cpp
View File

@ -1,20 +0,0 @@
--- plugins/zynaddsubfx/src/Params/PresetsStore.cpp.orig 2011-10-04 13:25:02.000000000 +0000
+++ plugins/zynaddsubfx/src/Params/PresetsStore.cpp 2011-10-04 13:26:03.000000000 +0000
@@ -167,7 +167,7 @@
bool PresetsStore::pastepreset(XMLwrapper *xml, int npreset)
{
npreset--;
- if(npreset >= presets.size())
+ if(npreset >= (int)presets.size())
return false;
string filename = presets[npreset].file;
if(filename.empty())
@@ -179,7 +179,7 @@
void PresetsStore::deletepreset(int npreset)
{
npreset--;
- if(npreset >= presets.size())
+ if(npreset >= (int)presets.size())
return;
string filename = presets[npreset].file;
if(filename.empty())

11
audio/lmms/files/patch-plugins_zynaddsubfx_src_UI_PresetsUI.cc
View File

@ -1,11 +0,0 @@
--- plugins/zynaddsubfx/src/UI/PresetsUI.cc 2011-07-02 13:14:01.000000000 +0000
+++ plugins/zynaddsubfx/src/UI/PresetsUI.cc.new 2011-09-30 21:19:59.000000000 +0000
@@ -263,7 +263,7 @@
pastebrowse->clear();
p->rescanforpresets();
- for (int i=0;i<presetsstore.presets.size();i++){
+ for (int i=0;i<(int)presetsstore.presets.size();i++){
std::string name=presetsstore.presets[i].name;
if(name.empty())
continue;

1058
audio/lmms/pkg-plist
View File

File diff suppressed because it is too large Load Diff