[SCM] ecasound/master: Drop build-shared-libecasound patch

ghedo-guest at users.alioth.debian.org ghedo-guest at users.alioth.debian.org
Tue May 24 16:07:38 UTC 2011 

The following commit has been merged in the master branch:
commit c2b39cf80616dc99d81244862c41e8a53372b1eb
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Tue May 24 16:02:24 2011 +0200

    Drop build-shared-libecasound patch

diff --git a/debian/patches/0003-build-shared-libecasound.patch b/debian/patches/0003-build-shared-libecasound.patch
deleted file mode 100644
index 30a088a..0000000
--- a/debian/patches/0003-build-shared-libecasound.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Alessandro Ghedini <al3xbio at gmail.com>
-Date: Sun, 6 Feb 2011 18:55:33 +0100
-Subject: [PATCH] build shared libecasound
-
-Build libecasound as shared library instead of static
----
- libecasound/Makefile.am         |    2 +-
- libecasound/Makefile.in         |    2 +-
- libecasound/plugins/Makefile.am |    2 +-
- libecasound/plugins/Makefile.in |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/libecasound/Makefile.am
-+++ b/libecasound/Makefile.am
-@@ -364,7 +364,7 @@
- 
- libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
- libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
--libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static
-+libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -shared -fPIC
- libecasound_la_LIBADD = $(eca_libadd)
- libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
- libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
---- a/libecasound/Makefile.in
-+++ b/libecasound/Makefile.in
-@@ -708,7 +708,7 @@
- 
- libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
- libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
--libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static
-+libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -shared -fPIC
- libecasound_la_LIBADD = $(eca_libadd)
- libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
- libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
---- a/libecasound/plugins/Makefile.am
-+++ b/libecasound/plugins/Makefile.am
-@@ -105,7 +105,7 @@
- libecasound_plugins_la_SOURCES          = audioio_dummy.cpp $(plugin_cond_sources)
- EXTRA_libecasound_plugins_la_SOURCES    = $(plugin_all_sources)
- libecasound_plugins_la_LIBADD		= $(ECA_S_EXTRA_LIBS)
--libecasound_plugins_la_LDFLAGS 		= -static
-+libecasound_plugins_la_LDFLAGS 		= -shared -fPIC
- 
- libecasound_plugins_debug_la_SOURCES	= $(libecasound_plugins_la_SOURCES)
- EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
---- a/libecasound/plugins/Makefile.in
-+++ b/libecasound/plugins/Makefile.in
-@@ -328,7 +328,7 @@
- libecasound_plugins_la_SOURCES = audioio_dummy.cpp $(plugin_cond_sources)
- EXTRA_libecasound_plugins_la_SOURCES = $(plugin_all_sources)
- libecasound_plugins_la_LIBADD = $(ECA_S_EXTRA_LIBS)
--libecasound_plugins_la_LDFLAGS = -static
-+libecasound_plugins_la_LDFLAGS = -shared -fPIC
- libecasound_plugins_debug_la_SOURCES = $(libecasound_plugins_la_SOURCES)
- EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
- libecasound_plugins_debug_la_LIBADD = $(libecasound_plugins_la_LIBADD)
diff --git a/debian/patches/0005-build-shared-libkvutils.patch b/debian/patches/0005-build-shared-libkvutils.patch
index 4d627f5..154ba3f 100644
--- a/debian/patches/0005-build-shared-libkvutils.patch
+++ b/debian/patches/0005-build-shared-libkvutils.patch
@@ -14,18 +14,18 @@ Build libkvutils as shared library instead of static
 +++ b/kvutils/Makefile.am
 @@ -56,7 +56,7 @@
  			kvu_value_queue.h
- 
+
  libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers)
 -libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -static
 +libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -shared -fPIC
- 
+
  libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES)
  libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS)
 --- a/kvutils/Makefile.in
 +++ b/kvutils/Makefile.in
 @@ -299,7 +299,7 @@
  			kvu_value_queue.h
- 
+
  libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers)
 -libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -static
 +libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -shared -fPIC
@@ -35,22 +35,22 @@ Build libkvutils as shared library instead of static
 --- a/libecasound/Makefile.am
 +++ b/libecasound/Makefile.am
 @@ -364,7 +364,7 @@
- 
+
  libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
  libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
--libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -shared -fPIC
-+libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -shared -fPIC -L$(top_builddir)/kvutils -lkvutils
+-libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static
++libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static -L$(top_builddir)/kvutils -lkvutils
  libecasound_la_LIBADD = $(eca_libadd)
  libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
  libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
 --- a/libecasound/Makefile.in
 +++ b/libecasound/Makefile.in
 @@ -708,7 +708,7 @@
- 
+
  libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
  libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
--libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -shared -fPIC
-+libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -shared -fPIC -L$(top_builddir)/kvutils -lkvutils
+-libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static
++libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static -L$(top_builddir)/kvutils -lkvutils
  libecasound_la_LIBADD = $(eca_libadd)
  libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
  libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
diff --git a/debian/patches/series b/debian/patches/series
index 04d6d4c..5322a6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-fix-manpages-errors.patch
-0003-build-shared-libecasound.patch
 0004-build-shared-libecasoundc.patch
 0005-build-shared-libkvutils.patch
 0006-handle_estrpipe.patch

-- 
ecasound packaging

More information about the pkg-multimedia-commits mailing list