Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (41fca23a339b2607be4baf55e08343ea716e98f1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (41fca23a339b2607be4baf55e08343ea716e98f1)
  • Date: Mon, 19 Nov 2018 08:59:10 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +++
disk/hdparm/DETAILS | 8 ++++----
disk/hdparm/HISTORY | 3 +++
graphics-libs/opencv/CONFLICTS | 1 +
graphics-libs/opencv/HISTORY | 3 +++
graphics-libs/opencv3/CONFLICTS | 1 +
graphics-libs/opencv3/HISTORY | 3 +++
graphics-libs/opencv4/BUILD | 17 +++++++++++++++++
graphics-libs/opencv4/CONFIGURE | 1 +
graphics-libs/opencv4/CONFLICTS | 2 ++
graphics-libs/opencv4/DEPENDS | 25 +++++++++++++++++++++++++
graphics-libs/opencv4/DETAILS | 28 ++++++++++++++++++++++++++++
graphics-libs/opencv4/HISTORY | 4 ++++
graphics-libs/opencv4/INSTALL | 1 +
graphics-libs/opencv4/PREPARE | 8 ++++++++
graphics-libs/opencv4/PRE_BUILD | 13 +++++++++++++
graphics-libs/opencv4/PRE_SUB_DEPENDS | 8 ++++++++
graphics-libs/opencv4/PROVIDES | 1 +
graphics-libs/opencv4/SUB_DEPENDS | 8 ++++++++
security/nmap/DETAILS | 12 ++++++------
security/nmap/HISTORY | 3 +++
video-libs/libdvdcss/DETAILS | 8 ++++----
video-libs/libdvdcss/HISTORY | 3 +++
23 files changed, 150 insertions(+), 14 deletions(-)

New commits:
commit 41fca23a339b2607be4baf55e08343ea716e98f1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

opencv -- conflicts opencv4

commit cd7acd44dba82faabff512916cef97555412358f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

opencv3 -- conflicts opencv4

commit 7564f26b35c702dc514fca390dfe3a3034b292c3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

opencv4-4.0.0

commit f508030ce3ab36592851a05927ddcc2e4d4f68ee
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

nmap: => 7.70

commit e34ef438501f3c180c9532aa1fda44fbcabae08b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

hdparm: => 9.58

commit 14a3ce988cdb3006d9eadb33ac5cdfed0f56056f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdvdcss: => 1.4.2

diff --git a/ChangeLog b/ChangeLog
index 9957dc5..7455d45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2018-11-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * graphics-libs/opencv4: added, computer vision library
+
2018-11-18 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/pyfuse3: new spell,Python 3 bindings for libfuse 3

diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS
index 6c70c93..319f8f2 100755
--- a/disk/hdparm/DETAILS
+++ b/disk/hdparm/DETAILS
@@ -1,11 +1,11 @@
SPELL=hdparm
- VERSION=9.56
-
SOURCE_HASH=sha512:5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
+ VERSION=9.58
+
SOURCE_HASH=sha512:42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
+ SOURCE_URL[0]=https://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
LICENSE[0]=BSD
- WEB_SITE=http://sourceforge.net/projects/hdparm/
+ WEB_SITE=https://sourceforge.net/projects/hdparm/
KEYWORDS="disk"
ENTERED=20010922
SHORT="A utility to access/tune Linux's EIDE drivers."
diff --git a/disk/hdparm/HISTORY b/disk/hdparm/HISTORY
index 248a93b..859011a 100644
--- a/disk/hdparm/HISTORY
+++ b/disk/hdparm/HISTORY
@@ -1,3 +1,6 @@
+2018-11-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 9.58
+
2018-09-22 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 9.56

diff --git a/graphics-libs/opencv/CONFLICTS b/graphics-libs/opencv/CONFLICTS
index 281d26f..658de34 100755
--- a/graphics-libs/opencv/CONFLICTS
+++ b/graphics-libs/opencv/CONFLICTS
@@ -1 +1,2 @@
conflicts opencv3 n
+conflicts opencv4 n
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 0e53555..ac98b7d 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,6 @@
+2018-11-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add opencv4
+
2018-09-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Downgrade to 3.4.0
Fixes ffmpeg, see https://trac.ffmpeg.org/ticket/7059
diff --git a/graphics-libs/opencv3/CONFLICTS b/graphics-libs/opencv3/CONFLICTS
index f3d8ad7..b5900d3 100755
--- a/graphics-libs/opencv3/CONFLICTS
+++ b/graphics-libs/opencv3/CONFLICTS
@@ -1 +1,2 @@
conflicts opencv n
+conflicts opencv4 n
diff --git a/graphics-libs/opencv3/HISTORY b/graphics-libs/opencv3/HISTORY
index 7b38932..176357b 100644
--- a/graphics-libs/opencv3/HISTORY
+++ b/graphics-libs/opencv3/HISTORY
@@ -1,3 +1,6 @@
+2018-11-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add opencv4
+
2018-09-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4.3

diff --git a/graphics-libs/opencv4/BUILD b/graphics-libs/opencv4/BUILD
new file mode 100755
index 0000000..7470e85
--- /dev/null
+++ b/graphics-libs/opencv4/BUILD
@@ -0,0 +1,17 @@
+CXXFLAGS=-D__STDC_CONSTANT_MACROS &&
+OPTS+=" -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS=0 -DBUILD_PERF_TESTS=0 \
+ -DBUILD_TESTS=0 -Wno-dev" &&
+if [[ $CV_CONTRIB != none ]];then
+ OPTS+=" -DOPENCV_EXTRA_MODULES_PATH=$SOURCE_DIRECTORY/contrib"
+fi &&
+
+OPTS+=" -DIPPROOT=$SOURCE_DIRECTORY/ippicv_lnx" &&
+
+# PCH fails, at least with, with GCC 6.2
+#OPTS+=" -DENABLE_PRECOMPILED_HEADERS=0" &&
+
+if is_depends_enabled $SPELL qtbase;then
+ qt5_cmake_build
+else
+ cmake_build
+fi
diff --git a/graphics-libs/opencv4/CONFIGURE b/graphics-libs/opencv4/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/graphics-libs/opencv4/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/graphics-libs/opencv4/CONFLICTS b/graphics-libs/opencv4/CONFLICTS
new file mode 100755
index 0000000..b0bcb3b
--- /dev/null
+++ b/graphics-libs/opencv4/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts opencv n
+conflicts opencv3 n
diff --git a/graphics-libs/opencv4/DEPENDS b/graphics-libs/opencv4/DEPENDS
new file mode 100755
index 0000000..f6314fd
--- /dev/null
+++ b/graphics-libs/opencv4/DEPENDS
@@ -0,0 +1,25 @@
+source $GRIMOIRE/CMAKE_CONFIGURE &&
+depends -sub CXX gcc &&
+depends pkgconfig &&
+depends bzip2 &&
+depends zlib &&
+#depends protobuf ' -DBUILD_PROTOBUF=0' &&
+optional_depends gstreamer-1.0 '-DWITH_GSTREAMER=1' '-DWITH_GSTREAMER=0'
'GStreamer support'
+optional_depends LIBAVCODEC '-DWITH_FFMPEG=1' '-DWITH_FFMPEG=0' 'FFMgeg
suport'
+optional_depends v4l-utils '-DWITH_V4L=1' '-DWITH_V4L=0' 'V4L
support' &&
+optional_depends JPEG '-DWITH_JPEG=1' '-DWITH_JPEG=0' 'JPEG
support' &&
+optional_depends jasper '-DWITH_JASPER=1' '-DWITH_JASPER=0' 'JPEG-2000
support' &&
+optional_depends tiff '-DWITH_TIFF=1' '-DWITH_TIFF=1' 'TIFF
support' &&
+optional_depends libpng '-DWITH_PNG=1' '-DWITH_PNG=0' 'PNG support'
+optional_depends PYTHON '' '' 'Python bindings' &&
+optional_depends numpy '' '' 'Numerical python support' &&
+optional_depends tbb '-DWITH_TBB=1' '-DWITH_TBB=0' 'parallel
processing support' &&
+optional_depends xine-lib '-DWITH_XINE=1' '-DWITH_XINE=0' 'Xine
support' &&
+optional_depends libucil '-DWITH_UNICAP=1' '-DWITH_UNICAP=0' 'video
capture support' &&
+optional_depends libraw1394 '-DWITH_1394=1' '-DWITH_1394=0' 'Firewire
support' &&
+optional_depends gtk+3 '-DWITH_GTK=1' '-DWITH_GTK=0' 'Gtk gui
support' &&
+optional_depends qtbase '-DWITH_QT=1' '-DWITH_QT=0' 'Qt5 gui
support' &&
+optional_depends EIGEN '-DWITH_EIGEN=1' '-DWITH_EIGEN=0' 'Eigen2/3
matrix support' &&
+optional_depends openexr '-DWITH_OPENEXR=1' '-DWITH_OPENEXR=0' 'ILM
support' &&
+optional_depends libwebp '-DWITH_WEBP=1' '-DWITH_WEBP=0' 'WebP
support' &&
+optional_depends vtk '-DWITH_VTK=1' '-DWITH_VTK=0' 'Visual
Toolkit support'
diff --git a/graphics-libs/opencv4/DETAILS b/graphics-libs/opencv4/DETAILS
new file mode 100755
index 0000000..76fd9fb
--- /dev/null
+++ b/graphics-libs/opencv4/DETAILS
@@ -0,0 +1,28 @@
+ SPELL=opencv4
+ VERSION=4.0.0
+
SOURCE_HASH=sha512:0f1aff13bae68ca3e834e0e69fb22411f5a1bdad3e2b947f580e24e3aa291447bf85e82212caae3eaeef60910992de5575c250f2dbbff3edd37ce06ec810c6c6
+ IPPV=ippicv_2017u3_lnx_intel64_general_20170822.tgz
+ GIT=dfe3162c237af211e98b8960018b564bc209261d
+ SOURCE=${SPELL}-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL%?}-${VERSION}
+ URL=https://github.com/opencv
+ SOURCE_URL[0]=$URL/opencv/archive/$VERSION.tar.gz
+if ! list find "$CV_CONTRIB" none ;then
+
SOURCE2_HASH=sha512:c84588f86ea0e48a13b24cb1998a9b95ed953b547193815229c84faa0059d39e8968f58d00b4164dbe8287324f0669880733ba7d068d695bea878b70daf61ad3
+ SOURCE2=opencv_contrib-$VERSION.tar.gz
+ SOURCE2_URL[0]=$URL/opencv_contrib/archive/$VERSION.tar.gz
+fi
+ SOURCE3=${IPPV}
+
SOURCE3_HASH=sha512:a7a2a50ff2c2c852c108d6393ad2b3cbc39130fbfdbc21cc4bcdfe1954c9a3814bc4d29445915e76b364fee97b625d93a0369a00e746eb95e33e4a7d366c0df7
+
SOURCE3_URL[0]=https://raw.githubusercontent.com/opencv/opencv_3rdparty/$GIT/ippicv/$SOURCE3
+
+ TMPFS=off
+ WEB_SITE=https://opencv.org
+ LICENSE[0]=BSD
+ ENTERED=20150917
+ KEYWORDS="graphics"
+ SHORT="real time computer vision"
+cat << EOF
+The Open Computer Vision Library has > 2500 algorithms, documentation and
+sample code for real time computer vision.
+EOF
diff --git a/graphics-libs/opencv4/HISTORY b/graphics-libs/opencv4/HISTORY
new file mode 100644
index 0000000..bc556a1
--- /dev/null
+++ b/graphics-libs/opencv4/HISTORY
@@ -0,0 +1,4 @@
+2018-11-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.0.0
+ spell created, based on opencv3
+
diff --git a/graphics-libs/opencv4/INSTALL b/graphics-libs/opencv4/INSTALL
new file mode 100755
index 0000000..157bcdc
--- /dev/null
+++ b/graphics-libs/opencv4/INSTALL
@@ -0,0 +1 @@
+cmake_install
diff --git a/graphics-libs/opencv4/PREPARE b/graphics-libs/opencv4/PREPARE
new file mode 100755
index 0000000..33a1478
--- /dev/null
+++ b/graphics-libs/opencv4/PREPARE
@@ -0,0 +1,8 @@
+source $GRIMOIRE/config_query_multi.function
+config_query_multi CV_CONTRIB "Which contributed modules" none \
+aruco bgsegm bioinspired ccalib cnn_3dobj cudaarithm cudabgsegm cudacodec \
+cudafeatures2d cudafilters cudaimgproc cudalegacy cudaobjdetect cudaoptflow \
+cudastereo cudawarping cudev cvv datasets dnn_objdetect dnns_easily_fooled
dpm \
+face freetype fuzzy hdf hfs img_hash line_descriptor matlab optflow ovis \
+phase_unwrapping plot reg rgbd saliency sfm stereo structured_light \
+surface_matching text tracking xfeatures2d ximgproc xobjdetect xphoto
diff --git a/graphics-libs/opencv4/PRE_BUILD b/graphics-libs/opencv4/PRE_BUILD
new file mode 100755
index 0000000..245b9a0
--- /dev/null
+++ b/graphics-libs/opencv4/PRE_BUILD
@@ -0,0 +1,13 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+unpack_file 3 &&
+if ! list_find "$CV_CONTRIB" none ;then
+ cd $BUILD_DIRECTORY &&
+ unpack_file 2 &&
+ cd $SOURCE_DIRECTORY &&
+ mkdir contrib &&
+ cd contrib &&
+ for FF in $CV_CONTRIB;do
+ ln -sf $BUILD_DIRECTORY/opencv_contrib-$VERSION/modules/$FF
+ done
+fi
diff --git a/graphics-libs/opencv4/PRE_SUB_DEPENDS
b/graphics-libs/opencv4/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..dc0a269
--- /dev/null
+++ b/graphics-libs/opencv4/PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ FACE) list_find "$CV_CONTRIB" "face" &&
+ list_find "$CV_CONTRIB" "plot" &&
+ list_find "$CV_CONTRIB" "tracking" &&
+ return 0;;
+ *) echo "Eek, unknown subdependency requested!"; return 1;;
+esac
+return 1
diff --git a/graphics-libs/opencv4/PROVIDES b/graphics-libs/opencv4/PROVIDES
new file mode 100644
index 0000000..da42bf1
--- /dev/null
+++ b/graphics-libs/opencv4/PROVIDES
@@ -0,0 +1 @@
+OPENCV
diff --git a/graphics-libs/opencv4/SUB_DEPENDS
b/graphics-libs/opencv4/SUB_DEPENDS
new file mode 100755
index 0000000..3251d0e
--- /dev/null
+++ b/graphics-libs/opencv4/SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ FACE) echo "facial recognition requested - forcing it" &&
+ list_add CV_CONTRIB "face" &&
+ list_add CV_CONTRIB "plot" &&
+ list_add CV_CONTRIB "tracking"
+ ;;
+ *) echo unknown sub-depends!!! ; return 1 ;;
+esac
diff --git a/security/nmap/DETAILS b/security/nmap/DETAILS
index 6bf013f..64f6d15 100755
--- a/security/nmap/DETAILS
+++ b/security/nmap/DETAILS
@@ -1,15 +1,15 @@
SPELL=nmap
- VERSION=7.60
+ VERSION=7.70
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://nmap.org/dist/$SOURCE
- SOURCE2_URL[0]=http://nmap.org/dist/sigs/$SOURCE2
- SOURCE_URL[1]=http://sectools.org/nmap/$SOURCE
- SOURCE2_URL[1]=http://sectools.org/nmap/sigs/$SOURCE2
+ SOURCE_URL[0]=https://nmap.org/dist/$SOURCE
+ SOURCE2_URL[0]=https://nmap.org/dist/sigs/$SOURCE2
+ SOURCE_URL[1]=https://sectools.org/nmap/$SOURCE
+ SOURCE2_URL[1]=https://sectools.org/nmap/sigs/$SOURCE2
SOURCE_GPG=nmap.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- WEB_SITE=http://nmap.org/
+ WEB_SITE=https://nmap.org/
ENTERED=20010922
LICENSE[0]=GPL
KEYWORDS="security"
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index 0860476..8753740 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,6 @@
+2018-11-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.70
+
2018-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.60

