[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3fe889f214d8a57dd26993426b600da34a660ebc)

Treeve Jelbert scm at sourcemage.org
Sat Apr 26 08:12:04 EDT 2008


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 ChangeLog                     |    3 +++
 database/tokyocabinet/DETAILS |    4 ++--
 database/tokyocabinet/HISTORY |    3 +++
 kde4-apps/kmplayer4/DEPENDS   |    3 +++
 kde4-apps/kmplayer4/DETAILS   |   15 +++++++++++++++
 kde4-apps/kmplayer4/HISTORY   |    3 +++
 kde4-apps/kmplayer4/TRIGGERS  |    1 +
 kde4-apps/kmplayer4/b         |    8 ++++++++
 kde4-apps/kmplayer4/c         |    7 +++++++
 kde4-apps/kmplayer4/d         |   34 ++++++++++++++++++++++++++++++++++
 kde4/kdebase4-runtime/DEPENDS |   11 +++++------
 kde4/kdebase4-runtime/HISTORY |    4 ++++
 kde4/kdeedu4/DEPENDS          |   12 ++++++++++--
 kde4/kdeedu4/HISTORY          |    6 +++++-
 kde4/kdelibs4/DEPENDS         |    3 ++-
 kde4/kdelibs4/HISTORY         |    4 ++++
 kde4/kdemultimedia4/DEPENDS   |    2 --
 kde4/kdemultimedia4/HISTORY   |    4 ++++
 kde4/kdenetwork4/DEPENDS      |    8 ++++++--
 kde4/kdenetwork4/HISTORY      |    4 ++++
 kde4/kdepim4/DEPENDS          |    4 +++-
 kde4/kdepim4/HISTORY          |    4 ++++
 22 files changed, 130 insertions(+), 17 deletions(-)

New commits:
commit a078559996bcc73210c75391aae0530e5745cb63
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kmplayer4  0.11.0-rc3

commit 2da681670a35aa1127c313c31f93519ff37158c7
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdebase4-runtime - fix bug #14488

commit b2171a3ea2a3f0944252de939ce4d436f2d8a202
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdelibs4 - fix bug #14487

commit 6ce483bb3a53259a0722bc765bcaf5d8c8b06ef4
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdemultimedia4 - fix bug #14491

commit ff553c5940ba5fd3591331324a3c4a598b25f46f
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdepim4 - fix bug #14492

commit b8501793050f9af839af831b19cb6c81d22a7ac6
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdenetwork4 - fix bug #14490

commit ad4ef136e342adaebb4c849e07a7f616c7d32367
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdeedu4 - fix bug #14487

commit 02a2f441b4519a0e142dec3f6681599d97c8c603
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    "tokyocabinet-1.2.5"

diff --git a/ChangeLog b/ChangeLog
index 89f1fbd..157a442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-04-26 Treeve Jelbert <treeve at sourcemage.org>
+	* kde4-apps/kmplayer4: new spell, watch video in Konqueror
+
 2008-04-25 David Kowis <dkowis at shlrm.org>
 	* python-pypi/gitosis: new spell, badass git management app
 	  Added from ryuji's grimoire thinger
diff --git a/database/tokyocabinet/DETAILS b/database/tokyocabinet/DETAILS
index 5869909..472eb1e 100755
--- a/database/tokyocabinet/DETAILS
+++ b/database/tokyocabinet/DETAILS
@@ -1,6 +1,6 @@
            SPELL=tokyocabinet
-         VERSION=1.2.4
-     SOURCE_HASH=sha512:531e552444c1dcf46bc22531064e291d98ee503e748e1acaef80449ae33e6a6a4c08391a221488ed4c4facd4407430d56cd8a81c01268ebac3f27e3bcddc04fa
+         VERSION=1.2.5
+     SOURCE_HASH=sha512:12520d47d664ea49df99c5884e6bff86cc5919af2038f8a9b6333bcac3ee00ee8d1da664bed16aff7f2f3df560ebee196b4cd7f4884694b0f4dfa2df4dc1e6d2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://$SPELL.sf.net/$SOURCE
diff --git a/database/tokyocabinet/HISTORY b/database/tokyocabinet/HISTORY
index d601404..bf8b854 100644
--- a/database/tokyocabinet/HISTORY
+++ b/database/tokyocabinet/HISTORY
@@ -1,3 +1,6 @@
+2008-04-25 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.2.5
+
 2008-04-20 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.2.4
 
