[SCM] mjpegtools/master: Drop debian/patches/11_fix_ftbfs_gcc4.7.patch patch, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Oct 7 16:18:34 UTC 2013
The following commit has been merged in the master branch:
commit 5681e94b40ef4c585f73775fa4c698596be7da10
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Oct 7 17:17:53 2013 +0100
Drop debian/patches/11_fix_ftbfs_gcc4.7.patch patch, applied upstream.
diff --git a/debian/patches/11_fix_ftbfs_gcc4.7.patch b/debian/patches/11_fix_ftbfs_gcc4.7.patch
deleted file mode 100644
index ea4ffb4..0000000
--- a/debian/patches/11_fix_ftbfs_gcc4.7.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Reinhard Tartler <siretart at tauware.de>
-Subject: Allow compilation with GCC 4.7
-Forwarded-upstream: no
-
---- a/y4mdenoise/MotionSearcher.hh
-+++ b/y4mdenoise/MotionSearcher.hh
-@@ -2196,7 +2196,7 @@ MotionSearcher<PIXEL_NUM,DIM,PIXEL_TOL,P
- {
- // This region is too small to be bothered with.
- // Just get rid of it.
-- DeleteRegion (a_pRegion);
-+ this->DeleteRegion (a_pRegion);
- }
- else
- {
diff --git a/debian/patches/series b/debian/patches/series
index 3d856d0..08cb4df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
08_use_bash.patch
09_script_path.patch
10_usr_local.patch
-11_fix_ftbfs_gcc4.7.patch
13_fix_lav2yuv_linking.diff
14_fix_mplex_linking.diff
15_fix_qttoy4m_linking.diff
--
mjpegtools packaging
More information about the pkg-multimedia-commits
mailing list