Source: amarok
Version: 2.8.0-2
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..392ed6a
--- /dev/null
+++ b/debian/patches/pkg-config.patch
@@ -0,0 +1,19 @@
+Description: Use pkg-config to determine FFmpeg linker flags
+
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2014-08-06>
+
+--- amarok-2.8.0.orig/CMakeLists.txt
++++ amarok-2.8.0/CMakeLists.txt
+@@ -105,7 +105,10 @@ if( LIBLASTFM_FOUND )
+ endif( LIBLASTFM_FOUND )
+ macro_bool_to_01( LIBLASTFM_FOUND HAVE_LIBLASTFM )
+ 
+-macro_optional_find_package( FFmpeg )
++pkg_check_modules(FFMPEG libavcodec)
++pkg_check_modules(AVFORMAT libavformat)
++pkg_check_modules(AVCODEC libavcodec)
++pkg_check_modules(AVUTIL libavutil)
+ 
+ if( FFMPEG_FOUND )
+     macro_optional_find_package( LibOFA )
diff --git a/debian/patches/series b/debian/patches/series
index 3b702c1..fb5f1a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ debian_mysqle_amarok_local_errmsg_feature.diff
 debian_mysqle_force_defaults_file.diff
 debian_find_mysql_fix.diff
 debian_clamz_is_runtime_dependency.diff
+pkg-config.patch

_______________________________________________
pkg-kde-extras mailing list
pkg-kde-extras@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-kde-extras

Reply via email to