Skip to Content.
Sympa Menu

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

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 (4cb93195c7c7782c8ed3d817c09f083e2c502c13)
  • Date: Mon, 24 Mar 2014 08:17:05 -0500

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

kernels/linux/HISTORY | 4 ++++
kernels/linux/info/patches/maintenance_patches_3/patch-3.13.7 | 5 +++++
kernels/linux/latest.defaults | 2 +-
video/ffmpeg/CONFIGURE | 4 ++++
video/ffmpeg/DEPENDS | 10
+++++++++-
video/ffmpeg/DETAILS | 2 +-
video/ffmpeg/HISTORY | 5 +++++
7 files changed, 29 insertions(+), 3 deletions(-)

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

video/ffmpeg: version 2.2

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

kernels/linux: version 3.13.7

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 8170a8b..ec0c061 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/patches/maintenance_patches_3/patch-3.13.7: added
+ * latest_defaults: version 3.13.7
+
2014-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* info/patches/maintenance_patches_3/patch-3.13.6: added
* latest_defaults: version 3.13.6
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.13.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.13.7
new file mode 100755
index 0000000..de2c26a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.13.7
@@ -0,0 +1,5 @@
+appliedkernels="3.13"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="ddba8cdde36f7ec835f40b75d148dc0800297633"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 42a56f3..550f115 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.13
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.13.6
+LATEST_maintenance_patches_3=patch-3.13.7
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/video/ffmpeg/CONFIGURE b/video/ffmpeg/CONFIGURE
index f5368be..0ac2e1a 100755
--- a/video/ffmpeg/CONFIGURE
+++ b/video/ffmpeg/CONFIGURE
@@ -18,6 +18,10 @@ config_query_option FFMPEG_OPTS "Enable debugging
symbols?" y \
"--enable-debug" \
"--disable-debug" &&

+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 ffserver" &&

diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 118b060..28f10b2 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -99,7 +99,15 @@ else
optional_depends dirac \
"--enable-libdirac" \
"" \
- "for dirac encoder support via libdirac"
+ "for dirac encoder support via libdirac" &&
+ optional_depends libwebp \
+ "--enable-libwebp" \
+ "" \
+ "for WebP encoding via libwebp" &&
+ optional_depends OPENGL \
+ "--enable-opengl" \
+ "" \
+ "for OpenGL rendering"
fi &&

optional_depends schroedinger \
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 3039387..8ee4fff 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=2.1.4
+ VERSION=2.2
SECURITY_PATCH=14
else
VERSION=0.7.16
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 9dffb47..ecf829d 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,8 @@
+2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.2
+ * CONFIGURE: add option for Blackmagick Decklink output
+ * DEPENDS: add optional dependencies on libwebp and OPENGL
+
2014-02-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.1.4




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4cb93195c7c7782c8ed3d817c09f083e2c502c13), Florian Franzmann, 03/24/2014

Archive powered by MHonArc 2.6.24.

Top of Page