Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (9e59696c341e76f9ce6f196a8cc1f1f944c79ac5)

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 devel-xorg-modular grimoire by Treeve Jelbert (9e59696c341e76f9ce6f196a8cc1f1f944c79ac5)
  • Date: Fri, 24 Jan 2014 10:20:08 -0600

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 3
devel/cmake/DETAILS | 4
devel/cmake/HISTORY | 3
devel/indent/DETAILS | 5
devel/indent/HISTORY | 4
devel/indent/PRE_BUILD | 1
devel/indent/gcc-4.0-indent.h.patch | 11
disk/partclone/DETAILS | 4
disk/partclone/HISTORY | 3
ftp/wget/DETAILS | 2
ftp/wget/HISTORY | 5
ftp/wget/PRE_BUILD | 3
ftp/wget/wget-1.14-perl-5.18-pod-fixes.diff | 82 --
ftp/wget/wget.gpg |binary
gnome2-libs/glib2/DETAILS | 8
gnome2-libs/glib2/HISTORY | 3
gnome2-libs/pango/DETAILS | 4
gnome2-libs/pango/HISTORY | 3
graphics-libs/harfbuzz/DETAILS | 4
graphics-libs/harfbuzz/HISTORY | 3
graphics-libs/libraw/DETAILS | 8
graphics-libs/libraw/HISTORY | 3
http/lighttpd/DETAILS | 6
http/lighttpd/HISTORY | 4
http/qupzilla/BUILD | 1
http/qupzilla/DEPENDS | 1
http/qupzilla/DETAILS | 13
http/qupzilla/HISTORY | 2
kernels/linux/HISTORY | 7
kernels/linux/PRE_BUILD | 24
kernels/linux/info/kernels/3.13 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.13 | 5
kernels/linux/latest.defaults | 4
libs/cfitsio/DETAILS | 4
libs/cfitsio/HISTORY | 3
libs/libmpc/DETAILS | 4
libs/libmpc/HISTORY | 3
libs/vc/DETAILS | 6
libs/vc/HISTORY | 3
net/dhcpcd/BUILD | 1
net/dhcpcd/CONFIGURE | 2
net/dhcpcd/HISTORY | 3
python-pypi/isort/DETAILS | 4
python-pypi/isort/HISTORY | 3
python-pypi/six/DETAILS | 4
python-pypi/six/HISTORY | 3
science-libs/netcdf/DETAILS | 7
science-libs/netcdf/HISTORY | 3
utils/dbus/DETAILS | 4
utils/dbus/HISTORY | 3
video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch | 34 +
video/dvdauthor/0002-Fix-build-with-FriBidi-0.19.x.patch | 15
video/dvdauthor/BUILD | 7
video/dvdauthor/CONFIGURE | 5
video/dvdauthor/DEPENDS | 17
video/dvdauthor/DETAILS | 17
video/dvdauthor/HISTORY | 8
video/dvdauthor/PREPARE | 2
video/dvdauthor/PRE_BUILD | 9
video/ffmpeg/DEPENDS | 2
video/ffmpeg/HISTORY | 3
video/transcode/HISTORY | 3
video/transcode/PRE_BUILD | 12
video/transcode/transcode-1.1.7-ffmpeg-0.10.patch | 15
video/transcode/transcode-1.1.7-ffmpeg-0.11.patch | 303 ++++++++++
video/transcode/transcode-1.1.7-ffmpeg.patch | 51 +
video/transcode/transcode-1.1.7-ffmpeg2.patch | 332
++++++++++++
video/transcode/transcode-1.1.7-freetype251.patch | 12
video/transcode/transcode-1.1.7-libav-9.patch | 31 +
video/transcode/transcode-1.1.7-preset-force.patch | 28 +
video/transcode/transcode-1.1.7-preset-free.patch | 34 +
71 files changed, 1084 insertions(+), 154 deletions(-)

New commits:
commit 378e02a02346e93854914f2af03e753985b238cd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cmake: => 2.8.12.2

commit 23fbd1eaec466c9e84765a6badca70b5f0f1ab3d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

vc: => 0.7.3

commit 9756f57227ac9911de26bba47e3f7b6eb5b48119
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

ffmpeg: fixed typo in previous correction

commit 6bd803c2fb708f443fe0c15efea0bfd6809a0f38
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

ffmpeg: requires libcdio-paranoia

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

libs/cfitsio: version 3360

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

science-libs/netcdf: version 4.3.1

commit 2355604617b38581694867a6c9ac14266f87e32f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

glib2: => 2.38.2

commit d2b817773d798ea7600969b6b61dfe7afe3e5afb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dbus: => 1.8.0

commit 8a243e4eee64a88510b63cdf41344f09bc5a661e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

six: => 1.5.2

commit 31812ff023b7550688b32bcac467f2fe45d11ee0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

harfbuzz: => 0.9.25

commit 5c65d439f7011e5ff07c68ace5561b6f80e9518a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pango: => 1.36.1

commit 1a222a25b4ffcefcde506aeab7f491eec5bf72a6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

indent 2.2.10

commit 61d8b460ed5c5f619efc1a6cd0cb0719322d905b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

isort: => 3.1.2

commit 833239eb5a5c1ac2a355a66a35bbc5a978472ae3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

partclone: => 0.2.70

commit 30d2acd0e56a142cf55c31f8f8e14d426a4856df
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dhcpcd - IPv6/4 support

commit 18a12b7d0ddd2e745084281febf33a5bf8939cf0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libraw: => 0.16.0

commit 1193d47c250a02bdb9f7785f3a6374794cebdc3c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libmpc: => 1.0.2

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

lighttpd: => 1.4.34 (security)

commit e74ed29cdb6881a2e5d8494064e03a8f700efc90
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

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

kernels/linux: add support for xz compressed kernels

commit e855dcb0a0bdcaa2c9de8983a1978a7cea0a1b19
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

http/qupzilla: new spell, web browser based on qtwebkit

commit ed34ac3b81f44ee3b70bdbe2287e37727236c642
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

transcode: added PRE_BUILD to apply gentoo patches so will build

commit d4505fc28641af30e3282da13f450d7cdc579f09
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wget: => 1.15

commit c26568c7cf486c569d7af5ab9e112c39cf4ef711
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

dvdauthor: updated to 0.7.1 and added scm build option

diff --git a/ChangeLog b/ChangeLog
index a8f5d1e..10761bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-01-20 Ladislav Hagara <hgr AT vabo.cz>
+ * http/qupzilla: new spell, web browser based on qtwebkit
+
2014-01-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* libs/libnoise: new spell, a coherent noise generator in C++
* libs/osgearth: new spell, a 3D mapping SDK for openscenegraph
diff --git a/devel/cmake/DETAILS b/devel/cmake/DETAILS
index adcde5f..4f654a5 100755
--- a/devel/cmake/DETAILS
+++ b/devel/cmake/DETAILS
@@ -1,6 +1,6 @@
SPELL=cmake
- VERSION=2.8.11.2
-
SOURCE_HASH=sha512:05ac2293300bf15fdcf98f07dfa7b9862b117cd0d6f7e30c1995ecb8a3bfd94e2b7e778caaa05bc46bd88eca5afe7f6be38b1904275a9a2aeae562bfdbaeec94
+ VERSION=2.8.12.2
+
SOURCE_HASH=sha512:a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.cmake.org/files/v2.8/$SOURCE
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index 14768a0..fcd0a40 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2014-01-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.8.12.2
+
2013-07-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.8.11.2

diff --git a/devel/indent/DETAILS b/devel/indent/DETAILS
index e380717..726d8cd 100755
--- a/devel/indent/DETAILS
+++ b/devel/indent/DETAILS
@@ -1,11 +1,10 @@
SPELL=indent
- VERSION=2.2.9
- PATCHLEVEL=1
+ VERSION=2.2.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:e7dd5c27cfe50633efc73cc870adc42e6ac6176ee94b0e1422231e7ba32ed0a6e0f4fb29b96a79b39534908fc7b0026c18714a3a48c5c9ac94d0dfd85dff0a39
+
SOURCE_HASH=sha512:a90faf1bf855ecc1e0b0f47f4133e4a46be8b2c42bd0aa7f6cf6d764b7883b34b558e3ca443b193b1a747f64cd2653640f1aecbc8a17265c66260f6d6d621e19
WEB_SITE=http://www.gnu.org/software/indent/
ENTERED=20020128
LICENSE[0]=GPL
diff --git a/devel/indent/HISTORY b/devel/indent/HISTORY
index 622e56f..26e8d93 100644
--- a/devel/indent/HISTORY
+++ b/devel/indent/HISTORY
@@ -1,3 +1,7 @@
+2014-01-22 Ismael Luceno <ismael AT sourcemage.org>
+ * gcc-4.0-indent.h.patch: removed, no longer needed
+ * DETAILS: updated spell to 2.2.10
+
2008-04-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD: fixed html doc installation path #14348
* DETAILS: PATCHLEVEL++
diff --git a/devel/indent/PRE_BUILD b/devel/indent/PRE_BUILD
index b756f9e..090e721 100755
--- a/devel/indent/PRE_BUILD
+++ b/devel/indent/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < ${SCRIPT_DIRECTORY}/gcc-4.0-indent.h.patch &&
sed -i 's,docdir = $(prefix)/doc,docdir = $(prefix)/share/doc,'
doc/Makefile.*
diff --git a/devel/indent/gcc-4.0-indent.h.patch
b/devel/indent/gcc-4.0-indent.h.patch
deleted file mode 100644
index a28f94b..0000000
--- a/devel/indent/gcc-4.0-indent.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/indent.h.old 2005-08-10 18:05:07.000000000 -0700
-+++ src/indent.h 2005-08-10 18:03:46.000000000 -0700
-@@ -97,7 +97,7 @@
- extern unsigned long in_prog_size;
-
- /* The output file. */
--extern FILE *output;
-+static FILE *output;
-
-
-
diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index 7c5e17e..a8a58c3 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,6 +1,6 @@
SPELL=partclone
- VERSION=0.2.69
-
SOURCE_HASH=sha512:70c5056fe31fbe1099e0f9603efa35ea7729d1af9efab692493a8e3e93b64c4b23c69d943185c62b4574089ed1320aedf67b93fab93c212e048eaaefb0905847
+ VERSION=0.2.70
+
SOURCE_HASH=sha512:7aa6c6618e36b2114d9ddee1d7fe957faea713315871ae357a174a8214d6b36c3a75ad8f03419d9893e2c53a4dd32925af12870c407a84310321a6c434cf4b69
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
diff --git a/disk/partclone/HISTORY b/disk/partclone/HISTORY
index b7daae7..060c3c1 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,6 @@
+2014-01-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.70
+
2014-01-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.69

