pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/digikam Allow build with C++11 STL providing ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/68c37d5b7cf9
branches:  trunk
changeset: 641770:68c37d5b7cf9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Nov 17 19:02:30 2014 +0000

description:
Allow build with C++11 STL providing std::ratio.

diffstat:

 graphics/digikam/distinfo                                                      |   4 ++-
 graphics/digikam/patches/patch-core_tests_imgqsort_detectblur_detectblur.cpp   |  13 ++++++++++
 graphics/digikam/patches/patch-core_tests_imgqsort_detectnoise_detectnoise.cpp |  13 ++++++++++
 3 files changed, 29 insertions(+), 1 deletions(-)

diffs (50 lines):

diff -r 5001db6e48ae -r 68c37d5b7cf9 graphics/digikam/distinfo
--- a/graphics/digikam/distinfo Mon Nov 17 19:01:46 2014 +0000
+++ b/graphics/digikam/distinfo Mon Nov 17 19:02:30 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2014/11/15 21:15:18 markd Exp $
+$NetBSD: distinfo,v 1.46 2014/11/17 19:02:30 joerg Exp $
 
 SHA1 (digikam-4.4.0.tar.bz2) = 1feb43120addda314e09761440ec2058e430171c
 RMD160 (digikam-4.4.0.tar.bz2) = 540f243361aba3c95b675c05f84d8d60efab1948
@@ -9,4 +9,6 @@
 SHA1 (patch-core_libs_dimg_filters_icc_iccmanager.h) = 999bd32312fbe840913a8d29613b351384061b65
 SHA1 (patch-core_libs_imageproperties_captionedit.cpp) = a0f181ff4af9f71eee5679aef540a78497a113a9
 SHA1 (patch-core_libs_imageproperties_imagedescedittab.cpp) = a09fa20eaac60bf7dc6bcb2b9a1304891029ccb0
+SHA1 (patch-core_tests_imgqsort_detectblur_detectblur.cpp) = a2d49329ff9c4d7d05c23d5f0a2a152e9d02d790
+SHA1 (patch-core_tests_imgqsort_detectnoise_detectnoise.cpp) = 62b4f08733475c7eaf95c64747bc8c18a3dbfae3
 SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661
diff -r 5001db6e48ae -r 68c37d5b7cf9 graphics/digikam/patches/patch-core_tests_imgqsort_detectblur_detectblur.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/digikam/patches/patch-core_tests_imgqsort_detectblur_detectblur.cpp      Mon Nov 17 19:02:30 2014 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-core_tests_imgqsort_detectblur_detectblur.cpp,v 1.1 2014/11/17 19:02:30 joerg Exp $
+
+--- core/tests/imgqsort/detectblur/detectblur.cpp.orig 2014-11-17 15:36:48.000000000 +0000
++++ core/tests/imgqsort/detectblur/detectblur.cpp
+@@ -53,7 +53,7 @@ void CannyThreshold(int, void*)
+     blur( src_gray, detected_edges, Size(3,3) );
+ 
+     // Canny detector
+-    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*ratio, kernel_size );
++    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*::ratio, kernel_size );
+ 
+     // Using Canny's output as a mask, we display our result
+     dst = Scalar::all(0);
diff -r 5001db6e48ae -r 68c37d5b7cf9 graphics/digikam/patches/patch-core_tests_imgqsort_detectnoise_detectnoise.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/digikam/patches/patch-core_tests_imgqsort_detectnoise_detectnoise.cpp    Mon Nov 17 19:02:30 2014 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-core_tests_imgqsort_detectnoise_detectnoise.cpp,v 1.1 2014/11/17 19:02:30 joerg Exp $
+
+--- core/tests/imgqsort/detectnoise/detectnoise.cpp.orig       2014-11-17 15:37:46.000000000 +0000
++++ core/tests/imgqsort/detectnoise/detectnoise.cpp
+@@ -48,7 +48,7 @@ void CannyThreshold(int, void*)
+     blur( src_gray, detected_edges, Size(3,3) );
+ 
+     // Canny detector
+-    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*ratio, kernel_size );
++    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*::ratio, kernel_size );
+ 
+     // Using Canny's output as a mask, we display our result
+     dst = Scalar::all(0);



Home | Main Index | Thread Index | Old Index