Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dfc0a26ba7f18b2da61d3fc3662a299862d46f62)

Chronological Thread  
    < 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 (dfc0a26ba7f18b2da61d3fc3662a299862d46f62)
  • Date: Sat, 1 Oct 2022 13:21:46 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

python-pypi/m2crypto/DETAILS | 6 -
python-pypi/m2crypto/HISTORY | 4
python-pypi/m2crypto/PRE_BUILD | 3
python-pypi/m2crypto/patches/0001-fix-BIO_get_init-usage.patch | 57
----------
python-pypi/m2crypto/patches/0002-fix-OPENSSL_zalloc-usage.patch | 25 ----
video/ffmpeg5/DEPENDS | 2
video/ffmpeg5/HISTORY | 3
7 files changed, 11 insertions(+), 89 deletions(-)

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

m2crypto: => 0.38.0

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

ffmpeg5 - use OPENCV

diff --git a/python-pypi/m2crypto/DETAILS b/python-pypi/m2crypto/DETAILS
index 6b17aaa..2a69a3b 100755
--- a/python-pypi/m2crypto/DETAILS
+++ b/python-pypi/m2crypto/DETAILS
@@ -1,7 +1,7 @@
SPELL=m2crypto
- VERSION=0.35.2
-
VX=74/18/3beedd4ac48b52d1a4d12f2a8c5cf0ae342ce974859fba838cbbc1580249
-
SOURCE_HASH=sha512:3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
+ VERSION=0.38.0
+
VX=2c/52/c35ec79dd97a8ecf6b2bbd651df528abb47705def774a4a15b99977274e8
+
SOURCE_HASH=sha512:b1e24e3101ce0dd9f17be4cabeddc2ec0f1228b270d74ef2fb38bae8807c5025b031d0743185f06370786a3dd5c3f42129720534dcff07ea4de3c727613f8d20
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/M2Crypto-$VERSION

SOURCE_URL[0]=https://files.pythonhosted.org/packages/$VX/M2Crypto-${VERSION}.tar.gz
diff --git a/python-pypi/m2crypto/HISTORY b/python-pypi/m2crypto/HISTORY
index 49efef3..6ff9e24 100644
--- a/python-pypi/m2crypto/HISTORY
+++ b/python-pypi/m2crypto/HISTORY
@@ -1,3 +1,7 @@
+2022-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.38.0
+ * PRE_BUILD patches/*: deleted
+
2019-08-25 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD patches/*: added, fix for libressl

diff --git a/python-pypi/m2crypto/PRE_BUILD b/python-pypi/m2crypto/PRE_BUILD
deleted file mode 100755
index 922c0ab..0000000
--- a/python-pypi/m2crypto/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches
diff --git a/python-pypi/m2crypto/patches/0001-fix-BIO_get_init-usage.patch
b/python-pypi/m2crypto/patches/0001-fix-BIO_get_init-usage.patch
deleted file mode 100644
index 06109c6..0000000
--- a/python-pypi/m2crypto/patches/0001-fix-BIO_get_init-usage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b993907bf6f290235c8f196d9bb6ff4561ea5100 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Mon, 22 Oct 2018 11:49:22 +0200
-Subject: [PATCH 1/2] fix BIO_get_init usage
-
----
- SWIG/_bio.i | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/SWIG/_bio.i b/SWIG/_bio.i
-index e85a275..f6eebbe 100644
---- a/SWIG/_bio.i
-+++ b/SWIG/_bio.i
-@@ -325,7 +325,9 @@ BIO_meth_free( BIO_METHOD *meth )
- #define BIO_set_shutdown(b, x) (b)->shutdown = x
- #define BIO_get_shutdown(b) (b)->shutdown
- #define BIO_set_init(b, x) b->init = x
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define BIO_get_init(b) (b)->init
-+#endif
- #define BIO_set_data(b, x) b->ptr = x
- #define BIO_clear_flags(b, x) b->flags &= ~(x)
- #define BIO_get_data(b) b->ptr
-@@ -442,9 +444,13 @@ static int pyfd_free(BIO* b) {
- ctx = BIO_get_data(b);
- if (ctx == NULL)
- return 0;
--
-+#ifndef LIBRESSL_VERSION_NUMBER
- if (BIO_get_shutdown(b) && BIO_get_init(b))
- close(ctx->fd);
-+#else
-+ if (BIO_get_shutdown(b))
-+ close(ctx->fd);
-+#endif
-
- BIO_set_data(b, NULL);
- BIO_set_shutdown(b, 0);
-@@ -484,6 +490,7 @@ static long pyfd_ctrl(BIO *b, int cmd, long num, void
*ptr) {
- BIO_set_init(b, 1);
- }
- break;
-+#ifndef LIBRESSL_VERSION_NUMBER
- case BIO_C_GET_FD:
- if (BIO_get_init(b)) {
- ip = (int *)ptr;
-@@ -493,6 +500,7 @@ static long pyfd_ctrl(BIO *b, int cmd, long num, void
*ptr) {
- } else
- ret = -1;
- break;
-+#endif
- case BIO_CTRL_GET_CLOSE:
- ret = BIO_get_shutdown(b);
- break;
---
-2.23.0
-
diff --git a/python-pypi/m2crypto/patches/0002-fix-OPENSSL_zalloc-usage.patch
b/python-pypi/m2crypto/patches/0002-fix-OPENSSL_zalloc-usage.patch
deleted file mode 100644
index cbb9c2e..0000000
--- a/python-pypi/m2crypto/patches/0002-fix-OPENSSL_zalloc-usage.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5c6fbf1d8080ab56483e85bf8e2d314dcd124809 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Mon, 22 Oct 2018 11:54:38 +0200
-Subject: [PATCH 2/2] fix OPENSSL_zalloc usage
-
----
- SWIG/_lib11_compat.i | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SWIG/_lib11_compat.i b/SWIG/_lib11_compat.i
-index 1ec42dd..b781952 100644
---- a/SWIG/_lib11_compat.i
-+++ b/SWIG/_lib11_compat.i
-@@ -8,7 +8,7 @@
- */
-
- %{
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined
(LIBRESSL_VERSION_NUMBER)
-
- #include <string.h>
- #include <openssl/engine.h>
---
-2.23.0
-
diff --git a/video/ffmpeg5/DEPENDS b/video/ffmpeg5/DEPENDS
index f6a8645..d123599 100755
--- a/video/ffmpeg5/DEPENDS
+++ b/video/ffmpeg5/DEPENDS
@@ -175,7 +175,7 @@ optional_depends libvdpau \
"--disable-vdpau" \
"to enable VDPAU code" &&

-optional_depends opencv \
+optional_depends OPENCV \
"--enable-libopencv" \
"" \
"to video filtering via libopencv" &&
diff --git a/video/ffmpeg5/HISTORY b/video/ffmpeg5/HISTORY
index b676145..cd702b2 100644
--- a/video/ffmpeg5/HISTORY
+++ b/video/ffmpeg5/HISTORY
@@ -1,3 +1,6 @@
+2022-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: use OPENCV
+
2022-08-31 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 5.1.1



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dfc0a26ba7f18b2da61d3fc3662a299862d46f62), Treeve Jelbert, 10/01/2022

Archive powered by MHonArc 2.6.24.

Top of Page