diff --git a/ftp/wget/DETAILS b/ftp/wget/DETAILS
index ebd7b62..57e14b8 100755
--- a/ftp/wget/DETAILS
+++ b/ftp/wget/DETAILS
@@ -1,5 +1,5 @@
SPELL=wget
- VERSION=1.14
+ VERSION=1.15
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index 2b75569..e14aa28 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,8 @@
+2014-01-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.15
+ * PRE_BUILD, wget-1.14-perl-5.18-pod-fixes.diff: deleted
+ * wget.gpg: add E163E1EA: Giuseppe Scrivano <gscrivan AT redhat.com>
+
2013-05-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, wget-1.14-perl-5.18-pod-fixes.diff: add fix for
bug #546
diff --git a/ftp/wget/PRE_BUILD b/ftp/wget/PRE_BUILD
deleted file mode 100755
index 6cda7c3..0000000
--- a/ftp/wget/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/wget-1.14-perl-5.18-pod-fixes.diff
diff --git a/ftp/wget/wget-1.14-perl-5.18-pod-fixes.diff
b/ftp/wget/wget-1.14-perl-5.18-pod-fixes.diff
deleted file mode 100644
index 5110ab7..0000000
--- a/ftp/wget/wget-1.14-perl-5.18-pod-fixes.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur wget-1.14.orig/doc/wget.texi wget-1.14.new/doc/wget.texi
---- wget-1.14.orig/doc/wget.texi 2012-08-04 02:41:52.000000000 -0600
-+++ wget-1.14.new/doc/wget.texi 2013-05-26 11:18:52.986107183 -0600
-@@ -876,7 +876,7 @@
- actions of one.
-
- @cindex proxy
--@itemx --no-proxy
-+@item --no-proxy
- Don't use proxies, even if the appropriate @code{*_proxy} environment
- variable is defined.
-
-@@ -977,7 +977,7 @@
- whose encoding does not match the one used locally.
-
- @cindex IPv6
--@itemx -4
-+@item -4
- @itemx --inet4-only
- @itemx -6
- @itemx --inet6-only
-@@ -2106,32 +2106,32 @@
-
-
- @table @asis
--@item 0
-+@item .0
- No problems occurred.
-
--@item 1
-+@item .1
- Generic error code.
-
--@item 2
--Parse error---for instance, when parsing command-line options, the
-+@item .2
-+Parse error - for instance, when parsing command-line options, the
- @samp{.wgetrc} or @samp{.netrc}...
-
--@item 3
-+@item .3
- File I/O error.
-
--@item 4
-+@item .4
- Network failure.
-
--@item 5
-+@item .5
- SSL verification failure.
-
--@item 6
-+@item .6
- Username/password authentication failure.
-
--@item 7
-+@item .7
- Protocol errors.
-
--@item 8
-+@item .8
- Server issued an error response.
- @end table
-
-@@ -3094,7 +3094,7 @@
- Change setting of passive @sc{ftp}, equivalent to the
- @samp{--passive-ftp} option.
-
--@itemx password = @var{string}
-+@item password = @var{string}
- Specify password @var{string} for both @sc{ftp} and @sc{http} file
retrieval.
- This command can be overridden using the @samp{ftp_password} and
- @samp{http_password} command for @sc{ftp} and @sc{http} respectively.
-@@ -3605,7 +3605,7 @@
- may be specified from within Wget itself.
-
- @table @samp
--@itemx --no-proxy
-+@item --no-proxy
- @itemx proxy = on/off
- This option and the corresponding command may be used to suppress the
- use of proxy, even if the appropriate environment variables are set.
diff --git a/ftp/wget/wget.gpg b/ftp/wget/wget.gpg
index 9aad033..36b304c 100644
Binary files a/ftp/wget/wget.gpg and b/ftp/wget/wget.gpg differ
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index 4869813..31a1582 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,12 +1,12 @@
SPELL=glib2
if [[ $GLIB_VER == devel ]];then
- VERSION=2.38.1
-
SOURCE_HASH=sha512:8471d8d3468040d551e0f34f6818f5839c7109be25d8b62d9b3c789940a7b1fd4fe903fa755cb6b2700509aa791ba9cbce3d80f36c40c9a99f270dcdcc55e79b
+ VERSION=2.38.2
+
SOURCE_HASH=sha512:f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0
SOURCE=glib-$VERSION.tar.xz
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
else
- VERSION=2.38.1
-
SOURCE_HASH=sha512:8471d8d3468040d551e0f34f6818f5839c7109be25d8b62d9b3c789940a7b1fd4fe903fa755cb6b2700509aa791ba9cbce3d80f36c40c9a99f270dcdcc55e79b
+ VERSION=2.38.2
+
SOURCE_HASH=sha512:f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0
SECURITY_PATCH=1
SOURCE=glib-$VERSION.tar.xz
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index c3d507e..600e442 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2014-01-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.38.2
+
2013-10-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.38.1

diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index 0fec924..6e1baf5 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,6 +1,6 @@
SPELL=pango
- VERSION=1.36.0
-
SOURCE_HASH=sha512:31bf58a25255ea2ff2d38a5195a05d7619669f3b29eec3ef5cace177f0af20543cf74b13db98f48fd73145945e704d20ae8a8faedd2589db6855e25ecf36ea4c
+ VERSION=1.36.1
+
SOURCE_HASH=sha512:4807462ad2ff886ebdf83a6d4a4f7f855163de1d58a9cdb94de48d003bbdff2697ebb0628029e6270cee13071b81f8104b35ec9e0d6801312969299b8d8f859c
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 60c3635..cd5b37a 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2014-01-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.36.1
+
2013-10-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.36.0

diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index 5e54554..a64a79b 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -11,8 +11,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"

SOURCE_URL[1]=git_http://anongit.freedesktop.org/git/harfbuzz.git:harfbuzz-git
SOURCE_IGNORE=volatile
else
- VERSION=0.9.22
-
SOURCE_HASH=sha512:5bdaa850c2a5cc23b7eb6a4a3771cb82925f3ef34630fdd94404dbc480f6da569c95c17359b6154326effbfe5f7cee4ca9bed0c208873471cdd67d7ef1e69f31
+ VERSION=0.9.25
+
SOURCE_HASH=sha512:db6e69c9dab25b794116261238b143c850eb625a05877fbe43fe99ea78d29375421e6c3bc0201adfb964dcdd6b081af2acbf741c3408d3166fb7fffb6fb7ef17
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/harfbuzz/release/$SOURCE
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 4fec792..be3990b 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2014-01-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.25
+
2013-10-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.22

diff --git a/graphics-libs/libraw/DETAILS b/graphics-libs/libraw/DETAILS
index 8a41d36..f092756 100755
--- a/graphics-libs/libraw/DETAILS
+++ b/graphics-libs/libraw/DETAILS
@@ -1,12 +1,12 @@
SPELL=libraw
SPELLX=LibRaw
- VERSION=0.15.4
+ VERSION=0.16.0
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE2=LibRaw-demosaic-pack-GPL2-$VERSION.tar.gz
SOURCE3=LibRaw-demosaic-pack-GPL3-$VERSION.tar.gz
-
SOURCE_HASH=sha512:86a0c3bd8e019b415e75ef8e505e317188d8c24fdcf1aae804234e10cc3dcfd452537cc9a25a2a94f27c3b2ee70ab503af6ab189be3449b2ace3a61353fc255e
-
SOURCE2_HASH=sha512:c75c9823f5c888a81c5e8240999d3facf9a5ed9518c6c1ec93930281cfb055d93b4a44cc80f384032bdc36abc843ed75f53c1c1ee03127221d478a17d26fa0ad
-
SOURCE3_HASH=sha512:0a369349ed11bb888d042724fe85e5c2bd3b553c68aeb6637877560f733956211201fc30940b168e06f3bfaa0f564190b1ab7b999a7a854227db4a9219874e36
+
SOURCE_HASH=sha512:192e0e78e8f32235618007d6917f92153e7cb8a2d83ca0933f21d4fce3d550c507f5410ba18d86b0f0a16b0ac81ba8cc4cf788fa217080507ac0b3c39e51a9ef
+
SOURCE2_HASH=sha512:807063cfe292f19a0f7f7c2be532983843480ed43768f97753aa474bd64335989b1816b370fb43b3be2e265b5fa9ab9a27639b3cfc9919e81311b1d260f09d03
+
SOURCE3_HASH=sha512:c01b9dfc6fec2a85cbab0bf2b45a7de93e378bc1fd1e15381f8ce9ed27423da0f5230568143d87d442b137d0d2f4e20241fe7084274b1c40c515086e0425bcc8
WEB_SITE=http://www.libraw.org/
SOURCE_URL[0]=$WEB_SITE/data/$SOURCE
SOURCE2_URL[0]=$WEB_SITE/data/$SOURCE2
diff --git a/graphics-libs/libraw/HISTORY b/graphics-libs/libraw/HISTORY
index 1aafcee..feb21a6 100644
--- a/graphics-libs/libraw/HISTORY
+++ b/graphics-libs/libraw/HISTORY
@@ -1,3 +1,6 @@
+2014-01-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.16.0
+
2013-11-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.15.4

diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index 4ce87a0..1607dd7 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -1,14 +1,14 @@
SPELL=lighttpd
- VERSION=1.4.33
+ VERSION=1.4.34
BRANCH=`echo -n $VERSION | cut -d . -f 1,2`
-
SOURCE_HASH=sha512:f380adb20944846340b409290c43d54188f94e7992fe1e90121ab866f75048dfb7c2c1592b07b1df0af3b6d12b60d1d7e5d41de75c8684b8939b3df736f00762
+
SOURCE_HASH=sha512:ad8b25090f81bcb55d3aac89cd17119ed3574a86756992bf36f7d302cf5966006bbc4a76e2d3926a4f096c0db30b01722aa7fb7fa556200ace6c3b82874d81ee
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://download.lighttpd.net/$SPELL/releases-$BRANCH.x/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.lighttpd.net/
LICENSE[0]=BSD
ENTERED=20050722
- SECURITY_PATCH=8
+ SECURITY_PATCH=9
KEYWORDS="http"
SHORT="light httpd"
cat << EOF
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 0075387..5a20338 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,7 @@
+2014-01-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.34; SECURITY_PATCH++
+ (CVE-2013-4508, CVE-2013-4559, CVE-2013-4560)
+
2013-12-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: use SPELL variable
* CONFIGURE: added option for ability specify a custom ldap port in
diff --git a/http/qupzilla/BUILD b/http/qupzilla/BUILD
new file mode 100755
index 0000000..eec3de4
--- /dev/null
+++ b/http/qupzilla/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/http/qupzilla/DEPENDS b/http/qupzilla/DEPENDS
new file mode 100755
index 0000000..6ad1ff9
--- /dev/null
+++ b/http/qupzilla/DEPENDS
@@ -0,0 +1 @@
+depends -sub WEBKIT qt4
diff --git a/http/qupzilla/DETAILS b/http/qupzilla/DETAILS
new file mode 100755
index 0000000..a70ebb5
--- /dev/null
+++ b/http/qupzilla/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=qupzilla
+ VERSION=1.6.0
+
SOURCE_HASH=sha512:4a30a9be9bdd6b2fd131bc19e92c86f751562d5ffa0179e8381ace0820746039d59e0ad58b2f9c50b546e983fb5f7b206eaef4140a03d1c3f140209bc62f4a6b
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=https://github.com/QupZilla/qupzilla/archive/v${VERSION}.tar.gz
+ WEB_SITE=http://www.qupzilla.com/
+ LICENSE[0]=GPL
+ ENTERED=20140120
+ SHORT="web browser based on WebKit core and Qt Framework"
+cat << EOF
+QupZilla is modern web browser based on WebKit core and Qt Framework.
+EOF
diff --git a/http/qupzilla/HISTORY b/http/qupzilla/HISTORY
new file mode 100644
index 0000000..56a2422
--- /dev/null
+++ b/http/qupzilla/HISTORY
@@ -0,0 +1,2 @@
+2014-01-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 1.6.0
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 9eade51..ac9b4c5 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,8 @@
+2014-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD: add support for xz compressed kernels
+ * info/kernels/3.13, latest.defaults,
+ info/patches/maintenance_patches_3/patch-3.13: version 3.13
+
2014-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* info/patches/maintenance_patches_3/patch-3.12.8: added
* latest_defaults: version 3.12.8
@@ -6,7 +11,7 @@
* info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch: Works
with 3.12.x

2014-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * PRE_BUILD: add support for xz compressed files
+ * PRE_BUILD: add support for xz compressed patches
* info/patches/maintenance_patches_3/patch-3.12.7: added
* latest_defaults: version 3.12.7

diff --git a/kernels/linux/PRE_BUILD b/kernels/linux/PRE_BUILD
index 3ccfe01..c3c8ce5 100755
--- a/kernels/linux/PRE_BUILD
+++ b/kernels/linux/PRE_BUILD
@@ -64,11 +64,25 @@ case "${KMODE}" in
mk_source_dir $LINUX_SOURCE_DIRECTORY &&
cd $LINUX_SOURCE_DIRECTORY &&
case $VERSION in
- 3.[1-9]*)
- message "${MESSAGE_COLOR}bunzip2
$SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
- bunzip2 -k $SOURCE_CACHE/$SOURCE
- SOURCE_ORI=$SOURCE
- SOURCE=${SOURCE/.bz2}
+ 3.[1-9]*)
+ case $SOURCE in
+ *.bz2)
+ message "${MESSAGE_COLOR}bunzip2
$SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
+ bunzip2 -k $SOURCE_CACHE/$SOURCE
+ SOURCE_ORI=$SOURCE
+ SOURCE=${SOURCE/.bz2}
+ ;;
+ *.xz)
+ message "${MESSAGE_COLOR}unxz
$SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
+ unxz -k $SOURCE_CACHE/$SOURCE
+ SOURCE_ORI=$SOURCE
+ SOURCE=${SOURCE/.xz}
+ ;;
+ *)
+ message "${MESSAGE_COLOR}unknown compression:
$SOURCE${DEFAULT_COLOR}"
+ return 1
+ ;;
+ esac
unpack_file '' || return 1
message "${MESSAGE_COLOR}rm
$SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
rm $SOURCE_CACHE/$SOURCE
diff --git a/kernels/linux/info/kernels/3.13 b/kernels/linux/info/kernels/3.13
new file mode 100755
index 0000000..8c055ca
--- /dev/null
+++ b/kernels/linux/info/kernels/3.13
@@ -0,0 +1,5 @@
+version="3.13"
+source="linux-${version}.tar.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+source2="linux-${version}.tar.sign"
+source2_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source2}"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.13
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.13
new file mode 100755
index 0000000..aa68e3e
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.13
@@ -0,0 +1,5 @@
+patchversion="3.13.0"
+source=""
+source_url=""
+appliedkernels="3.13"
+md5sum=""
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index a0e2e62..95f8af6 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
-LATEST_3=3.12
+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.12.8
+LATEST_maintenance_patches_3=patch-3.13
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/libs/cfitsio/DETAILS b/libs/cfitsio/DETAILS
index f36f586..ed6c251b 100755
--- a/libs/cfitsio/DETAILS
+++ b/libs/cfitsio/DETAILS
@@ -1,8 +1,8 @@
SPELL=cfitsio
- VERSION=3300
+ VERSION=3360
SOURCE="${SPELL}${VERSION}.tar.gz"
SOURCE_URL[0]=ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${SOURCE}
-
SOURCE_HASH=sha512:0e1bca3dfbe8ee2082e5bd5414475181140e41132d0f955022475265b92c5b63b31a35148b536c6ca29319abf4289421de0db6166dd709d37082b9359e17fc6c
+
SOURCE_HASH=sha512:1ee864cc5c51347ec262dbc585b2dbbd8630a7396bdcbe7a860906371dc296dc147d72a999a54b255514dd81783bb8f8c79d7a75f8689d085ba90931947100e1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://heasarc.gsfc.nasa.gov/fitsio/";
LICENSE[0]=GPL
diff --git a/libs/cfitsio/HISTORY b/libs/cfitsio/HISTORY
index 226d248..237f470 100644
--- a/libs/cfitsio/HISTORY
+++ b/libs/cfitsio/HISTORY
@@ -1,3 +1,6 @@
+2014-01-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3360
+
2012-05-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3300

