Skip to content

V
vlc-2-2
Commit d6f2ec0d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

contrib: fluidsynth simplification

parent f2ab4fa5
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
contrib/src/fluid/rules.mak
View file @ d6f2ec0d
...@@ -6,7 +6,7 @@ FLUID_URL := $(SF)/fluidsynth/fluidsynth-$(FLUID_VERSION)/fluidsynth-$(FLUID_VER ...@@ -6,7 +6,7 @@ FLUID_URL := $(SF)/fluidsynth/fluidsynth-$(FLUID_VERSION)/fluidsynth-$(FLUID_VER
ifeq ($(call need_pkg,"glib-2.0 gthread-2.0"),) ifeq ($(call need_pkg,"glib-2.0 gthread-2.0"),)
PKGS += fluid PKGS += fluid
endif endif
ifeq ($(call need_pkg,"fluidsynth"),) ifeq ($(call need_pkg,"fluidsynth >= 1.1.2"),)
PKGS_FOUND += fluid PKGS_FOUND += fluid
endif endif
...@@ -21,10 +21,9 @@ fluidsynth: fluidsynth-$(FLUID_VERSION).tar.bz2 .sum-fluid ...@@ -21,10 +21,9 @@ fluidsynth: fluidsynth-$(FLUID_VERSION).tar.bz2 .sum-fluid
ifdef HAVE_WIN32 ifdef HAVE_WIN32
$(APPLY) $(SRC)/fluid/fluid-static-win32.patch $(APPLY) $(SRC)/fluid/fluid-static-win32.patch
endif endif
ifneq ($(FLUID_VERSION),1.0.9)
$(APPLY) $(SRC)/fluid/fluid-pkg-static.patch $(APPLY) $(SRC)/fluid/fluid-pkg-static.patch
endif # Remove symbolic links to /usr/share/aclocal
cd $(UNPACK_DIR)/m4/ && rm -f libtool.m4 lt*m4 # 1.1.3 ships symlinks to /usr/share/aclocal cd $(UNPACK_DIR)/m4/ && rm -f libtool.m4 lt*m4
$(MOVE) $(MOVE)
FLUIDCONF := $(HOSTCONF) \ FLUIDCONF := $(HOSTCONF) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment