diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-02-20 10:44:24 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-02-20 10:44:24 +0200 |
| commit | a12b733d4f045a93df459282ea36faa4fc94f5ae (patch) | |
| tree | 5555f5f57d9ae8dba9c5f61b257384fdb03164fe | |
| parent | 3e31840c9bd8c055dd643405ad3bde921338b065 (diff) | |
soundtouch: Try harder to build Win32 DLLs instead of just static libraries
https://bugzilla.gnome.org/show_bug.cgi?id=762309
| -rw-r--r-- | recipes/soundtouch.recipe | 3 | ||||
| -rw-r--r-- | recipes/soundtouch/0010-Try-harder-to-generate-Win32-DLLs.patch | 42 |
2 files changed, 44 insertions, 1 deletions
diff --git a/recipes/soundtouch.recipe b/recipes/soundtouch.recipe index 65c5f681..df3ded78 100644 --- a/recipes/soundtouch.recipe +++ b/recipes/soundtouch.recipe @@ -19,7 +19,8 @@ class Recipe(recipe.Recipe): 'soundtouch/0006-Fix-pkg-config-file.patch', 'soundtouch/0007-Make-it-compile-on-IOS.patch', 'soundtouch/0008-Fix-compilation-with-clang.patch', - 'soundtouch/0009-Don-t-use-fcheck-new.patch'] + 'soundtouch/0009-Don-t-use-fcheck-new.patch', + 'soundtouch/0010-Try-harder-to-generate-Win32-DLLs.patch'] files_libs = ['libSoundTouch'] files_devel = ['include/soundtouch', 'lib/pkgconfig/soundtouch.pc'] diff --git a/recipes/soundtouch/0010-Try-harder-to-generate-Win32-DLLs.patch b/recipes/soundtouch/0010-Try-harder-to-generate-Win32-DLLs.patch new file mode 100644 index 00000000..2675031d --- /dev/null +++ b/recipes/soundtouch/0010-Try-harder-to-generate-Win32-DLLs.patch @@ -0,0 +1,42 @@ +From 4f01a0292b613ece878a3c1076bd9211c9301d03 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Sat, 20 Feb 2016 10:42:33 +0200 +Subject: [PATCH] Try harder to generate Win32 DLLs + +--- + configure.ac | 4 +--- + source/SoundTouch/Makefile.am | 1 + + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5053626..3bed150 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,11 +46,9 @@ AC_PROG_INSTALL + #AC_PROG_LN_S + AC_PROG_MAKE_SET + ++AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL dnl turn on using libtool + +- +- +- + dnl ############################################################################ + dnl # Checks for header files # + dnl ############################################################################ +diff --git a/source/SoundTouch/Makefile.am b/source/SoundTouch/Makefile.am +index b2e598b..90cfb71 100644 +--- a/source/SoundTouch/Makefile.am ++++ b/source/SoundTouch/Makefile.am +@@ -38,6 +38,7 @@ AM_CXXFLAGS=-O3 -I../../include $(GNUSTL_CFLAGS) +
+ # Compile the files that need MMX and SSE individually.
+ libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la $(GNUSTL_LIBS) ++libSoundTouch_la_LDFLAGS=-no-undefined + noinst_LTLIBRARIES=libSoundTouchMMX.la libSoundTouchSSE.la
+ libSoundTouchMMX_la_SOURCES=mmx_optimized.cpp
+ libSoundTouchSSE_la_SOURCES=sse_optimized.cpp
+-- +2.7.0 + |