[SCM] libshout/master: Drop patch 1002 to link against libspeex: Applied upstream.

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Mar 25 19:39:08 UTC 2012


The following commit has been merged in the master branch:
commit 55bad1e08502169934d4dda703b7b0c4e7ca4b95
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 25 17:22:13 2012 +0200

    Drop patch 1002 to link against libspeex: Applied upstream.

diff --git a/debian/patches/1002_link_against_libspeex.patch b/debian/patches/1002_link_against_libspeex.patch
deleted file mode 100644
index 0fd20fa..0000000
--- a/debian/patches/1002_link_against_libspeex.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN libshout-2.2.orig/src/Makefile.am libshout-2.2/src/Makefile.am
---- libshout-2.2.orig/src/Makefile.am	2006-01-03 20:22:17.000000000 +0100
-+++ libshout-2.2/src/Makefile.am	2006-05-28 18:37:22.000000000 +0200
-@@ -26,7 +26,7 @@
- AM_CFLAGS = @XIPH_CFLAGS@
- 
- libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
--		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS)
-+		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(SPEEX_LIBS) $(VORBIS_LIBS)
- 
- INCLUDES = -I$(top_builddir)/include
- 
-diff -ruN libshout-2.2.orig/src/Makefile.in libshout-2.2/src/Makefile.in
---- libshout-2.2.orig/src/Makefile.in	2006-01-03 20:24:29.000000000 +0100
-+++ libshout-2.2/src/Makefile.in	2006-05-28 18:37:56.000000000 +0200
-@@ -261,7 +261,7 @@
- libshout_la_SOURCES = shout.c util.c ogg.c vorbis.c mp3.c $(MAYBE_THEORA) $(MAYBE_SPEEX)
- AM_CFLAGS = @XIPH_CFLAGS@
- libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
--		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS)
-+		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(SPEEX_LIBS) $(VORBIS_LIBS)
- 
- INCLUDES = -I$(top_builddir)/include
- all: all-recursive
diff --git a/debian/patches/series b/debian/patches/series
index 07275fe..90d9845 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 1001_upstream_is_not_debian.patch
-1002_link_against_libspeex.patch
 1003_fix_pkg-config_requires.patch

-- 
libshout packaging



More information about the pkg-multimedia-commits mailing list