Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b3fea6ba7c25b5e6fd552fffe57f87a796f86536)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b3fea6ba7c25b5e6fd552fffe57f87a796f86536)
  • Date: Wed, 9 Oct 2013 10:00:15 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

utils/xen/DETAILS | 4 ++--
utils/xen/HISTORY | 5 ++++-
video/ffmpeg/BUILD | 10 ++++++++++
video/ffmpeg/DEPENDS | 8 ++++----
video/ffmpeg/DETAILS | 2 +-
video/ffmpeg/HISTORY | 4 ++++
6 files changed, 25 insertions(+), 8 deletions(-)

New commits:
commit b3fea6ba7c25b5e6fd552fffe57f87a796f86536
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ffmpeg: => 1.2.4 (stable)

commit 1cf293abc11b4c9abfffe4dfbff5c7ee2e322f96
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xen: => 4.1.6.1 (security)

diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index a86a167..4d2729c 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,6 +1,6 @@
SPELL=xen
- VERSION=4.1.5
- SECURITY_PATCH=8
+ VERSION=4.1.6.1
+ SECURITY_PATCH=9
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index ab186d3..587916a 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2013-10-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.1.6.1; SECURITY_PATCH++
+
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV

2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
diff --git a/video/ffmpeg/BUILD b/video/ffmpeg/BUILD
index 947f03f..932ec8c 100755
--- a/video/ffmpeg/BUILD
+++ b/video/ffmpeg/BUILD
@@ -22,6 +22,16 @@ 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 &&
+
# fixing issue #381
if is_depends_enabled $SPELL openjpeg; then
CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/openjpeg-1.5"
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index c50ba92..fee584d 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -27,7 +27,7 @@ if [[ $FFMPEG_RELEASE == stable ]]; then
optional_depends openssl \
"--enable-openssl" \
"" \
- "for crypto support via OpenSSL" &&
+ "for crypto support via OpenSSL
(${PROBLEM_COLOR}nonfree${DEFAULT_COLOR})" &&

optional_depends gnutls \
"--enable-gnutls" \
@@ -156,17 +156,17 @@ optional_depends sdl \
"for ffplay video player" &&

optional_depends faac \
- "--enable-libfaac --enable-nonfree" \
+ "--enable-libfaac" \
"" \
"for AAC encoding via libfaac
(${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}) support" &&

optional_depends opencore-amr \
- "--enable-libopencore-amrnb --enable-version3" \
+ "--enable-libopencore-amrnb" \
"" \
"for AMR-NB de/encoding via libopencore-amrnb
(${PROBLEM_COLOR}GPLv3${DEFAULT_COLOR}) support" &&

optional_depends opencore-amr \
- "--enable-libopencore-amrwb --enable-version3" \
+ "--enable-libopencore-amrwb" \
"" \
"for AMR-WB decoding via libopencore-amrwb
(${PROBLEM_COLOR}GPLv3${DEFAULT_COLOR}) support" &&

diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index ba5b24f..23066ae 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=1.2.3
+ VERSION=1.2.4
SECURITY_PATCH=14
else
VERSION=0.7.15
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index f4c3059..b84d4ca 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,7 @@
+2013-10-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.4 (stable)
+ * BUILD, DEPENDS: moved license handling to BUILD
+
2013-09-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, {PRE_,}BUILD, CONFIGURE, DEPENDS, INSTALL, PREPARE:
rewritten
added build for qt-faststart tool



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b3fea6ba7c25b5e6fd552fffe57f87a796f86536), Vlad Glagolev, 10/09/2013

Archive powered by MHonArc 2.6.24.

Top of Page