Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (21a9e3058c9dacd044ceacac5f0712e1dfd67a2e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (21a9e3058c9dacd044ceacac5f0712e1dfd67a2e)
  • Date: Fri, 21 Oct 2022 23:12:36 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

audio-creation/flite/DETAILS | 10 +++++-----
audio-creation/flite/HISTORY | 3 +++
video/ffmpeg/CONFIGURE | 9 ++++-----
video/ffmpeg/DEPENDS | 19 ++++++-------------
video/ffmpeg/DETAILS | 5 -----
video/ffmpeg/HISTORY | 12 ++++++++----
video/ffmpeg/PREPARE | 3 ---
video/ffmpeg/PRE_BUILD | 13 -------------
video/ffmpeg/SUB_DEPENDS | 3 +--
video/ffmpeg/freetype.patch | 21 ---------------------
video/ffmpeg5/DETAILS | 2 +-
video/ffmpeg5/HISTORY | 3 +++
12 files changed, 31 insertions(+), 72 deletions(-)

New commits:
commit 21a9e3058c9dacd044ceacac5f0712e1dfd67a2e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

flite 2.2

commit 81fed92101cfa33efb14a93eb52863e20aad1dcf
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ffmpeg5 5.1.2

commit ddb5a25f0aa190cf2e24a9e5458eb4eef05597ec
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ffmpeg: Remove branch choice

diff --git a/audio-creation/flite/DETAILS b/audio-creation/flite/DETAILS
index b748c4e..bbd6728 100755
--- a/audio-creation/flite/DETAILS
+++ b/audio-creation/flite/DETAILS
@@ -1,10 +1,10 @@
SPELL=flite
- VERSION=2.1
- SOURCE=$SPELL-$VERSION-release.tar.bz2
-
SOURCE_HASH=sha512:e9ef9ca4b6920178634d94bbe6e21a8b0ec471b010b07e6cc961ed2d120acb944c8e1d268fe26188f7dfe43fb7bd4bdff7fa53b2d2f12029d37e08d0316620d2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-release
+ VERSION=2.2
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_URL[0]=https://github.com/festvox/flite/archive/refs/tags/v$VERSION.tar.gz
+
SOURCE_HASH=sha512:1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.festvox.org/flite/
- SOURCE_URL[0]="$WEB_SITE/packed/$SPELL-$VERSION/$SOURCE"
ENTERED=20030502
KEYWORDS="editors audio"
SHORT="Flite (festival-lite) is a small, fast run-time synthesis
engine"
diff --git a/audio-creation/flite/HISTORY b/audio-creation/flite/HISTORY
index 3a177a7..3be480b 100644
--- a/audio-creation/flite/HISTORY
+++ b/audio-creation/flite/HISTORY
@@ -1,3 +1,6 @@
+2022-10-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.2
+
2019-05-23 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0], WEB_SITE
updated spell to 2.1
diff --git a/video/ffmpeg/CONFIGURE b/video/ffmpeg/CONFIGURE
index 8136047..6371992 100755
--- a/video/ffmpeg/CONFIGURE
+++ b/video/ffmpeg/CONFIGURE
@@ -1,3 +1,4 @@
+persistent_remove FFMPEG_RELEASE &&
list_remove FFMPEG_HTTPS openssl
list_remove FFMPEG_HTTPS openssl-1.1
list_remove FFMPEG_HTTPS libressl
@@ -20,11 +21,9 @@ config_query_option FFMPEG_OPTS "Enable debugging
symbols?" y \
"--enable-debug" \
"--disable-debug" &&

-if [[ $FFMPEG_RELEASE == stable ]]; then
- config_query_option FFMPEG_OPTS "Enable support for Blackmagick Decklink
output?" n \
- "--enable-decklink" \
- "--disable-decklink"
-fi &&
+config_query_option FFMPEG_OPTS "Enable support for Blackmagick Decklink
output?" n \
+ "--enable-decklink" \
+ "--disable-decklink" &&

persistent_add FFMPEG_PROGRAM_LIST &&
local FFMPEG_PROGRAM_LIST="ffmpeg ffprobe" &&
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 09c4a55..38d7aec 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -80,12 +80,11 @@ optional_depends frei0r-plugins \
"" \
"to use frei0r for video filtering" &&

-if [[ $FFMPEG_RELEASE == stable ]]; then
- case $FFMPEG_HTTPS in
- gnutls) depends gnutls "--enable-gnutls" ;;
- SSL) depends SSL "--enable-nonfree --enable-openssl" &&
- message "Open/Libre SSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}" ;;
- esac &&
+case $FFMPEG_HTTPS in
+ gnutls) depends gnutls "--enable-gnutls" ;;
+ SSL) depends SSL "--enable-nonfree --enable-openssl" &&
+ message "Open/Libre SSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}" ;;
+esac &&

optional_depends fontconfig \
"--enable-libfontconfig" \
@@ -159,13 +158,7 @@ if [[ $FFMPEG_RELEASE == stable ]]; then
optional_depends OPENGL \
"--enable-opengl" \
"" \
- "for OpenGL rendering"
-else
- optional_depends dirac \
- "--enable-libdirac" \
- "" \
- "for dirac encoder support via libdirac"
-fi &&
+ "for OpenGL rendering" &&