diff --git a/kde4-apps/kmplayer4/DEPENDS b/kde4-apps/kmplayer4/DEPENDS
new file mode 100755
index 0000000..ba71e9b
--- /dev/null
+++ b/kde4-apps/kmplayer4/DEPENDS
@@ -0,0 +1,3 @@
+source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
+optional_depends cairo    '' ''      "SMIL support"  
+
diff --git a/kde4-apps/kmplayer4/DETAILS b/kde4-apps/kmplayer4/DETAILS
new file mode 100755
index 0000000..880c7e8
--- /dev/null
+++ b/kde4-apps/kmplayer4/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=kmplayer4
+         VERSION=0.11.0-rc3
+     SOURCE_HASH=sha512:a4afb8cb497e72e9448c5a35fee1dd182a3076076a79b98f4d9a5b10d24ec8c4a029a3ae396b4ac4fa7f837ff57a73c3a6ecd4004be47f40d78d1e0b17ddf320
+          SOURCE=${SPELL//4}-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
+        WEB_SITE=http://kmplayer.kde.org
+   SOURCE_URL[0]=$WEB_SITE/pkgs/$SOURCE
+         ENTERED=20030202
+      LICENSE[0]=GPL
+        KEYWORDS="player kde4 video"
+           SHORT="video player fro KDE4"
+cat << EOF
+kmplayer is a KDE4 GUI plugin.
+It allows you to watch video in Konqueror.
+EOF
diff --git a/kde4-apps/kmplayer4/HISTORY b/kde4-apps/kmplayer4/HISTORY
new file mode 100644
index 0000000..b1ef9bd
--- /dev/null
+++ b/kde4-apps/kmplayer4/HISTORY
@@ -0,0 +1,3 @@
+2008-03-23 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.11.0-rc3
+	  kde4 version derived from kde3
diff --git a/kde4-apps/kmplayer4/TRIGGERS b/kde4-apps/kmplayer4/TRIGGERS
new file mode 100755
index 0000000..2a517a8
--- /dev/null
+++ b/kde4-apps/kmplayer4/TRIGGERS
@@ -0,0 +1 @@
+on_cast  kdelibs4  check_self
diff --git a/kde4-apps/kmplayer4/b b/kde4-apps/kmplayer4/b
new file mode 100755
index 0000000..87311ce
--- /dev/null
+++ b/kde4-apps/kmplayer4/b
@@ -0,0 +1,8 @@
+if ! list_find "$BACKENDS" "xine"; then
+  OPTS="$OPTS --without-xine"
+fi  &&
+if ! list_find "$BACKENDS" "gstreamer"; then
+  OPTS="$OPTS --without-gstreamer"
+fi  &&
+
+default_kde3_build
diff --git a/kde4-apps/kmplayer4/c b/kde4-apps/kmplayer4/c
new file mode 100755
index 0000000..418a3e2
--- /dev/null
+++ b/kde4-apps/kmplayer4/c
@@ -0,0 +1,7 @@
+. $GRIMOIRE/config_query_multi.function  &&
+
+config_query_multi  BACKENDS             \
+  "Which backends do you want?"          \
+  mplayer                                \
+  xine                                   \
+  gstreamer
diff --git a/kde4-apps/kmplayer4/d b/kde4-apps/kmplayer4/d
new file mode 100755
index 0000000..750f90c
--- /dev/null
+++ b/kde4-apps/kmplayer4/d
@@ -0,0 +1,34 @@
+depends  kdelibs  &&
+depends  pkgconfig &&
+
+if list_find "$BACKENDS" "mplayer"; then
+  depends  mplayer
+fi  &&
+if list_find "$BACKENDS" "xine"; then
+  depends  xine-lib
+fi  &&
+if list_find "$BACKENDS" "gstreamer"; then
+  depends  gst-plugins-base
+fi  &&
+
+optional_depends cairo                         \
+                  '--enable-cairo'             \
+                  '--disable-cairo'            \
+                  "SMIL support"               &&
+
+optional_depends expat                         \
+                  '--enable-expat'             \
+                  '--disable-expat'            \
+                  "expat XML parsing"          &&
+
+optional_depends arts  ""  "--without-arts"  "for arts support"  &&
+
+optional_depends  LIBAVCODEC                    \
+                  ""                            \
+                  ""                            \
+                  "for recording using ffmpeg"  &&
+
+optional_depends  koffice                     \
+                  ""                          \
+                  "--disable-koffice-plugin"  \
+                  "for koffice integration"
diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index 2b4bc1e..0b423e2 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -2,6 +2,7 @@ source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 source $GRIMOIRE/FUNCTIONS              &&
 depends qimageblitz                     &&
 depends kdepimlibs4                     &&
+depends xine-lib                        &&
 if  check_if_xorg_modular_libs  qt4  ;  then
 #  depends  imake          &&
 #  depends  libxau         &&
@@ -15,11 +16,9 @@ if  check_if_xorg_modular_libs  qt4  ;  then
 #  depends  libxxf86misc   &&
 #  depends  xsetroot       &&
 #  depends  xset           &&
-  optional_depends  xine-lib   '' ''   'video player'            &&
-  if is_depends_enabled $SPELL xine-lib;then
-#    sub_depends xine-lib libxcb
-    depends libxcb
-  fi
 #  optional_depends  libxdamage  '' '' 'Compositing support'
-fi
+    sub_depends xine-lib libxcb
+fi                         &&
+optional_depends openexr  '' '' 'EXR support for thumbnails'  &&
+optional_depends samba    '' '' 'build smb-ioslave'
 
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index c8ff9d6..e5ec801 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,7 @@
+2008-04-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add optional samba, openexr
+	  xine-lib is now required ( fixes bug #14488
+
 2008-04-18 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.0.70
 
diff --git a/kde4/kdeedu4/DEPENDS b/kde4/kdeedu4/DEPENDS
index fc6742d..98ac04f 100755
--- a/kde4/kdeedu4/DEPENDS
+++ b/kde4/kdeedu4/DEPENDS
@@ -8,8 +8,16 @@ if is_depends_enabled $SPELL facile ; then
   depends eigen                                                 &&
   depends ocaml
 fi                                                              &&
-optional_depends  openbabel  "" "" "chemistry support"
+optional_depends  openbabel  "" "" "chemistry support"          &&
+optional_depends  OPENGL     "" "" "3D graphs and viewers"      &&
+optional_depends  readline   "" "" "build kalgebra console interface"   &&
+optional_depends  libusb     "" "" "kstars INDI support"        &&
+optional_depends  gpsd       "" "" "GPS support in marble"
 # libsbigudrv for KStars
-# 
+# http://indi.sourceforge.net
+#
+# libnova     for KStars
+# http://libnova.sourceforge.net
+#
 # libcfitsio  for KStars
 # http://heasarc.gsfc.nasa.gov/docs/software/fitsio
diff --git a/kde4/kdeedu4/HISTORY b/kde4/kdeedu4/HISTORY
index 4af22c1..7170e52 100644
--- a/kde4/kdeedu4/HISTORY
+++ b/kde4/kdeedu4/HISTORY
@@ -1,6 +1,10 @@
+2008-04-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add several optional depends
+	  fixes bug #14493 
+
 2008-04-18 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.0.70
-
+  
 2008-04-14 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.0.69
 
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index c848086..db76e80 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -16,7 +16,8 @@ optional_depends  aspell      '' '' 'for spell checking support'&&
 optional_depends  hspell      '' '' 'for Hebrew spell checking' &&
 optional_depends  enchant     '' '' 'generic spelling library'  &&
 optional_depends  avahi       '' '' 'for domain browsing'       &&
-optional_depends  mdnsresponder '' '' 'for domain browsing'       &&
+optional_depends  gssapi      '' '' 'GSSAPI HTTP authentication support'  &&
+optional_depends  mdnsresponder'' '' 'Zerconf/DNS-SD service support'&&
 optional_depends  python      '' '' 'kross scripting support'   &&
 optional_depends  jpeg        '' '' 'for JPEG image support'    &&
 optional_depends  libmng      '' '' 'for animated PNG'          &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 66a2241..aa28bd9 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,7 @@
+2008-04-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add optional gssapi
+	  fixes bug #14487, supplied by <carlosdgtorres at gmail.com>
+
 2008-04-23 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: add optional mdnsresponder
 
diff --git a/kde4/kdemultimedia4/DEPENDS b/kde4/kdemultimedia4/DEPENDS
index 7c3e7a3..06835a3 100755
--- a/kde4/kdemultimedia4/DEPENDS
+++ b/kde4/kdemultimedia4/DEPENDS
@@ -2,9 +2,7 @@ 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 glib2          '' '' ''    &&
 optional_depends libtheora      '' '' 'video codec'              &&
-optional_depends gstreamer      '' '' 'Phonon GStreamer backend' &&
 optional_depends xine-lib       '' '' 'video playback'           &&
 optional_depends flac           '' '' 'lossless audio codec'     &&
 optional_depends libtunepimp    '' '' 'MusicBrainz tagging'      &&
diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY
index 9635d3d..b5f8c3d 100644
--- a/kde4/kdemultimedia4/HISTORY
+++ b/kde4/kdemultimedia4/HISTORY
@@ -1,3 +1,7 @@
+2008-04-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: remove gstreamer
+	  fixes bug #14491
+
 2008-04-18 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.0.70
 
diff --git a/kde4/kdenetwork4/DEPENDS b/kde4/kdenetwork4/DEPENDS
index db45fa5..0bea2d1 100755
--- a/kde4/kdenetwork4/DEPENDS
+++ b/kde4/kdenetwork4/DEPENDS
@@ -7,5 +7,9 @@ optional_depends  libidn     '' '' 'International Domain Name Support'  &&
 optional_depends  decibel    '' '' 'Decibel support'                    &&
 optional_depends  qca2       '' '' 'needed to build kopete'             &&
 optional_depends  ktorrent4  '' '' 'download using torrents'            &&
-optional_depends  xmms       '' '' 'nowlistening plugin'
-# libdnssd: libvncserver  jpeg?
+optional_depends  xmms       '' '' 'nowlistening plugin'                &&
+optional_depends  libvncserver '' '' 'build krfb and VNC suport in krdc'  &&
+optional_depends  mdnsresponder '' '' 'krfb and krdc service discovery and dnssd ioslave'  &&
+optional_depends  jpeg       '' '' 'JPEG images in krdc'                &&
+optional_depends  sqlite     '' '' 'build kopete statistics and kget history plugins'  &&
+optional_depends  libotr     '' '' 'build kopete OTR plugin'
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index 1257666..98edb64 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,7 @@
+2008-04-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: more optional depends
+	  fixes bug #14490
+
 2008-04-18 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.0.70
 
diff --git a/kde4/kdepim4/DEPENDS b/kde4/kdepim4/DEPENDS
index 89a8346..66140ad 100755
--- a/kde4/kdepim4/DEPENDS
+++ b/kde4/kdepim4/DEPENDS
@@ -8,4 +8,6 @@ optional_depends cyrus-sasl    '' '' 'authentication of logins'       &&
 optional_depends libopensync   '' '' 'sync with mobile devices'       &&
 optional_depends pilot-link    '' '' 'Palm Pilot support'             &&
 optional_depends libmal        '' '' 'Avantgo support'                &&
-optional_depends gnokii        '' '' 'Nokia support'
+optional_depends gnokii        '' '' 'Nokia support'                  &&
+optional_depends libxscrnsaver '' '' 'screensaver support for ktimetracker'
+
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index 7e99aa1..53398b6 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,7 @@
+2008-04-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add optional libxscrnsaver
+	  fixes bug #14492
+
 2008-04-18 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.0.70
 	* PRE_BUILD: added, fix compile with gcc-4.3 



More information about the SM-Commit mailing list