pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics libkface: remove - only used by old digikam
details: https://anonhg.NetBSD.org/pkgsrc/rev/661ce2c17c38
branches: trunk
changeset: 418355:661ce2c17c38
user: markd <markd%pkgsrc.org@localhost>
date: Mon Nov 25 06:14:32 2019 +0000
description:
libkface: remove - only used by old digikam
diffstat:
graphics/Makefile | 3 +-
graphics/libkface/DESCR | 4 -
graphics/libkface/Makefile | 30 -
graphics/libkface/PLIST | 26 -
graphics/libkface/buildlink3.mk | 16 -
graphics/libkface/distinfo | 14 -
graphics/libkface/patches/patch-CMakeLists.txt | 29 -
graphics/libkface/patches/patch-README | 18 -
graphics/libkface/patches/patch-libkface_CMakeLists.txt | 22 -
graphics/libkface/patches/patch-libkface_detection_opencvfacedetector.cpp | 31 -
graphics/libkface/patches/patch-libkface_libopencv.h.cmake.in | 76 ----
graphics/libkface/patches/patch-libkface_recognition-opencv-lbph_facerec_borrowed.cpp | 169 ----------
graphics/libkface/patches/patch-libkface_recognition-opencv-lbph_facerec_borrowed.h | 100 -----
graphics/libkface/patches/patch-libkface_recognition-opencv-lbph_lbphfacemodel.cpp | 155 ---------
14 files changed, 1 insertions(+), 692 deletions(-)
diffs (truncated from 759 to 300 lines):
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/Makefile
--- a/graphics/Makefile Mon Nov 25 04:13:30 2019 +0000
+++ b/graphics/Makefile Mon Nov 25 06:14:32 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.862 2019/11/22 17:23:53 nia Exp $
+# $NetBSD: Makefile,v 1.863 2019/11/25 06:14:32 markd Exp $
#
COMMENT= Graphics tools and libraries
@@ -320,7 +320,6 @@
SUBDIR+= libkdcraw
SUBDIR+= libkexiv2
SUBDIR+= libkexiv2-kde4
-SUBDIR+= libkface
SUBDIR+= libkipi
SUBDIR+= libksane
SUBDIR+= liblqr
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/libkface/DESCR
--- a/graphics/libkface/DESCR Mon Nov 25 04:13:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-Libkface is a Qt/C++ wrapper around LibFace library to perform face recognition
-and detection over pictures.
-
-This library is used by kipi-plugins, digiKam and others kipi host programs.
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/libkface/Makefile
--- a/graphics/libkface/Makefile Mon Nov 25 04:13:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.43 2019/08/22 12:23:20 ryoon Exp $
-#
-
-PKGNAME= libkface-4.13.0
-PKGREVISION= 14
-DISTNAME= digikam-4.13.0
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_KDE:=digikam/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.digikam.org/
-COMMENT= LibFace Library interface for KDE
-LICENSE= gnu-gpl-v2
-
-BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
-
-USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DENABLE_OPENCV3:BOOL=ON
-
-PKGCONFIG_OVERRIDE+= libkface.pc.cmake
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/extra/libkface
-
-.include "../../meta-pkgs/kde4/kde4.mk"
-.include "../../graphics/opencv/buildlink3.mk"
-.include "../../graphics/opencv-contrib-face/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/libkface/PLIST
--- a/graphics/libkface/PLIST Mon Nov 25 04:13:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2015/11/03 20:28:57 markd Exp $
-include/libkface/dataproviders.h
-include/libkface/facedetector.h
-include/libkface/identity.h
-include/libkface/libkface_export.h
-include/libkface/recognitiondatabase.h
-include/libkface/version.h
-lib/cmake/Kface-3.5.0/Kface-export-relwithdebinfo.cmake
-lib/cmake/Kface-3.5.0/Kface-export.cmake
-lib/cmake/Kface-3.5.0/kface-config-version.cmake
-lib/cmake/Kface-3.5.0/kface-config.cmake
-lib/libkface.so
-lib/libkface.so.3
-lib/libkface.so.3.0.0
-lib/pkgconfig/libkface.pc
-share/kde/apps/libkface/alignment-congealing/face-funnel.data
-share/kde/apps/libkface/database/dbconfig.xml
-share/kde/apps/libkface/haarcascades/haarcascade_frontalface_alt.xml
-share/kde/apps/libkface/haarcascades/haarcascade_frontalface_alt2.xml
-share/kde/apps/libkface/haarcascades/haarcascade_frontalface_alt_tree.xml
-share/kde/apps/libkface/haarcascades/haarcascade_frontalface_default.xml
-share/kde/apps/libkface/haarcascades/haarcascade_mcs_lefteye.xml
-share/kde/apps/libkface/haarcascades/haarcascade_mcs_mouth.xml
-share/kde/apps/libkface/haarcascades/haarcascade_mcs_nose.xml
-share/kde/apps/libkface/haarcascades/haarcascade_mcs_righteye.xml
-share/kde/apps/libkface/haarcascades/haarcascade_profileface.xml
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/libkface/buildlink3.mk
--- a/graphics/libkface/buildlink3.mk Mon Nov 25 04:13:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.35 2019/08/22 12:23:20 ryoon Exp $
-
-BUILDLINK_TREE+= libkface
-
-.if !defined(LIBKFACE_BUILDLINK3_MK)
-LIBKFACE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libkface+= libkface>=2.5.0
-BUILDLINK_ABI_DEPENDS.libkface?= libkface>=4.13.0nb14
-BUILDLINK_PKGSRCDIR.libkface?= ../../graphics/libkface
-
-.include "../../graphics/opencv/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.endif # LIBKFACE_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -libkface
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/libkface/distinfo
--- a/graphics/libkface/distinfo Mon Nov 25 04:13:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.7 2016/03/29 10:14:05 markd Exp $
-
-SHA1 (digikam-4.13.0.tar.bz2) = d696ac88dcb3bcbd3a5da83b0fbe5e7315a43f92
-RMD160 (digikam-4.13.0.tar.bz2) = 11d6aa15a94cd38acca79f2a31f65393a01a2b0b
-SHA512 (digikam-4.13.0.tar.bz2) = 0cadb55f568a34d07f008791ca351428f4cd9e7060ba79aa8acc25e5e38f0bbcd586df764dacbcb9d1dadb56d2fb9160760cc89aeab4d7cef9bdbd26f691752b
-Size (digikam-4.13.0.tar.bz2) = 69554099 bytes
-SHA1 (patch-CMakeLists.txt) = a5c798fc35127996d38ce1103c7b321108f56eaa
-SHA1 (patch-README) = 520dd6ee6562b708fb96adf6bf209056adb5d159
-SHA1 (patch-libkface_CMakeLists.txt) = d183bcfa09244984350fa0ae2957d877618b2d0d
-SHA1 (patch-libkface_detection_opencvfacedetector.cpp) = e8a31a469df3f0bc4d3f3bb2c3864a0913985fab
-SHA1 (patch-libkface_libopencv.h.cmake.in) = 354103b0be8e202630059dc438af9d03837bed72
-SHA1 (patch-libkface_recognition-opencv-lbph_facerec_borrowed.cpp) = 29d390a44a52daf15e7bfd8f2b7e7ee73d59f45a
-SHA1 (patch-libkface_recognition-opencv-lbph_facerec_borrowed.h) = 96e28212344df9bd749ed8db69d877a0aba3c140
-SHA1 (patch-libkface_recognition-opencv-lbph_lbphfacemodel.cpp) = c181d1b94948f7988081b09e3c2bf3190eaf046e
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/libkface/patches/patch-CMakeLists.txt
--- a/graphics/libkface/patches/patch-CMakeLists.txt Mon Nov 25 04:13:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/11/03 20:28:57 markd Exp $
-
-opencv3 support. https://bugs.kde.org/show_bug.cgi?id=349601
-
---- CMakeLists.txt.orig 2015-09-03 21:22:44.000000000 +0000
-+++ CMakeLists.txt
-@@ -10,6 +10,8 @@ project(libkface)
- message(STATUS "----------------------------------------------------------------------------------")
- message(STATUS "Starting CMake configuration for: libkface")
-
-+option(ENABLE_OPENCV3 "Build libkface with OpenCV3 instead OpenCV2 (default=OFF)" OFF)
-+
- find_package(Qt4 4.6.0 REQUIRED)
- find_package(KDE4 REQUIRED)
-
-@@ -30,7 +32,12 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-
- include(MacroOpenCV)
--DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
-+
-+if (ENABLE_OPENCV3)
-+ DETECT_OPENCV(3.0.0 core face highgui objdetect imgproc)
-+else()
-+ DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
-+endif()
-
- include_directories(${OpenCV_INCLUDE_DIRS})
-
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/libkface/patches/patch-README
--- a/graphics/libkface/patches/patch-README Mon Nov 25 04:13:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-README,v 1.1 2015/11/03 20:28:57 markd Exp $
-
-opencv3 support. https://bugs.kde.org/show_bug.cgi?id=349601
-
---- README.orig 2015-09-03 21:22:44.000000000 +0000
-+++ README
-@@ -21,6 +21,11 @@ libqt >= 4.6.x h
- libkde >= 4.4.x http://www.kde.org
- libopencv >= 2.4.9 http://opencv.willowgarage.com/wiki (with opencv 'haarcascades' data files)
-
-+CMake compilation options to custom libkface:
-+
-+Use CMake "-DENABLE_OPENCV3=on" flag to compile libkface source code using OpenCV3 instead OpenCV2 (disabled by default).
-+ OpenCV3 support needs extra contrib modules package, especially 'face' ands 'legacy' components.
-+
- -- INSTALL ------------------------------------------------------------
-
- In order to compile, especially when QT3/Qt4 are installed at the same time,
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/libkface/patches/patch-libkface_CMakeLists.txt
--- a/graphics/libkface/patches/patch-libkface_CMakeLists.txt Mon Nov 25 04:13:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-libkface_CMakeLists.txt,v 1.1 2015/11/03 20:28:57 markd Exp $
-
-opencv3 support. https://bugs.kde.org/show_bug.cgi?id=349601
-
---- libkface/CMakeLists.txt.orig 2015-09-03 21:22:44.000000000 +0000
-+++ libkface/CMakeLists.txt
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2010-2014, Gilles Caulier, <caulier dot gilles at gmail dot com>
-+# Copyright (c) 2010-2015, Gilles Caulier, <caulier dot gilles at gmail dot com>
- #
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-@@ -52,7 +52,7 @@ target_link_libraries(kface ${KDE4_KDECO
- ${QT_QTXML_LIBRARY}
- ${QT_QTSQL_LIBRARY}
-
-- ${OpenCV_LIBRARIES}
-+ ${OpenCV_LIBRARIES} -lopencv_face
- )
-
- set_target_properties(kface PROPERTIES VERSION ${KFACE_LIB_SO_VERSION_STRING}
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/libkface/patches/patch-libkface_detection_opencvfacedetector.cpp
--- a/graphics/libkface/patches/patch-libkface_detection_opencvfacedetector.cpp Mon Nov 25 04:13:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-libkface_detection_opencvfacedetector.cpp,v 1.1 2015/11/03 20:28:57 markd Exp $
-
-opencv3 support. https://bugs.kde.org/show_bug.cgi?id=349601
-
---- libkface/detection/opencvfacedetector.cpp.orig 2015-09-03 21:22:44.000000000 +0000
-+++ libkface/detection/opencvfacedetector.cpp
-@@ -18,7 +18,7 @@
- * <a href="alexjironkin at gmail dot com">alexjironkin at gmail dot com</a>
- * @author Copyright (C) 2010 by Aditya Bhatt
- * <a href="adityabhatt at gmail dot com">adityabhatt at gmail dot com</a>
-- * @author Copyright (C) 2010-2014 by Gilles Caulier
-+ * @author Copyright (C) 2010-2015 by Gilles Caulier
- * <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
- * @author Copyright (C) 2010-2013 by Marcel Wiesweg
- * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
-@@ -136,13 +136,14 @@ public:
-
- cv::Size getOriginalWindowSize() const
- {
-+#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,11)
- // This is a HACK which may break any time. Work around the fact that getOriginalWindowSize()
- // always returns (0,0) and we need these values.
- if (oldCascade)
- {
- return oldCascade->orig_window_size;
- }
--
-+#endif
- return cv::Size(0, 0);
- }
-
diff -r 1541a6dc65d5 -r 661ce2c17c38 graphics/libkface/patches/patch-libkface_libopencv.h.cmake.in
--- a/graphics/libkface/patches/patch-libkface_libopencv.h.cmake.in Mon Nov 25 04:13:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-$NetBSD: patch-libkface_libopencv.h.cmake.in,v 1.1 2015/11/03 20:28:57 markd Exp $
-
-opencv3 support. https://bugs.kde.org/show_bug.cgi?id=349601
-
---- libkface/libopencv.h.cmake.in.orig 2015-09-03 21:22:44.000000000 +0000
-+++ libkface/libopencv.h.cmake.in
-@@ -7,7 +7,7 @@
- * @date 2010-06-16
- * @brief Wrapper for OpenCV header files
- *
-- * @author Copyright (C) 2012-2014 by Gilles Caulier
-+ * @author Copyright (C) 2012-2015 by Gilles Caulier
- * <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
- *
- * This program is free software; you can redistribute it
-@@ -31,16 +31,16 @@
-
- // Pragma directives to reduce warnings from OpenCV header files.
- #if not defined(__APPLE__) && defined(__GNUC__)
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
--#pragma GCC diagnostic ignored "-Woverloaded-virtual"
-+# pragma GCC diagnostic push
-+# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-+# pragma GCC diagnostic ignored "-Woverloaded-virtual"
- #endif
-
- #if defined(__APPLE__) && defined(__clang__)
--#pragma clang diagnostic push
--#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
--#pragma clang diagnostic ignored "-Woverloaded-virtual"
--#pragma clang diagnostic ignored "-Wcast-align"
-+# pragma clang diagnostic push
-+# pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-+# pragma clang diagnostic ignored "-Woverloaded-virtual"
-+# pragma clang diagnostic ignored "-Wcast-align"
- #endif
-
- // OpenCV includes
-@@ -51,23 +51,30 @@
- #define OPENCV_VERSION OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
- #define OPENCV_TEST_VERSION(major,minor,patch) ( OPENCV_VERSION >= OPENCV_MAKE_VERSION(major,minor,patch) )
-
--#include <opencv2/core/core.hpp>
--#include <opencv2/core/internal.hpp>
--#include <opencv2/contrib/contrib.hpp>
-+#if OPENCV_TEST_VERSION(3,0,0)
-+# include <opencv2/face.hpp>
-+# include <opencv2/core.hpp>
-+#else
-+# include <opencv2/core/core.hpp>
-+# include <opencv2/core/internal.hpp>
-+# include <opencv2/contrib/contrib.hpp>
Home |
Main Index |
Thread Index |
Old Index