Skip to Content.
Sympa Menu

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

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 (aaeca0696bd090d5697fe455ba0f1802d99db068)
  • Date: Thu, 26 Apr 2012 23:53:08 -0500

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

devel/automake/DETAILS | 2 -
devel/automake/HISTORY | 3 ++
disk/vcdimager-unstable/DETAILS | 4 +--
disk/vcdimager-unstable/HISTORY | 3 ++
doc/mupdf/DEPENDS | 4 ++-
doc/mupdf/HISTORY | 3 ++
http/seamonkey/DETAILS | 6 ++---
http/seamonkey/HISTORY | 3 ++
libs/libcdio/DETAILS | 2 -
libs/libcdio/HISTORY | 3 ++
mail/sylpheed/DETAILS | 2 -
mail/sylpheed/HISTORY | 3 ++
video-libs/xine-lib/CONFIGURE | 11 ++++++---
video-libs/xine-lib/DEPENDS | 44
++++++++++++++++++++++++--------------
video-libs/xine-lib/DETAILS | 4 +--
video-libs/xine-lib/HISTORY | 7 ++++++
video-libs/xine-lib/PRE_BUILD | 2 -
video-libs/xine-lib/UP_TRIGGERS | 18 +++++++++++++++
video-libs/xine-lib/zlib126.patch | 41 -----------------------------------
video/ffmpeg-svn/DEPENDS | 3 +-
video/ffmpeg-svn/HISTORY | 3 ++
video/ffmpeg/DEPENDS | 28 ++++++++++++++----------
video/ffmpeg/DETAILS | 10 +++++++-
video/ffmpeg/HISTORY | 7 ++++++
video/ffmpeg/PREPARE | 4 +++
video/ffmpeg/ffmpeg.gpg |binary
26 files changed, 134 insertions(+), 86 deletions(-)

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

mupdf: added missing X11 deps

commit 8042bd91557482b1275c9a80c25b9d0121f26393
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seamonkey: => 2.9 [security]

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

automake: => 1.12

commit 763842bf7df7d0c927e808390800970c14801f06
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ffmpeg: readded 0.7 branch; converted to upstream signature checking

commit 4a6b6fd0e510614aa3a5e3f10dc2b14966e807fa
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ffmpeg-svn: uses git now

commit 38af46a95d4a34fb42a3acc68d97db8fd5405a85
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xine-lib: => 1.2.1

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

vcdimager-unstable: => 0.7.24

commit 9f1ad01f780035392f2ae3ee1b2b0dc1b845dfeb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libcdio: => 0.83

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

sylpheed: => 3.1.4

diff --git a/devel/automake/DETAILS b/devel/automake/DETAILS
index 534c98e..e236edd 100755
--- a/devel/automake/DETAILS
+++ b/devel/automake/DETAILS
@@ -1,5 +1,5 @@
SPELL=automake
- VERSION=1.11.5
+ VERSION=1.12
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/automake/HISTORY b/devel/automake/HISTORY
index 531b5a4..d3bcb67 100644
--- a/devel/automake/HISTORY
+++ b/devel/automake/HISTORY
@@ -1,3 +1,6 @@
+2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.12
+
2012-04-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.11.5