#optional_depends libvmaf \
# "--enable-libvmaf" \
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 9b908c2..63904e1 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,11 +1,6 @@
SPELL=ffmpeg
-if [[ $FFMPEG_RELEASE == stable ]]; then
VERSION=4.4.2
SECURITY_PATCH=20
-else
- VERSION=0.7.16
- SECURITY_PATCH=11
-fi
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 054c260..aaf4917 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,16 +1,20 @@
+2022-10-21 Ismael Luceno <ismael AT iodev.co.uk>
+ * PREPARE, PRE_BUILD, freetype.patch: removed, no longer needed
+ * CONFIGURE, DEPENDS, DETAILS, SUB_DEPENDS: removed branch choice
+
2022-06-12 Treeve Jelbert <treeve AT sourcemage.org>
* CONFLICTS: add ffmpeg5

-2022-06-04 Florian Franzmann <bwlf AT bandrate.org>
- * DEPENDS: depend on LZMA instead of lzma-utils
+2022-06-04 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: depend on LZMA instead of lzma-utils

-2022-04-18 Florian Franzmann <bwlf AT bandrate.org>
+2022-04-18 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 4.4.2

2022-02-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add libxvmc, vulkan

-2021-10-30 Florian Franzmann <bwlf AT bandrate.org>
+2021-10-30 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 4.4.1

2021-04-09 Florian Franzmann <bwlf AT bandrate.org>
diff --git a/video/ffmpeg/PREPARE b/video/ffmpeg/PREPARE
deleted file mode 100755
index 7735aea..0000000
--- a/video/ffmpeg/PREPARE
+++ /dev/null
@@ -1,3 +0,0 @@
-config_query_list FFMPEG_RELEASE "Select which release to build:" \
- stable \
- legacy
diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
deleted file mode 100755
index af47999..0000000
--- a/video/ffmpeg/PRE_BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-if [[ $FFMPEG_RELEASE == legacy ]]; then
- patch -p0 < "$SPELL_DIRECTORY/freetype.patch"
-
-#fix bad pkg-config files
-sed -i \
--e '/^pkg.*{/,/^}/
s|\$libdir|\$\{prefix\}/lib|;s|\$incdir|\$\{prefix\}/include|'\
- configure &&
-#s|\\\$|\$|;
-sedit '/#define LIBAVCODEC_VERSION_INT/i#if !defined INT64_C\n#if defined
__WORDSIZE && __WORDSIZE == 64\n#define INT64_C(c) c ## L\n#else\n#define
INT64_C(c) c ## LL\n#endif\n#endif' libavcodec/avcodec.h
-fi
diff --git a/video/ffmpeg/SUB_DEPENDS b/video/ffmpeg/SUB_DEPENDS
index bf6ceb9..35fd16e 100755
--- a/video/ffmpeg/SUB_DEPENDS
+++ b/video/ffmpeg/SUB_DEPENDS
@@ -1,5 +1,4 @@
case ${THIS_SUB_DEPENDS} in
-"LEGACY") FFMPEG_RELEASE="legacy" && echo "Forcing legacy release." ;;
-"STABLE") FFMPEG_RELEASE="stable" && echo "Forcing stable release." ;;
+STABLE) ;;
*) echo "Unknown sub depends!!!" && return 1 ;;
esac
diff --git a/video/ffmpeg/freetype.patch b/video/ffmpeg/freetype.patch
deleted file mode 100644
index 5dc18f8..0000000
--- a/video/ffmpeg/freetype.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig 2015-04-24 07:48:32.000000000 +0300
-+++ configure 2015-04-24 07:51:07.626025323 +0300
-@@ -2932,7 +2932,7 @@
- "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \
- "dirac_decoder_init dirac_encoder_init"
- enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion
-lfaac
--enabled libfreetype && require_pkg_config freetype2 "ft2build.h
freetype/freetype.h" FT_Init_FreeType
-+enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype.h"
FT_Init_FreeType
- enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
- enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h
lame_set_VBR_quality -lmp3lame
- enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
---- libavfilter/vf_drawtext.c.orig 2013-10-06 20:18:09.000000000 +0400
-+++ libavfilter/vf_drawtext.c 2015-04-24 08:00:29.846711104 +0300
-@@ -41,7 +41,6 @@
- #undef time
-
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
-
diff --git a/video/ffmpeg5/DETAILS b/video/ffmpeg5/DETAILS
index f47a79b..22b030b 100755
--- a/video/ffmpeg5/DETAILS
+++ b/video/ffmpeg5/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg5
SPELLX=ffmpeg
- VERSION=5.1.1
+ VERSION=5.1.2
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/video/ffmpeg5/HISTORY b/video/ffmpeg5/HISTORY
index cd702b2..e2bb2dc 100644
--- a/video/ffmpeg5/HISTORY
+++ b/video/ffmpeg5/HISTORY
@@ -1,3 +1,6 @@
+2022-10-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 5.1.2
+
2022-10-01 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: use OPENCV




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (21a9e3058c9dacd044ceacac5f0712e1dfd67a2e), Ismael Luceno, 10/21/2022

Archive powered by MHonArc 2.6.24.

Top of Page