diff --git a/libs/libmpc/DETAILS b/libs/libmpc/DETAILS
index 78703b1..1fdbc1e 100755
--- a/libs/libmpc/DETAILS
+++ b/libs/libmpc/DETAILS
@@ -1,6 +1,6 @@
SPELL=libmpc
- VERSION=1.0.1
-
SOURCE_HASH=sha512:fa381e75999bba626ba08d73225285b03c6d2f6cca87881b28829925d1624eaed1c9b544f75e7281cf5d8dcdd7831025a4eafc05f88f13375f9e08239a8a9303
+ VERSION=1.0.2
+
SOURCE_HASH=sha512:0e94ba9a20c7374839d2a53a9ed8cce647cc74142b464634fdb9cbaf96e91e43ea13f0b4dab5c06c247e6719de0c0ae03fdcba0c7c4518ee504c545c96da70d0
SECURITY_PATCH=1
SOURCE="mpc-$VERSION.tar.gz"
SOURCE_URL[0]=http://www.multiprecision.org/mpc/download/$SOURCE
diff --git a/libs/libmpc/HISTORY b/libs/libmpc/HISTORY
index 0cdba50..55673c9 100644
--- a/libs/libmpc/HISTORY
+++ b/libs/libmpc/HISTORY
@@ -1,3 +1,6 @@
+2014-01-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.2
+
2012-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.1
SECURITY_PATCH=1, fixes CVE-2012-3386
diff --git a/libs/vc/DETAILS b/libs/vc/DETAILS
index 9a691e7..323380b 100755
--- a/libs/vc/DETAILS
+++ b/libs/vc/DETAILS
@@ -1,8 +1,8 @@
SPELL=vc
SPELLX=Vc
- VERSION=0.7.2
- VX=164
-
SOURCE_HASH=sha512:997087e04a40fa70a91ca1e0814e5fcd92edf945130c894176af8b7471fcbe27fde17a3aab2d60adb67f2df07f9065e1f999c2bef8b72703930713d60595cc5e
+ VERSION=0.7.3
+ VX=174
+
SOURCE_HASH=sha512:79330ca9d9258ab356d15760550ec6e88421bc7c268a46eb120680a5df6008384cf9b35d28f37f28bcf795be594a4a87c6e31496484f59cec9a611cc55f9ac42
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=http://code.compeng.uni-frankfurt.de/projects/vc
diff --git a/libs/vc/HISTORY b/libs/vc/HISTORY
index 4cbd69d..b49e1c4 100644
--- a/libs/vc/HISTORY
+++ b/libs/vc/HISTORY
@@ -1,3 +1,6 @@
+2014-01-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.3
+
2013-08-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.2

diff --git a/net/dhcpcd/BUILD b/net/dhcpcd/BUILD
index 52de65c..5a7fc26 100755
--- a/net/dhcpcd/BUILD
+++ b/net/dhcpcd/BUILD
@@ -1,2 +1,3 @@
+OPTS+=" $DHCPD" &&
./configure --libexecdir=${INSTALL_ROOT}/usr/libexec
--dbdir=${INSTALL_ROOT}/var/lib/dhcpcd $OPTS &&
CSTD=gnu99 make DESTDIR="$INSTALL_ROOT"
diff --git a/net/dhcpcd/CONFIGURE b/net/dhcpcd/CONFIGURE
new file mode 100755
index 0000000..00f56f6
--- /dev/null
+++ b/net/dhcpcd/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_option DHCPD 'use IPv6' n '--enable-ipv6' '--disable-ipv6'
+config_query_option DHCPD 'use IPv4' y '--enable-ipv4' '--disable-ipv4'
diff --git a/net/dhcpcd/HISTORY b/net/dhcpcd/HISTORY
index e455fa3..54159da 100644
--- a/net/dhcpcd/HISTORY
+++ b/net/dhcpcd/HISTORY
@@ -1,3 +1,6 @@
+2014-01-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE, BUILD: allow building IpV4/6 support
+
2014-01-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 6.2.1

diff --git a/python-pypi/isort/DETAILS b/python-pypi/isort/DETAILS
index 73998cd..3a1d119 100755
--- a/python-pypi/isort/DETAILS
+++ b/python-pypi/isort/DETAILS
@@ -1,6 +1,6 @@
SPELL=isort
- VERSION=3.1.0
-
SOURCE_HASH=sha512:2a24e276e6fee4b6b8717e8882417feba58459ce3ce031ffdbddc749e0ea0c5bd56d883e2bf70f369c0ffa2682c75e675030ad7056fb4a7eced5aade2c2bb23c
+ VERSION=3.1.2
+
SOURCE_HASH=sha512:0d75ee3f323c42386329e501549e811c9224dced2e82bd9dbf93c0fa9e75194a91809ea2edae755db7986ebca8df78c9a3bf14a0e15565ee6ae782c3f14523ad
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pypi.python.org/pypi/$SPELL
diff --git a/python-pypi/isort/HISTORY b/python-pypi/isort/HISTORY
index fa02d9f..d5be366 100644
--- a/python-pypi/isort/HISTORY
+++ b/python-pypi/isort/HISTORY
@@ -1,3 +1,6 @@
+2014-01-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.2
+
2014-01-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.0

diff --git a/python-pypi/six/DETAILS b/python-pypi/six/DETAILS
index 89edcd0..a0fcba5 100755
--- a/python-pypi/six/DETAILS
+++ b/python-pypi/six/DETAILS
@@ -1,6 +1,6 @@
SPELL=six
- VERSION=1.4.1
-
SOURCE_HASH=sha512:849e5f7c5058bceefcf3d5a76b52ec315b5efd015f66d8dff7a61854e6bb07195c3b74e521df548a9a63fa89b1be4e1b6f44d2b5d3ac6261ab3eaf0729ebed84
+ VERSION=1.5.2
+
SOURCE_HASH=sha512:62988e44ecb53f282712d4c87d5720b001eade777e0fa8002917a6d1b21d2aea5738dac598ff9e8c555ff9a6fe2a876853f01d09a37ae027358de90334b54b12
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pypi.python.org/pypi/$SPELL
diff --git a/python-pypi/six/HISTORY b/python-pypi/six/HISTORY
index 45111df..1179f7d 100644
--- a/python-pypi/six/HISTORY
+++ b/python-pypi/six/HISTORY
@@ -1,3 +1,6 @@
+2014-01-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.2
+
2013-11-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.1

diff --git a/science-libs/netcdf/DETAILS b/science-libs/netcdf/DETAILS
index 3cd8376..3b47723 100755
--- a/science-libs/netcdf/DETAILS
+++ b/science-libs/netcdf/DETAILS
@@ -1,9 +1,9 @@
SPELL=netcdf
- VERSION=4.2
+ VERSION=4.3.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.unidata.ucar.edu/pub/netcdf/$SOURCE
-
SOURCE_HASH=sha512:ba41f35375cef4dd7911cb89a5ae66b4e3cc5f98022516d4072d29d4a3a17c09fcb37466ad6088f63d7cc08678ba0eaac86c59044c8eba3f2127c4deaf53ff11
+
SOURCE_HASH=sha512:b9f2d881188b6f87f5691bc9e2182dd6e116498d6bc02f1f7e0d4be2198e2439530533d2a38896e3d2d3ccdce8dbf71cf8a77f6c0ad830402648b4b8a886e131
WEB_SITE=http://www.unidata.ucar.edu/software/netcdf/
ENTERED=20040914
LICENSE[0]=BSD
@@ -16,7 +16,4 @@ The netCDF library also defines a machine-independent
format for representing
scientific data. Together, the interface, library, and format support the
creation, access, and sharing of scientific data. The netCDF software was
developed at the Unidata Program Center in Boulder, Colorado.
-
-Note: This spell for NetCDF 4.x misses the new NetCDF-4 file format since
-we do not have the HDF5 libs packaged.
EOF
diff --git a/science-libs/netcdf/HISTORY b/science-libs/netcdf/HISTORY
index ab9fc33..b8e2cc6 100644
--- a/science-libs/netcdf/HISTORY
+++ b/science-libs/netcdf/HISTORY
@@ -1,3 +1,6 @@
+2014-01-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.3.1, remove note wrt missing hdf5
+
2012-05-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added optional dependencies on doxygen, hdf5, hdf4 and zlib
* DETAILS: version 4.2
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 79571aa..0582a27 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbus
- VERSION=1.6.18
-
SOURCE_HASH=sha512:6fe295eaf4865de447d8a68c5f226dd94bb53f39d69a5752440c9dc8f244d23803937449540f632aa0c017d5ce43c6f9bc1a36cfc95519aed9df8ea30165b664
+ VERSION=1.8.0
+
SOURCE_HASH=sha512:39b1c294abe25e80d741a294b67a9691337cc71f69f8db03e4e6588512a94de2b772b74ae5cb35fa91da812293f0cf392cb51823ebe3c21f7f9ea99287d0655f
SECURITY_PATCH=9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 223d5a3..7cf11b4 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2014-01-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.0
+
2013-11-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.18

