[SCM] forked-daapd/master: Revert "Use pkg-config to determine FFmpeg linker flags"

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c37d1d6ab0c627c48197767e294b06702464a414
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu Oct 16 13:56:07 2014 +0200

    Revert "Use pkg-config to determine FFmpeg linker flags"
    
    See #758337for details.
    
    This reverts commit 73e9fe3117461df53a3b8348de59f5e7e09f05de.

diff --git a/debian/patches/pkg-config.patch b/debian/patches/pkg-config.patch
deleted file mode 100644
index afae24c..0000000
--- a/debian/patches/pkg-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Use pkg-config to determine FFmpeg linker flags
-
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2014-06-03>
-
---- forked-daapd-20.0+git20140530+gc740e6e.orig/configure.ac
-+++ forked-daapd-20.0+git20140530+gc740e6e/configure.ac
-@@ -142,11 +142,14 @@ PKG_CHECK_EXISTS([ libavcodec >= 54.35 ]
-   PKG_CHECK_MODULES(LIBAV, [ libavformat libavcodec libswscale libavutil ])
- ])
- 
-+PKG_CHECK_MODULES([LIBAVCODEC], [libavcodec])
-+avc_name=`echo $LIBAVCODEC_LIBS | sed 's/-l//'`
-+
- save_LIBS="$LIBS"
- dnl Check for av_lock_manager (ffmpeg >= 0.5.1)
--AC_CHECK_LIB([avcodec], [av_lockmgr_register], , AC_MSG_ERROR([libav (ffmpeg) >= 0.5.1 required]))
-+AC_CHECK_LIB([$avc_name], [av_lockmgr_register], , AC_MSG_ERROR([libav (ffmpeg) >= 0.5.1 required]))
- dnl Check for avcodec_find_best_pix_fmt_of_list (is only in ffmpeg, not libav)
--AC_CHECK_LIB([avcodec], [avcodec_find_best_pix_fmt_of_list],
-+AC_CHECK_LIB([$avc_name], [avcodec_find_best_pix_fmt_of_list],
- 	AC_DEFINE(FFMPEG_INCOMPATIBLE_API, 1, [Define to 1 if you have ffmpeg (and not libav).]))
- LIBS="$save_LIBS"
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9937964..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-pkg-config.patch

-- 
forked-daapd packaging