diff --git a/disk/vcdimager-unstable/DETAILS b/disk/vcdimager-unstable/DETAILS
index 0218823..d0c522c 100755
--- a/disk/vcdimager-unstable/DETAILS
+++ b/disk/vcdimager-unstable/DETAILS
@@ -1,8 +1,8 @@
SPELL=vcdimager-unstable
- VERSION=0.7.23
+ VERSION=0.7.24
SOURCE=vcdimager-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/vcdimager-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/vcdimager-$VERSION"
SOURCE_URL[0]=$GNU_URL/vcdimager/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=8275EC21.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/disk/vcdimager-unstable/HISTORY b/disk/vcdimager-unstable/HISTORY
index 9ee4ab8..4992be3 100644
--- a/disk/vcdimager-unstable/HISTORY
+++ b/disk/vcdimager-unstable/HISTORY
@@ -1,3 +1,6 @@
+2012-04-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.24; quoting paths
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 8275EC21.gpg: added gpg keyring
diff --git a/doc/mupdf/DEPENDS b/doc/mupdf/DEPENDS
index 9c5f147..70e3d77 100755
--- a/doc/mupdf/DEPENDS
+++ b/doc/mupdf/DEPENDS
@@ -2,4 +2,6 @@ depends JPEG &&
depends openjpeg &&
depends freetype2 &&
depends jbig2dec &&
-depends zlib
+depends zlib &&
+depends libxext &&
+depends libx11
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index d6ba5f5..122eb58 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,2 +1,5 @@
+2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing X11 deps
+
2012-04-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL: spell created
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 50d194c..c3693cf 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
SPELL=seamonkey
- VERSION=2.8
+ VERSION=2.9
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:4a80a1ff1b512a44bd5944597a9133708be0843f29ebe402f83c6a6b2c8b20e2d15cfc0c6b0c998d5d0ae7eea465d9caaebd79d057783f03437f16a998af58dc
+
SOURCE_HASH=sha512:ec753af6258cd738884b25b08df287f6cabc7d75671326d180b1c0d4d83fb546e34e7ddc68648cba4a4d817bbf747182a8abc7142f4fd7bf3e625febe9f43320
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=41
+ SECURITY_PATCH=42
TMPFS=off
ENTERED=20010922
LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index b8e3b7e..7579044 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,6 @@
+2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.9; SECURITY_PATCH++
+
2012-03-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.8; SECURITY_PATCH++
* DEPENDS: requires nspr >=4.9, nss >=3.13.2
diff --git a/libs/libcdio/DETAILS b/libs/libcdio/DETAILS
index eca70f2..344cdb9 100755
--- a/libs/libcdio/DETAILS
+++ b/libs/libcdio/DETAILS
@@ -1,5 +1,5 @@
SPELL=libcdio
- VERSION=0.82
+ VERSION=0.83
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libcdio/HISTORY b/libs/libcdio/HISTORY
index 892da7d..829bd51 100644
--- a/libs/libcdio/HISTORY
+++ b/libs/libcdio/HISTORY
@@ -1,3 +1,6 @@
+2012-04-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.83
+
2009-11-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.82

diff --git a/mail/sylpheed/DETAILS b/mail/sylpheed/DETAILS
index bd3e8b4..50bf634 100755
--- a/mail/sylpheed/DETAILS
+++ b/mail/sylpheed/DETAILS
@@ -3,7 +3,7 @@ if [[ $SYLPHEED_GTK2 == n ]]; then
VERSION=1.0.6

SOURCE_HASH=sha512:2b94979b671ef63b62040ed6b394368536a4817de910407cdfcdadc891e77a6752a6b547c0c1fdaa5360bd4c3b6c0a497f3d75bb17476a0ee37f7c4b5f18136e
else
- VERSION=3.1.3
+ VERSION=3.1.4
SECURITY_PATCH=1
if [[ $SYLPHEED_IT == y ]]; then
SOURCE3=Sylpheed3.0_icon-set.tar.gz
diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index 59c5b86..fe9e276 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,6 @@
+2012-04-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.1.4
+
2012-04-24 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply the patch
* glib232.patch: added, to fix compilation with glib2 >=2.32
diff --git a/video-libs/xine-lib/CONFIGURE b/video-libs/xine-lib/CONFIGURE
index 3a3c337..dd357be 100755
--- a/video-libs/xine-lib/CONFIGURE
+++ b/video-libs/xine-lib/CONFIGURE
@@ -4,6 +4,11 @@ config_query_option XINE_LIB_OPTS \
"--disable-ipv6" &&

config_query_option XINE_LIB_OPTS \
- "Build Video4Linux input plugins?" y \
- "--enable-v4l" \
- "--disable-v4l"
+ "Build Video4Linux 2 input plugins?" y \
+ "--enable-v4l2" \
+ "--disable-v4l2" &&
+
+# V4L 1 is deprecated
+if list_find "$XINE_LIB_OPTS" "--enable-v4l"; then
+ list_remove "XINE_LIB_OPTS" "--enable-v4l"
+fi
diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index 5c4d385..808ad5d 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -1,5 +1,7 @@
depends zlib &&
-depends LIBAVCODEC '--with-external-ffmpeg' &&
+depends LIBAVCODEC &&
+depends libcdio &&
+depends vcdimager-unstable &&

optional_depends gettext \
"--enable-nls" \
@@ -105,20 +107,34 @@ if is_depends_enabled $SPELL speex; then
depends libogg
fi &&

+# not recommended as system libraries
+#
+# libdvdnav: --with-external-dvdnav
+
optional_depends libmpcdec \
- "--with-external-libmpcdec" "" \
- "use system library for MusePack decoding" &&
+ "--enable-musepack" \
+ "--disable-musepack" \
+ "for Musepack decoding support" &&

optional_depends faad2 \
- "--with-external-libfaad" "" \
- "use system libfaad (recommended)" &&
+ "--enable-faad" \
+ "--disable-faad" \
+ "for FAAD decoder support" &&