diff --git a/video-libs/libdvdcss/DETAILS b/video-libs/libdvdcss/DETAILS
index 1c71069..64262e0 100755
--- a/video-libs/libdvdcss/DETAILS
+++ b/video-libs/libdvdcss/DETAILS
@@ -1,10 +1,10 @@
SPELL=libdvdcss
- VERSION=1.4.1
-
SOURCE_HASH=sha512:4456ebcf8b53a8aaee97643261a14a05c929e9e9120cbe5fc6839ddf62be3dcfe7313fca3ee57c00bea43ddf623dc3d61fff7c2f6316338495df95c9c422f39e
+ VERSION=1.4.2
+
SOURCE_HASH=sha512:e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://download.videolan.org/pub/libdvdcss/$VERSION/$SOURCE
- WEB_SITE=http://developers.videolan.org/libdvdcss/
+ SOURCE_URL[0]=https://download.videolan.org/pub/libdvdcss/$VERSION/$SOURCE
+ WEB_SITE=https://developers.videolan.org/libdvdcss/
ENTERED=20010927
LICENSE[0]=GPL
KEYWORDS="dvd video libs"
diff --git a/video-libs/libdvdcss/HISTORY b/video-libs/libdvdcss/HISTORY
index a810e44..d522c89 100644
--- a/video-libs/libdvdcss/HISTORY
+++ b/video-libs/libdvdcss/HISTORY
@@ -1,3 +1,6 @@
+2018-11-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.2
+
2018-01-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.4.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (41fca23a339b2607be4baf55e08343ea716e98f1), Treeve Jelbert, 11/19/2018

Archive powered by MHonArc 2.6.24.

Top of Page