← Back to branch summary

~ubuntu-branches/debian/stretch/acoustid-fingerprinter/stretch

« back to all changes in this revision

Viewing changes to debian/patches/03-pkg-config.patch

  • Committer: Package Import Robot
  • Author(s): Jerome Charaoui
  • Date: 2014-08-26 20:30:49 UTC
  • mfrom: (7.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140826203049-qg3pn0syyg01udl3
Tags: 0.6-4
http://bugs.debian.org/758323
Make package FFmpeg-friendly (Closes: #758323)
Patch provided by Andreas Cadhalpun.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03-pkg-config.patch
 
1
Description: Use pkg-config to determine FFmpeg linker flags
 
2
 
 
3
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 
4
Last-Update: <2014-07-27>
 
5
 
 
6
--- acoustid-fingerprinter-0.6.orig/CMakeLists.txt
 
7
+++ acoustid-fingerprinter-0.6/CMakeLists.txt
 
8
@@ -12,6 +12,7 @@ set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_
 
9
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
10
 
 
11
 find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
 
12
+find_package(PkgConfig REQUIRED)
 
13
 find_package(FFmpeg REQUIRED)
 
14
 find_package(Taglib REQUIRED)
 
15
 find_package(Chromaprint REQUIRED)
 
16
--- acoustid-fingerprinter-0.6.orig/cmake/modules/FindFFmpeg.cmake
 
17
+++ acoustid-fingerprinter-0.6/cmake/modules/FindFFmpeg.cmake
 
18
@@ -47,29 +47,7 @@ MACRO(FFMPEG_FIND varname shortname head
 
19
                DOC "Location of FFMPEG Headers"
 
20
        )
 
21
 
 
22
-    FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES
 
23
-        NAMES ${shortname}
 
24
-        PATHS
 
25
-        ${FFMPEG_ROOT}/lib
 
26
-        $ENV{FFMPEG_DIR}/lib
 
27
-        ~/Library/Frameworks
 
28
-        /Library/Frameworks
 
29
-        /usr/local/lib
 
30
-        /usr/local/lib64
 
31
-        /usr/lib
 
32
-        /usr/lib64
 
33
-        /sw/lib
 
34
-        /opt/local/lib
 
35
-        /opt/csw/lib
 
36
-        /opt/lib
 
37
-        /usr/freeware/lib64
 
38
-               NO_DEFAULT_PATH
 
39
-        DOC "Location of FFMPEG Libraries"
 
40
-    )
 
41
-    FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES
 
42
-        NAMES ${shortname}
 
43
-        DOC "Location of FFMPEG Libraries"
 
44
-    )
 
45
+       pkg_check_modules(FFMPEG_${varname} lib${shortname})
 
46
 
 
47
     IF (FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS)
 
48
         SET(FFMPEG_${varname}_FOUND 1)