[SCM] forked-daapd/master: Drop obsolete patch removing embedded AVL implementation

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Wed Jul 1 00:13:01 UTC 2015


The following commit has been merged in the master branch:
commit 4f3b42506eade0d19723e414e03d09c94f7cb20c
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Tue Jun 30 18:04:48 2015 -0500

    Drop obsolete patch removing embedded AVL implementation

diff --git a/debian/patches/0001-Revert-Embed-libavl-v0.3.5-it-is-no-longer-available.patch b/debian/patches/0001-Revert-Embed-libavl-v0.3.5-it-is-no-longer-available.patch
deleted file mode 100644
index f20e6b9..0000000
--- a/debian/patches/0001-Revert-Embed-libavl-v0.3.5-it-is-no-longer-available.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From f7da4a63e17706f08b84777b4b1fb56e885d8642 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Tue, 24 Feb 2015 05:50:19 +0100
-Subject: [PATCH] Revert "Embed libavl (v0.3.5), it is no longer available
- upstream and the dependency is a hassle"
-
-This reverts commit df9bcade5a8161b1bba6e8032248204369216cf9.
----
- INSTALL                  |   8 +-
- configure.ac             |   4 +
- src/Makefile.am          |   7 +-
- src/avl/README           |  91 --------
- src/avl/avl.c            | 590 -----------------------------------------------
- src/avl/avl.h            | 186 ---------------
- src/filescanner_itunes.c |   2 +-
- src/httpd_daap.c         |   3 +-
- 8 files changed, 16 insertions(+), 875 deletions(-)
- delete mode 100644 src/avl/README
- delete mode 100644 src/avl/avl.c
- delete mode 100644 src/avl/avl.h
-
-diff --git a/INSTALL b/INSTALL
-index c618115..9261e42 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -23,7 +23,8 @@ sudo apt-get install \
-  build-essential git autotools-dev autoconf libtool gettext gawk gperf \
-  antlr3 libantlr3c-dev libconfuse-dev libunistring-dev libsqlite3-dev \
-  libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libasound2-dev \
-- libmxml-dev libgcrypt11-dev libavahi-client-dev zlib1g-dev libevent-dev
-+ libmxml-dev libgcrypt11-dev libavahi-client-dev libavl-dev zlib1g-dev \
-+ libevent-dev
- 
- Depending on the version of libav/ffmpeg in your distribution you may also need
- libavresample-dev.
-@@ -122,6 +123,8 @@ Libraries:
-         from <http://www.nongnu.org/confuse/>
-  - libevent 1.4+ (best with version 1.4 or 2.1.4+)
-         from <http://libevent.org/>
-+ - libavl 0.3.5
-+        from <http://ftp.debian.org/debian/pool/main/liba/libavl>
-  - MiniXML (aka mxml or libmxml)
-         from <http://minixml.org/software.php>
-  - gcrypt 1.2.0+
-@@ -146,6 +149,9 @@ Libraries:
- If using binary packages, remember that you need the development packages to
- build forked-daapd (usually named -dev or -devel).
- 
-+libavl is not the GNU libavl. There doesn't seem to be an upstream website
-+anymore, but you can fetch it from any Debian mirror.
-+
- sqlite3 needs to be built with support for the unlock notify API; this isn't
- always the case in binary packages, so you may need to rebuild sqlite3 to
- enable the unlock notify API (you can check for the presence of the
-diff --git a/configure.ac b/configure.ac
-index fedb450..66c01ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -188,6 +188,10 @@ else
- 	)
- fi
- 
-+AC_CHECK_HEADER(avl.h, , AC_MSG_ERROR([avl.h not found]))
-+AC_CHECK_LIB([avl], [avl_alloc_tree], [LIBAVL_LIBS="-lavl"], AC_MSG_ERROR([libavl not found]))
-+AC_SUBST(LIBAVL_LIBS)
-+
- AC_CHECK_HEADER(antlr3.h, , AC_MSG_ERROR([antlr3.h not found]))
- AC_CHECK_LIB([antlr3c], [antlr3BaseRecognizerNew], [ANTLR3C_LIBS="-lantlr3c"], AC_MSG_ERROR([ANTLR3 C runtime (libantlr3c) not found]))
- AC_CHECK_LIB([antlr3c], [antlr3NewAsciiStringInPlaceStream],
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 66f35a2..7c1c0f0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -54,8 +54,6 @@ EVHTTP_SRC=
- RTSP_SRC=evrtsp/rtsp.c evrtp/evrtsp.h evrtsp/rtsp-internal.h evrtsp/log.h
- endif
- 
--AVL_SRC=avl/avl.c avl/avl.h
--
- GPERF_FILES = \
- 	daap_query.gperf \
- 	rsp_query.gperf \
-@@ -93,7 +91,7 @@ forked_daapd_CFLAGS = \
- forked_daapd_LDADD = -lrt \
- 	@ZLIB_LIBS@ @AVAHI_LIBS@ @SQLITE3_LIBS@ @LIBAV_LIBS@ \
- 	@CONFUSE_LIBS@ @FLAC_LIBS@ @TAGLIB_LIBS@ @LIBEVENT_LIBS@ \
--	@MINIXML_LIBS@ @ANTLR3C_LIBS@ @LIBPLIST_LIBS@ \
-+	@LIBAVL_LIBS@ @MINIXML_LIBS@ @ANTLR3C_LIBS@ @LIBPLIST_LIBS@ \
- 	@LIBGCRYPT_LIBS@ @GPG_ERROR_LIBS@ @ALSA_LIBS@ @LIBUNISTRING@ @SPOTIFY_LIBS@ \
- 	@LIBCURL_LIBS@
- 
-@@ -101,8 +99,7 @@ forked_daapd_SOURCES = main.c \
- 	db.c db.h \
- 	logger.c logger.h \
- 	conffile.c conffile.h \
--	cache.c cache.h \
--	$(AVL_SRC) \
-+	cache.h cache.c \
- 	filescanner.c filescanner.h \
- 	filescanner_ffmpeg.c filescanner_playlist.c filescanner_icy.c $(ITUNES_SRC) \
- 	mdns_avahi.c mdns.h \
-diff --git a/src/filescanner_itunes.c b/src/filescanner_itunes.c
-index c73a42f..b171b95 100644
---- a/src/filescanner_itunes.c
-+++ b/src/filescanner_itunes.c
-@@ -34,6 +34,7 @@
- #include <stdint.h>
- #include <inttypes.h>
- 
-+#include <avl.h>
- #include <plist/plist.h>
- 
- #ifdef HAVE_LIBEVENT2
-@@ -42,7 +43,6 @@
- # include "evhttp/evhttp.h"
- #endif
- 
--#include "avl/avl.h"
- #include "logger.h"
- #include "db.h"
- #include "filescanner.h"
-diff --git a/src/httpd_daap.c b/src/httpd_daap.c
-index 2a41945..0e6065a 100644
---- a/src/httpd_daap.c
-+++ b/src/httpd_daap.c
-@@ -40,7 +40,8 @@
- #include <uninorm.h>
- #include <unistd.h>
- 
--#include "avl/avl.h"
-+#include <avl.h>
-+
- #include "logger.h"
- #include "db.h"
- #include "conffile.h"
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index d10bf99..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Revert-Embed-libavl-v0.3.5-it-is-no-longer-available.patch
+

-- 
forked-daapd packaging



More information about the pkg-multimedia-commits mailing list