[SCM] ffdiaporama/master: Drop fix-ftbfs-libav-0.7.patch. Applied upstream.

fabricesp-guest at users.alioth.debian.org fabricesp-guest at users.alioth.debian.org
Tue Nov 27 04:27:43 UTC 2012


The following commit has been merged in the master branch:
commit 96d092fc53e77bdcb6a3c1496d8779a93e921ff0
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Mon Nov 26 21:18:09 2012 +0100

    Drop fix-ftbfs-libav-0.7.patch. Applied upstream.

diff --git a/debian/patches/fix-ftbfs-libav-0.7.patch b/debian/patches/fix-ftbfs-libav-0.7.patch
deleted file mode 100644
index 335090d..0000000
--- a/debian/patches/fix-ftbfs-libav-0.7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix FTBFS because of missing headers in libav 0.7
- Those headers has been added in libav 0.8 by splitting existing ones
-Author: Fabrice Coutadeur <coutadeurf at gmail.com>
-Index: ffdiaporama/src/engine/cDeviceModelDef.h
-===================================================================
---- ffdiaporama.orig/src/engine/cDeviceModelDef.h	2012-05-30 06:41:02.181850071 +0200
-+++ ffdiaporama/src/engine/cDeviceModelDef.h	2012-05-30 06:55:49.861872546 +0200
-@@ -45,8 +45,6 @@
-     #endif
- 
-     #include <libavcodec/version.h>
--    #include <libavdevice/avdevice.h>
--    #include <libavfilter/avfilter.h>
-     #include <libavformat/version.h>
-     #include <libavutil/avutil.h>
-     #include <libswscale/swscale.h>
diff --git a/debian/patches/series b/debian/patches/series
index 38e661d..3acc3d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix_hardening_flags.patch
-fix-ftbfs-libav-0.7.patch

-- 
ffdiaporama packaging



More information about the pkg-multimedia-commits mailing list