diff --git a/packages/addons/addon-depends/libconfig/package.mk b/packages/addons/addon-depends/libconfig/package.mk index 00bfbfd0c5..2530f76248 100644 --- a/packages/addons/addon-depends/libconfig/package.mk +++ b/packages/addons/addon-depends/libconfig/package.mk @@ -15,3 +15,8 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-shared \ --disable-examples \ --with-sysroot=$SYSROOT_PREFIX" + +pre_configure_target() { + cd .. + rm -rf .$TARGET_NAME +} diff --git a/packages/addons/addon-depends/libconfig/patches/libconfig-0001_fix-include.patch b/packages/addons/addon-depends/libconfig/patches/libconfig-0001_fix-include.patch deleted file mode 100644 index 79b0a2e00f..0000000000 --- a/packages/addons/addon-depends/libconfig/patches/libconfig-0001_fix-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/tests/Makefile.am b/tests/Makefile.am ---- a/tests/Makefile.am 2014-03-04 03:04:17.000000000 +0100 -+++ b/tests/Makefile.am 2016-01-22 21:22:38.742833399 +0100 -@@ -3,7 +3,7 @@ - - libconfig_tests_SOURCES = tests.c - --libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I../lib -+libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib - - libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \ - -L$(top_builddir)/lib/.libs -lconfig diff --git a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk index 9643dc718f..36cea23bc4 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk @@ -12,7 +12,7 @@ PKG_LONGDESC="A client for the Logitech Media Server." pre_make_target() { export OPTS="-DDSD -DFFMPEG -DRESAMPLE -DVISEXPORT -DLINKALL" - export LIBS="-lvorbis -logg" + export LDFLAGS="$LDFLAGS -lFLAC -lvorbisfile -lvorbis -logg" } makeinstall_target() { diff --git a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/patches/squeezelite-01-makefile.patch b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/patches/squeezelite-01-makefile.patch deleted file mode 100644 index 6389fe3861..0000000000 --- a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/patches/squeezelite-01-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile 2018-05-07 14:06:07.000000000 +0200 -+++ b/Makefile 2018-10-25 19:08:15.000000000 +0200 -@@ -103,7 +103,7 @@ - all: $(EXECUTABLE) - - $(EXECUTABLE): $(OBJECTS) -- $(CC) $(OBJECTS) $(LDFLAGS) $(LDADD) -o $@ -+ $(CC) $(OBJECTS) $(LDFLAGS) $(LDADD) $(LIBS) -o $@ - - $(OBJECTS): $(DEPS) - diff --git a/packages/audio/fluidsynth/package.mk b/packages/audio/fluidsynth/package.mk index d4f1309e0c..628c934934 100644 --- a/packages/audio/fluidsynth/package.mk +++ b/packages/audio/fluidsynth/package.mk @@ -13,6 +13,7 @@ PKG_LONGDESC="FluidSynth renders midi music files as raw audio data, for playing PKG_BUILD_FLAGS="+pic" PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=0 \ + -DLIB_SUFFIX= \ -Denable-readline=0 \ -Denable-pulseaudio=0 \ -Denable-libsndfile=0" diff --git a/packages/audio/fluidsynth/patches/fluidsynth-01-fix-libdir.patch b/packages/audio/fluidsynth/patches/fluidsynth-01-fix-libdir.patch deleted file mode 100644 index 038fa7d385..0000000000 --- a/packages/audio/fluidsynth/patches/fluidsynth-01-fix-libdir.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- fluidsynth-1.1.6/CMakeLists.txt.orig 2015-04-06 13:12:55.151874342 +0200 -+++ fluidsynth-1.1.6/CMakeLists.txt 2015-04-06 13:14:32.931876573 +0200 -@@ -85,11 +85,11 @@ - endif ( ${CMAKE_SYSTEM} MATCHES "OS2" ) - - # Initialize the library directory name suffix. --if ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) -- set ( _init_lib_suffix "64" ) --else ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) -+#if ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) -+# set ( _init_lib_suffix "64" ) -+#else ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - set ( _init_lib_suffix "" ) --endif ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) -+#endif ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - set ( LIB_SUFFIX ${_init_lib_suffix} CACHE STRING - "library directory name suffix (32/64/nothing)" ) - mark_as_advanced ( LIB_SUFFIX )