[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (48d2e7f8070f36fb79736799136a5383f1c90818)

Vlad Glagolev scm at sourcemage.org
Sun Jul 29 18:06:17 EDT 2012


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 devel/qt-creator/DETAILS                                  |    8 
 devel/qt-creator/HISTORY                                  |    3 
 disk/davfs/DETAILS                                        |    4 
 disk/davfs/HISTORY                                        |    3 
 editors/tea/DETAILS                                       |    4 
 editors/tea/HISTORY                                       |    3 
 fonts-x11/liberation-fonts-ttf/DETAILS                    |    6 
 fonts-x11/liberation-fonts-ttf/HISTORY                    |    3 
 ftp/curl/DETAILS                                          |    2 
 ftp/curl/HISTORY                                          |    3 
 graphics/darktable/DETAILS                                |    4 
 graphics/darktable/HISTORY                                |    3 
 kde4-apps/ktorrent4/DEPENDS                               |    4 
 kde4-apps/ktorrent4/DETAILS                               |    4 
 kde4-apps/ktorrent4/HISTORY                               |    3 
 kde4-apps/libktorrent/DETAILS                             |    4 
 kde4-apps/libktorrent/HISTORY                             |    3 
 kde4/kdegames4/DETAILS                                    |    6 
 kde4/kdegames4/HISTORY                                    |    4 
 kde4/kdemultimedia4/DEPENDS                               |   27 +
 kde4/kdemultimedia4/DETAILS                               |    4 
 kde4/kdemultimedia4/HISTORY                               |   11 
 kde4/kdemultimedia4/PRE_BUILD                             |   10 
 kde4/kdemultimedia4/kdemultimedia-4.8.4-ffmpeg-0.11.patch |   28 +
 kde4/kdenetwork4/DETAILS                                  |    4 
 kde4/kdenetwork4/HISTORY                                  |    3 
 net/samba/DETAILS                                         |    3 
 net/samba/HISTORY                                         |    5 
 net/samba/init.d/samba                                    |   21 -
 python-pypi/cssutils/DETAILS                              |    8 
 python-pypi/cssutils/HISTORY                              |    3 
 science/qlandkarte-gt/DETAILS                             |    4 
 science/qlandkarte-gt/HISTORY                             |    3 
 telephony/mediastreamer/BUILD                             |    7 
 telephony/mediastreamer/CONFIGURE                         |    1 
 telephony/mediastreamer/DEPENDS                           |   11 
 telephony/mediastreamer/DETAILS                           |    2 
 telephony/mediastreamer/HISTORY                           |   14 
 telephony/mediastreamer/PRE_BUILD                         |    9 
 telephony/mediastreamer/disable-v4l1.patch                |   50 ---
 telephony/mediastreamer/mediastreamer-ffmpeg-0.11.patch   |  205 ++++++++++++++
 utils/quvi/DEPENDS                                        |    2 
 utils/quvi/HISTORY                                        |    3 
 utils/vimpager/DETAILS                                    |    6 
 utils/vimpager/HISTORY                                    |    3 
 45 files changed, 407 insertions(+), 114 deletions(-)

New commits:
commit 2d46f67cd5e3060d494abca314fe5f62963540a3
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    samba: fixed longer starting/stopping (don't resolve numeric IPs and ports)

commit 3485503619f2818a60e415bc36fcd5b0dee8d20d
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    devel/qt-creator: version 2.5.1

commit 666f74b26d96e0eba8806e7681f9fc507495d19c
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    graphics/darktable: version 1.0.5

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

    science/qlandkarte-gt: version 1.5.0

commit 615ef024b575924b04fdd07904c72d445fa1beca
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    kdenetwork4: => 4.8.4

commit d60b25aabec605298e0a6240a1a6e83d3ddda87d
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    kdegames4: => 4.8.4
    bz2 -> xz

commit 2ed56aa0d50a80757708e4c52d7503e5479c2ba6
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    ktorrent4: removed depend qca2, it's a libktorrent depends

commit 2957bd69ebea8fbd221856b0e9ae5ab734d7fb16
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    libktorrent: => 1.2.1-2

commit e2d4c6d06b4adc9634088e1a57b5e482c0ccb33f
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    ktorrent4: => 4.2.1
    * DEPENDS: added depends qca2

commit a41a08bb69ac24b0364a2ebf3e85334817bfc2e2
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    mediastreamer: apply ffmpeg patch for ffmpeg-svn as well

commit 2cdbb5d75a510bcde720d3cc95b199baff06b810
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    kdemultimedia4: forgot to account for ffmpeg-svn
    DEPENDS: ffmpeg -> LIBAVCODEC
    PRE_BUILD: apply ffmpeg-0.11 patch for ffmpeg-svn as well

commit afed7772bb2f4584e9107927ce87b36746fd0bfc
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    mediastreamer: =>2.8.2
    * PREPARE: added, to query for video support
    * BUILD: added, to apply video support flags
    * DEPENDS: added optional_depends pulseaudio & doxygen.
               added optional_depends ffmpeg, libvpx, libtheora, libxv for when if video support is enabled.
     * PRE_BUILD: apply ffpmeg patch if ffmpeg is enabled & >= 0.11
     * mediastreamer-ffmpeg-0.11.patch: added, to fix compilation with ffmpeg >=0.11
     * disable-v4l1.patch: removed, no longer needed

commit b5adbf7f44b2ec2212c61d315949db5f5b0ba0fe
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    kdemultimedia4: => 4.8.4
    * DEPENDS: added optional_depends pulseaudio & ffmpeg
               fixed up optional_depend descriptions
    * PRE_BUILD: added to apply patch if ffmpeg >= 0.11 is installed
    * kdemultimedia-4.8.4-ffmpeg-0.11.patch: added, to remove deprecated functions

commit 405761d6270c32d78702b01c315848608acb0f35
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    liberation-fonts-ttf 2.00.0

commit ba0916bd452bd7e30e82a8a08b97dad4d3f203be
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    tea 33.2.0

commit 66692454746d93b0e3826d9d3a28255655cdeb20
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    vimpager 1.7.1

commit 72775e9f8f2a75b27baf20dfad54bcdc26247bb3
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    quvi: depends on lua51
    
    It doesn't build with lua 5.2+.

commit b67adc5c9f970c6162ee5cb62da616e4d368f363
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    curl 7.27.0

commit 654ee3171cf969438776f7f1f8501fc37323bef0
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    cssutils: version 0.9.10b1 and corrected urls

commit e150bd96960fc136a337c955c49a9301aaca1b04
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    davfs: => 1.4.7

diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
index 6276450..0c1a69b 100755
--- a/devel/qt-creator/DETAILS
+++ b/devel/qt-creator/DETAILS
@@ -1,10 +1,10 @@
            SPELL=qt-creator
 if [[ "${QTCREATOR_DEVEL}" == "y" ]]; then
-         VERSION=2.5.0
-     SOURCE_HASH=sha512:b97c8a9d6ca36495fe88bf1ea1e80b85dfca0729c205a2fab4509f2888c1c9f927c89e4461b9db06330cfa0bf2b18c0e778a08468e7b2841bf71581860039692
+         VERSION=2.5.1
+     SOURCE_HASH=sha512:aa0b35d6924d5a63e9723afef4a3594cd99fc464d9c38132bde530366228a98b60a1b552650c88b386047a00b4155f660d91f91abc4f2348621778a9e28f5c2a
 else
-         VERSION=2.5.0
-     SOURCE_HASH=sha512:b97c8a9d6ca36495fe88bf1ea1e80b85dfca0729c205a2fab4509f2888c1c9f927c89e4461b9db06330cfa0bf2b18c0e778a08468e7b2841bf71581860039692
+         VERSION=2.5.1
+     SOURCE_HASH=sha512:aa0b35d6924d5a63e9723afef4a3594cd99fc464d9c38132bde530366228a98b60a1b552650c88b386047a00b4155f660d91f91abc4f2348621778a9e28f5c2a
 fi
           SOURCE=$SPELL-$VERSION-src.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index 2045e39..430fd13 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,3 +1,6 @@
+2012-07-29 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: stable and devel version 2.5.1
+
 2012-06-13 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: stable and devel version 2.5.0
 
diff --git a/disk/davfs/DETAILS b/disk/davfs/DETAILS
index 8e17796..3a03ee3 100755
--- a/disk/davfs/DETAILS
+++ b/disk/davfs/DETAILS
@@ -1,7 +1,7 @@
            SPELL=davfs
      SAV_PROJECT=davfs2
-         VERSION=1.4.6
-     SOURCE_HASH=sha512:dc6683b4344d42f1a800a354233bc5fb9ced0c0bdb886f2f4bb1d390c86ce5f9d858b19cd1b48a495521bc68a4447882afb8b479045218d55f0176156315f8b0
+         VERSION=1.4.7
+     SOURCE_HASH=sha512:6754d08cdfcceea47a4248fb05a6f5a1907acbc9a6c0ab175dce640b160ee24b7efdf9da38be1cc8bd6dbb0825c88a7017a3534a7c3188860dcd1bef12a5d4ae
           SOURCE=${SAV_PROJECT}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SAV_PROJECT}-${VERSION}
    SOURCE_URL[0]=http://download.savannah.gnu.org/releases/${SAV_PROJECT}/${SOURCE}
diff --git a/disk/davfs/HISTORY b/disk/davfs/HISTORY
index 0e9e513..01e0948 100644
--- a/disk/davfs/HISTORY
+++ b/disk/davfs/HISTORY
@@ -1,3 +1,6 @@
+2012-07-28 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.4.7
+
 2012-05-24 Vlad Glagolev <stealth at sourcemage.org>
 	* PRE_BUILD: dropped, accounts are created usually in BUILD
 	* BUILD: create 'davfs2' account here
diff --git a/editors/tea/DETAILS b/editors/tea/DETAILS
index ab09235..aa7511a 100755
--- a/editors/tea/DETAILS
+++ b/editors/tea/DETAILS
@@ -1,9 +1,9 @@
            SPELL=tea
-         VERSION=33.1.0
+         VERSION=33.2.0
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       SOURCE_URL=$SOURCEFORGE_URL/tea-editor/$SOURCE
-     SOURCE_HASH=sha512:701cde142bbfdf6736b45ecf129c65d3bfc9ebab9e02fe95d7d24e81e0329230d0c0dcc6912bfbf6caf73e424a6a7b4bc896d22e6d3f0ecdba3afa25f362d4ad
+     SOURCE_HASH=sha512:e8e5db38da4ed635932bc7f7d0d7650c9b61969dd1e27e7240ab216bbb92736ed3d1184602541b68a6e50635cc416dcb35ac29fda56b93ca631cc9e07aee66e5
         WEB_SITE=http://tea-editor.sourceforge.net/
          ENTERED=20070302
       LICENSE[0]=GPL
diff --git a/editors/tea/HISTORY b/editors/tea/HISTORY
index 20367eb..e395374 100644
--- a/editors/tea/HISTORY
+++ b/editors/tea/HISTORY
@@ -1,3 +1,6 @@
+2012-07-29 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 33.2.0
+
 2012-06-02 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 33.1.0, SHORT and description updated
 	* DEPENDS: depends on qt4 now
diff --git a/fonts-x11/liberation-fonts-ttf/DETAILS b/fonts-x11/liberation-fonts-ttf/DETAILS
index 6e65164..4222942 100755
--- a/fonts-x11/liberation-fonts-ttf/DETAILS
+++ b/fonts-x11/liberation-fonts-ttf/DETAILS
@@ -1,11 +1,11 @@
            SPELL=liberation-fonts-ttf
-         VERSION=1.06.0.20100721
+         VERSION=2.00.0
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=https://fedorahosted.org/releases/l/i/liberation-fonts/$SOURCE
-     SOURCE_HASH=sha512:5d89f7987db2543a362f5378b793725cb4fdf8e7e1e480eb0fbdb12e7c884f81b27c7779e5c6f550079f90a705e802f06fb1691de6f0c1beb6d0bb1e7bf95eae
+     SOURCE_HASH=sha512:d7b801967dbbe643316241883b2f58e658f0ed55e3de6153f23c7110afb8f1f683602362c7e44a66e68c7fb5b4bdb600e4e0a6697bbaa5ec67f64891d1dcec87
  SOURCE_HINTS[0]="no-check-certificate"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-      LICENSE[0]=GPL
+      LICENSE[0]=OFL
         WEB_SITE=https://www.redhat.com/promo/fonts/
         KEYWORDS="fonts x11 libs"
             DOCS="COPYING License.txt"
diff --git a/fonts-x11/liberation-fonts-ttf/HISTORY b/fonts-x11/liberation-fonts-ttf/HISTORY
index 564a226..69b0177 100644
--- a/fonts-x11/liberation-fonts-ttf/HISTORY
+++ b/fonts-x11/liberation-fonts-ttf/HISTORY
@@ -1,3 +1,6 @@
+2012-07-29 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.00.0, LICENSE: GPL -> OFL
+
 2011-01-21 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.06.0.20100721, SOURCE and SOURCE_DIRECTORY updated
 
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 3fc7697..0f9407a 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
            SPELL=curl
-         VERSION=7.26.0
+         VERSION=7.27.0
   SECURITY_PATCH=8
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 6e73ae5..59388fe 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2012-07-28 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 7.27.0
+
 2012-05-25 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 7.26.0
 
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index b11f648..d8f25ef 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,9 +1,9 @@
            SPELL=darktable
 if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
-         VERSION=1.0.4
+         VERSION=1.0.5
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/1.0/${SOURCE}
-     SOURCE_HASH=sha512:cc79695735d3de7494d835707cf043ae8b4252d6cf278539214b2e7ca833fa9262c70e98712812ba7104cbfe261a979d8b65215c61c242c48086477288c1d5b5
+     SOURCE_HASH=sha512:52b532a07a029355a3e689971f15bf5c1a28a587419b5fae40aa342f724d3c15b4ceb557354ad46d4ca7f6e951e9b8de5ac15ccf0c4fa41a85249d5a41972cfb
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
 else
 if [[ "$DARKTABLE_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 2efb589..3ccc298 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,6 @@
+2012-07-29 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.0.5
+
 2012-06-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 1.0.4
 
diff --git a/kde4-apps/ktorrent4/DEPENDS b/kde4-apps/ktorrent4/DEPENDS
index 98fe78b..1c1e526 100755
--- a/kde4-apps/ktorrent4/DEPENDS
+++ b/kde4-apps/ktorrent4/DEPENDS
@@ -1,6 +1,6 @@
 .  "$SECTION_DIRECTORY/KDE_DEPENDS" &&
 depends boost        &&
-depends kdepimlibs4   &&
+depends kdepimlibs4  &&
 depends libktorrent  &&
-depends taglib      &&
+depends taglib       &&
 optional_depends avahi "" "" "to find peers on the local network"
diff --git a/kde4-apps/ktorrent4/DETAILS b/kde4-apps/ktorrent4/DETAILS
index 683b143..5fdca24 100755
--- a/kde4-apps/ktorrent4/DETAILS
+++ b/kde4-apps/ktorrent4/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ktorrent4
-         VERSION=4.1.3
-     SOURCE_HASH=sha512:930e09daca7168151763a9ac724b4679b7346e92432df8e7945612d328d44fc5750b24941f74e7c865f0315a31bb25d3406fcdfbe3af373283e71549ecd7a9b2
+         VERSION=4.2.1
+     SOURCE_HASH=sha512:933fac0f69d06bb4d2e4bf25ec716a0988d5f36b42399679672dd2a58648d4cc7ac547b41ad21dcb96c04e14a694f121d9f702c53ccb6fd2e02198c12570452e
 #              VX=4.0
           SOURCE=${SPELL//4}-${VERSION}.tar.bz2
 #      SOURCE_URL=$KDE_URL/stable/${VERSION}/src/extragear/$SOURCE
diff --git a/kde4-apps/ktorrent4/HISTORY b/kde4-apps/ktorrent4/HISTORY
index 46643b9..b24b9d6 100644
--- a/kde4-apps/ktorrent4/HISTORY
+++ b/kde4-apps/ktorrent4/HISTORY
@@ -1,3 +1,6 @@
+2012-07-29 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 4.2.1
+
 2011-11-23 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.1.3
 
diff --git a/kde4-apps/libktorrent/DETAILS b/kde4-apps/libktorrent/DETAILS
index 58cd3b0..d50be93 100755
--- a/kde4-apps/libktorrent/DETAILS
+++ b/kde4-apps/libktorrent/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libktorrent
-         VERSION=1.1.3
-     SOURCE_HASH=sha512:b603530de5ba05ee9eb1e8c7234ba7668e801a5d4c36dea38abab27e518e0efe00be9fdfb19d43f5e4ccf21626892f4a758b0dcd29483a6d50007e189070509b
+         VERSION=1.2.1-2
+     SOURCE_HASH=sha512:e09d2a921593dea0c16e2de9478177c2da74b9f7724a2f0acb0bbf7dcbec77a49787c527c0d0acb255115a0a0960219226701518ba1c516dd976b2f5dd9df4a3
               VX=4${VERSION:1:4}
           SOURCE=${SPELL}-${VERSION}.tar.bz2
       SOURCE_URL=http://ktorrent.org/downloads/$VX/$SOURCE
diff --git a/kde4-apps/libktorrent/HISTORY b/kde4-apps/libktorrent/HISTORY
index f143b3c..5ed3dbd 100644
--- a/kde4-apps/libktorrent/HISTORY
+++ b/kde4-apps/libktorrent/HISTORY
@@ -1,3 +1,6 @@
+2012-07-29 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 1.2.1
+
 2011-11-23 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.1.3
 
diff --git a/kde4/kdegames4/DETAILS b/kde4/kdegames4/DETAILS
index b633c25..df9f1b4 100755
--- a/kde4/kdegames4/DETAILS
+++ b/kde4/kdegames4/DETAILS
@@ -1,8 +1,8 @@
            SPELL=kdegames4
           SPELLX=${SPELL//4}
-         VERSION=4.8.0
-     SOURCE_HASH=sha512:9345326822f19ed6ac3a1108bb6c4352739833ee0a823c8eab8e8ed9c069a18b79b6a8a012975a9d4338b79834077a76b0dd42460ef3db7a298f35e577dacd12
-          SOURCE=$SPELLX-$VERSION.tar.bz2
+         VERSION=4.8.4
+     SOURCE_HASH=sha512:0ef18f82774dfc8b8479dd1374b30ce6b47b0585129557db734722e174f4b6eb1f3cf9d896cb6fc7c5e0465a5188ea5650395f84ee7f7dca2e7dbd6060c03384
+          SOURCE=$SPELLX-$VERSION.tar.xz
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
         WEB_SITE=http://www.kde.org
diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
index 14d750c..b0c7f15 100644
--- a/kde4/kdegames4/HISTORY
+++ b/kde4/kdegames4/HISTORY
@@ -1,3 +1,7 @@
+2012-07-29 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 4.8.4
+	  bz2 -> xz
+
 2012-02-01 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.8.0
 
diff --git a/kde4/kdemultimedia4/DEPENDS b/kde4/kdemultimedia4/DEPENDS
index 06835a3..19c8997 100755
--- a/kde4/kdemultimedia4/DEPENDS
+++ b/kde4/kdemultimedia4/DEPENDS
@@ -1,14 +1,17 @@
-source  $SECTION_DIRECTORY/KDE_DEPENDS                           &&
-optional_depends alsa-lib       '' '' 'sound support'            &&
-optional_depends libogg         '' '' 'play Ogg files'           &&
-optional_depends libvorbis      '' '' 'play Vorbis files'        &&
-optional_depends libtheora      '' '' 'video codec'              &&
-optional_depends xine-lib       '' '' 'video playback'           &&
-optional_depends flac           '' '' 'lossless audio codec'     &&
-optional_depends libtunepimp    '' '' 'MusicBrainz tagging'      &&
-optional_depends taglib         '' '' 'process audio meta data'  &&
-#optional_depends nmm           '' '' 'Phonon-NMM backend'       &&
+source  $SECTION_DIRECTORY/KDE_DEPENDS                             &&
+optional_depends alsa-lib       '' '' 'for ALSA sound support'     &&
+optional_depends libogg         '' '' 'to play Ogg files'          &&
+optional_depends libvorbis      '' '' 'to play Vorbis files'       &&
+optional_depends libtheora      '' '' 'to play Theora video files' &&
+optional_depends xine-lib       '' '' 'for video playback'         &&
+optional_depends flac           '' '' 'to play FLAC files'         &&
+optional_depends libtunepimp    '' '' 'for MusicBrainz tagging'    &&
+optional_depends taglib         '' '' 'to build Juk and for Strigi to process audio meta data'  &&
+#optional_depends nmm           '' '' 'Phonon-NMM backend'         &&
 # http://www.networkmultimedia.org
 
-optional_depends cdparanoia     '' '' 'cd ripper'                
-optional_depends libmusicbrainz '' '' 'download music metadata'
+optional_depends cdparanoia     '' '' 'to build cd ripper'         && 
+optional_depends libmusicbrainz '' '' 'for music metadata lookup'  &&
+optional_depends pulseaudio     '' '' 'to allow KMix to control PulseAudio' &&
+optional_depends LIBAVCODEC     '' '' 'for video preview backend'  && 
+optional_depends doxygen        '' '' 'to build documentation'
diff --git a/kde4/kdemultimedia4/DETAILS b/kde4/kdemultimedia4/DETAILS
index b21cab3..01f9724 100755
--- a/kde4/kdemultimedia4/DETAILS
+++ b/kde4/kdemultimedia4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdemultimedia4
           SPELLX=${SPELL//4}
-         VERSION=4.8.3
-     SOURCE_HASH=sha512:34dcbb98387d6a16ed9f6abe9070246bad9c92f6d6de2cd02a9e7b34e3272c80acb18c5d6c091f096aa62aa94e7c23d549b5fa8c805dc194270817875e619476
+         VERSION=4.8.4
+     SOURCE_HASH=sha512:2696788ebb4cbf28cd2cf6b128d5f482cc1b47f6ce6c0c83e27369f17164f0793dec7d5d5714fd2d8af879f6e0c57a60386e73e5b334c5a215753db5301350d9
           SOURCE=$SPELLX-$VERSION.tar.xz
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY
index 1ff2bc2..d1ff1a7 100644
--- a/kde4/kdemultimedia4/HISTORY
+++ b/kde4/kdemultimedia4/HISTORY
@@ -1,3 +1,14 @@
+2012-07-29 Sukneet Basuta <sukneet at sourcemage.org>
+	* DEPENDS: ffmpeg -> LIBAVCODEC
+	* PRE_BUILD: also apply patch if ffmpeg-svn is installed
+
+2012-07-28 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 4.8.4
+	* DEPENDS: added optional_depends pulseaudio & ffmpeg
+	  fixed up optional_depend descriptions
+	* PRE_BUILD: added to apply patch if ffmpeg >= 0.11 is installed
+	* kdemultimedia-4.8.4-ffmpeg-0.11.patch: added, to remove deprecated functions
+
 2012-05-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.8.3, bz2 -> xz
 
diff --git a/kde4/kdemultimedia4/PRE_BUILD b/kde4/kdemultimedia4/PRE_BUILD
new file mode 100755
index 0000000..3436c80
--- /dev/null
+++ b/kde4/kdemultimedia4/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+
+FFMPEG_VER=0
+if is_depends_enabled $SPELL ffmpeg && spell_ok ffmpeg; then
+  FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2)
+fi
+if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then
+  cd $SOURCE_DIRECTORY/ffmpegthumbs &&
+  patch -p1 < $SPELL_DIRECTORY/kdemultimedia-4.8.4-ffmpeg-0.11.patch
+fi
diff --git a/kde4/kdemultimedia4/kdemultimedia-4.8.4-ffmpeg-0.11.patch b/kde4/kdemultimedia4/kdemultimedia-4.8.4-ffmpeg-0.11.patch
new file mode 100644
index 0000000..d31c355
--- /dev/null
+++ b/kde4/kdemultimedia4/kdemultimedia-4.8.4-ffmpeg-0.11.patch
@@ -0,0 +1,28 @@
+From: Christoph Feck <christoph at maxiom.de>
+Date: Tue, 29 May 2012 13:53:18 +0000
+Subject: Two deprecated calls have been removed from ffmpeg 0.11.
+X-Git-Tag: v4.8.80
+X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&amp;a=commitdiff&amp;h=4f03b20614c122e3e14473d42a000c0bffdce39c
+---
+Two deprecated calls have been removed from ffmpeg 0.11.
+
+BUG:300732
+---
+
+
+--- a/ffmpegthumbnailer/moviedecoder.cpp
++++ b/ffmpegthumbnailer/moviedecoder.cpp
+@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder()
+ void MovieDecoder::initialize(const QString& filename)
+ {
+     av_register_all();
+-    avcodec_init();
+     avcodec_register_all();
+
+     QFileInfo fileInfo(filename);
+
+-    if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
++    if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
+         kDebug() <<  "Could not open input file: " << fileInfo.absoluteFilePath();
+         return;
+     }
diff --git a/kde4/kdenetwork4/DETAILS b/kde4/kdenetwork4/DETAILS
index aabe950..299e662 100755
--- a/kde4/kdenetwork4/DETAILS
+++ b/kde4/kdenetwork4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdenetwork4
           SPELLX=${SPELL//4}
-         VERSION=4.8.3
-     SOURCE_HASH=sha512:1b861702a536a6cdbba5bb977ec6b89d00991720b80801633b43126fc49da06cd6867bd73a1b156426a5fccad9f6820da22dca61e8d89fef422ef52120f419ca
+         VERSION=4.8.4
+     SOURCE_HASH=sha512:7c1bdff15cdf8ea0e8fdfe1f9518cfd7a0b9b1c12a2e7c933c646f585823561f8446b03606f753e02e338877d617f6547d07ecedd1fa76e29278c7c0bbcff1e8
           SOURCE=$SPELLX-$VERSION.tar.xz
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index db23098..f6c5a1d 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,6 @@
+2012-07-29 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 4.8.4
+
 2012-05-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.8.3, bz2 -> xz
 
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 739d208..ffe76e4 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,5 +1,7 @@
            SPELL=samba
          VERSION=3.6.6
+  SECURITY_PATCH=18
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
@@ -12,7 +14,6 @@ if [[ "$SAMBA_VSCAN" == "y" ]] ; then
   SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2
     SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
 fi
-  SECURITY_PATCH=18
       LICENSE[0]=GPL
         WEB_SITE=http://www.samba.org/
         KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 6c879d8..e11d37b 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,8 @@
+2012-07-29 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* init.d/samba: fixed bug about start/stop for a long time when running
+	  plenty of services; added 445 default tcp port; cleaned up restart()
+
 2012-07-15 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: libcap becomes optional; added missing optional deps
 
diff --git a/net/samba/init.d/samba b/net/samba/init.d/samba
index 1db8804..b521886 100644
--- a/net/samba/init.d/samba
+++ b/net/samba/init.d/samba
@@ -14,12 +14,12 @@ start()
   if [ ! -e /var/run/samba ]; then
     mkdir /var/run/samba
   fi &&
-  if ! netstat -l --udp | grep -q netbios-ns ; then
+  if ! netstat -nl --udp | grep -q ":137" ; then
     echo "Starting NetBIOS nameserver ..."
     loadproc /usr/sbin/nmbd ${ARGS}
     evaluate_retval
   fi  &&
-  if ! netstat -l --tcp | grep -q netbios-ssn ; then
+  if ! netstat -nl --tcp | grep -q ":139\|:445" ; then
     echo "Starting NetBIOS sessions ..."
     loadproc /usr/sbin/smbd ${ARGS}
     evaluate_retval
@@ -28,14 +28,14 @@ start()
 #
 stop()
 {
-  if netstat -l --udp | grep -q netbios-ns ; then
+  if netstat -nl --udp | grep -q ":137" ; then
     if ps -C nmbd | grep -q nmbd ; then
       echo "Stopping NetBIOS nameserver ..."
       killproc /usr/sbin/nmbd
       evaluate_retval
     fi 
   fi &&
-  if netstat -l --tcp | grep -q netbios-ssn ; then
+  if netstat -nl --tcp | grep -q ":139\|:445" ; then
     if ps -C smbd | grep -q smbd; then
       echo "Stopping NetBIOS sessions ..."
       killproc /usr/sbin/smbd
@@ -46,7 +46,7 @@ stop()
 #
 status()
 {
-  if netstat -l --udp | grep -q netbios-ns ; then
+  if netstat -nl --udp | grep -q ":137" ; then
     if ! ps -C nmbd | grep -q nmbd; then
       echo "NetBIOS nameserver : xinetd"
       evaluate_retval
@@ -56,7 +56,7 @@ status()
       evaluate_retval
     fi
   fi  &&
-  if netstat -l --tcp | grep -q netbios-ssn ; then
+  if netstat -nl --tcp | grep -q ":139\|:445" ; then
     if ! ps -C smbd | grep -q smbd ; then
       echo "NetBIOS sessions : xinetd"
       evaluate_retval
@@ -68,9 +68,8 @@ status()
   fi
 }
 
-restart(){
- 	
-	stop &&
-
-	start
+restart() {
+  stop &&
+  sleep 1 &&
+  start
 }
diff --git a/python-pypi/cssutils/DETAILS b/python-pypi/cssutils/DETAILS
index 062cf54..8048ae9 100755
--- a/python-pypi/cssutils/DETAILS
+++ b/python-pypi/cssutils/DETAILS
@@ -1,10 +1,10 @@
            SPELL=cssutils
-         VERSION=0.9.7b3
+         VERSION=0.9.10b1
           SOURCE="${SPELL}-${VERSION}.zip"
-   SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
-     SOURCE_HASH=sha512:9e79246ebf056dc509a45988776786fb9eacddde9edc1fdb3678b79fd899a61e565a1f8e51d10ba3d0e1ac010ace9c46fa70ffad574535aa2b2cb7505f015486
+   SOURCE_URL[0]="https://bitbucket.org/cthedot/cssutils/downloads/${SOURCE}"
+     SOURCE_HASH=sha512:118865cba38fe65fd35a5adfe9d80cf3413c528c216c9cdb9a0cc7b74b9c2140b466f76efab80579c8796aff801afd06683839912e197962c6194a02ab410e64
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="http://code.google.com/p/cssutils/"
+        WEB_SITE="https://bitbucket.org/cthedot/cssutils"
       LICENSE[0]="LGPL"
          ENTERED=20100926
         KEYWORDS=""
diff --git a/python-pypi/cssutils/HISTORY b/python-pypi/cssutils/HISTORY
index 3b4d64b..a507513 100644
--- a/python-pypi/cssutils/HISTORY
+++ b/python-pypi/cssutils/HISTORY
@@ -1,3 +1,6 @@
+2012-07-28 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 0.9.10b1 and corrected urls
+
 2010-09-26 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DEPENDS, DETAILS: spell created
 
diff --git a/science/qlandkarte-gt/DETAILS b/science/qlandkarte-gt/DETAILS
index b499f3c..6b837bb 100755
--- a/science/qlandkarte-gt/DETAILS
+++ b/science/qlandkarte-gt/DETAILS
@@ -1,8 +1,8 @@
            SPELL=qlandkarte-gt
-         VERSION=1.4.2
+         VERSION=1.5.0
           SOURCE="qlandkartegt-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://garr.dl.sourceforge.net/project/qlandkartegt/qlandkartegt/QLandkarteGT%20${VERSION}/${SOURCE}
-     SOURCE_HASH=sha512:86756f1bf81a65da0c74c5dfb60c20abdd6e905b2b75c725c1e8aa63d2d9de9aad73a90b2ffcde473685a4b4b44de92f9cd6e8d4be854ff3aa55687abcde7626
+     SOURCE_HASH=sha512:e25fc4fd0f62312a9768b9f9b8f76c0759a1e2823392b73a7a5a9e152a8e8d64218492098f26245b4d6cb1f19ea54f9bfdc49f041d98c7643d6cd08173b4933e
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/qlandkartegt-${VERSION}"
         WEB_SITE="http://www.qlandkarte.org/"
       LICENSE[0]=GPL
diff --git a/science/qlandkarte-gt/HISTORY b/science/qlandkarte-gt/HISTORY
index 6bc3fa2..307c59d 100644
--- a/science/qlandkarte-gt/HISTORY
+++ b/science/qlandkarte-gt/HISTORY
@@ -1,3 +1,6 @@
+2012-07-29 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.5.0
+
 2012-06-09 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 1.4.2
 
diff --git a/telephony/mediastreamer/BUILD b/telephony/mediastreamer/BUILD
new file mode 100755
index 0000000..df66706
--- /dev/null
+++ b/telephony/mediastreamer/BUILD
@@ -0,0 +1,7 @@
+if [[ $VIDEO_SUPPORT == "y" ]];then
+  OPTS="--enable-video $OPTS" 
+else
+  OPTS="--disable-video $OPTS"
+fi &&
+
+default_build
diff --git a/telephony/mediastreamer/CONFIGURE b/telephony/mediastreamer/CONFIGURE
new file mode 100755
index 0000000..19f0aa5
--- /dev/null
+++ b/telephony/mediastreamer/CONFIGURE
@@ -0,0 +1 @@
+config_query VIDEO_SUPPORT "Build with video support?" y
diff --git a/telephony/mediastreamer/DEPENDS b/telephony/mediastreamer/DEPENDS
index c650a8a..75ebace 100755
--- a/telephony/mediastreamer/DEPENDS
+++ b/telephony/mediastreamer/DEPENDS
@@ -1,3 +1,12 @@
 depends speex &&
 depends ortp &&
-depends ffmpeg 
+optional_depends pulseaudio "--enable-pulseaudio" "--disable-pulseaudio" "for PulseAudio support" &&
+
+if [[ $VIDEO_SUPPORT == "y" ]]; then
+  optional_depends LIBAVCODEC "--enable-ffmpeg" "--disable-ffmpeg" "for video support" &&
+  optional_depends libtheora  "--enable-theora" "--disable-theora" "for Ogg Theora support" &&
+  optional_depends libxv      "--enable-xv"     "--disable-xv"     "to enable xv support" &&
+  optional_depends libvpx     "--enable-vp8"    "--disable-vp8"    "to enable vp8 (webm) support"
+fi &&
+
+optional_depends doxygen "" "" "to build documentation"
diff --git a/telephony/mediastreamer/DETAILS b/telephony/mediastreamer/DETAILS
index ef96ae9..eeb42c5 100755
--- a/telephony/mediastreamer/DETAILS
+++ b/telephony/mediastreamer/DETAILS
@@ -1,5 +1,5 @@
            SPELL=mediastreamer
-         VERSION=2.7.3
+         VERSION=2.8.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
          SOURCE2=$SOURCE.sig
    SOURCE_URL[0]=http://download-mirror.savannah.gnu.org/releases/linphone/${SPELL}/${SOURCE}
diff --git a/telephony/mediastreamer/HISTORY b/telephony/mediastreamer/HISTORY
index 18827a5..ce3581c 100644
--- a/telephony/mediastreamer/HISTORY
+++ b/telephony/mediastreamer/HISTORY
@@ -1,3 +1,17 @@
+2012-07-29 Sukneet Basuta <sukneet at sourcemage.org>
+	* PRE_BUILD: apply ffmpeg 0.11 patch for ffmpeg-svn as well
+
+2012-07-28 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 2.8.2
+	* PREPARE: added, to query for video support
+	* BUILD: added, to apply video support flags
+	* DEPENDS: added optional_depends pulseaudio & doxygen.
+	  added optional_depends ffmpeg, libvpx, libtheora, libxv 
+	  for when if video support is enabled.
+	* PRE_BUILD: apply ffpmeg patch if ffmpeg is enabled & >= 0.11
+	* mediastreamer-ffmpeg-0.11.patch: added, to fix compilation with ffmpeg >=0.11 
+	* disable-v4l1.patch: removed, no longer needed
+
 2011-10-18 Bor Kraljič <pyrobor at ver.si>
 	* PRE_BUILD, DEPENDS, DETAILS, disable-v4l1.patch: spell created
 
diff --git a/telephony/mediastreamer/PRE_BUILD b/telephony/mediastreamer/PRE_BUILD
index eefb607..880fd5e 100755
--- a/telephony/mediastreamer/PRE_BUILD
+++ b/telephony/mediastreamer/PRE_BUILD
@@ -1,3 +1,10 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-patch -p2 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/disable-v4l1.patch
+
+FFMPEG_VER=0
+if is_depends_enabled $SPELL ffmpeg && spell_ok ffmpeg; then
+  FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2)
+fi
+if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then
+  patch -p1 < $SPELL_DIRECTORY/mediastreamer-ffmpeg-0.11.patch
+fi
diff --git a/telephony/mediastreamer/disable-v4l1.patch b/telephony/mediastreamer/disable-v4l1.patch
deleted file mode 100644
index 9f6cb84..0000000
--- a/telephony/mediastreamer/disable-v4l1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
---- linphone-3.4.3/mediastreamer2/src/Makefile.am	2011-02-09 08:43:11.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am	2011-04-01 14:54:04.000000000 +0000
-@@ -117,7 +117,7 @@
- endif
- 
- if BUILD_V4L
--libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
-+libmediastreamer_la_SOURCES+=msv4l2.c
- endif
- 
- if BUILD_WIN32
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
---- linphone-3.4.3/mediastreamer2/src/Makefile.in	2011-03-28 18:34:07.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in	2011-04-01 14:55:00.000000000 +0000
-@@ -54,7 +54,7 @@
- @BUILD_MACAQSND_TRUE at am__append_12 = aqsnd.c
- @BUILD_PULSEAUDIO_TRUE at am__append_13 = pulseaudio.c
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE at am__append_14 = msv4m.m
-- at BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE at am__append_15 = msv4l.c msv4l2.c
-+ at BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE at am__append_15 = msv4l2.c
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE at am__append_16 = msdscap-mingw.cc drawdib-display.c
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE at am__append_17 = theora.c
- @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE at am__append_18 = videoenc.c \
-@@ -135,7 +135,7 @@
- 	audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
- 	msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
- 	msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
--	aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
-+	aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
- 	drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
- 	sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
- 	h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
-@@ -156,7 +156,7 @@
- @BUILD_MACAQSND_TRUE at am__objects_12 = aqsnd.lo
- @BUILD_PULSEAUDIO_TRUE at am__objects_13 = pulseaudio.lo
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE at am__objects_14 = msv4m.lo
-- at BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE at am__objects_15 = msv4l.lo msv4l2.lo
-+ at BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE at am__objects_15 = msv4l2.lo
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE at am__objects_16 = msdscap-mingw.lo \
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@	drawdib-display.lo
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE at am__objects_17 = theora.lo
-@@ -600,7 +600,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mssndcard.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msspeex.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msticker.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msv4l.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msv4l2.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msv4m.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msvideo.Plo at am__quote@
diff --git a/telephony/mediastreamer/mediastreamer-ffmpeg-0.11.patch b/telephony/mediastreamer/mediastreamer-ffmpeg-0.11.patch
new file mode 100644
index 0000000..6df9364
--- /dev/null
+++ b/telephony/mediastreamer/mediastreamer-ffmpeg-0.11.patch
@@ -0,0 +1,205 @@
+diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h
+index 5ae8a63..86edf86 100644
+--- mediastreamer2/include/mediastreamer2/msvideo.h
++++ mediastreamer2/include/mediastreamer2/msvideo.h
+@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #define msvideo_h
+
+ #include <mediastreamer2/msfilter.h>
++#ifndef INT64_C
++#define INT64_C(c) (c ## LL)
++#define UINT64_C(c) (c ## ULL)
++#endif
++#include <libavutil/avutil.h>
++#include <libavcodec/version.h>
+
+ /* some global constants for video MSFilter(s) */
+ #define MS_VIDEO_SIZE_SQCIF_W 128
+@@ -206,7 +212,9 @@ extern "C"{
+ MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt);
+ MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt);
+ MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc);
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ MS2_PUBLIC void ms_ffmpeg_check_init(void);
++#endif
+ MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m);
+ MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h);
+ MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h);
+diff --git a/src/h264dec.c b/src/h264dec.c
+index 223de3d..8c40a7c 100644
+--- mediastreamer2/src/h264dec.c
++++ mediastreamer2/src/h264dec.c
+@@ -44,7 +44,9 @@ typedef struct _DecData{
+ static void ffmpeg_init(){
+	static bool_t done=FALSE;
+	if (!done){
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+		avcodec_init();
++#endif
+		avcodec_register_all();
+		done=TRUE;
+	}
+diff --git a/src/mscommon.c b/src/mscommon.c
+index 2cab005..bebb946 100644
+--- mediastreamer2/src/mscommon.c
++++ mediastreamer2/src/mscommon.c
+@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #include "mediastreamer2/mscodecutils.h"
+ #include "mediastreamer2/msfilter.h"
+ #include <ortp/ortp_srtp.h>
++#ifndef INT64_C
++#define INT64_C(c) (c ## LL)
++#define UINT64_C(c) (c ## ULL)
++#endif
++#include <libavutil/avutil.h>
++#include <libavcodec/version.h>
+
+ extern void __register_ffmpeg_encoders_if_possible(void);
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ extern void ms_ffmpeg_check_init();
++#endif
+ extern bool_t libmsandroiddisplay_init(void);
+ extern void libmsandroiddisplaybad_init(void);
+ extern void libmsandroidopengldisplay_init(void);
+@@ -645,7 +653,9 @@ void ms_init(){
+		}
+	}
+ #if !defined(NO_FFMPEG)
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+	ms_ffmpeg_check_init();
++#endif
+	__register_ffmpeg_encoders_if_possible();
+ #endif
+ #endif
+diff --git a/src/videodec.c b/src/videodec.c
+index c04e1e9..a455075 100644
+--- mediastreamer2/src/videodec.c
++++ mediastreamer2/src/videodec.c
+@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #include "mediastreamer2/msvideo.h"
+ #include "mediastreamer2/msticker.h"
+ #include "rfc2429.h"
++#ifndef INT64_C
++#define INT64_C(c) (c ## LL)
++#define UINT64_C(c) (c ## ULL)
++#endif
++#include <libavutil/avutil.h>
++#include <libavcodec/version.h>
+
+-
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ extern void ms_ffmpeg_check_init();
++#endif
+
+
+ typedef struct DecState{
+@@ -50,7 +57,9 @@
+ 
+ static void dec_init(MSFilter *f, enum CodecID cid){
+ 	DecState *s=(DecState *)ms_new0(DecState,1);
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 	ms_ffmpeg_check_init();
++#endif
+ 	
+ 	avcodec_get_context_defaults(&s->av_context);
+ 	s->av_codec=NULL;
+diff --git a/src/videoenc.c b/src/videoenc.c
+index 21d016f..520f06a 100644
+--- mediastreamer2/src/videoenc.c
++++ mediastreamer2/src/videoenc.c
+@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+ #define RATE_CONTROL_MARGIN 15000 /*bits/second*/
+
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ static bool_t avcodec_initialized=FALSE;
++#endif
+
+ #ifdef ENABLE_LOG_FFMPEG
+
+@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+
+ #endif
+
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ void ms_ffmpeg_check_init(){
+	if(!avcodec_initialized){
+		avcodec_init();
+@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){
+ #endif
+	}
+ }
++#endif
+
+ /* the goal of this small object is to tell when to send I frames at startup:
+ at 2 and 4 seconds*/
+@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec)
+ {
+	EncState *s=(EncState *)ms_new(EncState,1);
+	f->data=s;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+	ms_ffmpeg_check_init();
++#endif
+	s->profile=0;/*always default to profile 0*/
+	s->comp_buf=NULL;
+	s->fps=15;
+@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){
+	if (s->profile==0){
+		s->codec=CODEC_ID_H263;
+	}else{
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+		c->flags|=CODEC_FLAG_H263P_UMV;
++#endif
+		c->flags|=CODEC_FLAG_AC_PRED;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
++#endif
+		/*
+		c->flags|=CODEC_FLAG_OBMC;
+		c->flags|=CODEC_FLAG_AC_PRED;
+@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){
+	// assume video size is CIF or QCIF
+	if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60;
+	else header->b_wptr[1] = 0x40;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+	if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10;
++#else
++	if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10;
++#endif
+	header->b_wptr += 4;
+	header->b_cont = *packet;
+	*packet = header;
+@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
+		s->req_vfu=TRUE;
+	}
+	if (s->req_vfu){
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+		pict.pict_type=FF_I_TYPE;
++#else
++		pict.pict_type=AV_PICTURE_TYPE_I;
++#endif
+		s->req_vfu=FALSE;
+	}
+	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
+@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
+		if (s->framenum==1){
+			video_starter_first_frame (&s->starter,f->ticker->time);
+		}
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+		if (c->coded_frame->pict_type==FF_I_TYPE){
++#else
++		if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
++#endif
+			ms_message("Emitting I-frame");
+		}
+		comp_buf->b_wptr+=error;
+@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={
+ #endif
+
+ void __register_ffmpeg_encoders_if_possible(void){
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+	ms_ffmpeg_check_init();
++#endif
+	if (avcodec_find_encoder(CODEC_ID_MPEG4))
+		ms_filter_register(&ms_mpeg4_enc_desc);
+	if (avcodec_find_encoder(CODEC_ID_H263)){
diff --git a/utils/quvi/DEPENDS b/utils/quvi/DEPENDS
index 1c50d1e..e99de10 100755
--- a/utils/quvi/DEPENDS
+++ b/utils/quvi/DEPENDS
@@ -1,3 +1,3 @@
 depends curl &&
 depends pkgconfig &&
-depends lua
+depends lua51
diff --git a/utils/quvi/HISTORY b/utils/quvi/HISTORY
index f4587dc..ccd60e1 100644
--- a/utils/quvi/HISTORY
+++ b/utils/quvi/HISTORY
@@ -1,3 +1,6 @@
+2012-07-28 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS: depends on lua51
+
 2011-08-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.2.19
 
diff --git a/utils/vimpager/DETAILS b/utils/vimpager/DETAILS
index 250c535..67b8683 100755
--- a/utils/vimpager/DETAILS
+++ b/utils/vimpager/DETAILS
@@ -1,9 +1,9 @@
            SPELL=vimpager
-         VERSION=1.4.4
-     SOURCE_HASH=sha512:d4c4b1521944c750f28b68bdd7487ba8cd820e3cf715fe108b48dfb1a612878e4997b6cc160d3400f2472bcd9c3e713381599cf3b555a80c73e40d98322b577f
+         VERSION=1.7.1
+     SOURCE_HASH=sha512:69bfa9a1e41e0d28b4050951b27b6ce651d5416713d0104501d2d374bfeb702404f99e09be22a11fd1fab3546c9811a6568043ac78b1ccec4c9d3963eedd6e46
           SOURCE=$SPELL-$VERSION
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://www.vim.org/scripts/download_script.php?src_id=15268
+   SOURCE_URL[0]=http://www.vim.org/scripts/download_script.php?src_id=18306
         WEB_SITE=http://www.vim.org/scripts/script.php?script_id=1723
       LICENSE[0]=http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
          ENTERED=20110323
diff --git a/utils/vimpager/HISTORY b/utils/vimpager/HISTORY
index f7a27ad..7916e8b 100644
--- a/utils/vimpager/HISTORY
+++ b/utils/vimpager/HISTORY
@@ -1,3 +1,6 @@
+2012-07-28 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.7.1
+
 2011-03-23 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS, DEPENDS, BUILD, INSTALL, PROVIDES, profile.d/pages.sh:
 	  spell created, version 1.4.4


More information about the SM-Commit mailing list