Skip to content

Commit

Permalink
Remove LASH
Browse files Browse the repository at this point in the history
  • Loading branch information
derselbst committed Mar 26, 2024
1 parent c5ed1af commit 72cc6b3
Show file tree
Hide file tree
Showing 13 changed files with 2 additions and 406 deletions.
13 changes: 0 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ option ( enable-openmp "enable OpenMP support (parallelization of soundfont deco

# Platform specific options
if ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" )
option ( enable-lash "compile LASH support (if it is available)" off )
option ( enable-alsa "compile ALSA support (if it is available)" on )
endif ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" )

Expand Down Expand Up @@ -507,7 +506,6 @@ endif(ASTYLE)
set ( ALSA_MINIMUM_VERSION 0.9.1 )
set ( DBUS_MINIMUM_VERSION 1.11.12 )
set ( GLIB2_MINUMUM_VERSION 2.6.5 )
set ( LASH_MINIMUM_VERSION 0.3 )
set ( LIBINSTPATCH_MINIMUM_VERSION 1.1.0 )
set ( LIBSNDFILE_MINIMUM_VERSION 1.0.0 )
set ( PIPEWIRE_MINIMUM_VERSION 0.3 )
Expand Down Expand Up @@ -596,17 +594,6 @@ if ( enable-pipewire )
endif()
endif ( enable-pipewire )

unset ( LASH_SUPPORT CACHE )
if ( enable-lash )
find_package ( LASH ${LASH_MINIMUM_VERSION} )
if ( LASH_FOUND )
message ( WARNING "LASH support has been deprecated and will be removed in fluidsynth 2.4.0" )
set ( LASH_SUPPORT 1 )
add_definitions ( -DHAVE_LASH )
list( APPEND PC_REQUIRES_PRIV "lash-1.0")
endif ( LASH_FOUND )
endif ( enable-lash )

unset ( SYSTEMD_SUPPORT CACHE )
if ( enable-systemd )
find_package ( Systemd )
Expand Down
5 changes: 0 additions & 5 deletions FluidSynthConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ set(FLUIDSYNTH_SUPPORT_DBUS @DBUS_SUPPORT@)
set(FLUIDSYNTH_SUPPORT_GETOPT @HAVE_GETOPT_H@)
set(FLUIDSYNTH_SUPPORT_IPV6 @IPV6_SUPPORT@)
set(FLUIDSYNTH_SUPPORT_LADSPA @LADSPA_SUPPORT@)
set(FLUIDSYNTH_SUPPORT_LASH @LASH_SUPPORT@)
set(FLUIDSYNTH_SUPPORT_NETWORK @NETWORK_SUPPORT@)
set(FLUIDSYNTH_SUPPORT_READLINE @READLINE_SUPPORT@)
set(FLUIDSYNTH_SUPPORT_SYSTEMD @SYSTEMD_SUPPORT@)
Expand Down Expand Up @@ -92,10 +91,6 @@ if(NOT FLUIDSYNTH_IS_SHARED)
message(WARN "LADSPA support was built in but gmodule could not be found.")
endif()

if(FLUIDSYNTH_SUPPORT_LASH AND NOT TARGET LASH::LASH)
find_dependency(LASH @LASH_MINIMUM_VERSION@)
endif()

if(FLUIDSYNTH_SUPPORT_LIBINSTPATCH AND NOT TARGET InstPatch::libinstpatch)
find_dependency(InstPatch @LIBINSTPATCH_MINIMUM_VERSION@)
endif()
Expand Down
84 changes: 0 additions & 84 deletions cmake_admin/FindLASH.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions cmake_admin/report.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,6 @@ else ( LADSPA_SUPPORT )
set ( MISC_REPORT "${MISC_REPORT} LADSPA support: no\n" )
endif ( LADSPA_SUPPORT )

if ( LASH_SUPPORT )
set ( MISC_REPORT "${MISC_REPORT} LASH support: yes (NOTE: GPL library)\n" )
else ( LASH_SUPPORT )
set ( MISC_REPORT "${MISC_REPORT} LASH support: no\n" )
endif ( LASH_SUPPORT )

if ( NETWORK_SUPPORT )
set ( MISC_REPORT "${MISC_REPORT} NETWORK Support: yes\n" )
else ( NETWORK_SUPPORT )
Expand Down
3 changes: 1 addition & 2 deletions contrib/fluidsynth.spec
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ This package contains the shared library for Fluidsynth.

%build
%cmake \
-DFLUID_DAEMON_ENV_FILE=%{_fillupdir}/sysconfig.%{name} \
-Denable-lash=0
-DFLUID_DAEMON_ENV_FILE=%{_fillupdir}/sysconfig.%{name}
%cmake_build

%check
Expand Down
3 changes: 0 additions & 3 deletions doc/fluidsynth.1
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ Attempt to connect the jack outputs to the physical ports
.B \-K, \-\-midi\-channels=[num]
The number of midi channels [default = 16]
.TP
.B \-l, \-\-disable\-lash
Don't connect to LASH server
.TP
.B \-L, \-\-audio\-channels=[num]
The number of stereo audio channels [default = 1]
.TP
Expand Down
13 changes: 0 additions & 13 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ if ( OSS_SUPPORT )
set ( fluid_oss_SOURCES drivers/fluid_oss.c )
endif ( OSS_SUPPORT )

if ( LASH_SUPPORT )
set ( fluid_lash_SOURCES bindings/fluid_lash.c bindings/fluid_lash.h )
endif ( LASH_SUPPORT )

if ( DART_SUPPORT )
set ( fluid_dart_SOURCES drivers/fluid_dart.c )
endif ( DART_SUPPORT )
Expand Down Expand Up @@ -237,7 +233,6 @@ add_library ( libfluidsynth-OBJ OBJECT
${fluid_dbus_SOURCES}
${fluid_jack_SOURCES}
${fluid_pipewire_SOURCES}
${fluid_lash_SOURCES}
${fluid_midishare_SOURCES}
${fluid_opensles_SOURCES}
${fluid_oboe_SOURCES}
Expand Down Expand Up @@ -390,10 +385,6 @@ if ( TARGET PipeWire::PipeWire AND PIPEWIRE_SUPPORT )
target_link_libraries ( libfluidsynth-OBJ PUBLIC PipeWire::PipeWire )
endif()

if ( TARGET LASH::LASH AND LASH_SUPPORT )
target_link_libraries ( libfluidsynth-OBJ PUBLIC LASH::LASH )
endif()

if ( TARGET dbus-1 AND DBUS_SUPPORT )
target_link_libraries ( libfluidsynth-OBJ PUBLIC dbus-1 )
endif()
Expand Down Expand Up @@ -499,10 +490,6 @@ if ( TARGET PipeWire::PipeWire AND PIPEWIRE_SUPPORT ) # because pw_init() etc.
target_link_libraries ( fluidsynth PRIVATE PipeWire::PipeWire )
endif()

if ( TARGET LASH::LASH AND LASH_SUPPORT )
target_link_libraries ( fluidsynth PRIVATE LASH::LASH )
endif()

if ( MACOSX_FRAMEWORK )
install ( TARGETS fluidsynth libfluidsynth
EXPORT FluidSynthTargets
Expand Down
170 changes: 0 additions & 170 deletions src/bindings/fluid_lash.c

This file was deleted.

Loading

0 comments on commit 72cc6b3

Please sign in to comment.