diff --git a/audio-libs/celt/celt-0.7.1.tar.gz.sig
b/audio-libs/celt/celt-0.7.1.tar.gz.sig
deleted file mode 100644
index b096d2e..0000000
Binary files a/audio-libs/celt/celt-0.7.1.tar.gz.sig and /dev/null differ
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index ec9b7f0..4f06b6d 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -2,14 +2,42 @@ optional_depends yasm \
"" \
"--disable-yasm" \
"for some assembler optimizations" &&
+optional_depends celt \
+ "--enable-libcelt" \
+ "" \
+ "for celt codec support via libcelt" &&
optional_depends dirac \
"--enable-libdirac" \
"" \
"for dirac encoder support via libdirac" &&
+optional_depends frei0r-plugins \
+ "--enable-frei0r" \
+ "" \
+ "use frei0r for video filtering" &&
+optional_depends gnutls \
+ "--enable-gnutls" \
+ "" \
+ "support for crypto" &&
+optional_depends libass \
+ "--enable-libass" \
+ "" \
+ "use libass for subtitle rendering" &&
+optional_depends libmodplug \
+ "--enable-libmodplug" \
+ "" \
+ "enable libmodplug support for playing mod files" &&
optional_depends schroedinger \
"--enable-libschroedinger" \
"" \
"for dirac encoder/decoder support via libschroedinger" &&
+optional_depends speex \
+ "--enable-libspeex" \
+ "" \
+ "support for the Speex codec" &&
+optional_depends openjpeg \
+ "--enable-libopenjpeg" \
+ "" \
+ "support for JPEG 2000" &&
optional_depends "lame" \
"--enable-libmp3lame" \
"" \
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 5a47e72..4e35685 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,10 +1,10 @@
SPELL=ffmpeg
- VERSION=0.7.11
- SECURITY_PATCH=10
+ VERSION=0.10
+ SECURITY_PATCH=11
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
-
SOURCE_HASH=sha512:2078e13d40d660a85540349681c7a9a8d2648812167775c2d28cd1be3e29eb34aae944e18e1c798e4cf52f631737af1831eb508634e47e6ae0dee5c0cf9fe0fa
+
SOURCE_HASH=sha512:0839eb7c2292a5eda7d5d62595fc77ca68ea6b6596556618c9fe7eca758592cdf6ddf2997e8495a07f45553d25511e3a6ad01b011c048a2c58516fecc53ede14
#case $FFAMR in
# none);;
# *)
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index b4687aa..e728572 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,12 @@
+2012-01-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * UP_TRIGGERS: added up_trigger to trigger dependees on major version
updates
+ * DETAILS: version 0.10, SECURITY_PATCH++, fixes CVE-2011-3929,
+ CVE-2011-3934, CVE-2011-3935, CVE-2011-3936, CVE-2011-3937,
CVE-2011-3940,
+ CVE-2011-3941, CVE-2011-3944, CVE-2011-3945, CVE-2011-3946,
CVE-2011-3947,
+ CVE-2011-3949, CVE-2011-3950, CVE-2011-3951 and CVE-2011-3952
+ * DEPENDS: added optional dependencies on celt, frei0r-plugins,
gnutls,
+ libass, libmodplug, speex and openjpeg
+
2012-01-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.11, SECURITY_PATCH=10
diff --git a/video/ffmpeg/UP_TRIGGERS b/video/ffmpeg/UP_TRIGGERS
new file mode 100755
index 0000000..d074256
--- /dev/null
+++ b/video/ffmpeg/UP_TRIGGERS
@@ -0,0 +1,16 @@
+# up_trigger everything on major version updates
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if test "${VERSION}" != "${OLD_SPELL_VERSION}"; then
+ message "This is a possibly incompatible update of ${SPELL}..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL 1); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q
"NEEDED.*lib\(\(swscale\)\|\(avcodec\)\|\(avdevice\)\|\(avfilter\)\|\(avutil\)\|\(postproc\)\|\(swresample\)\)";
then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
+
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (74345944c0b51834ad6acbc81b1088fd0bb57e6a),
Florian Franzmann, 01/30/2012