Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.14 grimoire by Eric Sandall (81ee3dfd6c2ad9472db48c015e0087071e01420c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.14 grimoire by Eric Sandall (81ee3dfd6c2ad9472db48c015e0087071e01420c)
  • Date: Sat, 13 Oct 2007 00:27:00 -0500

GIT changes to stable-rc-0.14 grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

devel/unsermake/DEPENDS | 1
devel/unsermake/DETAILS | 21 +++------
devel/unsermake/DOWNLOAD | 43
-------------------
devel/unsermake/HISTORY | 7 +++
devel/unsermake/PREPARE | 1
telephony/asterisk/DETAILS | 4 -
telephony/asterisk/HISTORY | 5 ++
telephony/asterisk/patches/1.4r80750_app_voicemail.c | 11 ----
video/goggles/DETAILS | 4 -
video/goggles/HISTORY | 3 +
video/goggles/goggles-0.9.1.tar.bz2.sig |binary
video/xawtv/DEPENDS | 6 ++
video/xawtv/HISTORY | 4 +
video/xawtv/INSTALL | 5 ++
video/xawtv/PRE_BUILD | 8 ++-
15 files changed, 49 insertions(+), 74 deletions(-)

New commits:
commit 81ee3dfd6c2ad9472db48c015e0087071e01420c
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>

asterisk: Updated to 1.4.13, SECURITY_PATCH++, Bug 14035

commit 88e7c9ef19e486aa859982b42f77b54feafa7ca0
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>

asterisk: forgot to remove a patch file from the grimoire

commit 90853d1e5305a370f295124cde5dec591febfd56
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

unsermake: switch to a mirrored tarball; SVN is dead

commit 87b86acb22b65275002d1e1964593ac452d9f681
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

goggles: updated to 0.9.1

commit 8af4434db28a2aca87aef6cd966d8a24df6b7469
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xawtv: fixed to work with xorg-modular, bug 13014

diff --git a/devel/unsermake/DEPENDS b/devel/unsermake/DEPENDS
index 144cba7..867b4d4 100755
--- a/devel/unsermake/DEPENDS
+++ b/devel/unsermake/DEPENDS
@@ -1,2 +1 @@
-depends subversion &&
depends python
diff --git a/devel/unsermake/DETAILS b/devel/unsermake/DETAILS
index 706895d..2de8485 100755
--- a/devel/unsermake/DETAILS
+++ b/devel/unsermake/DETAILS
@@ -1,20 +1,17 @@
SPELL=unsermake
-if [[ $SVN_AUTOUPDATE = y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdenonbeta/$SPELL:$SPELL
- FORCE_DOWNLOAD=on
+ VERSION=20051117
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_HASH=sha512:9535178e2383d0aa0d9410d501f4f2a01d3f072aa2a85340cf730616e683004dcccf689520d272cd21cfe689196ae5033832a937ac680af690741e275aa080a0
+ SOURCE_URL[0]=http://sobukus.de/smgl/$SOURCE
WEB_SITE=http://wiki.kde.org/unsermake
LICENSE[0]=GPL
DOCS="doc/*.{txt,pdf,sxi}"
ENTERED=20050730
KEYWORDS="kde devel"
- SHORT="a replacement for automake, used by the KDE project"
+ SHORT="a replacement for automake, (been) used by the KDE project"
cat << EOF
-a replacement for automake, used by the KDE project
+Unsermake is a replacement for automake, written for use by the KDE project.
+Please note that it is unmaintained and just here to support build of spells
+still needing it.
EOF
diff --git a/devel/unsermake/DOWNLOAD b/devel/unsermake/DOWNLOAD
deleted file mode 100755
index b21c982..0000000
--- a/devel/unsermake/DOWNLOAD
+++ /dev/null
@@ -1,43 +0,0 @@
-function url_r_svn_crack() {
-
- URL=`url_strip_prefix "$1" svn`
- R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
- local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
- R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
- local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
- R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
-
-}
-
-url_r_svn_crack ${SOURCE_URL}
&&
-message "${MESSAGE_COLOR}Starting SVN checkout of"
\
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
&&
-if [[ -f $SOURCE_CACHE/${SOURCE} ]]
-then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/${SOURCE}
&&
- cd $R_SVN_MODULE
&&
- message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}"
&&
- svn
\
- --non-interactive
\
- update
\
- -r${R_SVN_TAG}
&&
- cd ..
&&
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-else
- message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}"
&&
- svn
\
- --non-interactive
\
- checkout
\
- -r${R_SVN_TAG}
\
- svn://${R_SVN_ROOT}
\
- ${R_SVN_MODULE}
&&
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-fi
&&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}"
&&
-tar -jcf
\
- ${SOURCE}
\
- ${R_SVN_MODULE}
&&
-cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE}
&&
-rm ${SOURCE}
&&
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
diff --git a/devel/unsermake/HISTORY b/devel/unsermake/HISTORY
index 0065a85..7c3f66b 100644
--- a/devel/unsermake/HISTORY
+++ b/devel/unsermake/HISTORY
@@ -1,3 +1,10 @@
+2007-10-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, DOWNLOAD, DEPENDS, PREPARE: switch to a mirrored tarball
+ (initially pulled from http://ftp.de.debian.org/debian/pool/main/
+ u/unsermake/unsermake_20051117.dfsg.orig.tar.gz) since svn repo is
dead.
+ Unsermake seems to be dead, but there is at least one spell
(kdenlive)
+ needing unsermake, so let's keep it.
+
2006-07-09 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Switched entirely to use svn, removed BUILD_API &
UPDATED, fixed WEB_SITE.
diff --git a/devel/unsermake/PREPARE b/devel/unsermake/PREPARE
deleted file mode 100755
index f17a48d..0000000
--- a/devel/unsermake/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query SVN_AUTOUPDATE "Update to the latest version on every cast?"
n
diff --git a/telephony/asterisk/DETAILS b/telephony/asterisk/DETAILS
index e9eb996..bb176ac 100755
--- a/telephony/asterisk/DETAILS
+++ b/telephony/asterisk/DETAILS
@@ -1,5 +1,5 @@
SPELL=asterisk
- VERSION=1.4.11
+ VERSION=1.4.13
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
@@ -13,7 +13,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
DOCS="$DOCS UPGRADE.txt BUGS CREDITS"
WEB_SITE=http://www.asterisk.org/
ENTERED=20051223
- SECURITY_PATCH=6
+ SECURITY_PATCH=7
LICENSE[0]=GPL2
KEYWORDS="telephony"
SHORT="Asterisk PBX"
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index 672ce3b..e83f211 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,8 @@
+2007-10-11 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * patches/1.4r80750_app_voicemail.c: deleted (obolsete since 1.4.12.1)
+ * DETAILS: updated spell to 1.4.13
+ SECURITY_PATCH++, fixes bug 14035
+
2007-08-25 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: updated spell to 1.4.11
SECURITY_PATCH++, Bug #13959
diff --git a/telephony/asterisk/patches/1.4r80750_app_voicemail.c
b/telephony/asterisk/patches/1.4r80750_app_voicemail.c
deleted file mode 100644
index 25c0efb..0000000
--- a/telephony/asterisk/patches/1.4r80750_app_voicemail.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- branches/1.4/apps/app_voicemail.c 2007/08/24 15:49:37 80749
-+++ branches/1.4/apps/app_voicemail.c 2007/08/24 15:51:03 80750
-@@ -4421,7 +4421,7 @@
- mail_fetchstructure
(vms->mailstream,vms->msgArray[vms->curmsg],&body);
-
- /* We have the body, now we extract the file name of the first
attachment. */
-- if (body->nested.part->next &&
body->nested.part->next->body.parameter->value) {
-+ if (body->nested.part && body->nested.part->next &&
body->nested.part->next->body.parameter->value) {
- attachedfilefmt =
ast_strdupa(body->nested.part->next->body.parameter->value);
- } else {
- ast_log(LOG_ERROR, "There is no file attached to this IMAP
message.\n");
diff --git a/video/goggles/DETAILS b/video/goggles/DETAILS
index 76d0f4b..40189a9 100755
--- a/video/goggles/DETAILS
+++ b/video/goggles/DETAILS
@@ -1,10 +1,10 @@
SPELL=goggles
- VERSION=0.8.0
+ VERSION=0.9.1
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.fifthplanet.net/files/$SOURCE
WEB_SITE=http://www.fifthplanet.net/goggles.html
-
SOURCE_HASH=sha512:f9c5d5f70e9fe866d6e2d06ba29614dc2f19329bc598ed4b305aa022c909e24ab8029853b89a98c2145b38ab37cc3c65a63cd9fb909ffd7fbaef0e637cc6dd00
LICENSE[0]=GPL
ENTERED=20050318
KEYWORDS="dvd player video"
diff --git a/video/goggles/HISTORY b/video/goggles/HISTORY
index 07cc5be..9ad1883 100644
--- a/video/goggles/HISTORY
+++ b/video/goggles/HISTORY
@@ -1,3 +1,6 @@
+2007-10-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.9.1, fixes bug #13973
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/video/goggles/goggles-0.9.1.tar.bz2.sig
b/video/goggles/goggles-0.9.1.tar.bz2.sig
new file mode 100644
index 0000000..4aa9e8f
Binary files /dev/null and b/video/goggles/goggles-0.9.1.tar.bz2.sig differ
diff --git a/video/xawtv/DEPENDS b/video/xawtv/DEPENDS
index afffbe6..19ce46d 100755
--- a/video/xawtv/DEPENDS
+++ b/video/xawtv/DEPENDS
@@ -2,6 +2,12 @@ depends gcc34 &&
depends X11-SERVER &&
depends jpeg &&

+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_server; then
+ depends libfs &&
+ depends xset
+fi &&
+
optional_depends libpng \
"" \
"" \
diff --git a/video/xawtv/HISTORY b/video/xawtv/HISTORY
index 95cedc4..8eabeb0 100644
--- a/video/xawtv/HISTORY
+++ b/video/xawtv/HISTORY
@@ -1,3 +1,7 @@
+2007-10-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depends on libfs and xset if using xorg-modular, bug 13014
+ * PRE_BUILD, INSTALL: added path adjustments for xorg-modular
+
2006-04-13 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD: disable use of libquicktime as xawtv is incompatible to the
current one
diff --git a/video/xawtv/INSTALL b/video/xawtv/INSTALL
index db1afc0..fdc3470 100755
--- a/video/xawtv/INSTALL
+++ b/video/xawtv/INSTALL
@@ -2,5 +2,10 @@ yes | make install &&

# Install fonts
cd ${SOURCE2/.tar.bz2/} &&
+if check_if_xorg_modular_server; then
+install -m 644 *.pcf.gz \
+${INSTALL_ROOT}/usr/lib/X11/fonts/misc
+else
install -m 644 *.pcf.gz \
${INSTALL_ROOT}/usr/X11R6/lib/X11/fonts/misc
+fi
diff --git a/video/xawtv/PRE_BUILD b/video/xawtv/PRE_BUILD
index edf2367..74d5c1f 100755
--- a/video/xawtv/PRE_BUILD
+++ b/video/xawtv/PRE_BUILD
@@ -1,4 +1,8 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-unpack_file 2
-# patch -p0 < $SCRIPT_DIRECTORY/gcc-4.0.patch
+unpack_file 2 &&
+if check_if_xorg_modular_server; then
+ sed -i 's:FSlib.h:X11/fonts/FSlib.h:' console/fs.h &&
+ sed -i 's:-L@x_libraries@ @FSLIB@:-lFS:' Makefile.in &&
+ sed -i 's:/usr/X11R6/lib/X11:/usr/lib/X11:' configure
+fi



  • [SM-Commit] GIT changes to stable-rc-0.14 grimoire by Eric Sandall (81ee3dfd6c2ad9472db48c015e0087071e01420c), Eric Sandall, 10/13/2007

Archive powered by MHonArc 2.6.24.

Top of Page