Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.32 grimoire by Jaka Kranjc (5d9acbc77cb2cdfeecd1c5179512c74128e52a3d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.32 grimoire by Jaka Kranjc (5d9acbc77cb2cdfeecd1c5179512c74128e52a3d)
  • Date: Tue, 12 May 2009 03:44:14 -0500

GIT changes to stable-0.32 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

dev/null |binary
gnome2-apps/gdesklets/DETAILS | 4 ++--
gnome2-apps/gdesklets/HISTORY | 4 ++++
gnome2-apps/revelation/DEPENDS | 12 +++++++-----
gnome2-apps/revelation/HISTORY | 5 +++++
libs/libusb-compat/DEPENDS | 3 ++-
libs/libusb-compat/HISTORY | 4 ++++
libs/openscenegraph/BUILD | 8 +-------
libs/openscenegraph/DEPENDS | 16 ++++++++++++++--
libs/openscenegraph/DETAILS | 11 ++++++-----
libs/openscenegraph/HISTORY | 10 ++++++++++
libs/openscenegraph/OpenSceneGraph-2.8.0.zip.sig |binary
net/ntop/DETAILS | 2 +-
net/ntop/HISTORY | 6 ++++++
net/ntop/init.d/ntop | 5 ++---
net/ntop/ntop-3.3.9.tar.gz.sig |binary
net/ntop/ntop-3.3.tar.gz.sig | 0
video-libs/mplayer-gui/HISTORY | 4 ++++
video-libs/mplayer-gui/INSTALL | 1 +
19 files changed, 69 insertions(+), 26 deletions(-)

New commits:
commit 5d9acbc77cb2cdfeecd1c5179512c74128e52a3d
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

mplayer-gui: /usr/share/mplayer may not exist, make it.
(cherry picked from commit 46feb7abb9d895f261f336780f921693eba78766)

commit 9539216c32a664d02206b4fce6d857b3c007d78e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

openscenegraph: Updated to 2.8.0
Removed UPDATED
SOURCE_URL moved to openscenegraph, hasn't been hosted on SF
since 2006
SOURCE is now .zip
Depends on libx11, libice, libxext, libxrandr, cmake, zlib,
and openthreads
No longer uses openproducer
Use cmake_build()
(cherry picked from commit f63e7f57713ab8010bb6e3136457c8342890339f)

commit 1a2e07f0bd37f122d6aff1f08ab797068d50eb19
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

revelation: Added dependencies on gnome-python-desktop
and gnome-python-extras
Bug #14158
(cherry picked from commit 1208aa4abe53ab66f035d5fab26f912fdab36f97)

commit 356dbd8ebf0ccfeb36089ccf8c44495643444871
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

ntop: Switch from netconf to ifupdown method
Fixes Bug #15184
(cherry picked from commit 4c7d163bd460066a473cf275e53bd0fb722e16dc)

commit ccee5e973a48e59bdfae58ba04e5b5c99f2ed330
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

ntop: Updated to 3.3.9
Fixes Bug #15183
(cherry picked from commit ddcb6ef9bfeaaab1c3eb268a0cd63b2bd1f0d62a)

commit d5ce22a4c1fc5222b814d91e381290ef22212d5f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libusb-compat: Depends on pkgconfig
Bug #15193
(cherry picked from commit d0c6ecd24cea6af380011a72dc7c35c53879c069)

commit 9bc8619176d44c4abe5af191194d5a0fedeef675
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gdesklets: WEB_SITE and SOURCE_URL moved to gdesklets.de
Bug #15029
(cherry picked from commit e5a4313fa97857fbaeceabb0152dc390cd0ad3d5)
(cherry picked from commit eb88975c424323ecddae71e1dbfea1ee15523b56)

diff --git a/gnome2-apps/gdesklets/DETAILS b/gnome2-apps/gdesklets/DETAILS
index 86e9011..d6b5b03 100755
--- a/gnome2-apps/gdesklets/DETAILS
+++ b/gnome2-apps/gdesklets/DETAILS
@@ -2,10 +2,10 @@
VERSION=0.35.4
SOURCE=gDesklets-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gDesklets-$VERSION
- SOURCE_URL[0]=http://gdesklets.org/downloads/$SOURCE
+ SOURCE_URL[0]=http://www.gdesklets.de/files/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
- WEB_SITE=http://www.gdesklets.org/
+ WEB_SITE=http://www.gdesklets.de/
ENTERED=20030821
PATCHLEVEL=1
KEYWORDS="gnome2"
diff --git a/gnome2-apps/gdesklets/HISTORY b/gnome2-apps/gdesklets/HISTORY
index f3f4458..de0724a 100644
--- a/gnome2-apps/gdesklets/HISTORY
+++ b/gnome2-apps/gdesklets/HISTORY
@@ -1,3 +1,7 @@
+2009-04-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: WEB_SITE and SOURCE_URL moved to gdesklets.de
+ Bug #15029
+
2006-11-13 Flavien Bridault <vlaaad AT sourcemage.org>
* no-update-mime.patch: disable mime database rebuild during install
* PRE_BUILD: added, apply patch
diff --git a/gnome2-apps/revelation/DEPENDS b/gnome2-apps/revelation/DEPENDS
index 323cb44..7cb8d5b 100755
--- a/gnome2-apps/revelation/DEPENDS
+++ b/gnome2-apps/revelation/DEPENDS
@@ -1,6 +1,8 @@
-depends gtk+2 &&
-depends python &&
-depends gnome-python2 &&
-depends pycrypto &&
-depends cracklib &&
+depends gtk+2 &&
+depends python &&
+depends gnome-python2 &&
+depends gnome-python-desktop &&
+depends gnome-python-extras &&
+depends pycrypto &&
+depends cracklib &&
depends libpanelappletmm
diff --git a/gnome2-apps/revelation/HISTORY b/gnome2-apps/revelation/HISTORY
index 1544e1c..3fae9b5 100644
--- a/gnome2-apps/revelation/HISTORY
+++ b/gnome2-apps/revelation/HISTORY
@@ -1,3 +1,8 @@
+2009-04-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Added dependencies on gnome-python-desktop
+ and gnome-python-extras
+ Bug #14158
+
2008-06-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added missing dependency

diff --git a/libs/libusb-compat/DEPENDS b/libs/libusb-compat/DEPENDS
index 5487d07..d3df555 100755
--- a/libs/libusb-compat/DEPENDS
+++ b/libs/libusb-compat/DEPENDS
@@ -1 +1,2 @@
-depends libusb
+depends libusb &&
+depends pkgconfig
diff --git a/libs/libusb-compat/HISTORY b/libs/libusb-compat/HISTORY
index b555006..06c503f 100644
--- a/libs/libusb-compat/HISTORY
+++ b/libs/libusb-compat/HISTORY
@@ -1,3 +1,7 @@
+2009-04-20 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on pkgconfig
+ Bug #15193
+
2009-03-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS: spell created, version 0.1.0
SOURCE_IGNORE=signature, gnupg is broken if compiled with libusb
diff --git a/libs/openscenegraph/BUILD b/libs/openscenegraph/BUILD
index 527e550..e013b8d 100755
--- a/libs/openscenegraph/BUILD
+++ b/libs/openscenegraph/BUILD
@@ -1,7 +1 @@
-sedit "s/gmake/make/" Make/instexamplesrc &&
-sedit "s/-O2/\"$CFLAGS\"/" Make/makedefs &&
-for i in $(grep -rl YieldCurrentThread .)
-do
- sedit "s/YieldCurrentThread/CurrentThread/" $i
-done &&
-make opt GIF_LIBS="-lungif"
+cmake_build
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index e5cb842..2e7a0e5 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -1,9 +1,21 @@
+depends cmake &&
depends GLUT &&
depends freetype1 &&
depends libpng &&
+depends libx11 &&
+depends libxext &&
+depends libice &&
+depends libxrandr &&
depends giflib &&
depends jpeg &&
+depends openthreads &&
depends tiff &&
-depends openproducer &&
depends libxml2 &&
-depends unzip
+depends unzip &&
+depends zlib &&
+
+optional_depends cairo '' '' '' 'for GTK+ plugins' &&
+optional_depends gtk+2 '' '' '' 'for GTK+ plugins' &&
+optional_depends gtkglext '' '' '' 'for GTK+ plugins' &&
+optional_depends librsvg2 '' '' '' 'for GTK+ plugins' &&
+optional_depends poppler '' '' '' 'for GTK+ plugins'
diff --git a/libs/openscenegraph/DETAILS b/libs/openscenegraph/DETAILS
index 5b295bb..deeb082 100755
--- a/libs/openscenegraph/DETAILS
+++ b/libs/openscenegraph/DETAILS
@@ -1,12 +1,13 @@
SPELL=openscenegraph
- VERSION=0.9.6-2
- SOURCE=OpenSceneGraph-$VERSION.tar.gz
+ VERSION=2.8.0
+ BRANCH=${VERSION/%.?/}
+ SOURCE=OpenSceneGraph-$VERSION.zip
SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenSceneGraph-${VERSION}
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:fa615b68dda33db468a4d476a76839692b2fb8cb6926ec60fbef00aef4b5da90ec6fdef87d668458aaebb661ec7142f58167facfb463f6127fe33841f932b9f3
+
SOURCE_URL[0]=http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$BRANCH/source/$SOURCE
+#
SOURCE_HASH=sha512:fa615b68dda33db468a4d476a76839692b2fb8cb6926ec60fbef00aef4b5da90ec6fdef87d668458aaebb661ec7142f58167facfb463f6127fe33841f932b9f3
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
WEB_SITE=http://www.openscenegraph.org/
ENTERED=20021102
- UPDATED=20031208
LICENSE[0]=LGPL
KEYWORDS="graph libs"
SHORT="A free scene graph library."
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index b644d9b..db86de3 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,13 @@
+2009-05-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.8.0
+ Removed UPDATED
+ SOURCE_URL moved to openscenegraph, hasn't been hosted on SF since
2006
+ SOURCE is now .zip
+ * DEPENDS: Depends on libx11, libice, libxext, libxrandr, cmake,
zlib, and
+ openthreads
+ No longer uses openproducer
+ * BUILD: Use cmake_build()
+
2008-07-12 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: depends on giflib, libungif deprecated

diff --git a/libs/openscenegraph/OpenSceneGraph-2.8.0.zip.sig
b/libs/openscenegraph/OpenSceneGraph-2.8.0.zip.sig
new file mode 100644
index 0000000..8df7280
Binary files /dev/null and b/libs/openscenegraph/OpenSceneGraph-2.8.0.zip.sig
differ
diff --git a/net/ntop/DETAILS b/net/ntop/DETAILS
index 762c04b..a0c9f74 100755
--- a/net/ntop/DETAILS
+++ b/net/ntop/DETAILS
@@ -1,5 +1,5 @@
SPELL=ntop
- VERSION=3.3
+ VERSION=3.3.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/net/ntop/HISTORY b/net/ntop/HISTORY
index ab53430..831152d 100644
--- a/net/ntop/HISTORY
+++ b/net/ntop/HISTORY
@@ -1,3 +1,9 @@
+2009-04-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.3.9
+ Fixes Bug #15183
+ * init.d/ntop: Switch from netconf to ifupdown method
+ Fixes Bug #15184
+
2008-01-22 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 3.3
SOURCE is now .tar.gz instead of .gz
diff --git a/net/ntop/init.d/ntop b/net/ntop/init.d/ntop
index 4879f0a..4624a68 100644
--- a/net/ntop/init.d/ntop
+++ b/net/ntop/init.d/ntop
@@ -2,9 +2,8 @@

. /etc/sysconfig/ntop

-if [ -d /etc/sysconfig/network ] ; then
- for i in /etc/sysconfig/network/*.dev ; do
- i=$( basename ${i%.dev} )
+if [ -f /etc/network/interfaces ] ; then
+ for i in $(grep "^iface" /etc/network/interfaces | awk '{print $2}') ; do
[ "$i" = "lo" -a "$IGNORE_LO" = "yes" ] && continue
IFACES="${IFACES},$i"
done
diff --git a/net/ntop/ntop-3.3.9.tar.gz.sig b/net/ntop/ntop-3.3.9.tar.gz.sig
new file mode 100644
index 0000000..4f49999
Binary files /dev/null and b/net/ntop/ntop-3.3.9.tar.gz.sig differ
diff --git a/net/ntop/ntop-3.3.tar.gz.sig b/net/ntop/ntop-3.3.tar.gz.sig
deleted file mode 100644
index 13fcfe9..0000000
Binary files a/net/ntop/ntop-3.3.tar.gz.sig and /dev/null differ
diff --git a/video-libs/mplayer-gui/HISTORY b/video-libs/mplayer-gui/HISTORY
index 14dca7b..6592841 100644
--- a/video-libs/mplayer-gui/HISTORY
+++ b/video-libs/mplayer-gui/HISTORY
@@ -1,3 +1,7 @@
+2009-05-06 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * INSTALL: /usr/share/mplayer may not exist, make it before attempting
+ to install theme.
+
2009-03-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]; updated spell to 1.7
* INSTALL: use correct path; removed useless stuff; increased
verbosity
diff --git a/video-libs/mplayer-gui/INSTALL b/video-libs/mplayer-gui/INSTALL
index e1a3eb9..5193cdc 100755
--- a/video-libs/mplayer-gui/INSTALL
+++ b/video-libs/mplayer-gui/INSTALL
@@ -1,3 +1,4 @@
+mkdir -p "$INSTALL_ROOT/usr/share/mplayer/skins" &&
cp -av Blue "$INSTALL_ROOT/usr/share/mplayer/skins" &&

ln -vsf "$TRACK_ROOT/usr/share/mplayer/skins/Blue" \



  • [SM-Commit] GIT changes to stable-0.32 grimoire by Jaka Kranjc (5d9acbc77cb2cdfeecd1c5179512c74128e52a3d), Jaka Kranjc, 05/12/2009

Archive powered by MHonArc 2.6.24.

Top of Page