Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (0ebde2aa1b0a84d3478cb206e843b4f56afbbf67)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (0ebde2aa1b0a84d3478cb206e843b4f56afbbf67)
  • Date: Mon, 13 Jul 2020 18:31:38 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

utils/entr/DETAILS | 5 ++---
utils/entr/HISTORY | 4 ++++
utils/entr/PRE_BUILD | 4 ----
utils/entr/child.patch | 23 -----------------------
video/ffmpeg/DETAILS | 2 +-
video/ffmpeg/HISTORY | 3 +++
6 files changed, 10 insertions(+), 31 deletions(-)

New commits:
commit 0ebde2aa1b0a84d3478cb206e843b4f56afbbf67
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/entr: version 4.6

commit 47612508966ab93bc2367101acfa60855a6741bf
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/ffmpeg: version 4.3.1

diff --git a/utils/entr/DETAILS b/utils/entr/DETAILS
index 4f1c1c8..dc50e1d 100755
--- a/utils/entr/DETAILS
+++ b/utils/entr/DETAILS
@@ -1,9 +1,8 @@
SPELL=entr
- VERSION=4.5
- PATCHLEVEL=1
+ VERSION=4.6
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=https://eradman.com/entrproject/code/${SOURCE}
-
SOURCE_HASH=sha512:db9499d78385df5056a30a4e3262fb436090acc5410ddfc529a7cfe4e10e304e13787abfc31dd38dbf8b9f01fa3369ef32d20c9fb903fa35763f41791bdda9c7
+
SOURCE_HASH=sha512:41e8c2311c7833a778193b13d1e0b1bb18ece54f5e20b8b5b0b4a2308ba1cc1a8b8378700dbac83ee68822b5f847a3fa9c47822d22a22d45da792d2408f48378
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=https://eradman.com/entrproject/
LICENSE[0]=ISC
diff --git a/utils/entr/HISTORY b/utils/entr/HISTORY
index 48a984c..5d9a3ff 100644
--- a/utils/entr/HISTORY
+++ b/utils/entr/HISTORY
@@ -1,3 +1,7 @@
+2020-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.6
+ * child.patch, PRE_BUILD: removed
+
2020-06-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* child.patch: added, official patch to fix handling child procs
diff --git a/utils/entr/PRE_BUILD b/utils/entr/PRE_BUILD
deleted file mode 100755
index e78a651..0000000
--- a/utils/entr/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-patch -p1 < "${SPELL_DIRECTORY}/child.patch"
diff --git a/utils/entr/child.patch b/utils/entr/child.patch
deleted file mode 100644
index 25cc6d2..0000000
--- a/utils/entr/child.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 76a56e3f8ee79c7a70acd96a3530d02ca9cf1f7a Mon Sep 17 00:00:00 2001
-From: Leonardo Taccari <iamleot AT gmail.com>
-Date: Mon, 15 Jun 2020 19:06:39 +0200
-Subject: [PATCH] Always wait childs to avoid zombies
-
----
- entr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/entr.c b/entr.c
-index 1532a9c..db414ab 100644
---- a/entr.c
-+++ b/entr.c
-@@ -254,8 +254,8 @@ void
- proc_exit(int sig) {
- int status;
-
-+ xwaitpid(child_pid, &status, 0);
- if ((oneshot_opt == 1) && (terminating == 0)) {
-- xwaitpid(child_pid, &status, 0);
- if ((shell_opt == 1) && (restart_opt == 0)) {
- fprintf(stdout, "%s returned exit code %d\n",
- basename(getenv("SHELL")), WEXITSTATUS(status));
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 227f343..667fe3d 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=4.3
+ VERSION=4.3.1
SECURITY_PATCH=20
else
VERSION=0.7.16
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index cd13d22..d3b9e77 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2020-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.3.1
+
2020-07-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* TRIGGERS: on cast codec2 check self




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (0ebde2aa1b0a84d3478cb206e843b4f56afbbf67), Florian Franzmann, 07/13/2020

Archive powered by MHonArc 2.6.24.

Top of Page