-# not recommended as system libraries
-#
-# a52dec: --with-external-a52dec
-# libmad: --with-external-libmad
-# libdvdnav: --with-external-dvdnav
-# libdts: --with-external-libdts
+optional_depends libdts \
+ "--enable-dts" \
+ "--disable-dts" \
+ "for DTS decoding library support" &&
+
+optional_depends a52dec \
+ "--enable-a52dec" \
+ "--disable-a52dec" \
+ "for a52dec decoding library support" &&
+
+optional_depends libmad \
+ "--enable-mad" \
+ "--disable-mad" \
+ "for MAD decoding library support" &&

optional_depends libmodplug \
"--enable-modplug" \
@@ -171,7 +187,7 @@ optional_depends quicktime-codecs \
"z-rejected" &&

# input plugins
-if list_find "$XINE_LIB_OPTS" "--enable-v4l"; then
+if list_find "$XINE_LIB_OPTS" "--enable-v4l2"; then
optional_depends libv4l \
"--enable-libv4l" \
"--disable-libv4l" \
@@ -188,10 +204,6 @@ optional_depends samba \
"--disable-samba" \
"for Samba input support" &&

-optional_depends vcdimager-unstable \
- "" "--with-internal-vcdlibs" \
- "for dynamically linked vcd plugin (not recommended)" &&
-
optional_depends libfame \
"--enable-dxr3" \
"--disable-dxr3" \
diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
index fe98485..c51c6c3 100755
--- a/video-libs/xine-lib/DETAILS
+++ b/video-libs/xine-lib/DETAILS
@@ -1,6 +1,6 @@
SPELL=xine-lib
- VERSION=1.1.20.1
-
SOURCE_HASH=sha512:0dee346682bc903136777d257625509b963fa1037d45229efc91456462c46bbe268fd9aa3f52750b6ce6658dbad5d241f2c87f1508988e7eb3acc68344487fa9
+ VERSION=1.2.1
+
SOURCE_HASH=sha512:7d68bc1ef6a3c15c95218b746437fe7c3ad6fffecab11b39b7580cf1ca0b7e5dda4754f38d459a99d71e82a3b11ac451fefc68fd2f5f3e418fd5136c949c73e4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index db57df8..442ea8a 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,10 @@
+2012-04-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.1
+ * DEPENDS: corrected dependencies and flags
+ * CONFIGURE: v4l -> v4l2
+ * UP_TRIGGERS: added, to recast everything for libxine.so.2
+ * zlib126.patch: removed, bug fixed by upstream
+
2012-02-13 Vlad Glagolev <stealth AT sourcemage.org>
* zlib126.patch: added, to fix build with zlib 1.2.6
* PRE_BUILD: apply the patch
diff --git a/video-libs/xine-lib/PRE_BUILD b/video-libs/xine-lib/PRE_BUILD
index b7155a1..a9a109c 100755
--- a/video-libs/xine-lib/PRE_BUILD
+++ b/video-libs/xine-lib/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/zlib126.patch" &&
-
message "${MESSAGE_COLOR}Fixing libXvMc 1.0.6 support...${DEFAULT_COLOR}" &&
sed -i '/xxmc.h/a#include <X11/extensions/XvMClib.h>' \
src/video_out/{xvmc_mocomp.c,video_out_xxmc.c}
diff --git a/video-libs/xine-lib/UP_TRIGGERS b/video-libs/xine-lib/UP_TRIGGERS
new file mode 100755
index 0000000..1cf58aa
--- /dev/null
+++ b/video-libs/xine-lib/UP_TRIGGERS
@@ -0,0 +1,18 @@
+# up_trigger everything on minor version updates
+
+if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)"
+
+ if test "${VERSION:2:1}" != "${OLD_SPELL_VERSION:2:1}"; 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
+ # Check if the binaries link against libxine.so
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libxine\.so"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/video-libs/xine-lib/zlib126.patch
b/video-libs/xine-lib/zlib126.patch
deleted file mode 100644
index 5348b82..0000000
--- a/video-libs/xine-lib/zlib126.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- misc/xine-fontconv.c.orig
-+++ misc/xine-fontconv.c
-@@ -109,7 +109,7 @@
- osd_font_t font;
-
-
--static int gzwrite_i16(gzFile *fp, uint16_t number) {
-+static int gzwrite_i16(gzFile fp, uint16_t number) {
- return gzputc(fp, number & 0xFF) != -1 &&
- gzputc(fp, (number >> 8) & 0xFF) != -1;
- }
-@@ -341,7 +341,7 @@
-
- char filename[1024];
- FT_Bitmap *out_bitmap;
-- gzFile *fp;
-+ gzFile fp;
- int error;
- int error_counter;
- int glyph_index;
---- src/xine-engine/osd.c.orig
-+++ src/xine-engine/osd.c
-@@ -650,7 +650,7 @@
- osd->display_y = y;
- }
-
--static uint16_t gzread_i16(gzFile *fp) {
-+static uint16_t gzread_i16(gzFile fp) {
- uint16_t ret;
- ret = gzgetc(fp);
- ret |= (gzgetc(fp)<<8);
-@@ -663,7 +663,7 @@
-
- static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
-
-- gzFile *fp;
-+ gzFile fp;
- osd_font_t *font = NULL;
- int i, ret = 0;
-
-
diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
index 13c0675..5541870 100755
--- a/video/ffmpeg-svn/DEPENDS
+++ b/video/ffmpeg-svn/DEPENDS
@@ -1,4 +1,5 @@
-depends subversion &&
+depends git &&
+
optional_depends "X86-ASSEMBLER" \
"" \
"--disable-mmx" \
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index c70b841..17eed91 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,6 @@
+2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: subversion -> git
+
2012-04-21 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: nasm -> X86-ASSEMBLER

diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 4edab6b..3af1f02 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -2,6 +2,7 @@ optional_depends yasm \
"" \
"--disable-yasm" \
"for some assembler optimizations" &&
+
optional_depends celt \
"--enable-libcelt" \
"" \
@@ -14,6 +15,9 @@ optional_depends frei0r-plugins \
"--enable-frei0r" \
"" \
"use frei0r for video filtering" &&
+
+if [[ $FFMPEG_RELEASE == stable ]]; then
+
optional_depends gnutls \
"--enable-gnutls" \
"" \
@@ -25,7 +29,10 @@ optional_depends libass \
optional_depends libmodplug \
"--enable-libmodplug" \
"" \
- "enable libmodplug support for playing mod files" &&
+ "enable libmodplug support for playing mod files"
+
+fi &&
+
optional_depends schroedinger \
"--enable-libschroedinger" \
"" \
@@ -63,15 +70,14 @@ optional_depends sdl \
"--disable-ffplay" \
"for ffplay video player" &&
optional_depends faac \
- "--enable-libfaac --enable-nonfree" \
- "" \
- "support for faac" &&
+ "--enable-libfaac --enable-nonfree" \
+ "" \
+ "support for faac" &&
optional_depends libtheora \
- "--enable-libtheora" \
- "" \
- "theora codec" &&
+ "--enable-libtheora" \
+ "" \
+ "theora codec" &&
optional_depends x264 \
- "--enable-libx264" \
- "" \
- "h.264 encoder"
-
+ "--enable-libx264" \
+ "" \
+ "h.264 encoder"
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 9ebe3be..5b05949 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,10 +1,18 @@
SPELL=ffmpeg
+if [[ $FFMPEG_RELEASE == stable ]]; then
VERSION=0.10.2
SECURITY_PATCH=12
+else
+ VERSION=0.7.12
+ SECURITY_PATCH=11
+fi
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
-
SOURCE_HASH=sha512:d244931391b35b3aa531a623965cc7f6a1394eac4fd64c411bb12b7e17c2a837ee36d07914f46af87a9012b27dcb22eed09f567b39a142f6c91da692fae3776a
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=ffmpeg.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
#case $FFAMR in
# none);;
# *)
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index b1bba17..9aa4172 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,10 @@
+2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: return back 0.7 branch, since some software rely on it;
+ converted to upstream signature checking
+ * DEPENDS: gnutls, libass and libmodplug are stable-only; removed tabs
+ * ffmpeg.gpg: added D67658D8 public key (FFmpeg release signing key
+ <ffmpeg-devel AT ffmpeg.org>)
+
2012-04-13 Julien "_kaze_" ROZO <julien AT rozo.org>
* BUILD: added path to openjpeg headers if dependency is enabled
(fix #381)
diff --git a/video/ffmpeg/PREPARE b/video/ffmpeg/PREPARE
index 6867783..328c960 100755
--- a/video/ffmpeg/PREPARE
+++ b/video/ffmpeg/PREPARE
@@ -1 +1,5 @@
+config_query_list FFMPEG_RELEASE "Select which release to build:" \
+ stable \
+ legacy
+
#config_query_list FFAMR "Include an AMR codec?" none amr_nb amr_nb-fixed
amr_wb
diff --git a/video/ffmpeg/ffmpeg.gpg b/video/ffmpeg/ffmpeg.gpg
new file mode 100644
index 0000000..67f9bd9
Binary files /dev/null and b/video/ffmpeg/ffmpeg.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (aaeca0696bd090d5697fe455ba0f1802d99db068), Vlad Glagolev, 04/27/2012

Archive powered by MHonArc 2.6.24.

Top of Page