[SCM] cmus/master: Link against libavcodec

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0fd74d359a3715c1f8916289b2e73bb8343c85fc
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Sun Nov 15 18:56:36 2015 +0100

    Link against libavcodec
    
    cmus uses function from libavcodec, so make sure that it links against it.

diff --git a/debian/patches/02_link_avcodec.patch b/debian/patches/02_link_avcodec.patch
new file mode 100644
index 0000000..bace974
--- /dev/null
+++ b/debian/patches/02_link_avcodec.patch
@@ -0,0 +1,64 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ cmus (2.7.1-1) UNRELEASED; urgency=medium
+ .
+   [ Alessio Treglia ]
+   * Demote extra plugins to Suggests (Closes: #789256)
+   * Refresh patchset for 2.6.0.
+ .
+   [ Sebastian Ramacher ]
+   * New upstream release. (Closes: #779335, #792134)
+     - Use libswresample instead of libavresample. (Closes: #805169, #805109)
+   * Update path for README
+   * debian/control:
+     - Add libdiscid-dev, libopusfile-dev, libsamplerate0-dev and libjack-dev
+       to Build-Depends.
+     - Change libavresample-dev to libswresample-dev in Build-Depends and add
+       libavcodec-dev.
+     - Add bash-completion to Build-Depends.
+     - Bump Standards-Version to 3.9.6.
+   * debian/cmus.install: Install zsh completion.
+   * debian/cmus.bash-completion: Install bash completion.
+   * debian/rules:
+     - Build with --parallel and --with bash-completion.
+     - Handle jack shlibs similar to pulse.
+   * debian/patches:
+     - libav10.patch: Removed, no longer needed.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Bug-Debian: https://bugs.debian.org/779335
+Bug-Debian: https://bugs.debian.org/789256
+Bug-Debian: https://bugs.debian.org/792134
+Bug-Debian: https://bugs.debian.org/805109
+Bug-Debian: https://bugs.debian.org/805169
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- cmus-2.7.1.orig/Makefile
++++ cmus-2.7.1/Makefile
+@@ -18,8 +18,8 @@ include scripts/lib.mk
+ 
+ CFLAGS += -D_FILE_OFFSET_BITS=64
+ 
+-FFMPEG_CFLAGS += $(shell pkg-config --cflags libswresample)
+-FFMPEG_LIBS += $(shell pkg-config --libs libswresample)
++FFMPEG_CFLAGS += $(shell pkg-config --cflags libswresample libavcodec)
++FFMPEG_LIBS += $(shell pkg-config --libs libswresample libavcodec)
+ 
+ CMUS_LIBS = $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) $(CUE_LIBS) -lm $(COMPAT_LIBS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ba82c49..c2cfb69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_config.mk.diff
+02_link_avcodec.patch
 11-fix_modplug_detection.patch

-- 
cmus packaging