Hi,

thanks for your patch. IMO this is something upstream may adapt.


-------- Weitergeleitete Nachricht --------
Betreff:        Bug#758347: kid3: Use pkg-config to determine FFmpeg linker 
flags
Weitersenden-Datum:     Sat, 16 Aug 2014 21:42:24 +0000
Weitersenden-Von:       Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
Weitersenden-An:        debian-bugs-dist@lists.debian.org
Weitersenden-CC: Debian KDE Extras Team <pkg-kde-ext...@lists.alioth.debian.org>
Datum:  Sat, 16 Aug 2014 23:40:27 +0200
Von:    Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
Antwort an: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>, 758...@bugs.debian.org
An:     Debian Bug Tracking System <sub...@bugs.debian.org>



Source: kid3
Version: 3.1-1
Severity: wishlist
Tags: patch
Usertags: reintroducing-ffmpeg

Dear maintainer,

I am working on reintroducing FFmpeg to Debian [1-2].

In order to make FFmpeg co-installable with Libav, the libraries were
renamed to lib*-ffmpeg. Thus using linker flags like '-lavcodec' doesn't
work with the FFmpeg packages.

To get the correct linking flags for both FFmpeg and Libav, one can
(and should) use pkg-config.

Attached patch achieves that for this package. Please apply it to
facilitate building your package with FFmpeg in Debian.

If you want to facilitate this even further, you can also add
lib*-ffmpeg-dev alternatives to the Libav build-dependencies.

While the FFmpeg package is still waiting in the NEW queue [3], it can
already be built from the git repository [4].

Best regards,
Andreas


1: https://lists.debian.org/debian-devel/2014/07/msg01010.html
2: https://bugs.debian.org/729203
3: https://ftp-master.debian.org/new/ffmpeg_7:2.3.1-1.html
4: https://anonscm.debian.org/cgit/collab-maint/ffmpeg.git




diff --git a/debian/patches/pkg-config.patch b/debian/patches/pkg-config.patch
new file mode 100644
index 0000000..9e8315c
--- /dev/null
+++ b/debian/patches/pkg-config.patch
@@ -0,0 +1,38 @@
+Description: Use pkg-config to determine FFmpeg linker flags
+
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2014-05-18>
+
+--- kid3-3.1.orig/src/plugins/acoustidimport/cmake/modules/FindFFmpeg.cmake
++++ kid3-3.1/src/plugins/acoustidimport/cmake/modules/FindFFmpeg.cmake
+@@ -47,29 +47,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ 		DOC "Location of FFMPEG Headers"
+ 	)
+ 
+-    FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES
+-        NAMES ${shortname}
+-        PATHS
+-        ${FFMPEG_ROOT}/lib
+-        $ENV{FFMPEG_DIR}/lib
+-        ~/Library/Frameworks
+-        /Library/Frameworks
+-        /usr/local/lib
+-        /usr/local/lib64
+-        /usr/lib
+-        /usr/lib64
+-        /sw/lib
+-        /opt/local/lib
+-        /opt/csw/lib
+-        /opt/lib
+-        /usr/freeware/lib64
+-		NO_DEFAULT_PATH
+-        DOC "Location of FFMPEG Libraries"
+-    )
+-    FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES
+-        NAMES ${shortname}
+-        DOC "Location of FFMPEG Libraries"
+-    )
++	pkg_check_modules(FFMPEG_${varname} lib${shortname})
+ 
+     IF (FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS)
+         SET(FFMPEG_${varname}_FOUND 1)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9937964
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+pkg-config.patch


Reply via email to