[SM-Commit] GIT changes to master grimoire by Andraž Levstik (4399c4a807d3fffd6b58668c7eec25d0ec75a441)

Andraž Levstik scm at sourcemage.org
Fri Oct 19 03:47:12 EDT 2007


GIT changes to master grimoire by Andraž Levstik <ruskie at mages.ath.cx>:

 ChangeLog                     |    3 ++
 audio-libs/libmp3splt/DEPENDS |   13 ++++++++++
 audio-libs/libmp3splt/DETAILS |   13 ++++++++++
 audio-libs/libmp3splt/HISTORY |    2 +
 audio-players/mp3splt/DEPENDS |    5 ---
 audio-players/mp3splt/DETAILS |    7 ++---
 audio-players/mp3splt/HISTORY |    5 +++
 libs/xmlrpc-c/BUILD           |   53 +++---------------------------------------
 libs/xmlrpc-c/CONFIGURE       |   22 ++++++++++++-----
 libs/xmlrpc-c/DEPENDS         |   16 +++++++++++-
 libs/xmlrpc-c/DETAILS         |    4 +--
 libs/xmlrpc-c/HISTORY         |    9 ++++++-
 libs/xmlrpc-c/PRE_BUILD       |    5 +++
 13 files changed, 89 insertions(+), 68 deletions(-)

New commits:
commit 4399c4a807d3fffd6b58668c7eec25d0ec75a441
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    audio-players/mp3splt: version update, slpits into libmp3splt

commit bd822d596d9aee82a545b6c9e353a28ee7cbf6d5
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    audio-libs/libmp3splt: new spell, library to split mp3/ogg files

commit 85a5bdfb6f89acbfbfc3ca68308acef71b7b8640
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    xmlrpc-c: cleaned up the spell and updated to latest stable version

