Skip to Content.
Sympa Menu

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

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 (6bb008b94256f9c5d06d143224836b973bd949ce)
  • Date: Sun, 22 Apr 2018 14:38:01 +0000

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

video/ffmpeg/BUILD | 6 ------
video/ffmpeg/CONFIGURE | 7 ++++---
video/ffmpeg/DEPENDS | 21 +++++++--------------
video/ffmpeg/DETAILS | 2 +-
video/ffmpeg/HISTORY | 5 +++++
video/ffmpeg/INSTALL | 6 +-----
6 files changed, 18 insertions(+), 29 deletions(-)

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

ffmpeg: => 4.0

diff --git a/video/ffmpeg/BUILD b/video/ffmpeg/BUILD
index bfe5877..05f91fa 100755
--- a/video/ffmpeg/BUILD
+++ b/video/ffmpeg/BUILD
@@ -22,12 +22,6 @@ if echo "$CFLAGS" | grep -q "\-Os"; then
OPTS="--enable-small $OPTS"
fi &&

-# license handling (nonfree/GPLv3)
-if is_depends_enabled $SPELL openssl || \
- is_depends_enabled $SPELL faac; then
- OPTS="--enable-nonfree $OPTS"
-fi &&
-
if is_depends_enabled $SPELL opencore-amr; then
OPTS="--enable-version3 $OPTS"
fi &&
diff --git a/video/ffmpeg/CONFIGURE b/video/ffmpeg/CONFIGURE
index 3a4339c..a97cf9a 100755
--- a/video/ffmpeg/CONFIGURE
+++ b/video/ffmpeg/CONFIGURE
@@ -25,9 +25,10 @@ if [[ $FFMPEG_RELEASE == stable ]]; then
fi &&

persistent_add FFMPEG_PROGRAM_LIST &&
-local FFMPEG_PROGRAM_LIST="ffmpeg ffprobe ffserver" &&
-
+local FFMPEG_PROGRAM_LIST="ffmpeg ffprobe" &&
config_query_multi FFMPEG_PROGRAMS "Which command line programs would you
like to build?" \
$FFMPEG_PROGRAM_LIST \
all \
- none
+ none &&
+config_query_list FFMPEG_HTTPS "how to support https"\
+ libressl gnutls openssl none
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 73c9113..fc8460a 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -23,10 +23,7 @@ optional_depends alsa-lib \
"--disable-alsa" \
"for alsa sound support" &&

-optional_depends JACK-DRIVER \
- "--enable-jack" \
- "--disable-jack" \
- "for libjack sound support" &&
+optional_depends JACK-DRIVER "--enable-jack" "" "for libjack sound support"
&&

optional_depends librsvg2 \
"--enable-librsvg" \
@@ -69,16 +66,12 @@ optional_depends frei0r-plugins \
"to use frei0r for video filtering" &&

if [[ $FFMPEG_RELEASE == stable ]]; then
- optional_depends gnutls \
- "--enable-gnutls" \
- "" \
- "for crypto support via GNUTLS" &&
- if ! is_depends_enabled $SPELL gnutls;then
- optional_depends SSL \
- "--enable-openssl --enable-nonfree" \
- "--disable-openssl" \
- "for crypto support via OpenSSL
(${PROBLEM_COLOR}nonfree${DEFAULT_COLOR})"
- fi &&
+ case $FFMPEG_HTTPS in
+ libressl) depends gnutls "--enable-nonfree --enable-libtls";;
+ gnutls) depends gnutls "--enable-gnutls";;
+ openssl) depends openssl "--enable-nonfree --enable-openssl" &&
+ message "OpenSSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}";;
+ esac &&

optional_depends fontconfig \
"--enable-fontconfig" \
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 4721d5b..ea1eeb3 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=3.4.2
+ VERSION=4.0
SECURITY_PATCH=19
else
VERSION=0.7.16
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 15f8f25..f1885eb 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,8 @@
+2018-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.0
+ * CONFIGURE DEPENDS: adjust for libressl
+ * INSTALL CONFIGURE: delete ffserver
+
2018-02-12 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.4.2

diff --git a/video/ffmpeg/INSTALL b/video/ffmpeg/INSTALL
index 355a840..be73a2f 100755
--- a/video/ffmpeg/INSTALL
+++ b/video/ffmpeg/INSTALL
@@ -2,8 +2,4 @@ make_single &&
make V=1 install &&
make_normal &&

-install -vm 755 "tools/qt-faststart" "$INSTALL_ROOT/usr/bin/qt-faststart" &&
-
-if list_find "ffserver" "$FFMPEG_PROGRAMS"; then
- install_config_file doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf
-fi
+install -vm 755 "tools/qt-faststart" "$INSTALL_ROOT/usr/bin/qt-faststart"



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6bb008b94256f9c5d06d143224836b973bd949ce), Treeve Jelbert, 04/22/2018

Archive powered by MHonArc 2.6.24.

Top of Page