diff --git a/video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch
b/video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch
new file mode 100644
index 0000000..61df26a
--- /dev/null
+++ b/video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch
@@ -0,0 +1,34 @@
+diff --git a/configure.ac b/configure.ac
+index e2433da..431cf51 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,14 +75,9 @@ fi
+ AC_SUBST(MAGICK_CPPFLAGS)
+ AC_SUBST(MAGICK_LIBS)
+
+-AC_CHECK_PROGS(FRIBIDICONFIG, [fribidi-config])
+-if test -n "$FRIBIDICONFIG"; then
+- FRIBIDI_CPPFLAGS="`$FRIBIDICONFIG --cflags`"
+- FRIBIDI_LIBS="`$FRIBIDICONFIG --libs`"
+- AC_DEFINE(HAVE_FRIBIDI, 1, [Whether FriBiDi is available])
+-fi
++PKG_CHECK_MODULES([FRIBIDI], [fribidi], [AC_DEFINE(HAVE_FRIBIDI, 1,
[Whether FriBiDi is available])])
+
+-AC_SUBST(FRIBIDI_CPPFLAGS)
++AC_SUBST(FRIBIDI_CFLAGS)
+ AC_SUBST(FRIBIDI_LIBS)
+
+ AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 41c8520..33cd80f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,7 +7,7 @@ endif
+
+ nodist_bin_SCRIPTS = dvddirdel
+
+-AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" @XML_CPPFLAGS@
@MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CPPFLAGS@
++AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" @XML_CPPFLAGS@
@MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@
+ AM_CFLAGS = -Wall
+
+ dvdauthor_SOURCES = dvdauthor.c dvdauthor.h da-internal.h \
diff --git a/video/dvdauthor/0002-Fix-build-with-FriBidi-0.19.x.patch
b/video/dvdauthor/0002-Fix-build-with-FriBidi-0.19.x.patch
new file mode 100644
index 0000000..c18ea23
--- /dev/null
+++ b/video/dvdauthor/0002-Fix-build-with-FriBidi-0.19.x.patch
@@ -0,0 +1,15 @@
+diff --git a/src/subreader.c b/src/subreader.c
+index 01f23e3..6838ea9 100644
+--- a/src/subreader.c
++++ b/src/subreader.c
+@@ -1082,8 +1082,8 @@ subtitle* sub_fribidi (subtitle *sub, int sub_utf8)
+ int char_set_num;
+ fribidi_boolean log2vis;
+ if(flip_hebrew) { // Please fix the indentation someday
+- fribidi_set_mirroring (FRIBIDI_TRUE);
+- fribidi_set_reorder_nsm (FRIBIDI_FALSE);
++ fribidi_set_mirroring (1);
++ fribidi_set_reorder_nsm (0);
+
+ if( sub_utf8 == 0 ) {
+ char_set_num = fribidi_parse_c
diff --git a/video/dvdauthor/BUILD b/video/dvdauthor/BUILD
new file mode 100755
index 0000000..716157c
--- /dev/null
+++ b/video/dvdauthor/BUILD
@@ -0,0 +1,7 @@
+if [ "$DVDAUTHOR_FORMAT" != "NONE" ]; then
+ OPTS="--enable-default-video-format=$DVDAUTHOR_FORMAT $OPTS"
+fi &&
+
+OPTS="$DVDAUTHOR_LOCALE $OPTS" &&
+
+default_build
diff --git a/video/dvdauthor/CONFIGURE b/video/dvdauthor/CONFIGURE
new file mode 100755
index 0000000..ed60ba6
--- /dev/null
+++ b/video/dvdauthor/CONFIGURE
@@ -0,0 +1,5 @@
+config_query_list DVDAUTHOR_FORMAT "Set default format?" NONE NTSC PAL &&
+
+config_query_option DVDAUTHOR_LOCALE "Use locale encoding for filenames?" n \
+ "--enable-localized-filenames" ""
+
diff --git a/video/dvdauthor/DEPENDS b/video/dvdauthor/DEPENDS
index 5be6985..69e5981 100755
--- a/video/dvdauthor/DEPENDS
+++ b/video/dvdauthor/DEPENDS
@@ -3,17 +3,22 @@ depends tiff &&
depends JPEG &&
depends zlib &&
depends libxml2 &&
-depends libdvdread &&
+
+
+optional_depends libdvdread \
+ "" \
+ "--disable-dvdunauthor" \
+ "Build dvdunauthor?" &&

optional_depends freetype2 \
"" \
"" \
- "freetype support" &&
+ "freetype support" &&

-optional_depends fribidi \
- "" \
- "" \
- "bidireectional language support" &&
+optional_depends fribidi \
+ "" \
+ "" \
+ "bidireectional language support" &&

optional_depends imagemagick \
"" \
diff --git a/video/dvdauthor/DETAILS b/video/dvdauthor/DETAILS
index c13fe7a..e70e851 100755
--- a/video/dvdauthor/DETAILS
+++ b/video/dvdauthor/DETAILS
@@ -1,9 +1,22 @@
SPELL=dvdauthor
- VERSION=0.7.0
+if [ "$DVDAUTHOR_BRANCH" == "scm" ]; then
+ if [ "$DVDAUTHOR_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
+ fi
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ SOURCE_URL[0]=git://github.com/ldo/dvdauthor
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+else
+ VERSION=0.7.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_HASH=sha512:2f450ef02dac774a8611f3398f71a8d9d4f7ebb3c9de56ec1c4ec2d54350f371bf32387f95bc90dcd399618819f46cd589cacfef6f7aae68ee3addda5e9ce892
+
SOURCE_HASH=sha512:0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9
+fi
WEB_SITE=http://dvdauthor.sourceforge.net/
ENTERED=20030921
LICENSE[0]=GPL
diff --git a/video/dvdauthor/HISTORY b/video/dvdauthor/HISTORY
index 1017ab4..4d4798a 100644
--- a/video/dvdauthor/HISTORY
+++ b/video/dvdauthor/HISTORY
@@ -1,3 +1,11 @@
+2013-01-15 Robin Cook <rcook AT wyrms.net>
+ * PREPARE: added for option for scm build
+ * DETAILS: updated to 0.7.1 and anded for scm build
+ * CONFIGURE: added new configure options
+ * DEPENDS: changed libdvdread to optional
+ * PRE_BUILD: added scm build steps and removed patches
+ * BUILD: apply new configure options
+
2011-09-12 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.7.0 (fixed SOURCE_DIRECTORY)

diff --git a/video/dvdauthor/PREPARE b/video/dvdauthor/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/video/dvdauthor/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/video/dvdauthor/PRE_BUILD b/video/dvdauthor/PRE_BUILD
new file mode 100755
index 0000000..47ab0c6
--- /dev/null
+++ b/video/dvdauthor/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [ "$DVDAUTHOR_BRANCH" == "scm" ]; then
+ ./bootstrap
+#else
+# patch -p1 < $SCRIPT_DIRECTORY/0001-Use-pkg-config-to-find-FriBidi.patch
&&
+# patch -p1 < $SCRIPT_DIRECTORY/0002-Fix-build-with-FriBidi-0.19.x.patch
+fi
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index fee584d..118b060 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -1,3 +1,5 @@
+depends libcdio-paranoia &&
+
optional_depends zlib \
"--enable-zlib" \
"--disable-zlib" \
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index b9710ac..1c63929 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2014-01-22 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: libcdio-paranoia required
+
2014-01-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.1.2
* PRE_BUILD, ffmpeg-2.1.1-freetype2.patch: patch removed
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index a6bef65..f46c0df 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,6 @@
+2014-01-15 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply patches from gentoo
+
2012-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libv4l -> v4l-utils

diff --git a/video/transcode/PRE_BUILD b/video/transcode/PRE_BUILD
new file mode 100755
index 0000000..cf2e7d6
--- /dev/null
+++ b/video/transcode/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/transcode-1.1.7-ffmpeg.patch &&
+patch -p0 < $SPELL_DIRECTORY/transcode-1.1.7-ffmpeg-0.10.patch &&
+patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-ffmpeg-0.11.patch &&
+patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-preset-free.patch &&
+patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-libav-9.patch &&
+patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-preset-force.patch &&
+patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-ffmpeg2.patch &&
+patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-freetype251.patch
+
diff --git a/video/transcode/SCRIBBLED b/video/transcode/SCRIBBLED
new file mode 100644
index 0000000..e69de29
diff --git a/video/transcode/transcode-1.1.7-ffmpeg-0.10.patch
b/video/transcode/transcode-1.1.7-ffmpeg-0.10.patch
new file mode 100644
index 0000000..ea737c8
--- /dev/null
+++ b/video/transcode/transcode-1.1.7-ffmpeg-0.10.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/401287
+
+--- filter/filter_pp.c
++++ filter/filter_pp.c
+@@ -38,8 +38,8 @@
+
+ /* FIXME: these use the filter ID as an index--the ID can grow
+ * arbitrarily large, so this needs to be fixed */
+-static pp_mode_t *mode[100];
+-static pp_context_t *context[100];
++static pp_mode *mode[100];
++static pp_context *context[100];
+ static int width[100], height[100];
+ static int pre[100];
+
diff --git a/video/transcode/transcode-1.1.7-ffmpeg-0.11.patch
b/video/transcode/transcode-1.1.7-ffmpeg-0.11.patch
new file mode 100644
index 0000000..871d073
--- /dev/null
+++ b/video/transcode/transcode-1.1.7-ffmpeg-0.11.patch
@@ -0,0 +1,303 @@
+Fix build with ffmpeg 0.11.
+https://bugs.gentoo.org/show_bug.cgi?id=419551
+Author: Brennan Shacklett
+
+diff -urN transcode-1.1.7-orig/encode/encode_lavc.c
transcode-1.1.7/encode/encode_lavc.c
+--- transcode-1.1.7-orig/encode/encode_lavc.c 2011-11-19 08:50:27.000000000
-0800
++++ transcode-1.1.7/encode/encode_lavc.c 2012-07-03 10:47:03.528009149
-0700
+@@ -114,6 +114,7 @@
+
+ AVFrame ff_venc_frame;
+ AVCodecContext ff_vcontext;
++ AVDictionary ** ff_opts;
+
+ AVCodec *ff_vcodec;
+
+@@ -1036,14 +1037,10 @@
+ SET_FLAG(pd, mv0);
+ SET_FLAG(pd, cbp);
+ SET_FLAG(pd, qpel);
+- SET_FLAG(pd, alt);
+- SET_FLAG(pd, vdpart);
+ SET_FLAG(pd, naq);
+ SET_FLAG(pd, ilme);
+ SET_FLAG(pd, ildct);
+ SET_FLAG(pd, aic);
+- SET_FLAG(pd, aiv);
+- SET_FLAG(pd, umv);
+ SET_FLAG(pd, psnr);
+ SET_FLAG(pd, trell);
+ SET_FLAG(pd, gray);
+@@ -1064,6 +1061,18 @@
+ pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
+ pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
+ }
++ if (pd->confdata.flags.alt) {
++ av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
++ }
++ if (pd->confdata.flags.vdpart) {
++ av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
++ }
++ if (pd->confdata.flags.umv) {
++ av_dict_set(pd->ff_opts, "umv", "1", 0);
++ }
++ if (pd->confdata.flags.aiv) {
++ av_dict_set(pd->ff_opts, "aiv", "1", 0);
++ }
+ }
+
+ #undef SET_FLAG
+@@ -1184,18 +1193,18 @@
+ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
+ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD
},
+ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL
},
+- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_ALT_SCAN },
++ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_INTERLACED_ME },
+ { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_INTERLACED_DCT },
+ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_NORMALIZE_AQP },
+- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_PART },
++ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_H263P_AIC },
+ #else
+ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_AC_PRED },
+ #endif
+- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_H263P_AIV },
+- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_H263P_UMV },
++ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
++ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR
},
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_TRELLIS_QUANT },
+@@ -1387,7 +1396,7 @@
+ pd->confdata.thread_count,
+ (pd->confdata.thread_count > 1) ?"s" :"");
+ }
+- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
++ pd->ff_vcontext.thread_count = pd->confdata.thread_count;
+
+ pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
+ if (pd->ff_vcodec == NULL) {
+@@ -1397,11 +1406,11 @@
+ }
+
+ TC_LOCK_LIBAVCODEC;
+- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
++ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
+ TC_UNLOCK_LIBAVCODEC;
+
+ if (ret < 0) {
+- tc_log_error(MOD_NAME, "avcodec_open() failed");
++ tc_log_error(MOD_NAME, "avcodec_open2() failed");
+ goto failed;
+ }
+ /* finally, pass up the extradata, if any */
+diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c
transcode-1.1.7/export/export_ffmpeg.c
+--- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19
08:50:27.000000000 -0800
++++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 13:15:23.918019415
-0700
+@@ -122,6 +122,7 @@
+ static AVFrame *lavc_convert_frame = NULL;
+
+ static AVCodec *lavc_venc_codec = NULL;
++static AVDictionary **lavc_venc_opts = NULL;
+ static AVFrame *lavc_venc_frame = NULL;
+ static AVCodecContext *lavc_venc_context;
+ static avi_t *avifile = NULL;
+@@ -180,7 +181,7 @@
+
+
+ /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
+-#include <libavcodec/opt.h>
++#include <libavutil/opt.h>
+ #include <libavutil/avstring.h>
+ #include <libswscale/swscale.h>
+
+@@ -470,7 +471,6 @@
+ }
+
+ TC_LOCK_LIBAVCODEC;
+- avcodec_init();
+ avcodec_register_all();
+ TC_UNLOCK_LIBAVCODEC;
+
+@@ -634,7 +634,7 @@
+ lavc_param_rc_max_rate = 2516;
+ lavc_param_rc_buffer_size = 224 * 8;
+ lavc_param_rc_buffer_aggressivity = 99;
+- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
++ lavc_param_scan_offset = 1;
+
+ break;
+
+@@ -674,7 +674,7 @@
+
+ lavc_param_rc_buffer_size = 224 * 8;
+ lavc_param_rc_buffer_aggressivity = 99;
+- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
++ lavc_param_scan_offset = 1;
+
+ break;
+
+@@ -887,7 +887,7 @@
+ lavc_venc_context->thread_count);
+ }
+
+- avcodec_thread_init(lavc_venc_context, lavc_param_threads);
++ lavc_venc_context->thread_count = lavc_param_threads;
+
+ if (lavc_param_intra_matrix) {
+ char *tmp;
+@@ -1065,15 +1065,10 @@
+ lavc_venc_context->flags |= lavc_param_closedgop;
+ lavc_venc_context->flags |= lavc_param_trunc;
+ lavc_venc_context->flags |= lavc_param_aic;
+- lavc_venc_context->flags |= lavc_param_umv;
+ lavc_venc_context->flags |= lavc_param_v4mv;
+- lavc_venc_context->flags |= lavc_param_data_partitioning;
+ lavc_venc_context->flags |= lavc_param_cbp;
+ lavc_venc_context->flags |= lavc_param_mv0;
+ lavc_venc_context->flags |= lavc_param_qp_rd;
+- lavc_venc_context->flags |= lavc_param_scan_offset;
+- lavc_venc_context->flags |= lavc_param_ss;
+- lavc_venc_context->flags |= lavc_param_alt;
+ lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ lavc_venc_context->flags |= lavc_param_trell;
+@@ -1203,7 +1198,6 @@
+
+ lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+
+-
+ /* FIXME: transcode itself contains "broken ffmpeg default settings",
thus we need to override them! */
+ if (lavc_param_video_preset) {
+ avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+@@ -1241,20 +1235,39 @@
+ }
+ }
+
++ if (lavc_param_scan_offset) {
++ av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
++ }
++
++ if (lavc_param_ss) {
++ av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
++ }
++
++ if (lavc_param_alt) {
++ av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
++ }
++
++ if (lavc_param_umv) {
++ av_dict_set(lavc_venc_opts, "umv", "1", 0);
++ }
++
++ if (lavc_param_data_partitioning) {
++ av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
++ }
+
+ //-- open codec --
+ //----------------
+ TC_LOCK_LIBAVCODEC;
+- ret = avcodec_open(lavc_venc_context, lavc_venc_codec);
++ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
+ TC_UNLOCK_LIBAVCODEC;
+ if (ret < 0) {
+ tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
+ return TC_EXPORT_ERROR;
+ }
+
+- if (lavc_venc_context->codec->encode == NULL) {
++ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) {
+ tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
+- "(lavc_venc_context->codec->encode == NULL)");
++ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)");
+ return TC_EXPORT_ERROR;
+ }
+
+diff -urN transcode-1.1.7-orig/export/ffmpeg_cfg.c
transcode-1.1.7/export/ffmpeg_cfg.c
+--- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2011-11-19 08:50:27.000000000
-0800
++++ transcode-1.1.7/export/ffmpeg_cfg.c 2012-07-03 10:09:25.011003254
-0700
+@@ -160,9 +160,9 @@
+ {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, -99, 99},
+ {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE,
0, 100000000},
+ {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE,
-99, 99},
+- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_PART},
++ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
+ // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
+- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
++ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
+ {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT,
TCCONF_FLAG_RANGE, -31.0, 31.0},
+ {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT,
TCCONF_FLAG_RANGE, 0.0, 31.0},
+@@ -211,7 +211,7 @@
+ #else
+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
+ #endif
+- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
++ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512,
512},
+ {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512,
512},
+ {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+@@ -223,9 +223,9 @@
+ {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE,
0, 1000000},
+ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
+ {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
16},
+- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_H263P_SLICE_STRUCT},
+- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_SVCD_SCAN_OFFSET},
+- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
++ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
++ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
++ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_INTERLACED_ME},
+ {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, -1000000, 1000000},
+ {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, -1000000, 1000000},
+diff -urN transcode-1.1.7-orig/import/decode_lavc.c
transcode-1.1.7/import/decode_lavc.c
+--- transcode-1.1.7-orig/import/decode_lavc.c 2011-11-19 08:50:27.000000000
-0800
++++ transcode-1.1.7/import/decode_lavc.c 2012-07-03 10:21:46.085005182
-0700
+@@ -181,7 +181,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ lavc_dec_context->error_resilience = 2;
+ #else
+- lavc_dec_context->error_recognition = 2;
++ lavc_dec_context->err_recognition = 2;
+ #endif
+ lavc_dec_context->error_concealment = 3;
+ lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+diff -urN transcode-1.1.7-orig/import/import_ffmpeg.c
transcode-1.1.7/import/import_ffmpeg.c
+--- transcode-1.1.7-orig/import/import_ffmpeg.c 2011-11-19
08:50:27.000000000 -0800
++++ transcode-1.1.7/import/import_ffmpeg.c 2012-07-03 10:19:36.936004841
-0700
+@@ -314,7 +314,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ lavc_dec_context->error_resilience = 2;
+ #else
+- lavc_dec_context->error_recognition = 2;
++ lavc_dec_context->err_recognition = 2;
+ #endif
+ lavc_dec_context->error_concealment = 3;
+ lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+diff -urN transcode-1.1.7-orig/import/probe_ffmpeg.c
transcode-1.1.7/import/probe_ffmpeg.c
+--- transcode-1.1.7-orig/import/probe_ffmpeg.c 2011-11-19 08:50:27.000000000
-0800
++++ transcode-1.1.7/import/probe_ffmpeg.c 2012-07-03 10:41:42.782008306
-0700
+@@ -99,8 +99,8 @@
+
+ TC_INIT_LIBAVCODEC;
+
+- ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
+- NULL, 0, NULL);
++ ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
++ NULL, NULL);
+ if (ret != 0) {
+ tc_log_error(__FILE__, "unable to open '%s'"
+ " (libavformat failure)",
+diff -urN transcode-1.1.7-orig/libtc/tcavcodec.h
transcode-1.1.7/libtc/tcavcodec.h
+--- transcode-1.1.7-orig/libtc/tcavcodec.h 2011-11-19 08:50:27.000000000
-0800
++++ transcode-1.1.7/libtc/tcavcodec.h 2012-07-03 10:34:43.648007213 -0700
+@@ -53,7 +53,6 @@
+
+ #define TC_INIT_LIBAVCODEC do { \
+ TC_LOCK_LIBAVCODEC; \
+- avcodec_init(); \
+ avcodec_register_all(); \
+ TC_UNLOCK_LIBAVCODEC; \
+ } while (0)
diff --git a/video/transcode/transcode-1.1.7-ffmpeg.patch
b/video/transcode/transcode-1.1.7-ffmpeg.patch
new file mode 100644
index 0000000..be7a6cb
--- /dev/null
+++ b/video/transcode/transcode-1.1.7-ffmpeg.patch
@@ -0,0 +1,51 @@
+--- encode/encode_lavc.c
++++ encode/encode_lavc.c
+@@ -955,8 +955,6 @@
+ /*
+ * context *transcode* (not libavcodec) defaults
+ */
+- pd->ff_vcontext.mb_qmin = 2;
+- pd->ff_vcontext.mb_qmax = 31;
+ pd->ff_vcontext.max_qdiff = 3;
+ pd->ff_vcontext.max_b_frames = 0;
+ pd->ff_vcontext.me_range = 0;
+@@ -1116,8 +1114,6 @@
+ // handled by transcode core
+ // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
60 },
+ // handled by transcode core
+- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
60 },
+- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
60 },
+ { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01,
255.0 },
+ { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01,
255.0 },
+ { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
31 },
+--- export/ffmpeg_cfg.c
++++ export/ffmpeg_cfg.c
+@@ -34,8 +34,6 @@
+ //int lavc_param_vqscale = 0;
+ //int lavc_param_vqmin = 2;
+ //int lavc_param_vqmax = 31;
+-int lavc_param_mb_qmin = 2;
+-int lavc_param_mb_qmax = 31;
+ int lavc_param_lmin = 2;
+ int lavc_param_lmax = 31;
+ int lavc_param_vqdiff = 3;
+@@ -143,8 +141,6 @@
+ // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE,
1, 31},
+ // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
31},
+ // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
31},
+- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
31},
+- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
31},
+ {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01,
255.0},
+ {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01,
255.0},
+ {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
31},
+--- export/ffmpeg_cfg.h
++++ export/ffmpeg_cfg.h
+@@ -13,8 +13,6 @@
+ //extern int lavc_param_vqscale;
+ //extern int lavc_param_vqmin;
+ //extern int lavc_param_vqmax;
+-extern int lavc_param_mb_qmin;
+-extern int lavc_param_mb_qmax;
+ extern int lavc_param_lmin;
+ extern int lavc_param_lmax;
+ extern int lavc_param_vqdiff;
diff --git a/video/transcode/transcode-1.1.7-ffmpeg2.patch
b/video/transcode/transcode-1.1.7-ffmpeg2.patch
new file mode 100644
index 0000000..26d7431
--- /dev/null
+++ b/video/transcode/transcode-1.1.7-ffmpeg2.patch
@@ -0,0 +1,332 @@
+Fix build with ffmpeg-2.0.
+Fix segfaults introduced by wrong usage of the av_dict API.
+Fix forgotten parts in the libav9 patch.
+
+Index: transcode-1.1.7/encode/encode_lavc.c
+===================================================================
+--- transcode-1.1.7.orig/encode/encode_lavc.c
++++ transcode-1.1.7/encode/encode_lavc.c
+@@ -74,6 +74,9 @@ struct tclavcconfigdata_ {
+ int lmin;
+ int lmax;
+ int me_method;
++ int luma_elim_threshold;
++ int chroma_elim_threshold;
++ int quantizer_noise_shaping;
+
+ /* same as above for flags */
+ struct {
+@@ -114,7 +117,7 @@ struct tclavcprivatedata_ {
+
+ AVFrame ff_venc_frame;
+ AVCodecContext ff_vcontext;
+- AVDictionary ** ff_opts;
++ AVDictionary * ff_opts;
+
+ AVCodec *ff_vcodec;
+
+@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou
+ TC_CODEC_ERROR
+ };
+
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ static const enum CodecID tc_lavc_internal_codecs[] = {
+ CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4,
+ CODEC_ID_H263I, CODEC_ID_H263P,
+@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern
+ CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3,
+ CODEC_ID_NONE
+ };
++#else
++static const enum AVCodecID tc_lavc_internal_codecs[] = {
++ AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4,
++ AV_CODEC_ID_H263I, AV_CODEC_ID_H263P,
++ AV_CODEC_ID_H264,
++ AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2,
++ AV_CODEC_ID_RV10,
++ AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1,
++ AV_CODEC_ID_DVVIDEO,
++ AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG,
++ AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3,
++ AV_CODEC_ID_NONE
++};
++#endif
+
+ static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR };
+
+@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL
+ static void tc_lavc_config_defaults(TCLavcPrivateData *pd)
+ {
+ /* first of all reinitialize lavc data */
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ avcodec_get_context_defaults(&pd->ff_vcontext);
++#else
++ avcodec_get_context_defaults3(&pd->ff_vcontext, NULL);
++#endif
+
+ pd->confdata.thread_count = 1;
+
+@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa
+ pd->ff_vcontext.mpeg_quant = 0;
+ pd->ff_vcontext.rc_initial_cplx = 0.0;
+ pd->ff_vcontext.rc_qsquish = 1.0;
+- pd->ff_vcontext.luma_elim_threshold = 0;
+- pd->ff_vcontext.chroma_elim_threshold = 0;
++ pd->confdata.luma_elim_threshold = 0;
++ pd->confdata.chroma_elim_threshold = 0;
+ pd->ff_vcontext.strict_std_compliance = 0;
+ pd->ff_vcontext.dct_algo = FF_DCT_AUTO;
+ pd->ff_vcontext.idct_algo = FF_IDCT_AUTO;
+@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa
+ pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
+ pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
+ pd->ff_vcontext.noise_reduction = 0;
+- pd->ff_vcontext.quantizer_noise_shaping = 0;
++ pd->confdata.quantizer_noise_shaping = 0;
+ pd->ff_vcontext.flags = 0;
+ }
+
+@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC
+
+ pd->ff_vcontext.flags = 0;
+ SET_FLAG(pd, mv0);
+- SET_FLAG(pd, cbp);
+ SET_FLAG(pd, qpel);
+ SET_FLAG(pd, naq);
+ SET_FLAG(pd, ilme);
+@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC
+ pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
+ }
+ if (pd->confdata.flags.alt) {
+- av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
++ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
+ }
+ if (pd->confdata.flags.vdpart) {
+- av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
++ av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0);
+ }
+ if (pd->confdata.flags.umv) {
+- av_dict_set(pd->ff_opts, "umv", "1", 0);
++ av_dict_set(&(pd->ff_opts), "umv", "1", 0);
+ }
+ if (pd->confdata.flags.aiv) {
+- av_dict_set(pd->ff_opts, "aiv", "1", 0);
++ av_dict_set(&(pd->ff_opts), "aiv", "1", 0);
+ }
++ if (pd->confdata.flags.cbp) {
++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
++ }
++
++ char buf[1024];
++#define set_dict_opt(val, opt) \
++ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
++ av_dict_set(&(pd->ff_opts), opt, buf, 0)
++
++ set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
++ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
++ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
+ }
+
+ #undef SET_FLAG
+@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri
+ { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT,
TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
+ // { "vrc_init_occupancy", }, // not yet supported
+ { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT,
TCCONF_FLAG_RANGE, 0.0, 99.0 },
+- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, -99, 99 },
+- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, -99, 99 },
++ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, -99, 99 },
++ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, -99, 99 },
+ { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, -99, 99 },
+ { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, 0, 100000000 },
+ { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10
},
+@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri
+ { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, -512, 512 },
+ { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, -512, 512 },
+ { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE,
0, 1000000},
+- { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, 0, 3 },
++ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT,
TCCONF_FLAG_RANGE, 0, 3 },
+ { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0,
0 },
+ { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0,
0 },
+
+ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
+- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD
},
++ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL
},
+ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0,
CODEC_FLAG_INTERLACED_ME },
+@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns
+
+ pd = self->userdata;
+
++ pd->ff_opts = NULL;
++
+ pd->flush_flag = vob->encoder_flush;
+
+ /* FIXME: move into core? */
+@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns
+ }
+
+ TC_LOCK_LIBAVCODEC;
+- ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
++ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts));
+ TC_UNLOCK_LIBAVCODEC;
+
+ if (ret < 0) {
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -122,7 +122,7 @@ static uint8_t *img_buffer =
+ static AVFrame *lavc_convert_frame = NULL;
+
+ static AVCodec *lavc_venc_codec = NULL;
+-static AVDictionary **lavc_venc_opts = NULL;
++static AVDictionary *lavc_venc_opts = NULL;
+ static AVFrame *lavc_venc_frame = NULL;
+ static AVCodecContext *lavc_venc_context;
+ static avi_t *avifile = NULL;
+@@ -486,7 +486,7 @@ MOD_init
+ codec->name, codec->fourCC, codec->comments);
+ }
+
+- lavc_venc_context = avcodec_alloc_context();
++ lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
+ lavc_venc_frame = avcodec_alloc_frame();
+
+ lavc_convert_frame= avcodec_alloc_frame();
+@@ -838,8 +838,13 @@ MOD_init
+ lavc_venc_context->rc_strategy = lavc_param_vrc_strategy;
+ lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy;
+ lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset;
+- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
+- lavc_venc_context->chroma_elim_threshold=
lavc_param_chroma_elim_threshold;
++
++ char buf[1024];
++#define set_dict_opt(val, opt) \
++ snprintf(buf, sizeof(buf), "%i", val); \
++ av_dict_set(&lavc_venc_opts, opt, buf, 0)
++ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
++ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
+ lavc_venc_context->rtp_payload_size = lavc_param_packet_size;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ if (lavc_param_packet_size)
+@@ -870,7 +875,7 @@ MOD_init
+ lavc_venc_context->context_model = lavc_param_context;
+ lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
+ lavc_venc_context->noise_reduction = lavc_param_noise_reduction;
+- lavc_venc_context->inter_threshold = lavc_param_inter_threshold;
++ set_dict_opt(lavc_param_inter_threshold, "inter_threshold");
+ lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision;
+ lavc_venc_context->skip_top = lavc_param_skip_top;
+ lavc_venc_context->skip_bottom = lavc_param_skip_bottom;
+@@ -1066,9 +1071,11 @@ MOD_init
+ lavc_venc_context->flags |= lavc_param_trunc;
+ lavc_venc_context->flags |= lavc_param_aic;
+ lavc_venc_context->flags |= lavc_param_v4mv;
+- lavc_venc_context->flags |= lavc_param_cbp;
++ if(lavc_param_cbp)
++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0);
+ lavc_venc_context->flags |= lavc_param_mv0;
+- lavc_venc_context->flags |= lavc_param_qp_rd;
++ if(lavc_param_qp_rd)
++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
+ lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ lavc_venc_context->flags |= lavc_param_trell;
+@@ -1238,29 +1245,29 @@ MOD_init
+ }
+
+ if (lavc_param_scan_offset) {
+- av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
++ av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0);
+ }
+
+ if (lavc_param_ss) {
+- av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
++ av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0);
+ }
+
+ if (lavc_param_alt) {
+- av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
++ av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0);
+ }
+
+ if (lavc_param_umv) {
+- av_dict_set(lavc_venc_opts, "umv", "1", 0);
++ av_dict_set(&lavc_venc_opts, "umv", "1", 0);
+ }
+
+ if (lavc_param_data_partitioning) {
+- av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
++ av_dict_set(&lavc_venc_opts, "vdpart", "1", 0);
+ }
+
+ //-- open codec --
+ //----------------
+ TC_LOCK_LIBAVCODEC;
+- ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
++ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec,
&lavc_venc_opts);
+ TC_UNLOCK_LIBAVCODEC;
+ if (ret < 0) {
+ tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
+Index: transcode-1.1.7/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.7.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.7/export/ffmpeg_cfg.c
+@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={
+ {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0,
10},
+ {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+ {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},
++ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
+ {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE,
0, 1000000},
+- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
++ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1,
16},
+ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
+Index: transcode-1.1.7/export/aud_aux.c
+===================================================================
+--- transcode-1.1.7.orig/export/aud_aux.c
++++ transcode-1.1.7/export/aud_aux.c
+@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+
+ //-- set parameters (bitrate, channels and sample-rate) --
+ //--------------------------------------------------------
+- avcodec_get_context_defaults(&mpa_ctx);
++ avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
+ #if LIBAVCODEC_VERSION_MAJOR < 53
+ mpa_ctx.codec_type = CODEC_TYPE_AUDIO;
+ #else
+@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+ //-- open codec --
+ //----------------
+ TC_LOCK_LIBAVCODEC;
+- ret = avcodec_open(&mpa_ctx, mpa_codec);
++ ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
+ TC_UNLOCK_LIBAVCODEC;
+ if (ret < 0) {
+ tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
+Index: transcode-1.1.7/import/import_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/import/import_ffmpeg.c
++++ transcode-1.1.7/import/import_ffmpeg.c
+@@ -302,7 +302,7 @@ do_avi:
+
+ // Set these to the expected values so that ffmpeg's decoder can
+ // properly detect interlaced input.
+- lavc_dec_context = avcodec_alloc_context();
++ lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec);
+ if (lavc_dec_context == NULL) {
+ tc_log_error(MOD_NAME, "Could not allocate enough memory.");
+ return TC_IMPORT_ERROR;
+@@ -344,7 +344,7 @@ do_avi:
+ }
+
+ TC_LOCK_LIBAVCODEC;
+- ret = avcodec_open(lavc_dec_context, lavc_dec_codec);
++ ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL);
+ TC_UNLOCK_LIBAVCODEC;
+ if (ret < 0) {
+ tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.",
diff --git a/video/transcode/transcode-1.1.7-freetype251.patch
b/video/transcode/transcode-1.1.7-freetype251.patch
new file mode 100644
index 0000000..59c6ab3
--- /dev/null
+++ b/video/transcode/transcode-1.1.7-freetype251.patch
@@ -0,0 +1,12 @@
+--- transcode-1.1.7/filter/subtitler/load_font.c
++++ transcode-1.1.7/filter/subtitler/load_font.c
+@@ -47,8 +47,8 @@
+ // FreeType specific includes
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
++#include FT_GLYPH_H
+
+-#include <freetype/ftglyph.h>
+
+ /**
+ * @file bswap.h
diff --git a/video/transcode/transcode-1.1.7-libav-9.patch
b/video/transcode/transcode-1.1.7-libav-9.patch
new file mode 100644
index 0000000..9f2d235
--- /dev/null
+++ b/video/transcode/transcode-1.1.7-libav-9.patch
@@ -0,0 +1,31 @@
+--- ./import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200
++++ ./import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200
+@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
+ return;
+ }
+
+- ret = av_find_stream_info(lavf_dmx_context);
++ ret = avformat_find_stream_info(lavf_dmx_context, NULL);
+ if (ret < 0) {
+ tc_log_error(__FILE__, "unable to fetch informations from '%s'"
+ " (libavformat failure)",
+--- ./import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200
++++ ./import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200
+@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
+
+ // Set these to the expected values so that ffmpeg's decoder can
+ // properly detect interlaced input.
+- lavc_dec_context = avcodec_alloc_context();
++ lavc_dec_context = avcodec_alloc_context3(NULL);
+ if (lavc_dec_context == NULL) {
+ tc_log_error(__FILE__, "Could not allocate enough memory.");
+ goto decoder_error;
+@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode)
+ lavc_dec_context->error_concealment = 3;
+ lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+
+- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {
++ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) {
+ tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
+ codec->name);
+ goto decoder_error;
diff --git a/video/transcode/transcode-1.1.7-preset-force.patch
b/video/transcode/transcode-1.1.7-preset-force.patch
new file mode 100644
index 0000000..0d1da8b
--- /dev/null
+++ b/video/transcode/transcode-1.1.7-preset-force.patch
@@ -0,0 +1,28 @@
+Do not force using a preset. Do not try to open non-existant preset by
default.
+
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -1206,7 +1206,7 @@ MOD_init
+ lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+
+ /* FIXME: transcode itself contains "broken ffmpeg default settings",
thus we need to override them! */
+- if (lavc_param_video_preset) {
++ if (lavc_param_video_preset && strcmp(lavc_param_video_preset,
"none")) {
+ avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+ video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
+
+Index: transcode-1.1.7/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.7.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.7/export/ffmpeg_cfg.c
+@@ -124,7 +124,7 @@ int lavc_param_gmc = 0;
+ //int lavc_param_atag = 0;
+ //int lavc_param_abitrate = 224;
+
+-char *lavc_param_video_preset = "medium";
++char *lavc_param_video_preset = "none";
+ char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
+
+ TCConfigEntry lavcopts_conf[]={
diff --git a/video/transcode/transcode-1.1.7-preset-free.patch
b/video/transcode/transcode-1.1.7-preset-free.patch
new file mode 100644
index 0000000..00494b9
--- /dev/null
+++ b/video/transcode/transcode-1.1.7-preset-free.patch
@@ -0,0 +1,34 @@
+Fix invalid free when preset file not found
+https://bugs.gentoo.org/show_bug.cgi?id=322945
+Author: Brennan Shacklett
+
+diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c
transcode-1.1.7/export/export_ffmpeg.c
+--- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19
08:50:27.000000000 -0800
++++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 20:07:05.669083945
-0700
+@@ -321,7 +321,7 @@
+ }
+
+ if(!f){
+- fprintf(stderr, "File for preset '%s' not found\n", arg);
++ tc_log_error(MOD_NAME, "File for preset '%s' not found", arg);
+ av_exit(1);
+ }
+
+@@ -1207,7 +1207,7 @@
+ /* FIXME: transcode itself contains "broken ffmpeg default settings",
thus we need to override them! */
+ if (lavc_param_video_preset) {
+ avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+- video_codec_name = ffmpeg_codec_name(codec->name);
++ video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
+
+ const char *preset_start = lavc_param_video_preset;
+ while (preset_start) {
+@@ -1225,6 +1225,8 @@
+ if (opt_preset("vpre", preset_name) != 0) {
+ tc_log_warn(MOD_NAME, "Parsing ffmpeg preset
'%s' failed", preset_name);
+ }
++ av_free(video_codec_name);
++ video_codec_name = NULL;
+ if (verbose) {
+ int i;
+ tc_log_info(MOD_NAME, "After parsing preset
'%s', %i options are overridden:", preset_name, opt_name_count);



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (9e59696c341e76f9ce6f196a8cc1f1f944c79ac5), Treeve Jelbert, 01/24/2014

Archive powered by MHonArc 2.6.24.

Top of Page