sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (733d6176f9e1bbae26364f54d25e6a2d17bcd32f)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (733d6176f9e1bbae26364f54d25e6a2d17bcd32f)
- Date: Mon, 2 Jan 2012 18:54:11 -0600
GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:
ChangeLog | 10
chat-im/pidgin/HISTORY | 4
chat-im/pidgin/PRE_BUILD | 3
chat-im/pidgin/glib-2.31.patch | 13
chat-libs/meanwhile/HISTORY | 4
chat-libs/meanwhile/PRE_BUILD | 3
chat-libs/meanwhile/glib-2.31.patch | 278
+++++++++++++
dev/null |binary
devel/cmake/DETAILS | 4
devel/cmake/HISTORY | 3
e-17/evas/BUILD | 2
e-17/evas/HISTORY | 3
editors/scribus4/DETAILS | 6
editors/scribus4/HISTORY | 3
ftp/lftp/DETAILS | 2
ftp/lftp/HISTORY | 3
gnome2-apps/dia/HISTORY | 4
gnome2-apps/dia/PRE_BUILD | 3
gnome2-apps/dia/glib-2.31.patch | 53 ++
gnome2-apps/gramps/DETAILS | 1
gnome2-apps/gramps/HISTORY | 4
gnome2-apps/gramps/PRE_BUILD | 10
gnome2-libs/clutter/DETAILS | 2
gnome2-libs/clutter/HISTORY | 3
gnome2-libs/clutter/clutter-1.8.0.tar.bz2.sig | 0
gnome2-libs/clutter/clutter-1.8.2.tar.bz2.sig |binary
gnome2-libs/mx/DETAILS | 4
gnome2-libs/mx/HISTORY | 3
gnome2-libs/mx/mx-1.3.2.tar.bz2.sig | 0
gnome2-libs/mx/mx-1.4.1.tar.bz2.sig |binary
graphics/mtpaint/DETAILS | 4
graphics/mtpaint/HISTORY | 3
http/eflwebkit/BUILD | 20
http/eflwebkit/CONFIGURE | 16
http/eflwebkit/DEPENDS | 22 -
http/eflwebkit/DETAILS | 17
http/eflwebkit/HISTORY | 9
http/eflwebkit/INSTALL | 1
http/eflwebkit/PREPARE | 5
http/eflwebkit/PRE_BUILD | 6
http/eflwebkit/webkit-efl-svn-r98964.tar.bz2.sig |binary
libs/libfreenect/BUILD | 24 +
libs/libfreenect/HISTORY | 7
libs/libfreenect/INSTALL | 7
libs/libfreenect/PREPARE | 1
net/farsight2/DETAILS | 4
net/farsight2/HISTORY | 3
net/host/64-bit-host.patch | 14
net/iptables/DETAILS | 2
net/iptables/HISTORY | 3
net/libnice/DETAILS | 4
net/libnice/HISTORY | 3
net/minicom/DETAILS | 6
net/minicom/HISTORY | 3
python-pypi/camelot/CONFIGURE | 6
python-pypi/camelot/DEPENDS | 9
python-pypi/camelot/DETAILS | 4
python-pypi/camelot/HISTORY | 8
python-pypi/camelot/PRE_BUILD | 30 +
python-pypi/dulwich/DETAILS | 4
python-pypi/dulwich/HISTORY | 3
python-pypi/papyon/DETAILS | 4
python-pypi/papyon/HISTORY | 3
python-pypi/pyutil/DEPENDS | 3
python-pypi/pyutil/DETAILS | 14
python-pypi/pyutil/HISTORY | 4
python-pypi/zfec/DEPENDS | 3
python-pypi/zfec/DETAILS | 16
python-pypi/zfec/HISTORY | 5
telephony/telepathy-farsight/DETAILS | 2
telephony/telepathy-farsight/HISTORY | 3
telephony/telepathy-gabble/DETAILS | 2
telephony/telepathy-gabble/HISTORY | 3
telephony/telepathy-glib/DETAILS | 2
telephony/telepathy-glib/HISTORY | 3
telephony/telepathy-idle/DETAILS | 2
telephony/telepathy-idle/HISTORY | 3
telephony/telepathy-logger/DETAILS | 2
telephony/telepathy-logger/HISTORY | 3
telephony/telepathy-mission-control/DETAILS | 6
telephony/telepathy-mission-control/HISTORY | 3
telephony/telepathy-salut/DETAILS | 2
telephony/telepathy-salut/HISTORY | 3
utils/file/DETAILS | 4
utils/file/HISTORY | 3
utils/multitail/DETAILS | 4
utils/multitail/HISTORY | 3
video-libs/gmtk/BUILD | 7
video-libs/gmtk/CONFIGURE | 5
video-libs/gmtk/DEPENDS | 24 +
video-libs/gmtk/DETAILS | 22 +
video-libs/gmtk/HISTORY | 2
video-libs/gmtk/gmtk-1.0.5.tar.gz.sig |binary
video/avidemux2/DETAILS | 4
video/avidemux2/HISTORY | 3
video/gecko-mediaplayer/DEPENDS | 3
video/gecko-mediaplayer/DETAILS | 2
video/gecko-mediaplayer/HISTORY | 4
video/gecko-mediaplayer/gecko-mediaplayer-1.0.4.tar.gz.sig | 0
video/gnome-mplayer/BUILD | 3
video/gnome-mplayer/CONFIGURE | 2
video/gnome-mplayer/DEPENDS | 57 ++
video/gnome-mplayer/DETAILS | 2
video/gnome-mplayer/HISTORY | 6
video/gnome-mplayer/gnome-mplayer-1.0.4.tar.gz.sig | 0
video/gnome-mplayer/gnome-mplayer-1.0.5.tar.gz.sig |binary
video/mplayer/CONFLICTS | 1
video/mplayer/HISTORY | 4
video/mplayer/PROVIDES | 1
video/mplayer2/BUILD | 15
video/mplayer2/CONFIGURE | 10
video/mplayer2/CONFLICTS | 1
video/mplayer2/DEPENDS | 79 +++
video/mplayer2/DETAILS | 30 +
video/mplayer2/HISTORY | 6
video/mplayer2/PREPARE | 3
video/mplayer2/PROVIDES | 1
video/mplayer2/mplayer.png |binary
video/mplayer2/mplayer2-2.0.tar.bz2.sig |binary
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
x11-toolkits/qt4/HISTORY | 4
x11-toolkits/qt4/PRE_BUILD | 2
x11-toolkits/qt4/WebKit.pri.patch | 11
124 files changed, 1020 insertions(+), 80 deletions(-)
New commits:
commit 588e3a153d8a3f06175657c60a424ef88174edff
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
iptables: => 1.4.12.2
commit a15a37cb5c17aac3168ad22d44da997075281a3a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wine: => 1.3.36 (devel)
commit b346b36b8304aa4f3a378ab246cba1fe5d8548c1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
video/avidemux2: version 2.5.6
commit 289c87e49f9e1d03887cc1b4fa8ba1954e98f469
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
x11-toolkits/qt4: removed -Werror CXXFLAG for webkit
commit 0b542df017abbe2ef97667f6413abea216a78f5c
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
video/mplayer2: added dependency on LIBAVCODEC, fixed some codec flags
commit c0c71cb584e820fd9c9ef013e1f1317c37888f74
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
scribus4 1.4.0
commit 33e3d76e7a664eacabf54a24ee4c888f43f0c8d0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
telepathy-salut 0.6.0
commit 69ac6296d337dfcc0c04bf018d70d846bc1a4ef5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
telepathy-idle 0.1.11
commit db51d0f1e56425ea4fa1e99c3c3d3b54ba6804ec
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
telepathy-farsight 0.0.19
commit 76e32f5268bafde47c40b285ea0ce50bddda7c18
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
farsight2 0.0.31
commit eb4442172fb62da7c7c8ffaafde95eaa206e8a59
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libnice 0.1.1
commit eab1ede36ba315fc2e1e29f7ffbd04daa6338cb2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
telepathy-logger 0.2.12
commit ff28705fb9681e82c0646cdd2bda752fc225f0dc
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
telepathy-mission-control 5.10.1
commit 400299587f7caffd864df92199a9709fa3559647
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
papyon 0.5.6
commit f4817220e003bd923c478993d2a263584d905798
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
telepathy-gabble 0.14.1
commit aa99ee9822074745fbe1054d85c0fceacc605559
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
telepathy-glib 0.16.4
commit 9fa1ac1ab38c2f57bcaf8b162ca77fc43d44ea21
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
mplayer: added to conflict with mplayer2 and provide MPLAYER
commit 323d10f4eb78fb45cf7458840203f31a234abf06
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
mplayer2: new spell - fork of mplayer
commit 1a0b6d191f3f36f1d73c37079aa200a706233050
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
gecko-mediaplayer: updated to 1.0.5
commit a23c6bb46ca56062b3112da209a7d4ac1eea91a8
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
gnome-mplayer: updated to 1.0.5
commit 0dbc67b80c6e07a34266945a49b345e87219bda0
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
gmtk: new spell - gnome-mplayer tool kit
commit 7c9d6a30de13e2d371ba2af36fae34557e8fbe39
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
minicom 2.6
commit 9301de405cf3476b5d29a03f082d3fc334db97af
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
mtpaint 3.40
commit 08147abcc9d26bd0653ba16b58b44ec7c39d5f0d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
lftp 4.3.4
commit 5b79a500837a93fa10d10f9647d7a1faa77ee18f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
multitail 5.2.9
commit c583c5009faa8c54d8e1fd7455507894943993b7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
zfec - depends pyutil
commit 7ab0a4e26aff5ef9af0d9efc066dedfe36b90d38
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
python-pypi/pyutil - new spell
commit 5159d1fd65d2b1198c689e30d77e02c1b943049a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
dulwich: => 0.8.2
commit bf76c69bb63699ce3bdc4b0d73e4e930ed73bf48
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
python-pypi/zfec - new spell
commit 0663742edfdaf285f59f649d11e9a88f9cba614c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cmake: => 2.8.7
commit 0a73f69f20fe2013f94db65c058898131c8e927f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
file 5.10
commit 5d5ae429a9a2c322938cde1d02ec59f1496d310d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
clutter 1.8.2
commit 545d7d9ee7f4e319c4f63e801e887cb197bf3668
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
mx 1.4.1
commit 1c7c6454841811b6814accf805e13f0ac0eef6ae
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libfreenect: 51-kinect.rules installed if spell_ok udev
commit 0a17e55f7e464db3c04de13735870827d5af0bea
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libfreenect: audios.bin backup and restore added
commit 776ffa1a686042eb4c5a11c534f3aa93ec9d58b0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libfreenect: option to enable audio added
commit 9f5c991049e3671361dbddc3a48628fb5d55019b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
camelot: => 11.12.30
commit 0efa1f863cd3e3ed13ed9c3d3b2115f07dad25d7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
camelot: => 11.12.29
commit 4a5eed2239c69268b756e272cc34757e1be8f2f8
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
evas: --disable-wayland-{shm,egl} added into BUILD, broken without these
We don't have wayland spells yet, http://wayland.freedesktop.org/
commit e6f60dc58e220a295ed6f508a80004542730d56d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
gramps - remove bad PRE_BUILD
commit ab2c9a11547be0cd84c144534dc2b68ecd6cac8e
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
dia: added patch to fix compilation issue with glib2 2.31.x
commit 66dd669b1c040178538fe10d825b3f08fea7dad0
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
pidgin: added a patch to fix compilation issue with glib2 2.31.x
commit 4e1e9a9633272a6dc95308285a5d1144e121a1de
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
meanwhile: added a patch to fix compilation issue with glib2 2.31.x
commit 9240f67195663b54d2be80a8558c72049693579a
Author: Seth Alan Woolley <seth AT mail.swoolley.org>
Commit: Seth Alan Woolley <seth AT mail.swoolley.org>
add 64-bit-host.patch to net/host
commit e5f2a8a4261357e246538f5ca85f5b2a4769a830
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
eflwebkit: added option to build snapshot since scm is broken currently.
diff --git a/ChangeLog b/ChangeLog
index 719514b..3a6a166 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-01 Robin Cook <rcook AT wyrms.net>
+ * video/mplayer2: new spell for of mplayer
+
+2011-12-31 Robin Cook <rcook AT wyrms.net>
+ * video-libs/gmtk: new spell gnome-mplayer tool kit
+
+2011-12-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * python-pypi/zfec: new spell, fast erasure codec
+ * python-pypi/pyutil: new spell, a collection of utilities for Python
programmers
+
2011-12-27 Vlad Glagolev <stealth AT sourcemage.org>
* lua-forge/luaxslt: new spell, XSLT to Lua wrapper
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 4cb4764..877bb12 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,7 @@
+2011-12-28 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * glib-2.31.patch: added, to fix compilation issue with latest glib2
+ * PRE_BUILD: applying new patch
+
2011-12-15 Justin Boffemmyer <flux AT sourcemage.org>
* DEPENDS: remove CVS if block, add intltool
diff --git a/chat-im/pidgin/PRE_BUILD b/chat-im/pidgin/PRE_BUILD
index fa78ec4..8a7fd53 100755
--- a/chat-im/pidgin/PRE_BUILD
+++ b/chat-im/pidgin/PRE_BUILD
@@ -3,4 +3,5 @@ cd ${SOURCE_DIRECTORY} &&
if [ "$PIDGIN_CVS" == "y" ]
then
NOCONFIGURE=Y ./autogen.sh
-fi
+fi &&
+patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch
diff --git a/chat-im/pidgin/glib-2.31.patch b/chat-im/pidgin/glib-2.31.patch
new file mode 100644
index 0000000..f3bfc27
--- /dev/null
+++ b/chat-im/pidgin/glib-2.31.patch
@@ -0,0 +1,13 @@
+Index: pidgin-2.10.0/libpurple/protocols/mxit/formcmds.c
+===================================================================
+--- pidgin-2.10.0.orig/libpurple/protocols/mxit/formcmds.c
++++ pidgin-2.10.0/libpurple/protocols/mxit/formcmds.c
+@@ -25,7 +25,7 @@
+
+
+ #include "internal.h"
+-#include <glib/gprintf.h>
++#include <glib.h>
+
+ #include "purple.h"
+
diff --git a/chat-libs/meanwhile/HISTORY b/chat-libs/meanwhile/HISTORY
index 887ed31..b5d7e1a 100644
--- a/chat-libs/meanwhile/HISTORY
+++ b/chat-libs/meanwhile/HISTORY
@@ -1,3 +1,7 @@
+2011-12-28 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PRE_BUILD, glib-2.31.patch: added, to fix compilation issue with
+ latest glib2
+
2007-09-24 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Created
diff --git a/chat-libs/meanwhile/PRE_BUILD b/chat-libs/meanwhile/PRE_BUILD
new file mode 100755
index 0000000..a7e8463
--- /dev/null
+++ b/chat-libs/meanwhile/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch
diff --git a/chat-libs/meanwhile/glib-2.31.patch
b/chat-libs/meanwhile/glib-2.31.patch
new file mode 100644
index 0000000..48c3fc9
--- /dev/null
+++ b/chat-libs/meanwhile/glib-2.31.patch
@@ -0,0 +1,278 @@
+Index: meanwhile-1.0.2/samples/logging_proxy.c
+===================================================================
+--- meanwhile-1.0.2.orig/samples/logging_proxy.c
++++ meanwhile-1.0.2/samples/logging_proxy.c
+@@ -25,7 +25,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+ #include <mw_cipher.h>
+ #include <mw_common.h>
+Index: meanwhile-1.0.2/samples/login_server.c
+===================================================================
+--- meanwhile-1.0.2.orig/samples/login_server.c
++++ meanwhile-1.0.2/samples/login_server.c
+@@ -19,7 +19,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+ #include <mw_cipher.h>
+ #include <mw_common.h>
+Index: meanwhile-1.0.2/samples/nocipher_proxy.c
+===================================================================
+--- meanwhile-1.0.2.orig/samples/nocipher_proxy.c
++++ meanwhile-1.0.2/samples/nocipher_proxy.c
+@@ -29,7 +29,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+ #include <mw_common.h>
+ #include <mw_message.h>
+Index: meanwhile-1.0.2/samples/redirect_server.c
+===================================================================
+--- meanwhile-1.0.2.orig/samples/redirect_server.c
++++ meanwhile-1.0.2/samples/redirect_server.c
+@@ -22,7 +22,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+ #include <mw_common.h>
+ #include <mw_message.h>
+Index: meanwhile-1.0.2/src/channel.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/channel.c
++++ meanwhile-1.0.2/src/channel.c
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+Index: meanwhile-1.0.2/src/mw_debug.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_debug.c
++++ meanwhile-1.0.2/src/mw_debug.c
+@@ -19,7 +19,7 @@
+ */
+
+
+-#include <glib/gstring.h>
++#include <glib.h>
+
+ #include "mw_debug.h"
+
+Index: meanwhile-1.0.2/src/mw_message.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_message.h
++++ meanwhile-1.0.2/src/mw_message.h
+@@ -22,7 +22,7 @@
+ #define _MW_MESSAGE_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+Index: meanwhile-1.0.2/src/mw_srvc_conf.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_srvc_conf.h
++++ meanwhile-1.0.2/src/mw_srvc_conf.h
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_CONF_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+Index: meanwhile-1.0.2/src/mw_srvc_dir.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_srvc_dir.h
++++ meanwhile-1.0.2/src/mw_srvc_dir.h
+@@ -22,7 +22,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+
+ #ifdef __cplusplus
+Index: meanwhile-1.0.2/src/mw_srvc_place.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_srvc_place.h
++++ meanwhile-1.0.2/src/mw_srvc_place.h
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_PLACE_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+Index: meanwhile-1.0.2/src/mw_srvc_resolve.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_srvc_resolve.h
++++ meanwhile-1.0.2/src/mw_srvc_resolve.h
+@@ -23,7 +23,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+
+ #ifdef __cplusplus
+Index: meanwhile-1.0.2/src/mw_st_list.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_st_list.h
++++ meanwhile-1.0.2/src/mw_st_list.h
+@@ -30,7 +30,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include "mw_common.h"
+
+
+Index: meanwhile-1.0.2/src/mw_util.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_util.h
++++ meanwhile-1.0.2/src/mw_util.h
+@@ -23,8 +23,6 @@
+
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+
+ #define map_guint_new() \
+Index: meanwhile-1.0.2/src/srvc_aware.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_aware.c
++++ meanwhile-1.0.2/src/srvc_aware.c
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+Index: meanwhile-1.0.2/src/srvc_conf.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_conf.c
++++ meanwhile-1.0.2/src/srvc_conf.c
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+Index: meanwhile-1.0.2/src/srvc_dir.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_dir.c
++++ meanwhile-1.0.2/src/srvc_dir.c
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/ghash.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+Index: meanwhile-1.0.2/src/srvc_ft.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_ft.c
++++ meanwhile-1.0.2/src/srvc_ft.c
+@@ -19,7 +19,7 @@
+ */
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+Index: meanwhile-1.0.2/src/srvc_im.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_im.c
++++ meanwhile-1.0.2/src/srvc_im.c
+@@ -19,7 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+Index: meanwhile-1.0.2/src/srvc_place.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_place.c
++++ meanwhile-1.0.2/src/srvc_place.c
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+Index: meanwhile-1.0.2/src/srvc_resolve.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_resolve.c
++++ meanwhile-1.0.2/src/srvc_resolve.c
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/ghash.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+Index: meanwhile-1.0.2/src/srvc_store.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_store.c
++++ meanwhile-1.0.2/src/srvc_store.c
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/glist.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_debug.h"
+Index: meanwhile-1.0.2/src/st_list.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/st_list.c
++++ meanwhile-1.0.2/src/st_list.c
+@@ -20,7 +20,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+
+ #include "mw_debug.h"
+ #include "mw_util.h"
diff --git a/devel/cmake/DETAILS b/devel/cmake/DETAILS
index fdb9c61..926c3bb 100755
--- a/devel/cmake/DETAILS
+++ b/devel/cmake/DETAILS
@@ -1,6 +1,6 @@
SPELL=cmake
- VERSION=2.8.6
-
SOURCE_HASH=sha512:68e097a95dc4184248ddc4e3f5f3513c2082c576a89ab8bcd45edc0abde5c256f2b0215535787662f49d006de39b46e2251ab989914e4b18176730e10ff9be3e
+ VERSION=2.8.7
+
SOURCE_HASH=sha512:2b48bd922a2fcd7569e610c823cbaa061178b112e045de2c97da5fd9591224ebb211e2e8688af0eb140d9762e87fa5e41d1324a80c57a933870a801914ba6431
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.cmake.org/files/v${VERSION%.*}/$SOURCE
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index f35f18e..6612da4 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2011-12-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.8.7
+
2011-10-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.8.6
diff --git a/e-17/evas/BUILD b/e-17/evas/BUILD
index 67da76f..9102a90 100755
--- a/e-17/evas/BUILD
+++ b/e-17/evas/BUILD
@@ -44,5 +44,7 @@ if is_depends_enabled $SPELL fribidi && is_depends_enabled
fribidi glib2 ; then
CFLAGS="$CFLAGS -I/usr/include/glib-2.0"
fi
+# We don't have wayland spells yet, http://wayland.freedesktop.org/
+OPTS="--disable-wayland-shm --disable-wayland-egl $OPTS" &&
default_build
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index 446b677..9cdf2c0 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,6 @@
+2011-12-30 Ladislav Hagara <hgr AT vabo.cz>
+ * BUILD: --disable-wayland-{shm,egl} added
+
2011-11-26 Robin Cook <rcook AT wyrms.net>
* BUILD: added CFLAGS include if fribidi is enabled and compiled with
glib2
diff --git a/editors/scribus4/DETAILS b/editors/scribus4/DETAILS
index de17b45..9637265 100755
--- a/editors/scribus4/DETAILS
+++ b/editors/scribus4/DETAILS
@@ -1,8 +1,8 @@
SPELL=scribus4
SPELLX=${SPELL//4}
- VERSION=1.3.9
+ VERSION=1.4.0
SOURCE=${SPELLX}-${VERSION}.tar.bz2
- SOURCE2=$SOURCE.sig
+ SOURCE2=$SOURCE.gpg.sig
SOURCE2_IGNORE=signature
SOURCE_GPG=F60166DA.gpg:$SOURCE2:UPSTREAM_KEY
# SOURCE2=${SOURCE}.sig
@@ -10,7 +10,7 @@
# SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELLX}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELLX}/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.gpg.sig
# SOURCE2_URL=${SOURCE_URL}.sig
WEB_SITE=http://www.scribus.net/
LICENSE[0]=GPL
diff --git a/editors/scribus4/HISTORY b/editors/scribus4/HISTORY
index 061a283..42a7184 100644
--- a/editors/scribus4/HISTORY
+++ b/editors/scribus4/HISTORY
@@ -1,3 +1,6 @@
+2012-01-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.0, sig -> gpg.sig
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* F60166DA.gpg: added gpg keyring
diff --git a/ftp/lftp/DETAILS b/ftp/lftp/DETAILS
index cc83973..30285aa 100755
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,5 +1,5 @@
SPELL=lftp
- VERSION=4.3.3
+ VERSION=4.3.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 7aba650..b27804f 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.3.4
+
2011-10-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.3.3
diff --git a/gnome2-apps/dia/HISTORY b/gnome2-apps/dia/HISTORY
index d46cb70..18f6dfc 100644
--- a/gnome2-apps/dia/HISTORY
+++ b/gnome2-apps/dia/HISTORY
@@ -1,3 +1,7 @@
+2011-12-28 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * glib-2.31.patch: added, to fix compilation issue with latest glib2
+ * PRE_BUILD: applying new patch
+
2011-12-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.97.2, bz2 -> xz
* PRE_BUILD: added due to bz2 -> xz
diff --git a/gnome2-apps/dia/PRE_BUILD b/gnome2-apps/dia/PRE_BUILD
index 6f54504..958f6d3 100755
--- a/gnome2-apps/dia/PRE_BUILD
+++ b/gnome2-apps/dia/PRE_BUILD
@@ -2,4 +2,5 @@ mk_source_dir $SOURCE_DIRECTORY &&
cd $BUILD_DIRECTORY &&
verify_file '' &&
xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch
diff --git a/gnome2-apps/dia/glib-2.31.patch b/gnome2-apps/dia/glib-2.31.patch
new file mode 100644
index 0000000..209d196
--- /dev/null
+++ b/gnome2-apps/dia/glib-2.31.patch
@@ -0,0 +1,53 @@
+Index: dia-0.97.1/objects/custom/shape_typeinfo.c
+===================================================================
+--- dia-0.97.1.orig/objects/custom/shape_typeinfo.c
++++ dia-0.97.1/objects/custom/shape_typeinfo.c
+@@ -27,7 +27,7 @@
+ #include "custom_util.h"
+ #include <string.h>
+ #include <stdarg.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+ #include <libxml/parser.h>
+
+Index: dia-0.97.1/plug-ins/pgf/render_pgf.c
+===================================================================
+--- dia-0.97.1.orig/plug-ins/pgf/render_pgf.c
++++ dia-0.97.1/plug-ins/pgf/render_pgf.c
+@@ -61,7 +61,7 @@ TODO:
+ #endif
+ #include <errno.h>
+
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+
+ #include "intl.h"
+Index: dia-0.97.1/tests/test-boundingbox.c
+===================================================================
+--- dia-0.97.1.orig/tests/test-boundingbox.c
++++ dia-0.97.1/tests/test-boundingbox.c
+@@ -28,7 +28,7 @@
+ #include <glib.h>
+ #include <glib-object.h>
+
+-#if GLIB_CHECK_VERSION(2,16,0)
++#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
+ #include <glib/gtestutils.h>
+ #endif
+ #include "dialib.h"
+Index: dia-0.97.1/tests/test-objects.c
+===================================================================
+--- dia-0.97.1.orig/tests/test-objects.c
++++ dia-0.97.1/tests/test-objects.c
+@@ -28,7 +28,7 @@
+ #include <glib.h>
+ #include <glib-object.h>
+
+-#if GLIB_CHECK_VERSION(2,16,0)
++#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
+ #include <glib/gtestutils.h>
+ #endif
+
+
diff --git a/gnome2-apps/gramps/DETAILS b/gnome2-apps/gramps/DETAILS
index cb2f141..2655e06 100755
--- a/gnome2-apps/gramps/DETAILS
+++ b/gnome2-apps/gramps/DETAILS
@@ -1,6 +1,7 @@
SPELL=gramps
VERSION=3.3.1
SOURCE_HASH=sha512:95c19ad449635360421db72dd144eafeb6e0bd830dca36526f5467e938cbb814ff65b5f5552a41217be4eec50d8974c4e6dccbe734957d8b32884c1bb18203e1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-?}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/gnome2-apps/gramps/HISTORY b/gnome2-apps/gramps/HISTORY
index 2ff0811..f5e8fec 100644
--- a/gnome2-apps/gramps/HISTORY
+++ b/gnome2-apps/gramps/HISTORY
@@ -1,3 +1,7 @@
+2011-12-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: deleted
+
2011-10-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.3.1
diff --git a/gnome2-apps/gramps/PRE_BUILD b/gnome2-apps/gramps/PRE_BUILD
deleted file mode 100755
index f40f165..0000000
--- a/gnome2-apps/gramps/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# force use of bsddb3
-# sed -i 's/from bsddb/&3/;s/import.*bsddb/&3/' $FF
-MOD=`grep -R bsddb *|grep import|cut -d: -f1` &&
-for FF in $MOD ;do
- sed -i 's/bsddb/&3/g' $FF
-done &&
-#sed -i 's/bsddb/&3/' src/GrampsLogger/_ErrorReportAssistant.py &&
-sed -i 's/b3txn/btxn/' src/gen/db/__init__.py
diff --git a/gnome2-libs/clutter/DETAILS b/gnome2-libs/clutter/DETAILS
index 3125412..19087ec 100755
--- a/gnome2-libs/clutter/DETAILS
+++ b/gnome2-libs/clutter/DETAILS
@@ -1,5 +1,5 @@
SPELL=clutter
- VERSION=1.8.0
+ VERSION=1.8.2
BRANCH=${VERSION:0:3}
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-libs/clutter/HISTORY b/gnome2-libs/clutter/HISTORY
index fa1447a..8d45a8b 100644
--- a/gnome2-libs/clutter/HISTORY
+++ b/gnome2-libs/clutter/HISTORY
@@ -1,3 +1,6 @@
+2011-12-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.2
+
2011-09-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.0
* DEPENDS: cogl added
diff --git a/gnome2-libs/clutter/clutter-1.8.0.tar.bz2.sig
b/gnome2-libs/clutter/clutter-1.8.0.tar.bz2.sig
deleted file mode 100644
index 66b215a..0000000
Binary files a/gnome2-libs/clutter/clutter-1.8.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/clutter/clutter-1.8.2.tar.bz2.sig
b/gnome2-libs/clutter/clutter-1.8.2.tar.bz2.sig
new file mode 100644
index 0000000..7014fde
Binary files /dev/null and b/gnome2-libs/clutter/clutter-1.8.2.tar.bz2.sig
differ
diff --git a/gnome2-libs/mx/DETAILS b/gnome2-libs/mx/DETAILS
index 8fe6fbb..97e1dad 100755
--- a/gnome2-libs/mx/DETAILS
+++ b/gnome2-libs/mx/DETAILS
@@ -1,7 +1,7 @@
SPELL=mx
- VERSION=1.3.2
+ VERSION=1.4.1
SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://source.clutter-project.org/sources/mx/1.3/$SOURCE
+
SOURCE_URL[0]=http://source.clutter-project.org/sources/mx/${VERSION:0:3}/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.clutter-project.org";
diff --git a/gnome2-libs/mx/HISTORY b/gnome2-libs/mx/HISTORY
index 0c6a9a6..e544c18 100644
--- a/gnome2-libs/mx/HISTORY
+++ b/gnome2-libs/mx/HISTORY
@@ -1,3 +1,6 @@
+2011-12-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.1
+
2011-10-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.2
diff --git a/gnome2-libs/mx/mx-1.3.2.tar.bz2.sig
b/gnome2-libs/mx/mx-1.3.2.tar.bz2.sig
deleted file mode 100644
index c016965..0000000
Binary files a/gnome2-libs/mx/mx-1.3.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/mx/mx-1.4.1.tar.bz2.sig
b/gnome2-libs/mx/mx-1.4.1.tar.bz2.sig
new file mode 100644
index 0000000..7135625
Binary files /dev/null and b/gnome2-libs/mx/mx-1.4.1.tar.bz2.sig differ
diff --git a/graphics/mtpaint/DETAILS b/graphics/mtpaint/DETAILS
index ac3a144..3c05ba9 100755
--- a/graphics/mtpaint/DETAILS
+++ b/graphics/mtpaint/DETAILS
@@ -1,11 +1,11 @@
SPELL=mtpaint
- VERSION=3.31
+ VERSION=3.40
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
DOCS='COPYING NEWS README'
WEB_SITE=http://mtpaint.sourceforge.net
-
SOURCE_HASH=sha512:ba84c530bcb55e20543cb30d03b891326e7335f9e8235163fd9a7199d0002a29525e3417066866e092a96e15e3ffd5d96ad45f05831a98d4027017e7686084d0
+
SOURCE_HASH=sha512:b242794ea74edeedeb1bc51df581b82b30196388b2aae03564f3152a9c4a20cdeeff715d46417722673279bcff5e5fb7e80147fc06babb8720b65bfa29f124fd
ENTERED=20050604
LICENSE[0]=GPL
KEYWORDS="graphics"
diff --git a/graphics/mtpaint/HISTORY b/graphics/mtpaint/HISTORY
index ef0026f..3524062 100644
--- a/graphics/mtpaint/HISTORY
+++ b/graphics/mtpaint/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.40
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG
diff --git a/http/eflwebkit/BUILD b/http/eflwebkit/BUILD
index def58e1..82cbdc4 100755
--- a/http/eflwebkit/BUILD
+++ b/http/eflwebkit/BUILD
@@ -1,6 +1,20 @@
-cd "$SOURCE_DIRECTORY" &&
-mkdir build &&
+if [ "$EFLWEBKIT_NETWORK" == "libsoup" ]; then
+ OPTS="-DNETWORK_BACKEND=soup $OPTS"
+else
+ OPTS="-DNETWORK_BACKEND=curl $OPTS"
+fi
-cmake $SOURCE_DIRECTORY/Source -DPORT=Efl -DSHARED_CORE=OFF
-DCMAKE_BUILD_TYPE=Release &&
+OPTS="$EFLWEBKIT_GLIB $EFLWEBKIT_VIDEO $EFLWEBKIT_GEO $OPTS" &&
+#OPTS="$EFLWEBKIT_NPAPI $OPTS" &&
+
+OPTS="-DENABLE_ORIENTATION_EVENTS=ON -DCMAKE_BUILD_TYPE=Release $OPTS" &&
+OPTS="-DENABLE_FULLSCREEN_API=ON -DENABLE_NOTIFICATIONS=ON $OPTS" &&
+OPTS="-DENABLE_BLOB=ON -DENABLE_DATAGRID=ON $OPTS" &&
+OPTS="-DPORT=Efl -DCMAKE_INSTALL_PREFIX=/usr $OPTS" &&
+
+mkdir build &&
+cd build &&
+
+cmake $OPTS ../Source &&
make
diff --git a/http/eflwebkit/CONFIGURE b/http/eflwebkit/CONFIGURE
new file mode 100755
index 0000000..3a5defe
--- /dev/null
+++ b/http/eflwebkit/CONFIGURE
@@ -0,0 +1,16 @@
+config_query_option EFLWEBKIT_GLIB "Enable building with glib2?" y
\
+ "-DENABLE_GLIB_SUPPORT=ON" "-DENABLE_GLIB_SUPPORT=OFF"
&&
+
+config_query_list EFLWEBKIT_NETWORK
\
+ "Build with which network backend? (libsoup will turn on glib2)"
\
+ libsoup curl
&&
+
+config_query_option EFLWEBKIT_VIDEO
\
+ "Enable gstreamer video support (will turn on glib2)?" y
\
+ "-DVIDEO=gstreamer" "-DVIDEO=OFF"
&&
+
+config_query_option EFLWEBKIT_GEO "Enable geolocation?" y
\
+ "-DENABLE_GEOLOCATION=ON" "-DENABLE_GEOLOCATION=OFF"
+
+#config_query_option EFLWEBKIT_NPAPI "Enable Netscape Plugin API?" n
\
+# "ENABLE_NETSCAPE_PLUGIN_API=ON" "ENABLE_NETSCAPE_PLUGIN_API=OFF"
diff --git a/http/eflwebkit/DEPENDS b/http/eflwebkit/DEPENDS
index f0ad26f..fc90423 100755
--- a/http/eflwebkit/DEPENDS
+++ b/http/eflwebkit/DEPENDS
@@ -10,10 +10,7 @@ depends libxt &&
depends fontconfig &&
depends cairo &&
depends freetype2 &&
-depends glib2 &&
-depends libsoup &&
-depends gtk+2 &&
-depends gstreamer &&
+depends mesalib &&
depends cmake &&
depends eina &&
depends eet &&
@@ -21,3 +18,20 @@ depends evas &&
depends ecore &&
depends edje &&
depends embryo
+
+
+if [ "$EFLWEBKIT_NETWORK" == "curl" ]; then
+ depends curl
+else
+ depends libsoup
+fi &&
+
+if [ "$EFLWEBKIT_VIDEO" == "-DVIDEO=gstreamer" ]; then
+ depends gstreamer
+fi &&
+
+if [ "$EFLWEBKIT_GLIB" == "-DENABLE_GLIB_SUPPORT=ON" ] || \
+ [ "$EFLWEBKIT_NETWORK" == "libsoup" ] || \
+ [ "EFLWEBKIT_VIDEO" == "-DVIDEO=gstreamer" ]; then
+ depends glib2
+fi
diff --git a/http/eflwebkit/DETAILS b/http/eflwebkit/DETAILS
index d2b1407..098b50b 100755
--- a/http/eflwebkit/DETAILS
+++ b/http/eflwebkit/DETAILS
@@ -1,17 +1,26 @@
SPELL=eflwebkit
-if [ "$EFLWEBKIT_AUTOUPDATE" == "y" ]; then
+if [ "$EFLWEBKIT_BRANCH" == "scm" ]; then
+ if [ "$EFLWEBKIT_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_URL[0]=svn_http://svn.webkit.org/repository/webkit/trunk:$SPELL-svn
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
+else
+ SRC_FILE=webkit-efl-svn
+ VERSION=r98964
+ SOURCE=$SRC_FILE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$SRC_FILE-$VERSION
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ SOURCE_URL[0]=http://packages.profusion.mobi/webkit-efl/$SOURCE
+fi
+ LICENSE[0]=GPL
WEB_SITE=http://trac.webkit.org/wiki/EFLWebKit
ENTERED=20111113
- LICENSE[0]=GPL
KEYWORDS="engine http"
SHORT="A EFL backport of the WebKit web browser engine"
cat << EOF
diff --git a/http/eflwebkit/HISTORY b/http/eflwebkit/HISTORY
index a4725f8..7039131 100644
--- a/http/eflwebkit/HISTORY
+++ b/http/eflwebkit/HISTORY
@@ -1,2 +1,11 @@
+2011-12-27 Robin Cook <rcook AT wyms.net>
+ * PREPARE: changed to query branch
+ * DETAILS: modified for branch query
+ * CONFIGURE: added for build options
+ * DEPENDS: changed to set for build options
+ * PRE_BUILD: modifed for branch query
+ * BUILD: modified for build options
+ * INSTALL: added to make sure install correctly
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* New Spell: DETAILS, DEPENDS, PRE_BUILD, BUILD
diff --git a/http/eflwebkit/INSTALL b/http/eflwebkit/INSTALL
new file mode 100644
index 0000000..fc36c95
--- /dev/null
+++ b/http/eflwebkit/INSTALL
@@ -0,0 +1 @@
+make install DESTDIR=/
diff --git a/http/eflwebkit/PREPARE b/http/eflwebkit/PREPARE
index 12f9b93..282c296 100755
--- a/http/eflwebkit/PREPARE
+++ b/http/eflwebkit/PREPARE
@@ -1,3 +1,2 @@
-config_query EFLWEBKIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch snaptshot scm
diff --git a/http/eflwebkit/PRE_BUILD b/http/eflwebkit/PRE_BUILD
index b674359..3e07b9a 100755
--- a/http/eflwebkit/PRE_BUILD
+++ b/http/eflwebkit/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/eflwebkit-local.patch
+if [ "$EFLWEBKIT_BRANCH" == "scm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ patch -p1 < $SCRIPT_DIRECTORY/eflwebkit-local.patch
+fi
diff --git a/http/eflwebkit/webkit-efl-svn-r98964.tar.bz2.sig
b/http/eflwebkit/webkit-efl-svn-r98964.tar.bz2.sig
new file mode 100644
index 0000000..0de8280
Binary files /dev/null and b/http/eflwebkit/webkit-efl-svn-r98964.tar.bz2.sig
differ
diff --git a/libs/libfreenect/BUILD b/libs/libfreenect/BUILD
index b7d48c6..ee24abf 100755
--- a/libs/libfreenect/BUILD
+++ b/libs/libfreenect/BUILD
@@ -1,4 +1,26 @@
-cmake_build &&
+if [[ "$LIBFREENECT_AUDIO" == "y" ]]; then
+ OPTS="-DBUILD_AUDIO=YES $OPTS"
+fi &&
+
+cd $SOURCE_DIRECTORY &&
+mkdir -p build &&
+cd build &&
+prepare_cmake_flags &&
+
+# do not download and extract audios.bin if already in $SOURCE_CACHE
+if [ -f $SOURCE_CACHE/audios.bin ]; then
+ message "${MESSAGE_COLOR}audios.bin restore: $SOURCE_CACHE/audios.bin ->
audios.bin${DEFAULT_COLOR}" &&
+ cp $SOURCE_CACHE/audios.bin audios.bin
+fi &&
+
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr
-DSYSCONFDIR=$INSTALL_ROOT/etc $OPTS ../ &&
+make &&
+
+# audios.bin backup
+if [ -f audios.bin ] && ! [ -f $SOURCE_CACHE/audios.bin ]; then
+ message "${MESSAGE_COLOR}audios.bin backup: audios.bin ->
$SOURCE_CACHE/audios.bin${DEFAULT_COLOR}" &&
+ cp audios.bin $SOURCE_CACHE/audios.bin
+fi &&
if [[ "$LIBFREENECT_PYTHON_WRAPPER" == "y" ]]; then
message "${MESSAGE_COLOR}python wrapper${DEFAULT_COLOR}" &&
diff --git a/libs/libfreenect/HISTORY b/libs/libfreenect/HISTORY
index 708069f..cafecc5 100644
--- a/libs/libfreenect/HISTORY
+++ b/libs/libfreenect/HISTORY
@@ -1,3 +1,10 @@
+2011-12-31 Ladislav Hagara <hgr AT vabo.cz>
+ * BUILD: audios.bin backup and restore added
+ * INSTALL: 51-kinect.rules installed if spell_ok udev
+
+2011-12-30 Ladislav Hagara <hgr AT vabo.cz>
+ * PREPARE, BUILD: option to enable audio added
+
2011-10-27 Ladislav Hagara <hgr AT vabo.cz>
* PREPARE, BUILD, INSTALL: option for python wrapper added
* PREPARE, PRE_BUILD: option to build unstable branch added
diff --git a/libs/libfreenect/INSTALL b/libs/libfreenect/INSTALL
index b6bb4d0..bf9b970 100755
--- a/libs/libfreenect/INSTALL
+++ b/libs/libfreenect/INSTALL
@@ -5,5 +5,10 @@ if [[ "$LIBFREENECT_PYTHON_WRAPPER" == "y" ]]; then
message "${MESSAGE_COLOR}python wrapper${DEFAULT_COLOR}" &&
cd $SOURCE_DIRECTORY/wrappers/python &&
default_install_python
-fi
+fi &&
+cd $SOURCE_DIRECTORY &&
+if spell_ok udev; then
+install_config_file platform/linux/udev/51-kinect.rules \
+ $INSTALL_ROOT/etc/udev/rules.d/51-kinect.rules
+fi
diff --git a/libs/libfreenect/PREPARE b/libs/libfreenect/PREPARE
index 10a3905..32d8b00 100755
--- a/libs/libfreenect/PREPARE
+++ b/libs/libfreenect/PREPARE
@@ -1,3 +1,4 @@
config_query LIBFREENECT_AUTOUPDATE "Queue for update on every system
update?" n &&
config_query LIBFREENECT_PYTHON_WRAPPER "Do you want to build libfreenect
python wrapper?" n &&
+config_query LIBFREENECT_AUDIO "Do you want to enable audio?" n &&
config_query_list LIBFREENECT_GIT_BRANCH "Which branch of libfreenect do you
want to build?" master unstable
diff --git a/net/farsight2/DETAILS b/net/farsight2/DETAILS
index ebcbfe4..ec264d8 100755
--- a/net/farsight2/DETAILS
+++ b/net/farsight2/DETAILS
@@ -1,6 +1,6 @@
SPELL=farsight2
- VERSION=0.0.21
-
SOURCE_HASH=sha512:7de5f2ef36f4f46178ab95595fdf6ce4ff71ddd9dc1b4e691b3446b1325153fb87ceb6fa4dc87d609919e063257271493140949edcfd5aaaa4602190c5ecf73f
+ VERSION=0.0.31
+
SOURCE_HASH=sha512:4dcde047df9fd913ff30de49b623c70d970fe43e1b93670934b3d14176448732cf9c8f220836c61279a8236993072cdf223c1250ec835edd8564c9b45d6f9306
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://farsight.freedesktop.org/releases/farsight2/$SOURCE
diff --git a/net/farsight2/HISTORY b/net/farsight2/HISTORY
index 3385bad..e26f7ba 100644
--- a/net/farsight2/HISTORY
+++ b/net/farsight2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.0.31
+
2010-08-26 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 0.0.21
* PRE_BUILD: added for 2 build fixes
diff --git a/net/host/64-bit-host.patch b/net/host/64-bit-host.patch
new file mode 100644
index 0000000..f6ee9e3
--- /dev/null
+++ b/net/host/64-bit-host.patch
@@ -0,0 +1,14 @@
+--- host.h.old 2011-12-27 23:07:51.000000000 -0800
++++ host.h 2011-12-27 22:55:36.000000000 -0800
+@@ -108,7 +108,7 @@
+ # define NOCHANGE 0xf /* compatibility with older BIND
+versions */
+ #endif
+
+-#define NOT_DOTTED_QUAD ((ipaddr_t) -1)
++#define NOT_DOTTED_QUAD ((ipaddr_t) 0xffffffffU)
+ #define BROADCAST_ADDR ((ipaddr_t) 0xffffffffU)
+ #define LOCALHOST_ADDR ((ipaddr_t) 0x7f000001U)
+
+
+
diff --git a/net/iptables/DETAILS b/net/iptables/DETAILS
index 6f8dca8..446c6db 100755
--- a/net/iptables/DETAILS
+++ b/net/iptables/DETAILS
@@ -1,5 +1,5 @@
SPELL=iptables
- VERSION=1.4.12.1
+ VERSION=1.4.12.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://www.iptables.org/projects/$SPELL/files/$SOURCE
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index 9bb82e0..1f1a747 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,6 @@
+2012-01-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.12.2
+
2011-09-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.12.1
diff --git a/net/libnice/DETAILS b/net/libnice/DETAILS
index 9504655..534c4b3 100755
--- a/net/libnice/DETAILS
+++ b/net/libnice/DETAILS
@@ -1,6 +1,6 @@
SPELL=libnice
- VERSION=0.0.13
-
SOURCE_HASH=sha512:6559c940b2ef88b1f61f8bc96606234537896800304ef89b4da6b9a81057e70e74f9828fd5d0dcdd0c9d22e0a57686054b0019a9c35e80ab52f46f1b856a9563
+ VERSION=0.1.1
+
SOURCE_HASH=sha512:0bbb4014c010d812a4811d1f564eb9e26b76cb7fe329825ace8d1373523db4f643f515f49031f603cce585dfa42adc924f436646c3b522a9b89919d6ec5b7bb7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://nice.freedesktop.org/releases/$SOURCE
diff --git a/net/libnice/HISTORY b/net/libnice/HISTORY
index 9026528..ae1d0da 100644
--- a/net/libnice/HISTORY
+++ b/net/libnice/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.1.1
+
2010-08-26 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: 0.0.13
diff --git a/net/minicom/DETAILS b/net/minicom/DETAILS
index dd9915d..5c6955b 100755
--- a/net/minicom/DETAILS
+++ b/net/minicom/DETAILS
@@ -1,9 +1,9 @@
SPELL=minicom
- VERSION=2.5
+ VERSION=2.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://alioth.debian.org/download.php/3487/$SOURCE
-
SOURCE_HASH=sha512:7fc330fd6a6165c2665552d6050a2c27b99d9a3759450e5ae3da8ae2ed53988442d956a4ff00f3d98d6b5a37429c5bd5547a9fc33dd4f8dda42b436cbc7e1e8f
+ SOURCE_URL[0]=http://alioth.debian.org/download.php/3689/$SOURCE
+
SOURCE_HASH=sha512:96345e0c7b5991d3320fb4478b26717efdcdde307cd1cd065be424456bd90e528405c889a8aebaf6a67f3c614e4858825ec7f32769f2069f1b2e3ec5a2556023
WEB_SITE=http://alioth.debian.org/projects/minicom/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/net/minicom/HISTORY b/net/minicom/HISTORY
index 8525ebd..f765684 100644
--- a/net/minicom/HISTORY
+++ b/net/minicom/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.6
+
2011-01-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.5
diff --git a/python-pypi/camelot/CONFIGURE b/python-pypi/camelot/CONFIGURE
new file mode 100755
index 0000000..7492e15
--- /dev/null
+++ b/python-pypi/camelot/CONFIGURE
@@ -0,0 +1,6 @@
+message "${MESSAGE_COLOR}Camelot now supports two different bindings to
Qt.\n\
+PySide (LGPL) - sibling project to Qt, financed by Nokia\n\
+PyQt4 (GPL) - developed by Riverbank Computing\n\
+PySide tends to track Qt changes faster and has more frequent releases.\
+${DEFAULT_COLOR}"
+config_query_list CAMBIND 'which Qt binding' pyside pyqt4
diff --git a/python-pypi/camelot/DEPENDS b/python-pypi/camelot/DEPENDS
index 934c33d..b2a33ed 100755
--- a/python-pypi/camelot/DEPENDS
+++ b/python-pypi/camelot/DEPENDS
@@ -7,6 +7,11 @@ depends chardet &&
depends jinja2 &&
depends xlrd &&
depends xlwt &&
-depends pyqt4
-depends qt4
+depends qt4 &&
+if [[ $CAMBIND == pyside ]];then
+ depends pyside &&
+ depends pyside-tools
+else
+ depends pyqt4
+fi
diff --git a/python-pypi/camelot/DETAILS b/python-pypi/camelot/DETAILS
index 829cd26..15d94ba 100755
--- a/python-pypi/camelot/DETAILS
+++ b/python-pypi/camelot/DETAILS
@@ -1,7 +1,7 @@
SPELL=camelot
SPELLX=Camelot
- VERSION=11.11.16
-
SOURCE_HASH=sha512:0bf3415a3ae5ee3eef79a70a8cf0f33f7206598be96a77d82cd9408474a1bbd3fb2ec90b7365366a2c2ab9f3b46ab7474a44865276f91c4ca0df26a9eb1f38d4
+ VERSION=11.12.30
+
SOURCE_HASH=sha512:f80bcd633dbcb68d081f99017d41510bb0a5a452260a8f56f76b852f2aa6b14ac5cdb2b00efadb9228653014036d8ad67b178e9c5d11b4bb27405f850fc9f4a1
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL=http://pypi.python.org/packages/source/C/$SPELLX/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/python-pypi/camelot/HISTORY b/python-pypi/camelot/HISTORY
index faf6fe1..ea7e9e2 100644
--- a/python-pypi/camelot/HISTORY
+++ b/python-pypi/camelot/HISTORY
@@ -1,3 +1,11 @@
+2011-12-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 11.12.30
+
+2011-12-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 11.12.29
+ * PRE_BUILD, CONFIGURE: added; choice of pyside/pyqt4
+ * DEPENDS: support pyside
+
2011-12-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 11.11.16
diff --git a/python-pypi/camelot/PRE_BUILD b/python-pypi/camelot/PRE_BUILD
new file mode 100755
index 0000000..7461f04
--- /dev/null
+++ b/python-pypi/camelot/PRE_BUILD
@@ -0,0 +1,30 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if is_depends_enabled $SPELL pyside;then
+message convert to use PySide
+
+python camelot/bin/camelot_admin.py to_pyside camelot &&
+rm -r camelot &&
+mv to_pyside/camelot . &&
+
+# tidyup some junk
+sed -i -e "/variant_to_pyobject/,/return value/D" \
+ camelot/core/utils.py &&
+sed -i -e "s/QtCore.PYQT_VERSION_STR/PySide.__version__/" \
+ camelot/admin/application_admin.py \
+ camelot/view/main.py &&
+
+sed -i -e "/%L/s/(.*$/(value)/" camelot/view/controls/editors/floateditor.py
&&
+
+# variant_to_pyobject is an obsolete construct, not needed with pyside
+sed -i \
+ -e "/import variant_to_pyobject/D" \
+ -e "s/, variant_to_pyobject//" \
+ -e "s/variant_to_pyobject,//" \
+ -e "s/variant_to_pyobject//" \
+ camelot/view/action_steps/*.py \
+ camelot/view/controls/*.py \
+ camelot/view/controls/delegates/*.py \
+ camelot/view/controls/editors/*.py
+fi
diff --git a/python-pypi/dulwich/DETAILS b/python-pypi/dulwich/DETAILS
index 920b997..2234b28 100755
--- a/python-pypi/dulwich/DETAILS
+++ b/python-pypi/dulwich/DETAILS
@@ -1,6 +1,6 @@
SPELL=dulwich
- VERSION=0.7.1
-
SOURCE_HASH=sha512:aaef097282f137e1fa4a9755007bf6f131e33983266248683ca402ec4b93b29efbff6881d2d823845b4159f0705a05e133d2809ecdbfa35a4c9905bd965501be
+ VERSION=0.8.2
+
SOURCE_HASH=sha512:bef6b87917f63a5e13d5b20343c63db9dc7a7b24b55e0ddcbc062b8e615451269f6255b88612d7d402597f27cd72ed1434459c072f6181478783620b9a20329d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://samba.org/~jelmer/dulwich
diff --git a/python-pypi/dulwich/HISTORY b/python-pypi/dulwich/HISTORY
index 629af3b..ad6baed 100644
--- a/python-pypi/dulwich/HISTORY
+++ b/python-pypi/dulwich/HISTORY
@@ -1,3 +1,6 @@
+2011-12-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.2
+
2011-05-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider
diff --git a/python-pypi/papyon/DETAILS b/python-pypi/papyon/DETAILS
index fae9368..9a2ffb8 100755
--- a/python-pypi/papyon/DETAILS
+++ b/python-pypi/papyon/DETAILS
@@ -1,8 +1,8 @@
SPELL=papyon
- VERSION=0.5.4
+ VERSION=0.5.6
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.freedesktop.org/software/${SPELL}/releases/${SOURCE}
-
SOURCE_HASH=sha512:415be422159e3a7022740ddc3a67861800f241ab4277e0a05cd8ca0ecd659a8a3bd01fd3ba43f0bfd2ce5c576fe50ad331e4929839293e324c37b8f228b2f181
+
SOURCE_HASH=sha512:aca60b4694188325377971ab5994ecc63fafbb91eb94d03d25bf9b6765e1d292d8e2a9db79d4bbed802a02b674dc9f50c8215080b36aa5be826b934fdd9a7b07
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.freedesktop.org/wiki/Software/papyon";
LICENSE[0]=GPL
diff --git a/python-pypi/papyon/HISTORY b/python-pypi/papyon/HISTORY
index ab3f02f..7e68022 100644
--- a/python-pypi/papyon/HISTORY
+++ b/python-pypi/papyon/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.5.6
+
2010-12-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.5.4
diff --git a/python-pypi/pyutil/DEPENDS b/python-pypi/pyutil/DEPENDS
new file mode 100755
index 0000000..448211f
--- /dev/null
+++ b/python-pypi/pyutil/DEPENDS
@@ -0,0 +1,3 @@
+depends python &&
+depends SETUPTOOLS
+
diff --git a/python-pypi/pyutil/DETAILS b/python-pypi/pyutil/DETAILS
new file mode 100755
index 0000000..b498bcd
--- /dev/null
+++ b/python-pypi/pyutil/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=pyutil
+ VERSION=1.8.4
+
SOURCE_HASH=sha512:b277d6e0a55dbb4d06fba04cdc94457b28f26830b7138d459c903c946c09b7c687cd96393e5c356b891e2f0c43825183aa739406557339baebeb146fc8f38f4b
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://pypi.python.org/pypi/$SPELL
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/p/pyutil/$SOURCE
+ LICENSE[0]=GPL
+ ENTERED=20111231
+ KEYWORDS="Python"
+ SHORT="a library of useful Python functions and classes"
+cat << EOF
+pyutil -- a library of useful Python functions and classes
+EOF
diff --git a/python-pypi/pyutil/HISTORY b/python-pypi/pyutil/HISTORY
new file mode 100644
index 0000000..57d7cc5
--- /dev/null
+++ b/python-pypi/pyutil/HISTORY
@@ -0,0 +1,4 @@
+2011-12-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.4
+ spell created
+
diff --git a/python-pypi/zfec/DEPENDS b/python-pypi/zfec/DEPENDS
new file mode 100755
index 0000000..21ffb49
--- /dev/null
+++ b/python-pypi/zfec/DEPENDS
@@ -0,0 +1,3 @@
+depends python &&
+depends SETUPTOOLS &&
+depends pyutil
diff --git a/python-pypi/zfec/DETAILS b/python-pypi/zfec/DETAILS
new file mode 100755
index 0000000..20aa591
--- /dev/null
+++ b/python-pypi/zfec/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=zfec
+ VERSION=1.4.22
+
SOURCE_HASH=sha512:15ab65a51fd9a74db8c542ba67de102df893b4685090ed0d47daeab1cf09b93cb4436baee2453c46702b4db8388a9a75f7c5867caa964e14baa36815c68dca92
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://pypi.python.org/pypi/$SPELL
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/z/zfec/$SOURCE
+ LICENSE[0]=GPL
+ ENTERED=20111231
+ KEYWORDS="Python"
+ SHORT="fast erasure codec"
+cat << EOF
+a fast erasure codec which can be used with the command-line, C, Python, or
Haskell,
+Generate redundant blocks of information such that if some of the blocks are
lost then the
+original data can be recovered from the remaining blocks
+EOF
diff --git a/python-pypi/zfec/HISTORY b/python-pypi/zfec/HISTORY
new file mode 100644
index 0000000..ded8c3f
--- /dev/null
+++ b/python-pypi/zfec/HISTORY
@@ -0,0 +1,5 @@
+2011-12-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.22
+ * DEPENDS : add pyutil
+ spell created
+
diff --git a/telephony/telepathy-farsight/DETAILS
b/telephony/telepathy-farsight/DETAILS
index 9d3fdb0..3535b74 100755
--- a/telephony/telepathy-farsight/DETAILS
+++ b/telephony/telepathy-farsight/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-farsight
- VERSION=0.0.17
+ VERSION=0.0.19
WEB_SITE=http://telepathy.freedesktop.org
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
diff --git a/telephony/telepathy-farsight/HISTORY
b/telephony/telepathy-farsight/HISTORY
index f4ec53e..62e0aa2 100644
--- a/telephony/telepathy-farsight/HISTORY
+++ b/telephony/telepathy-farsight/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.0.19
+
2011-04-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.0.17
diff --git a/telephony/telepathy-gabble/DETAILS
b/telephony/telepathy-gabble/DETAILS
index 4c27813..23cd47b 100755
--- a/telephony/telepathy-gabble/DETAILS
+++ b/telephony/telepathy-gabble/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-gabble
- VERSION=0.9.16
+ VERSION=0.14.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-gabble/HISTORY
b/telephony/telepathy-gabble/HISTORY
index d03cb05..01f9cd3 100644
--- a/telephony/telepathy-gabble/HISTORY
+++ b/telephony/telepathy-gabble/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.14.1
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/telephony/telepathy-glib/DETAILS
b/telephony/telepathy-glib/DETAILS
index 7cd67dd..666d314 100755
--- a/telephony/telepathy-glib/DETAILS
+++ b/telephony/telepathy-glib/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-glib
- VERSION=0.16.0
+ VERSION=0.16.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-glib/HISTORY
b/telephony/telepathy-glib/HISTORY
index 28bcc14..5fd54b2 100644
--- a/telephony/telepathy-glib/HISTORY
+++ b/telephony/telepathy-glib/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.16.4
+
2011-10-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.16.0
diff --git a/telephony/telepathy-idle/DETAILS
b/telephony/telepathy-idle/DETAILS
index 36405f0..2e20166 100755
--- a/telephony/telepathy-idle/DETAILS
+++ b/telephony/telepathy-idle/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-idle
- VERSION=0.1.9
+ VERSION=0.1.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-idle/HISTORY
b/telephony/telepathy-idle/HISTORY
index 497fd4f..e14dacf 100644
--- a/telephony/telepathy-idle/HISTORY
+++ b/telephony/telepathy-idle/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.1.11
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/telephony/telepathy-logger/DETAILS
b/telephony/telepathy-logger/DETAILS
index 59a6df4..35cd409 100755
--- a/telephony/telepathy-logger/DETAILS
+++ b/telephony/telepathy-logger/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-logger
- VERSION=0.2.10
+ VERSION=0.2.12
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-logger/HISTORY
b/telephony/telepathy-logger/HISTORY
index c4eba1b..acf093e 100644
--- a/telephony/telepathy-logger/HISTORY
+++ b/telephony/telepathy-logger/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.2.12
+
2011-10-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.2.10
diff --git a/telephony/telepathy-mission-control/DETAILS
b/telephony/telepathy-mission-control/DETAILS
index c964d48..6cb30fc 100755
--- a/telephony/telepathy-mission-control/DETAILS
+++ b/telephony/telepathy-mission-control/DETAILS
@@ -1,13 +1,13 @@
SPELL=telepathy-mission-control
- VERSION=5.7.9
+ VERSION=5.10.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$WEB_SITE/releases/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
-
SOURCE_HASH=sha512:e40293979bf6508625c5c69db04eda8edceebd31be2a5540a00843bd0004a734032983f053338764c5cf112068e9fc45e9cd3fa861dc5b826bf55ffef2e48230
-# SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
+#
SOURCE_HASH=sha512:e40293979bf6508625c5c69db04eda8edceebd31be2a5540a00843bd0004a734032983f053338764c5cf112068e9fc45e9cd3fa861dc5b826bf55ffef2e48230
+ SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
SOURCE2_IGNORE=signature
LICENSE[0]=LGPL
ENTERED=20070511
diff --git a/telephony/telepathy-mission-control/HISTORY
b/telephony/telepathy-mission-control/HISTORY
index 30a7392..363f95c 100644
--- a/telephony/telepathy-mission-control/HISTORY
+++ b/telephony/telepathy-mission-control/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.10.1
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/telephony/telepathy-salut/DETAILS
b/telephony/telepathy-salut/DETAILS
index 341f637..a18ba84 100755
--- a/telephony/telepathy-salut/DETAILS
+++ b/telephony/telepathy-salut/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-salut
- VERSION=0.4.0
+ VERSION=0.6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-salut/HISTORY
b/telephony/telepathy-salut/HISTORY
index 9194032..4dd4844 100644
--- a/telephony/telepathy-salut/HISTORY
+++ b/telephony/telepathy-salut/HISTORY
@@ -1,3 +1,6 @@
+2012-01-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.0
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/utils/file/DETAILS b/utils/file/DETAILS
index 180aa6e..55a5aad 100755
--- a/utils/file/DETAILS
+++ b/utils/file/DETAILS
@@ -1,6 +1,6 @@
SPELL=file
- VERSION=5.09
-
SOURCE_HASH=sha512:8808b35dae6c150f0ca09ae36813a64dfb1cde2172e1749488e59ccef2e5dd217d8d8d72d1abc86589cddc0a018ccc665491ed1dd0de00bc0bb7e565d9a9dfe2
+ VERSION=5.10
+
SOURCE_HASH=sha512:d49a091fe61c7b501c50ccd48b91928d0c3d155c7c31e273bd3ce013956f16e464fd803a52ed51fb311a317db92b2ab0e6f85c2e305ff7cae8cfe7837a0f7ced
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.astron.com/pub/file/$SOURCE
diff --git a/utils/file/HISTORY b/utils/file/HISTORY
index a4f64e9..6689611 100644
--- a/utils/file/HISTORY
+++ b/utils/file/HISTORY
@@ -1,3 +1,6 @@
+2011-12-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.10
+
2011-09-17 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 5.09
diff --git a/utils/multitail/DETAILS b/utils/multitail/DETAILS
index 9b980e3..e53099c 100755
--- a/utils/multitail/DETAILS
+++ b/utils/multitail/DETAILS
@@ -1,9 +1,9 @@
SPELL=multitail
- VERSION=5.2.8
+ VERSION=5.2.9
SOURCE=${SPELL}-${VERSION}.tgz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.vanheusden.com/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:95fdb6999e9d2b4ab9f17b62c7aa11a69d550de9156b0a7154fc7d2b6c243c8ec5c4336e30f22510324cc44b24967f92e49c4c4b6f39b852e8bc54ec894c5fea
+
SOURCE_HASH=sha512:0d643e499f04f9497cc3a9e82de10fe0f6d6f7f69eb3e200c409c0b7815548516a2aba77912d3961db689673b78afc46f78b062029522c3836d4732231d8b7be
WEB_SITE=http://www.vanheusden.com/multitail/
ENTERED=20060105
LICENSE[0]=GPL
diff --git a/utils/multitail/HISTORY b/utils/multitail/HISTORY
index 28d5358..c37addd 100644
--- a/utils/multitail/HISTORY
+++ b/utils/multitail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.2.9
+
2011-04-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.2.8
diff --git a/video-libs/gmtk/BUILD b/video-libs/gmtk/BUILD
new file mode 100755
index 0000000..dbe23ee
--- /dev/null
+++ b/video-libs/gmtk/BUILD
@@ -0,0 +1,7 @@
+OPTS="$GMTK_GIO $OPTS" &&
+
+if [ "$GMTK_PREF" == "keystore" ]; then
+ OPTS="--enable-keystore $OPTS"
+fi
+
+default_build
diff --git a/video-libs/gmtk/CONFIGURE b/video-libs/gmtk/CONFIGURE
new file mode 100755
index 0000000..242e714
--- /dev/null
+++ b/video-libs/gmtk/CONFIGURE
@@ -0,0 +1,5 @@
+config_query GMTK_GTK3 "Build with GTK+3?" n &&
+config_query_option GMTK_GIO "Use GIO for file I/O?" y \
+ "--with-gio" "--without-gio"
+config_query_list GMTK_PREF "Use which preference storage?" \
+ keystore gnome
diff --git a/video-libs/gmtk/DEPENDS b/video-libs/gmtk/DEPENDS
new file mode 100755
index 0000000..3caef18
--- /dev/null
+++ b/video-libs/gmtk/DEPENDS
@@ -0,0 +1,24 @@
+depends glib2 &&
+
+if [ "GMTK_GTK3" == "y" ]; then
+ depends gtk+3 "--enable-gtk3"
+ if [ "$GMTK_PREF" == "gnome" ]; then
+ depends dconf
+ fi
+else
+ depends gtk+2
+ if [ "$GMTK_PREF" == "gnome" ]; then
+ depends gconf2
+ fi
+fi &&
+
+
+optional_depends alsa-lib \
+ "--with-alsa" \
+ "--without-alsa" \
+ "Read volume from alsa devices?" &&
+
+optional_depends pulseaudio \
+ "--with-pulseaudio" \
+ "--without-pulseaudio" \
+ "PulseAudio device and volume support?"
diff --git a/video-libs/gmtk/DETAILS b/video-libs/gmtk/DETAILS
new file mode 100755
index 0000000..4cbbce9
--- /dev/null
+++ b/video-libs/gmtk/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=gmtk
+ VERSION=1.0.5
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://gmtk.googlecode.com/files/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=http://kdekorte.googlepages.com/gnomemplayer
+ LICENSE[0]=GPL
+ ENTERED=20111217
+ SHORT="Gnome Mplayer Toolkit."
+cat << EOF
+GMTK is the Gnome Mplayer Toolkit
+
+It includes common methods used by Gnome Mplayer and Gecko Media Player. The
+library also contains several widgets that can be used by other
applications.
+Those widgets are
+ . gmtk_media_player - a widget that completely embeds Mplayer
+ . gmtk_media_tracker - a widget that manages the timeline of media
+ . gmtk_audio_meter - a audio visualization tool
+ . gmtk_output_combobox - a widget for selecting audio outputs (alsa and
pulse
+ compatible)
+EOF
diff --git a/video-libs/gmtk/HISTORY b/video-libs/gmtk/HISTORY
new file mode 100644
index 0000000..e668c72
--- /dev/null
+++ b/video-libs/gmtk/HISTORY
@@ -0,0 +1,2 @@
+2011-12-31 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, DEPENDS, CONFIGURE, BUILD
diff --git a/video-libs/gmtk/gmtk-1.0.5.tar.gz.sig
b/video-libs/gmtk/gmtk-1.0.5.tar.gz.sig
new file mode 100644
index 0000000..94432b0
Binary files /dev/null and b/video-libs/gmtk/gmtk-1.0.5.tar.gz.sig differ
diff --git a/video/avidemux2/DETAILS b/video/avidemux2/DETAILS
index 2612d2f..dac0f8f 100755
--- a/video/avidemux2/DETAILS
+++ b/video/avidemux2/DETAILS
@@ -1,12 +1,12 @@
SPELL=avidemux2
- VERSION=2.5.5
+ VERSION=2.5.6
SOURCE=${SPELL%2}_$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL%2}_$VERSION"
SOURCE_URL[0]=http://download.berlios.de/${SPELL%2}/$SOURCE
SOURCE_URL[1]=http://download2.berlios.de/${SPELL%2}/$SOURCE
SOURCE_URL[2]=$SOURCEFORGE_URL/${SPELL%2}/$SOURCE
WEB_SITE=http://fixounet.free.fr/avidemux/
-
SOURCE_HASH=sha512:85da032f955e86437d65f7f7a289218246200178521d89a1a71868956607ea14220099c93b7f3c1894bf071257d8ea31774bf5af5fe452990d60e01df7449236
+
SOURCE_HASH=sha512:8a9dcfc61a396fc4f9f0a213269bcb574de0baa442d3165cfab0fe8e86309e7b0dd2ffe3e2d7ff8a8e6e3fd15da28699e8000367d92da0782fec6d5a38c1d77c
LICENSE[0]=GPL
ENTERED=20030512
KEYWORDS="video"
diff --git a/video/avidemux2/HISTORY b/video/avidemux2/HISTORY
index 2b5d2ac..7a6e685 100644
--- a/video/avidemux2/HISTORY
+++ b/video/avidemux2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.5.6
+
2011-10-12 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: removed optional dependency on arts
diff --git a/video/gecko-mediaplayer/DEPENDS b/video/gecko-mediaplayer/DEPENDS
index d5d99f1..e2b4550 100755
--- a/video/gecko-mediaplayer/DEPENDS
+++ b/video/gecko-mediaplayer/DEPENDS
@@ -1,4 +1,5 @@
depends gnome-mplayer &&
-depends GECKO &&
+depends firefox &&
+depends npapi-sdk &&
depends dbus-glib &&
depends glib2
diff --git a/video/gecko-mediaplayer/DETAILS b/video/gecko-mediaplayer/DETAILS
index 844e7f4..5918756 100755
--- a/video/gecko-mediaplayer/DETAILS
+++ b/video/gecko-mediaplayer/DETAILS
@@ -1,5 +1,5 @@
SPELL=gecko-mediaplayer
- VERSION=1.0.4
+ VERSION=1.0.5
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://gecko-mediaplayer.googlecode.com/files/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/video/gecko-mediaplayer/HISTORY b/video/gecko-mediaplayer/HISTORY
index 6e0a0bd..ccfec08 100644
--- a/video/gecko-mediaplayer/HISTORY
+++ b/video/gecko-mediaplayer/HISTORY
@@ -1,3 +1,7 @@
+2012-01-01 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 1.0.5
+ * DEPENDS: updated depends
+
2011-07-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.0.4
diff --git a/video/gecko-mediaplayer/gecko-mediaplayer-1.0.4.tar.gz.sig
b/video/gecko-mediaplayer/gecko-mediaplayer-1.0.4.tar.gz.sig
deleted file mode 100644
index 31b2dac..0000000
Binary files a/video/gecko-mediaplayer/gecko-mediaplayer-1.0.4.tar.gz.sig and
/dev/null differ
diff --git a/video/gnome-mplayer/BUILD b/video/gnome-mplayer/BUILD
new file mode 100755
index 0000000..1168cd0
--- /dev/null
+++ b/video/gnome-mplayer/BUILD
@@ -0,0 +1,3 @@
+OPTS="$GNOME_MPLAYER_GIO $OPTS" &&
+
+default_build
diff --git a/video/gnome-mplayer/CONFIGURE b/video/gnome-mplayer/CONFIGURE
new file mode 100755
index 0000000..c51752e
--- /dev/null
+++ b/video/gnome-mplayer/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_option GNOME_MPLAYER_GIO "Use GIO for file I/O?" y \
+ "--with-gio" "--without-gio"
diff --git a/video/gnome-mplayer/DEPENDS b/video/gnome-mplayer/DEPENDS
index e0c4e52..a8d0a83 100755
--- a/video/gnome-mplayer/DEPENDS
+++ b/video/gnome-mplayer/DEPENDS
@@ -1,4 +1,53 @@
-depends mplayer &&
-depends gtk+2 &&
-depends gconf2 &&
-depends dbus-glib
+depends glib2 &&
+depends MPLAYER &&
+depends gmtk &&
+
+if is_depends_enabled gmtk gtk+3; then
+ depends gtk+3
+else
+ depends gtk+2
+fi &&
+
+if is_depends_enabled gmtk gconf2; then
+ depends gconf2
+fi &&
+
+if is_depends_enabled gmtk dconf; then
+ depends dconf
+fi &&
+
+optional_depends nautilus2 \
+ "--enable-nautilus" \
+ "--disable-nautilus" \
+ "Compile nautilus plugin?" &&
+
+optional_depends dbus \
+ "--with-dbus" \
+ "--without-dbus" \
+ "Enable DBUS support, required for gecko-mediaplayer" &&
+
+optional_depends libnotify \
+ "--with-libnotify" \
+ "--without-libnotify" \
+ "Send notifications of new media?" &&
+
+optional_depends libgpod \
+ "--with-libgpod" \
+ "--without-libgpod" \
+ "Add support for libgpod?" &&
+
+optional_depends libmusicbrainz3 \
+ "--with-libmusicbrainz3" \
+ "--without-libmusicbrainz3" \
+ "Add support for libmusicbrainz3?" &&
+
+optional_depends alsa-lib \
+ "--with-alsa" \
+ "--without-alsa" \
+ "Read volume from alsa devices?" &&
+
+optional_depends pulseaudio \
+ "--with-pulseaudio" \
+ "--without-pulseaudio" \
+ "PulseAudio device and volume support?"
+
diff --git a/video/gnome-mplayer/DETAILS b/video/gnome-mplayer/DETAILS
index 0c7454a..158a56c 100755
--- a/video/gnome-mplayer/DETAILS
+++ b/video/gnome-mplayer/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-mplayer
- VERSION=1.0.4
+ VERSION=1.0.5
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://gnome-mplayer.googlecode.com/files/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/video/gnome-mplayer/HISTORY b/video/gnome-mplayer/HISTORY
index b97d638..cfb6745 100644
--- a/video/gnome-mplayer/HISTORY
+++ b/video/gnome-mplayer/HISTORY
@@ -1,3 +1,9 @@
+2012-01-01 Robin Cook <rcook AT wyrms.net>
+ * DETIALS: updated to 1.0.5
+ * DEPENDS: updated to new depends
+ * CONFIGURE: added to as query option
+ * BUILD: apply query option
+
2011-07-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.0.4
diff --git a/video/gnome-mplayer/gnome-mplayer-1.0.4.tar.gz.sig
b/video/gnome-mplayer/gnome-mplayer-1.0.4.tar.gz.sig
deleted file mode 100644
index b60ff0d..0000000
Binary files a/video/gnome-mplayer/gnome-mplayer-1.0.4.tar.gz.sig and
/dev/null differ
diff --git a/video/gnome-mplayer/gnome-mplayer-1.0.5.tar.gz.sig
b/video/gnome-mplayer/gnome-mplayer-1.0.5.tar.gz.sig
new file mode 100644
index 0000000..f8e4311
Binary files /dev/null and
b/video/gnome-mplayer/gnome-mplayer-1.0.5.tar.gz.sig differ
diff --git a/video/mplayer/CONFLICTS b/video/mplayer/CONFLICTS
new file mode 100755
index 0000000..eb4c07d
--- /dev/null
+++ b/video/mplayer/CONFLICTS
@@ -0,0 +1 @@
+conflicts mplayer2
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 98a909e..56caba3 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,7 @@
+2012-01-01 Robin Cook <rcook AT wyrms.net>
+ * CONFLICTS: added to conflict with mplayer2
+ * PROVIDES: added to provide MPLAYER
+
2011-11-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* TRIGGERS: added on_cast x264 check_self
* DETAILS: PATCHLEVEL++
diff --git a/video/mplayer/PROVIDES b/video/mplayer/PROVIDES
new file mode 100755
index 0000000..fb82d54
--- /dev/null
+++ b/video/mplayer/PROVIDES
@@ -0,0 +1 @@
+provides MPLAYER
diff --git a/video/mplayer2/BUILD b/video/mplayer2/BUILD
new file mode 100755
index 0000000..4c90659
--- /dev/null
+++ b/video/mplayer2/BUILD
@@ -0,0 +1,15 @@
+#disable_pic &&
+
+OPTS="$MPLAYER_OPTS $MPLAYER_IVTV $OPTS" &&
+
+CFLAGS= ./configure --prefix=${INSTALL_ROOT}/usr \
+ --confdir=${TRACK_ROOT}/etc/mplayer \
+ $OPTS &&
+
+if is_depends_enabled $SPELL openal; then
+ make
+else
+ make_single &&
+ make &&
+ make_normal
+fi
diff --git a/video/mplayer2/CONFIGURE b/video/mplayer2/CONFIGURE
new file mode 100755
index 0000000..7f6fa83
--- /dev/null
+++ b/video/mplayer2/CONFIGURE
@@ -0,0 +1,10 @@
+config_query_option MPLAYER_IVTV \
+ "Build against IVTV?" n \
+ "--enable-ivtv" "--disable-ivtv" &&
+config_query_option MPLAYER_OPTS \
+ "Enable Joystick support?" y \
+ "--enable-joystick" "--disable-joystick"
+
+#config_query_option MPLAYER_OPTS \
+# "Enable OSD Menu?" n \
+# "--enable-menu" "--disable-menu"
diff --git a/video/mplayer2/CONFLICTS b/video/mplayer2/CONFLICTS
new file mode 100755
index 0000000..4db5829
--- /dev/null
+++ b/video/mplayer2/CONFLICTS
@@ -0,0 +1 @@
+conflicts mplayer
diff --git a/video/mplayer2/DEPENDS b/video/mplayer2/DEPENDS
new file mode 100755
index 0000000..a28ed50
--- /dev/null
+++ b/video/mplayer2/DEPENDS
@@ -0,0 +1,79 @@
+depends LIBAVCODEC &&
+depends libcap &&
+depends libass &&
+
+optional_depends libdvdnav "" "--disable-dvdnav" "support for DVD
navigation" &&
+optional_depends libvorbis "--extra-libs=-lvorbisenc" "" "to use external
libvorbis to play ogg/vorbis audio" &&
+optional_depends faad2 "--enable-faad" "" "to use shared faad for AAC
decoding" &&
+
+# audio codecs
+optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support" &&
+optional_depends libmad "" "--disable-mad" "to play mp3 audio using libmad"
&&
+optional_depends xmms "--enable-xmms" "" "for xmms input plugin support" &&
+optional_depends ladspa "" "--disable-ladspa" "for LADSPA audio filter"
&&
+optional_depends libdca "" "--disable-libdca" "for DTS audio support" &&
+optional_depends lame "" "" "to encode files with mp3 audio (mencoder)" &&
+optional_depends speex "" "--disable-speex" "support for speex (an open
source speech encoder)" &&
+
+# video codecs
+optional_depends faac "" "" "for faac support"
&&
+optional_depends libtheora "" "--disable-theora" "for Theora video support"
&&
+optional_depends zlib "" "" "to play movies using losless compression
algorithms" &&
+optional_depends win32codecs "" "--disable-win32dll" "to use windows codec
DLLs for video decoding" "z-rejected" &&
+
+if ! is_depends_enabled $SPELL win32codecs ; then
+ optional_depends quicktime-codecs "" "--disable-qtx" "for some
audio/video codecs sometimes used in quicktime files" "z-rejected" &&
+ optional_depends real-codecs "" "--disable-real" "to decode RealMedia
files" "z-rejected" &&
+ optional_depends xanim-codecs "" "--disable-xanim" "for additional codecs
(intel indeo, ...)" "z-rejected"
+fi &&
+
+optional_depends libdv "" "--disable-libdv" "to play files encoded with
libdv (used by most digital camcorders)" &&
+optional_depends x264 "" "" "for x264 codec"
&&
+optional_depends twolame "" "" "Twolame (MPEG layer 2 audio) support in
mencoder" &&
+
+# audio devices
+optional_depends esound "" "--disable-esd" "for direct esd audio output" &&
+optional_depends arts "" "--disable-arts" "for arts audio output" &&
+optional_depends alsa-lib "" "--disable-alsa" "for alsa audio output" &&
+optional_depends nas "" "--disable-nas" "for NAS audio output" &&
+optional_depends pulseaudio "" "--disable-pulse" "for pulseaudio audio
output" &&
+
+# video devices
+optional_depends svgalib "" "--disable-svga" "for svgalib video output" &&
+optional_depends xorg-server "--enable-x11" "--disable-x11" "for X11 output
support" &&
+if is_depends_enabled $SPELL xorg-server; then
+ depends -sub "DPMS" xorg-server
+fi &&
+
+optional_depends libxv "--enable-xv" "--disable-xv" "for xv output support"
&&
+optional_depends xf86-video-mga "--enable-xmga" "--disable-xmga" "for xmga
output support" &&
+
+if [ "$MPLAYER_SVN" == "y" ]; then
+ optional_depends libxscrnsaver "" "--disable-xss" "to inhibit screensaver
start while playing"
+fi &&
+
+optional_depends sdl "" "--disable-sdl" "for SDL video and audio output" &&
+optional_depends directfb "" "--disable-directfb" "for direct framebuffer
support" &&
+optional_depends libcaca "" "--disable-caca" "for colored ASCII video
output" &&
+optional_depends aalib "" "--disable-aa" "for aalib (ascii) video output"
&&
+optional_depends libggi "" "--disable-ggi" "for GGI video output" &&
+
+# image support
+optional_depends giflib "" "--disable-gif" "to output to .gif files" &&
+optional_depends libpng "" "--disable-png" "to output to .png files" &&
+optional_depends JPEG "" "--disable-jpeg" "to output to .jpeg files" &&
+
+# misc
+optional_depends cdparanoia "" "--disable-cdparanoia" "to play audio cds"
&&
+optional_depends live "" "--disable-live" "for live.com Streaming Media
(sdp/rtsp) support" &&
+optional_depends libnemesi "--enable-nemesi" "--disable-nemesi" "for
Streaming Control Transmission Protocol (sctp) support" &&
+optional_depends lirc "" "--disable-lirc" "for remote-control" &&
+optional_depends freetype2 "" "--disable-freetype" "for truetype subtitle
font support" &&
+optional_depends fontconfig "" "--disable-fontconfig" "for fontconfig font
lookup support" &&
+optional_depends mplayer-fonts "" "" "for OSD/subtitle fonts (not needed if
compiled with freetype2 support" &&
+optional_depends libdvdread "" "--disable-dvdread" "support for reading
scrambled (CSS) DVDs" &&
+optional_depends fribidi "" "--disable-fribidi" "for locales writing from
right to left" &&
+optional_depends enca "" "--disable-enca" "for ENCA charset oracle library"
&&
+optional_depends OPENAL "" "--disable-openal" "for OpenAL sound support" &&
+optional_depends samba "--enable-smb" "" "for SMB protocol support" &&
+optional_depends yasm "" "--yasm=" "for NASM assembler support"
diff --git a/video/mplayer2/DETAILS b/video/mplayer2/DETAILS
new file mode 100755
index 0000000..e64d3d5
--- /dev/null
+++ b/video/mplayer2/DETAILS
@@ -0,0 +1,30 @@
+ SPELL=mplayer2
+if [ "$MPLAYER2_BRANCH" == "scm" ]; then
+ if [ "$MPLAYER2_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
+ fi
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git_http://git.mplayer2.org/$SPELL:$SPELL-git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+else
+ VERSION=2.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://ftp.mplayer2.org/pub/release/$SOURCE
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+fi
+ PATCHLEVEL=1
+ WEB_SITE=http://www.mplayer2.org/
+ LICENSE[0]=GPL
+ ENTERED=20120101
+ KEYWORDS="player video"
+ SHORT="An advanced general-purpose video player."
+cat << EOF
+mplayer2 is an advanced general-purpose video player. A fork of the original
+MPlayer project, it contains significant further development and supports a
+number of features not available in other Unix players.
+EOF
diff --git a/video/mplayer2/HISTORY b/video/mplayer2/HISTORY
new file mode 100644
index 0000000..caa59db
--- /dev/null
+++ b/video/mplayer2/HISTORY
@@ -0,0 +1,6 @@
+2012-01-01 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added LIBAVCODEC, fixed some flags
+
+2012-01-01 Robin Cook <rcook AT wyrms.net>
+ * New Spell: BUILD, CONFIGURE, CONFLICTS, DEPENDS, DETAILS, PREPARE,
+ PROVIDES
diff --git a/video/mplayer2/PREPARE b/video/mplayer2/PREPARE
new file mode 100755
index 0000000..83f15d3
--- /dev/null
+++ b/video/mplayer2/PREPARE
@@ -0,0 +1,3 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
+
diff --git a/video/mplayer2/PROVIDES b/video/mplayer2/PROVIDES
new file mode 100755
index 0000000..fb82d54
--- /dev/null
+++ b/video/mplayer2/PROVIDES
@@ -0,0 +1 @@
+provides MPLAYER
diff --git a/video/mplayer2/mplayer.png b/video/mplayer2/mplayer.png
new file mode 100644
index 0000000..9831f69
Binary files /dev/null and b/video/mplayer2/mplayer.png differ
diff --git a/video/mplayer2/mplayer2-2.0.tar.bz2.sig
b/video/mplayer2/mplayer2-2.0.tar.bz2.sig
new file mode 100644
index 0000000..9421b21
Binary files /dev/null and b/video/mplayer2/mplayer2-2.0.tar.bz2.sig differ
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index b3c1ab3..4da21de 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.3.35
+ VERSION=1.3.36
else
VERSION=1.2.3
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index f2832e2..c378c5a 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2012-01-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated devel to 1.3.36
+
2011-12-16 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated devel to 1.3.35
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index ad81f46..3d3b701 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2012-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, WebKit.pri.patch: removed -Werror CXXFLAG for webkit
+ to avoid compile error
+
2011-12-22 Ladislav Hagara <hgr AT vabo.cz>
* CONFIGURE: -qt-gif removed from saved QT_GIF
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 9518bc6..3435443 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p1 < ${SCRIPT_DIRECTORY}/WebKit.pri.patch &&
+
# fix bad .pro file for 4.6.0-beta1
for file in
tools/assistant/tools/{qhelpgenerator,qcollectiongenerator,qhelpconverter,assistant}/*.pro;
do
echo "LIBS += -lQtCLucene" >> $file || return 1
diff --git a/x11-toolkits/qt4/WebKit.pri.patch
b/x11-toolkits/qt4/WebKit.pri.patch
new file mode 100644
index 0000000..268874b
--- /dev/null
+++ b/x11-toolkits/qt4/WebKit.pri.patch
@@ -0,0 +1,11 @@
+---
qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/WebKit.pri.orig
2012-01-02 13:44:33.130841538 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/WebKit.pri
2012-01-02 13:44:54.300511604 +0100
+@@ -102,8 +102,6 @@
+
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
+- isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
+-
+ greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION,
5) {
+ if (!contains(QMAKE_CXXFLAGS, -std=c++0x) &&
!contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
+ # We need to deactivate those warnings because some names
conflicts with upcoming c++0x types (e.g.nullptr).
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (733d6176f9e1bbae26364f54d25e6a2d17bcd32f), Vlad Glagolev, 01/02/2012
Archive powered by MHonArc 2.6.24.