debian/0000775000000000000000000000000012237500601007164 5ustar debian/dirs0000664000000000000000000000007011542721665010062 0ustar /var/cache/forked-daapd /var/cache/forked-daapd/backups debian/source/0000775000000000000000000000000011411434703010466 5ustar debian/source/format0000664000000000000000000000001411411434703011674 0ustar 3.0 (quilt) debian/copyright0000664000000000000000000001174311577670763011154 0ustar This work was packaged for Debian by: Julien BLACHE on Sun, 20 Sep 2009 15:42:18 +0200 It was downloaded from: http://git.debian.org/?p=users/jblache/forked-daapd.git Upstream Author: Julien BLACHE Copyright: Copyright (C) 2009-2011 Julien BLACHE Copyright (C) 2010 Kai Elwert Copyright (C) 2003-2007 Ron Pedde Copyright (C) 2005 Timo J. Rinne Copyright (C) 2005 Sebastian Dröge Copyright (C) 2000-2007 Niels Provos (evbuffer) Copyright (C) 2008 the VideoLAN team Copyright (C) 2005 Shiro Ninomiya License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. forked-daapd includes C code generated by ANTLR v3 for use with the ANTLR v3 C runtime, license: Copyright (c) 2005-2009 Jim Idle, Temporal Wave LLC http://www.temporal-wave.com http://www.linkedin.com/in/jimidle All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. forked-daapd includes the evbuffer code from libevent 1.4, license: Copyright (c) 2000-2007 Niels Provos All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The Debian packaging is: Copyright (C) 2009-2011 Julien BLACHE you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. debian/changelog0000664000000000000000000002117712237500601011046 0ustar forked-daapd (0.19gcd-3build1) trusty; urgency=low * No change rebuild against libav 9. -- Dmitrijs Ledkovs Sat, 09 Nov 2013 18:40:01 +0000 forked-daapd (0.19gcd-3) unstable; urgency=low * QA upload, orphan package * Fix compatibility with libav9 (Closes: #720790) -- Moritz Muehlenhoff Wed, 28 Aug 2013 19:11:37 +0200 forked-daapd (0.19gcd-2.1) unstable; urgency=low * Non-maintainer upload for release goal * Enable hardened build flags (Closes: #654147) -- Moritz Muehlenhoff Fri, 11 May 2012 22:22:20 +0200 forked-daapd (0.19gcd-2) unstable; urgency=low * Move the GCD codebase to unstable. -- Julien BLACHE Thu, 22 Sep 2011 19:15:11 +0200 forked-daapd (0.19gcd-1) experimental; urgency=low * New upstream release, GCD codebase. * debian/patches/dacp-unknown-prop-loop-fix.patch: + Removed; merged upstream. -- Julien BLACHE Sun, 11 Sep 2011 16:19:40 +0200 forked-daapd (0.19-1) unstable; urgency=low * New upstream release. * debian/patches/dacp-unknown-prop-loop-fix.patch: + Removed; merged upstream. -- Julien BLACHE Sun, 11 Sep 2011 15:51:59 +0200 forked-daapd (0.18gcd-2) experimental; urgency=low * debian/patches/dacp-unknown-prop-loop-fix.patch: + Added; fix infinite loop on unknown DACP property (closes: #637864). -- Julien BLACHE Mon, 15 Aug 2011 13:05:51 +0200 forked-daapd (0.18gcd-1) experimental; urgency=low * New upstream release; GCD codebase. -- Julien BLACHE Sun, 07 Aug 2011 12:16:39 +0200 forked-daapd (0.18-1) unstable; urgency=low * New upstream release. * debian/forked-daapd.logrotate: + Add create option. -- Julien BLACHE Sun, 07 Aug 2011 11:40:27 +0200 forked-daapd (0.17gcd-1) experimental; urgency=low * New libdispatch-based codebase. * debian/control: + Adjust build-dependencies: remove libevent-dev, add libdispatch-dev, libblocksruntime-dev, libtre-dev, clang. * debian/copyright: + Adjust for new codebase. -- Julien BLACHE Mon, 20 Jun 2011 18:15:23 +0200 forked-daapd (0.17-1) unstable; urgency=low * New upstream release. + Adds support for libav 0.7. -- Julien BLACHE Mon, 20 Jun 2011 17:59:55 +0200 forked-daapd (0.16-2) unstable; urgency=low * debian/control: + Add missing dependency on psmisc, as we're using killall in the logrotate script (closes: #628888). -- Julien BLACHE Thu, 02 Jun 2011 15:51:50 +0200 forked-daapd (0.16-1) unstable; urgency=low * New upstream release. -- Julien BLACHE Sat, 30 Apr 2011 11:48:15 +0200 forked-daapd (0.15-1) unstable; urgency=low * New upstream release. * debian/control: + Add build-dependency on gperf. + Bump Standards-Version to 3.9.2 (no changes). * debian/copyright: + Update list of copyright holders. -- Julien BLACHE Sat, 09 Apr 2011 11:41:55 +0200 forked-daapd (0.14-1) unstable; urgency=low * New upstream release. * debian/dirs: + Add /var/cache/forked-daapd/backups. * debian/forked-daapd.postinst: + Backup the database before upgrade when needed. * debian/forked-daapd.README.Debian: + Document database backup upon upgrade. -- Julien BLACHE Fri, 25 Mar 2011 18:43:44 +0100 forked-daapd (0.13-1) unstable; urgency=low * New upstream release. + Improved mDNS address resolution (closes: #608448). + Trim metadata strings on insert/update (closes: #596014). + Added support for sort fields (closes: #596823). * debian/forked-daapd.init: + Fix restart action (closes: #616112). * debian/patches: + Drop all patches. -- Julien BLACHE Sat, 12 Mar 2011 14:19:09 +0100 forked-daapd (0.12~git0.11-125-gca72ee5-4) unstable; urgency=low * debian/control: + Add build-dependency on libgpg-error-dev. * debian/patches/fix_final_link.patch: + Added; fix missing -lrt -lgpg-error (closes: #614727). -- Julien BLACHE Wed, 23 Feb 2011 17:28:30 +0100 forked-daapd (0.12~git0.11-125-gca72ee5-3) unstable; urgency=low * debian/patches/murmurhash_32bit_fix.patch: + Added; fix improper handling of data buffer tail. * debian/patches/no_scoped_address_in_sdp.patch: + Added; don't let out scoped addresses in SDP payload. -- Julien BLACHE Mon, 01 Nov 2010 15:36:39 +0100 forked-daapd (0.12~git0.11-125-gca72ee5-2) unstable; urgency=low * debian/patches/doc_update.patch: + Added; small documentation updates. * debian/patches/db_crasher_fix.patch: + Added; fix a crasher in the database code. * debian/patches/code_typo_fix.patch: + Added; fix a typo, checking the wrong variable. * debian/patches/compilation_handling_fix.patch + Added; fix handling of album_artist for compilations. * debian/patches/gcrypt_init_eh_fix.patch: + Added; set the proper exit value in the gcrypt EH path. * debian/patches/plug_full_uri_leak_in_eh.patch: + Added; plug a memory leak in EH. * debian/patches/remove_dup_mstm_tag.patch: + Added; remove a duplicate mstm tag in DAAP server-info. * debian/patches/seek_computations_fix.patch: + Added; fix target & position computations for seeking. -- Julien BLACHE Mon, 20 Sep 2010 18:58:44 +0200 forked-daapd (0.12~git0.11-125-gca72ee5-1) unstable; urgency=low * Git snapshot 0.11-125-gca72ee5. * debian/forked-daapd.postrm: + Prevent rmdir failure when /var/cache/forked-daapd doesn't exist (closes: #591868). -- Julien BLACHE Fri, 06 Aug 2010 17:15:18 +0200 forked-daapd (0.12~git0.11-117-gd9f5e2a-2) unstable; urgency=low * Re-apply changes from 0.12~git0.11-92-ge396906-2 that got lost by erroneously preparing the previous upload using the packaging from 0.12~git0.11-92-ge396906-1. Doh! -- Julien BLACHE Mon, 02 Aug 2010 18:21:05 +0200 forked-daapd (0.12~git0.11-117-gd9f5e2a-1) unstable; urgency=low * Git snapshot 0.11-117-gd9f5e2a. * debian/control: + Bump Standards-Version to 3.9.1 (no changes). -- Julien BLACHE Sun, 01 Aug 2010 15:13:03 +0200 forked-daapd (0.12~git0.11-92-ge396906-2) unstable; urgency=low * debian/control: + Build-dep on libasound2-dev on Linux only. + Add a build-dep on oss4-dev on kFreeBSD. + Build-dep on libunistring-dev (>= 9.0.3) as previous versions ship broken headers. * debian/rules: + Build with OSS4 on kFreeBSD. -- Julien BLACHE Thu, 22 Jul 2010 17:54:11 +0200 forked-daapd (0.12~git0.11-92-ge396906-1) unstable; urgency=low * Git snapshot 0.11-92-ge396906. * Moved to unstable. -- Julien BLACHE Thu, 22 Jul 2010 09:45:05 +0200 forked-daapd (0.12~git0.11-80-g65d3651-1) experimental; urgency=low * Git snapshot 0.11-80-g65d3651. * Initial upload (closes: #587958). + Upload to experimental until antlr3 can move to testing. * Moved to source version 3.0 (quilt). * debian/control: + Add Build-dep on libunistring-dev. + Bump antlr3 build-dep to (>= 3.2-3). + Bump libantlr3c-dev build-dep to (>= 3.2). + Bump Standards-Version to 3.9.0 (no changes). + Rework descriptions. * debian/copyright: + Updated. -- Julien BLACHE Sat, 03 Jul 2010 11:26:12 +0200 forked-daapd (0.12~0.11-71-g7d858d6-2) unstable; urgency=low * debian/control: + Add missing build-dep: libswscale-dev, libavutil-dev. -- Julien BLACHE Mon, 17 May 2010 17:53:15 +0200 forked-daapd (0.12~0.11-71-g7d858d6-1) unstable; urgency=low * Git snapshot 0.11-71-g7d858d6. * debian/control: + Added build-deps: libasound2-dev, zlib1g-dev. + Bumped libsqlite3-dev build-dep to (>= 3.6.23.1-2) for update notify API support. -- Julien BLACHE Sat, 15 May 2010 16:53:17 +0200 forked-daapd (0.11~0.10-201-g2dde2f1-1) unstable; urgency=low * Git snapshot 0.10-201-g2dde2f1. * debian/control: + Add build-dep on libgcrypt11-dev. -- Julien BLACHE Sun, 14 Feb 2010 10:14:21 +0100 forked-daapd (0.11~0.10-34-g8ec1fa3-1) unstable; urgency=low * Git snapshot 0.10-34-g8ec1fa3. * debian/control: + Add build-dep on libplist-dev (>= 0.16). * debian/rules: + Enable support for iTunes Music Library (XML playlist). -- Julien BLACHE Sun, 13 Dec 2009 10:04:04 +0100 forked-daapd (0.10-1) unstable; urgency=low * Initial release. -- Julien BLACHE Sun, 20 Sep 2009 15:42:18 +0200 debian/forked-daapd.init0000775000000000000000000000630211536671115012410 0ustar #! /bin/sh ### BEGIN INIT INFO # Provides: forked-daapd # Required-Start: $local_fs $remote_fs $network $time avahi # Required-Stop: $local_fs $remote_fs $network $time # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: media server with support for RSP, DAAP, DACP and AirTunes # Description: forked-daapd is an iTunes-compatible media server for # sharing your music library over the local network with RSP # clients like the SoundBridge from Roku and DAAP clients like # iTunes. It can also stream music to AirTunes devices. ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/forked-daapd NAME=forked-daapd DESC="RSP and DAAP media server" test -x $DAEMON || exit 0 PIDFILE=/var/run/$NAME.pid set -e running_pid() { # Check if a given process pid's cmdline matches a given name pid=$1 name=$2 [ -z "$pid" ] && return 1 [ ! -d /proc/$pid ] && return 1 cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` # Is this the expected child? [ "$cmd" != "$name" ] && return 1 return 0 } running() { # Check if the process is running looking at /proc # (works for all users) # No pidfile, probably no daemon present [ ! -f "$PIDFILE" ] && return 1 # Obtain the pid and check it against the binary name pid=`cat $PIDFILE` running_pid $pid $DAEMON || return 1 return 0 } force_stop() { # Forcefully kill the process [ ! -f "$PIDFILE" ] && return if running ; then kill -15 $pid # Is it really dead? if running ; then kill -9 $pid if running ; then echo "Cannot kill $NAME (pid=$pid)!" exit 1 fi fi fi rm -f $PIDFILE return 0 } case "$1" in start) echo -n "Starting $DESC: " start-stop-daemon --start --quiet --pidfile $PIDFILE \ --exec $DAEMON -- $DAEMON_OPTS if running ; then echo "$NAME." else echo " ERROR." fi ;; stop) echo -n "Stopping $DESC: " start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \ --exec $DAEMON echo "$NAME." ;; force-reload) start-stop-daemon --stop --test --quiet --pidfile \ /var/run/$NAME.pid --exec $DAEMON \ && $0 restart \ || exit 0 ;; restart) PID=$(cat $PIDFILE 2> /dev/null || true) echo -n "Restarting $DESC: " start-stop-daemon --stop --quiet --oknodo --pidfile \ /var/run/$NAME.pid --exec $DAEMON if [ -n "$PID" ]; then while running_pid $PID $DAEMON; do echo -n "."; sleep 1; done fi start-stop-daemon --start --quiet --pidfile \ /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS echo "$NAME." ;; status) echo -n "$NAME is " if running ; then echo "running" else echo " not running." exit 1 fi ;; *) N=/etc/init.d/$NAME echo "Usage: $N {start|stop|restart|force-reload|status}" >&2 exit 1 ;; esac exit 0 debian/control0000664000000000000000000000305712237500601010574 0ustar Source: forked-daapd Section: sound Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian QA Group Build-Depends: debhelper (>= 7), libflac-dev, libtagc0-dev, libavcodec-dev (>= 3:0.svn20090204), libavformat-dev (>= 3:0.svn20090204), libswscale-dev, libavutil-dev, libavahi-client-dev, libsqlite3-dev (>= 3.6.23.1-2), libconfuse-dev, libavl-dev, libmxml-dev, libplist-dev (>= 0.16), libgcrypt11-dev, libgpg-error-dev, libasound2-dev [linux-any], oss4-dev [kfreebsd-any], zlib1g-dev, libunistring-dev (>= 0.9.3), libtre-dev (>= 0.8.0), libblocksruntime-dev, libdispatch-dev (>= 0~svn197-2), clang, libantlr3c-dev (>= 3.2), antlr3 (>= 3.2-3), gperf, autotools-dev Standards-Version: 3.9.2 Package: forked-daapd Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, avahi-daemon, adduser, psmisc Description: media server with support for RSP, DAAP, DACP and AirTunes forked-daapd is an iTunes-compatible media server, originally intended as a rewrite of Firefly Media Server (also known as mt-daapd). . It supports a wide range of audio formats, can stream video to iTunes, FrontRow and other compatible clients, has support for Apple's Remote iPhone/iPod application and can stream music to AirTunes devices like the AirPort Express. . It also features RSP support for Roku's SoundBridge devices. . Built-in, on-the-fly decoding support enables serving popular free music formats like FLAC, Ogg Vorbis or Musepack to those clients that do not otherwise support them. debian/forked-daapd.README.Debian0000664000000000000000000000160611543152111013546 0ustar forked-daapd for Debian ----------------------- The default database location is /var/cache/forked-daapd/songs3.db. This is forked-daapd's default location and can be configured in /etc/forked-daapd.conf using the db_path directive. forked-daapd upgrades --------------------- Upon upgrade, if the new forked-daapd version requires a database upgrade, a backup of the database is automatically made during the package upgrade IF AND ONLY IF the database is at the default location (see above). The backup database can be found under /var/cache/forked-daapd/backups with a name similar to songs3.db.prevXX, where XX is the version of the database schema used by the new forked-daapd version. Once the upgrade has completed and you have verified that the database upgraded properly, you can safely delete the backup database. -- Julien BLACHE , Fri, 25 Mar 2011 18:43:35 +0100 debian/forked-daapd.postrm0000664000000000000000000000041311427023356012760 0ustar #!/bin/sh set -e if [ "$1" = purge ]; then dpkg-statoverride --remove /var/cache/forked-daapd if [ -d /var/cache/forked-daapd ]; then rm -f /var/cache/forked-daapd/songs3.db rmdir --ignore-fail-on-non-empty /var/cache/forked-daapd fi fi #DEBHELPER# debian/forked-daapd.logrotate0000664000000000000000000000025111617462723013442 0ustar /var/log/forked-daapd.log { weekly missingok notifempty rotate 3 create compress delaycompress noolddir postrotate killall -q -HUP forked-daapd endscript } debian/rules0000775000000000000000000000422611753272327010265 0ustar #!/usr/bin/make -f # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) OSS4_OPTS = --with-oss4=/usr/include/linux endif CFLAGS = `dpkg-buildflags --get CFLAGS` CFLAGS += -Wall LDFLAGS = `dpkg-buildflags --get LDFLAGS` CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif autotools: autotools-stamp autotools-stamp: -rm -f config.sub config.guess ln -s /usr/share/misc/config.sub config.sub ln -s /usr/share/misc/config.guess config.guess touch autotools-stamp config.status: autotools-stamp configure dh_testdir ./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --mandir=\$${prefix}/share/man \ --enable-flac --enable-musepack \ --enable-itunes $(OSS4_OPTS) build: build-stamp build-stamp: config.status dh_testdir $(MAKE) touch $@ clean: dh_testdir dh_testroot rm -f autotools-stamp build-stamp # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean rm -f config.sub config.guess dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/forked-daapd rm debian/forked-daapd/usr/lib/forked-daapd/forked-daapd-sqlext.la binary-indep: # Nothing here, move along. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs ChangeLog dh_lintian dh_installdocs dh_installinit -- defaults 25 dh_installman dh_installlogrotate dh_compress dh_link dh_strip dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install autotools debian/patches/0000775000000000000000000000000012207433315010617 5ustar debian/patches/fix-libav9-compat0000664000000000000000000000763412207433304014005 0ustar * Fix compatibility with libav9 (Closes: #720790) Author: Moritz Muehlenhoff Bug-Debian: http://bugs.debian.org/720790 --- forked-daapd-0.19gcd.orig/src/artwork.c +++ forked-daapd-0.19gcd/src/artwork.c @@ -138,7 +138,7 @@ artwork_rescale(AVFormatContext *src_ctx return -1; } - ret = avcodec_open(src, img_decoder); + ret = avcodec_open2(src, img_decoder, NULL); if (ret < 0) { DPRINTF(E_LOG, L_ART, "Could not open codec for decoding: %s\n", strerror(AVUNERROR(ret))); @@ -211,7 +211,7 @@ artwork_rescale(AVFormatContext *src_ctx } #endif - dst_st = av_new_stream(dst_ctx, 0); + dst_st = avformat_new_stream(dst_ctx, NULL); if (!dst_st) { DPRINTF(E_LOG, L_ART, "Out of memory for new output stream\n"); @@ -222,11 +222,7 @@ artwork_rescale(AVFormatContext *src_ctx dst = dst_st->codec; -#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 64) - avcodec_get_context_defaults2(dst, AVMEDIA_TYPE_VIDEO); -#else - avcodec_get_context_defaults2(dst, CODEC_TYPE_VIDEO); -#endif + avcodec_get_context_defaults3(dst, NULL); if (dst_fmt->flags & AVFMT_GLOBALHEADER) dst->flags |= CODEC_FLAG_GLOBAL_HEADER; @@ -276,7 +272,7 @@ artwork_rescale(AVFormatContext *src_ctx #endif /* Open encoder */ - ret = avcodec_open(dst, img_encoder); + ret = avcodec_open2(dst, img_encoder, NULL); if (ret < 0) { DPRINTF(E_LOG, L_ART, "Could not open codec for encoding: %s\n", strerror(AVUNERROR(ret))); @@ -519,7 +515,7 @@ artwork_get(char *filename, int max_w, i return -1; } - ret = av_find_stream_info(src_ctx); + ret = avformat_find_stream_info(src_ctx, NULL); if (ret < 0) { DPRINTF(E_WARN, L_ART, "Cannot get stream info: %s\n", strerror(AVUNERROR(ret))); --- forked-daapd-0.19gcd.orig/src/filescanner_ffmpeg.c +++ forked-daapd-0.19gcd/src/filescanner_ffmpeg.c @@ -341,7 +341,7 @@ scan_metadata_ffmpeg(char *file, struct return -1; } - ret = av_find_stream_info(ctx); + ret = avformat_find_stream_info(ctx, NULL); if (ret < 0) { DPRINTF(E_WARN, L_SCAN, "Cannot get stream info: %s\n", strerror(AVUNERROR(ret))); --- forked-daapd-0.19gcd.orig/src/main.c +++ forked-daapd-0.19gcd/src/main.c @@ -515,9 +515,6 @@ main(int argc, char **argv) DPRINTF(E_LOG, L_MAIN, "Forked Media Server Version %s taking off\n", VERSION); - /* Initialize ffmpeg */ - avcodec_init(); - ret = av_lockmgr_register(ffmpeg_lockmgr); if (ret < 0) { --- forked-daapd-0.19gcd.orig/src/transcode.c +++ forked-daapd-0.19gcd/src/transcode.c @@ -366,7 +366,7 @@ transcode_setup(struct media_file_info * return NULL; } - ret = av_find_stream_info(ctx->fmtctx); + ret = avformat_find_stream_info(ctx->fmtctx, NULL); if (ret < 0) { DPRINTF(E_WARN, L_XCODE, "Could not find stream info: %s\n", strerror(AVUNERROR(ret))); @@ -409,7 +409,7 @@ transcode_setup(struct media_file_info * if (ctx->adecoder->capabilities & CODEC_CAP_TRUNCATED) ctx->acodec->flags |= CODEC_FLAG_TRUNCATED; - ret = avcodec_open(ctx->acodec, ctx->adecoder); + ret = avcodec_open2(ctx->acodec, ctx->adecoder, NULL); if (ret != 0) { DPRINTF(E_WARN, L_XCODE, "Could not open codec: %s\n", strerror(AVUNERROR(ret))); @@ -425,7 +425,7 @@ transcode_setup(struct media_file_info * goto setup_fail_codec; } - if ((ctx->acodec->sample_fmt != SAMPLE_FMT_S16) + if ((ctx->acodec->sample_fmt != AV_SAMPLE_FMT_S16) || (ctx->acodec->channels != 2) || (ctx->acodec->sample_rate != 44100)) { @@ -433,7 +433,7 @@ transcode_setup(struct media_file_info * ctx->resample_ctx = av_audio_resample_init(2, ctx->acodec->channels, 44100, ctx->acodec->sample_rate, - SAMPLE_FMT_S16, ctx->acodec->sample_fmt, + AV_SAMPLE_FMT_S16, ctx->acodec->sample_fmt, 16, 10, 0, 0.8); if (!ctx->resample_ctx) debian/patches/series0000664000000000000000000000002212207433252012026 0ustar fix-libav9-compat debian/docs0000664000000000000000000000001411411434112010026 0ustar NEWS README debian/compat0000664000000000000000000000000211411434112010356 0ustar 5 debian/forked-daapd.postinst0000664000000000000000000000216511543153625013327 0ustar #!/bin/sh set -e DBDIR="/var/cache/forked-daapd" DBDEFAULT="songs3.db" do_db_backup () { [ -f "$DBDIR/$DBDEFAULT" ] || return 0 DBBAK="$DBDIR/backups" if [ ! -d "$DBBAK" ]; then mkdir -p "$DBBAK" fi DBBAK="$DBBAK/$DBDEFAULT.$1" [ -e "$DBBAK" ] && return 0 cp "$DBDIR/$DBDEFAULT" "$DBBAK" } if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then if ! getent passwd daapd > /dev/null 2>&1; then adduser --quiet --system --no-create-home --home /var/cache/forked-daapd daapd fi if ! dpkg-statoverride --list /var/cache/forked-daapd > /dev/null 2>&1; then dpkg-statoverride --update --add daapd root 0755 /var/cache/forked-daapd fi # Backup database before a database upgrade DBPATH=$(awk '/^[\t ]+db_path[\t ]*=/{ $0 = $3; gsub(/^[\t "]|[\t "]$/, ""); print};' /etc/forked-daapd.conf) if [ -z "$DBPATH" ] || [ "$DBPATH" = "$DBDIR/$DBDEFAULT" ]; then # v0.14: schema v11 -> v12 if dpkg --compare-versions "$2" lt-nl "0.14"; then do_db_backup prev12 fi else echo "Database not in the default location; no automatic backup made" fi fi #DEBHELPER#