[SCM] KDE Multimedia module packaging branch, master, updated. debian/4.8.4-1-2-g53f7c30

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdemultimedia.git;a=commitdiff;h=53f7c30

The following commit has been merged in the master branch:
commit 53f7c30a4aeb02abec092d0500b3995481c87f4a
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jun 28 18:07:04 2012 +0200

    respect CXXFLAGS when building ffmpegthumbs
    
    backport upstream commit 1fe9ccc25af441895e126a54af89f33f01948c91
    (from the ffmpegthumbs repository)
---
 debian/changelog                                   |    4 +++
 debian/patches/series                              |    1 +
 ...-the-default-options-in-CXXFLAGS-when-bui.patch |   26 ++++++++++++++++++++
 3 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 336a4fe..9f5dcef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kdemultimedia (4:4.8.4-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream commit 1fe9ccc25af441895e126a54af89f33f01948c91 (from
+    the ffmpegthumbs repository) to respect CXXFLAGS when building ffmpegthumbs;
+    patch upstream_don-t-reset-the-default-options-in-CXXFLAGS-when-bui.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 28 Jun 2012 18:03:49 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index b5e7d70..41d620a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kmix_showeverywhere.diff
 fix_target_link_libraries.diff
 libav_compat.diff
+upstream_don-t-reset-the-default-options-in-CXXFLAGS-when-bui.patch
diff --git a/debian/patches/upstream_don-t-reset-the-default-options-in-CXXFLAGS-when-bui.patch b/debian/patches/upstream_don-t-reset-the-default-options-in-CXXFLAGS-when-bui.patch
new file mode 100644
index 0000000..dd97920
--- /dev/null
+++ b/debian/patches/upstream_don-t-reset-the-default-options-in-CXXFLAGS-when-bui.patch
@@ -0,0 +1,26 @@
+From 1fe9ccc25af441895e126a54af89f33f01948c91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <neoclust.kde at free.fr>
+Date: Thu, 28 Jun 2012 17:04:21 +0200
+Subject: [PATCH] don't reset the default options in CXXFLAGS when building
+ ffmpegthumbs
+
+---
+ CMakeLists.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ffmpegthumbs/CMakeLists.txt b/ffmpegthumbs/CMakeLists.txt
+index 4c4d67f..dd0974f 100644
+--- a/ffmpegthumbs/CMakeLists.txt
++++ b/ffmpegthumbs/CMakeLists.txt
+@@ -6,7 +6,7 @@ include_directories(
+     )
+ 
+ # Certain versions of FFMPEG need this to be defined
+-SET( CMAKE_CXX_FLAGS "-D __STDC_CONSTANT_MACROS" )
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D __STDC_CONSTANT_MACROS")
+ 
+ set( ffmpegthumbs_PART_SRCS
+   ffmpegthumbnailer.cpp
+-- 
+1.7.10
+

-- 
KDE Multimedia module packaging