diff --git a/ChangeLog b/ChangeLog
index 2fb9f72..483f5d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-10-19 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* audio-libs/libmp3splt: added new spell, library to split mp3/ogg files
+
 2007-10-18 Eric Sandall <sandalle at sourcemage.org>
 	* groups: Added netdev:160: for avahi (See
 	  https://bugzilla.redhat.com/show_bug.cgi?id=219218)
diff --git a/audio-libs/libmp3splt/DEPENDS b/audio-libs/libmp3splt/DEPENDS
new file mode 100755
index 0000000..6fe3ed5
--- /dev/null
+++ b/audio-libs/libmp3splt/DEPENDS
@@ -0,0 +1,13 @@
+depends libmad                                &&
+optional_depends libogg                       \
+                 "--enable-ogg"               \
+                 "--disable-ogg"              \
+                 "Enable Ogg/Vorbis support"  &&
+. $GRIMOIRE/is_depends_enabled.function
+if is_depends_enabled $SPELL libogg ; then
+depends libvorbis
+fi                                            &&
+optional_depends libid3tag                    \
+                 "--enable-id3tag"            \
+                 "--disable-id3tag"           \
+                 "Enable id3tag support(to preserve tags)"
diff --git a/audio-libs/libmp3splt/DETAILS b/audio-libs/libmp3splt/DETAILS
new file mode 100755
index 0000000..41872e1
--- /dev/null
+++ b/audio-libs/libmp3splt/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=libmp3splt
+         VERSION=0.4_rc1
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/mp3splt/${SOURCE}
+     SOURCE_HASH=sha512:9595541d3b329c12c20090d33a745f7a3d5ef7d7de80762add2a94c1ca755113ee503584041e1563753f68e068ebb0cbd79893f3c4b3f428a8a77d0c90dd6e7a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://mp3splt.sourceforge.net/"
+      LICENSE[0]=GPL
+         ENTERED=20071018
+           SHORT="Libmp3splt is a library created from mp3splt version 2.1c."
+cat << EOF
+Libmp3splt is a library created from mp3splt version 2.1c.
+EOF
diff --git a/audio-libs/libmp3splt/HISTORY b/audio-libs/libmp3splt/HISTORY
new file mode 100644
index 0000000..ec26c23
--- /dev/null
+++ b/audio-libs/libmp3splt/HISTORY
@@ -0,0 +1,2 @@
+2007-10-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/audio-players/mp3splt/DEPENDS b/audio-players/mp3splt/DEPENDS
index b6de5d0..bf52b67 100755
--- a/audio-players/mp3splt/DEPENDS
+++ b/audio-players/mp3splt/DEPENDS
@@ -1,4 +1 @@
-depends gcc34 &&
-depends libogg &&
-depends libvorbis &&
-depends libmad
+depends libmp3splt
diff --git a/audio-players/mp3splt/DETAILS b/audio-players/mp3splt/DETAILS
index 668ce49..4caf485 100755
--- a/audio-players/mp3splt/DETAILS
+++ b/audio-players/mp3splt/DETAILS
@@ -1,12 +1,11 @@
            SPELL=mp3splt
-         VERSION=2.1
-     GCC_VERSION=34
-          SOURCE=${SPELL}-${VERSION}-src.tar.gz
+         VERSION=2.2_rc1
+          SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
         WEB_SITE=http://mp3splt.sourceforge.net/
          ENTERED=20050118
-     SOURCE_HASH=sha512:196059a609ad5cd65c5e2c7cd8c4ffe4050d8ace3e6920442d5e31bc515a5589143b737ce8fc5e0e8cd239272737eb84f955b63c8bad56431a002d8a23a26179
+     SOURCE_HASH=sha512:af1b2f883990b5dded597c38ba406413942b1d310c1d6b5f2b1db58b7080e070c70a6a4fb0a40b12dc7ec9f3df7ff9d526370c98d3a98f5e5137a6500ef2bd42
       LICENSE[0]=GPL
         KEYWORDS="players audio"
            SHORT="split large mp3/ogg to make smaller files or to split entire albums"
diff --git a/audio-players/mp3splt/HISTORY b/audio-players/mp3splt/HISTORY
index 2f55d0b..77ac667 100644
--- a/audio-players/mp3splt/HISTORY
+++ b/audio-players/mp3splt/HISTORY
@@ -1,3 +1,8 @@
+2007-10-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: Fixed SOURCE_URL[0]
+	  updated spell to 2.2_rc1
+	* DEPENDS: depen on libmp3splt
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/libs/xmlrpc-c/BUILD b/libs/xmlrpc-c/BUILD
index 96114b2..1cee254 100755
--- a/libs/xmlrpc-c/BUILD
+++ b/libs/xmlrpc-c/BUILD
@@ -1,49 +1,4 @@
-if [ "$CURLCLIENT" == "n" ]; 
-then
-    MYCONF="--disable-curl-client " &&
-    message "${MESSAGE_COLOR}Disabled curl client build${DEFAULT_COLOR}"
-fi &&
-if [ "$ABYSSERV" == "n" ];
-then
-    MYCONF="$MYCONF --disable-abyss-server " &&
-    message "${MESSAGE_COLOR}Disabled abyss server build${DEFAULT_COLOR}"
-fi &&
-if [ "$CGISERV" == "n" ];
-then
-    MYCONF="$MYCONF --disable-cgi-server " &&
-    message "${MESSAGE_COLOR}Disabled cgi server build${DEFAULT_COLOR}"
-fi &&
-if [ "$CPLUSPLUS" == "n" ];
-then
-    MYCONF="$MYCONF --disable-cplusplus " &&
-    message "${MESSAGE_COLOR}Disabled c++ wrapper build${DEFAULT_COLOR}"
-fi &&
-if [ "$BUNICODE" == "n" ];
-then
-    MYCONF="$MYCONF --disable-unicode " &&
-    message "${MESSAGE_COLOR}Disabled unicode support build${DEFAULT_COLOR}"
-fi &&
-if [ "$ABFORK" == "y" ];
-then
-    MYCONF="$MYCONF --disable-abyss-threads " &&
-    message "${MESSAGE_COLOR}Disabled abys thread support build${DEFAULT_COLOR}"
-fi &&
-
-./configure \
-    --prefix=${INSTALL_ROOT}/usr                          \
-    --bindir=${INSTALL_ROOT}/usr/bin                      \
-    --sbindir=${INSTALL_ROOT}/usr/sbin                    \
-    --datadir=${INSTALL_ROOT}/usr/share                   \
-    --sysconfdir=${INSTALL_ROOT}/etc                      \
-    --libdir=${INSTALL_ROOT}/usr/lib                      \
-    --includedir=${INSTALL_ROOT}/usr/include              \
-    --infodir=${INSTALL_ROOT}/usr/info                    \
-    --mandir=${INSTALL_ROOT}/usr/share/man                \
-    --libexecdir=${INSTALL_ROOT}/usr/libexec              \
-    --datadir=${INSTALL_ROOT}/usr/share                   \
-    --localstatedir=${INSTALL_ROOT}/var/lib/xmlrpc-c      \
-    --sharedstatedir=${INSTALL_ROOT}/usr/share/xmlrpc-c   \
-    $OPTS                                                 \
-    $MYCONF                                               &&
-
-make
+OPTS="$XMLRPCC_OPTS $OPTS"  &&
+make_single                 &&
+default_build               &&
+make_normal
diff --git a/libs/xmlrpc-c/CONFIGURE b/libs/xmlrpc-c/CONFIGURE
index 6d9e163..93f7a2e 100755
--- a/libs/xmlrpc-c/CONFIGURE
+++ b/libs/xmlrpc-c/CONFIGURE
@@ -1,6 +1,16 @@
-config_query CURLCLIENT "Build curl client?"  y
-config_query ABYSSERV   "Build abyss server?" y
-config_query CGISERV    "Build cgi server?"   y
-config_query CPLUSPLUS  "Build c++ wrapper?"  y
-config_query BUNICODE   "Build unicode support?" y
-config_query ABFORK     "Use fork in abyss instead of pthreads?" n
+config_query_option XMLRPCC_OPTS                              \
+                    "Build abyss server?"                     \
+                    y                                         \
+                    "--enable-abyss-server"                   \
+                    "--disable-abyss-server"                  &&
+config_query_option XMLRPCC_OPTS                              \
+                    "Use fork in abyss instead of pthreads?"  \
+                    y                                         \
+                    "--enable-abyss-threads"                  \
+                    "--disable-abyss-threads"                 &&
+config_query_option XMLRPCC_OPTS                              \
+                    "Build cgi server?"                       \
+                    y                                         \
+                    "--enable-cgi-server"                     \
+                    "--disable-cgi-server"
+
diff --git a/libs/xmlrpc-c/DEPENDS b/libs/xmlrpc-c/DEPENDS
index 88dbfe6..4cf9e19 100755
--- a/libs/xmlrpc-c/DEPENDS
+++ b/libs/xmlrpc-c/DEPENDS
@@ -1,2 +1,14 @@
-depends	curl		&&
-depends w3c-libwww	
+# we prefer system libs to package provided ones
+depends libxml2 "--enable-libxml2-backend"  &&
+optional_depends curl                       \
+                 "--enable-curl-client"     \
+                 "--disable-curl-client"    \
+                 "Enable cURL support"      &&
+optional_depends w3c-libwww                 \
+                 "--enable-libwww-client"   \
+                 "--disable-libwww-client"  \
+                 "Enable libwww support"    &&
+optional_depends g++                        \
+                 "--enable-cplusplus"       \
+                 "--disable-cplusplus"      \
+                 "Enable C++ support"
diff --git a/libs/xmlrpc-c/DETAILS b/libs/xmlrpc-c/DETAILS
index 04ce3f6..7fefc8d 100755
--- a/libs/xmlrpc-c/DETAILS
+++ b/libs/xmlrpc-c/DETAILS
@@ -1,10 +1,10 @@
            SPELL=xmlrpc-c
-         VERSION=1.03.01
+         VERSION=1.06.18
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/xmlrpc-c/$SOURCE
         WEB_SITE=http://xmlrpc-c.sourceforge.net
-     SOURCE_HASH=sha512:41f969cc9e6d1fe803517b3b310f78d6b8fcce15468bc16b5b5afa66e745f0e7bfdda973f45fdfe6153e75df8874509635dcb8341fdbe0112c2deedacbd719da
+     SOURCE_HASH=sha512:13283e733492c654e9c1b6197c7f087dd19e12633dd9c96a4d32ab2ab223f0f74c74afc088cde33cf7a19c4a7c11a0f7adde4d00829be892cb727e53a1844a54
       LICENSE[0]=GPL
          ENTERED=20040907
         KEYWORDS="xml http libs"
diff --git a/libs/xmlrpc-c/HISTORY b/libs/xmlrpc-c/HISTORY
index 2db5aae..1294eb7 100644
--- a/libs/xmlrpc-c/HISTORY
+++ b/libs/xmlrpc-c/HISTORY
@@ -1,5 +1,12 @@
+2007-10-19 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update
+	* DEPENDS: revamped
+	* CONFIGURE: revamped
+	* BUILD: revamped
+	* PRE_BUILD: added, use our CFLAGS
+
 2007-10-18 Mathieu Lonjaret <lejatorn at sourcemage.org>
-        * BUILD: bogus configure for unicode
+	* BUILD: bogus configure for unicode
 
 2007-01-23 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DETAILS: use $SOURCEFORGE_URL instead of hardcoded broken value
diff --git a/libs/xmlrpc-c/PRE_BUILD b/libs/xmlrpc-c/PRE_BUILD
new file mode 100755
index 0000000..c25ae92
--- /dev/null
+++ b/libs/xmlrpc-c/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build                                               &&
+cd $SOURCE_DIRECTORY                                            &&
+sedit "s:\(CFLAGS_COMMON.*\)-g -O3:\1$CFLAGS:" Makefile.common  &&
+sedit "s:\(CXXFLAGS_COMMON.*\)-g:\1$CXXFLAGS:" Makefile.common
+



More information about the SM-Commit mailing list