Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (7297f782974b1e6a5f8c794fd5f0c94b4dc66219)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (7297f782974b1e6a5f8c794fd5f0c94b4dc66219)
  • Date: Mon, 19 Sep 2011 22:06:54 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

chat-im/choqok/DETAILS | 4 +--
chat-im/choqok/HISTORY | 3 ++
chat-im/choqok/PREPARE | 7 +-----
devel/codeblocks/DETAILS | 4 +--
devel/codeblocks/HISTORY | 3 ++
devel/codeblocks/PREPARE | 6 +----
devel/codeblocks/PRE_BUILD | 2 -
disk/cdrdao/BUILD | 7 +-----
disk/cdrdao/DEPENDS | 4 +--
disk/cdrdao/DETAILS | 4 +--
disk/cdrdao/HISTORY | 3 ++
disk/cdrdao/PREPARE | 9 +-------
disk/cdrdao/PRE_BUILD | 2 -
ftp/rsync/DETAILS | 4 +--
ftp/rsync/HISTORY | 3 ++
ftp/rsync/PREPARE | 8 +------
libs/glibc/DEPENDS | 2 -
libs/glibc/DETAILS | 12 ++++-------
libs/glibc/HISTORY | 3 ++
libs/glibc/PREPARE | 6 +----
smgl/castfs/DEPENDS | 2 -
smgl/castfs/DETAILS | 4 +--
smgl/castfs/HISTORY | 3 ++
smgl/castfs/PREPARE | 9 +-------
smgl/quill/DEPENDS | 2 -
smgl/quill/DETAILS | 4 +--
smgl/quill/HISTORY | 3 ++
smgl/quill/PREPARE | 9 +-------
video/mplayer/DEPENDS | 11 ++++------
video/mplayer/DETAILS | 4 +--
video/mplayer/DOWNLOAD | 47
---------------------------------------------
video/mplayer/HISTORY | 4 +++
video/mplayer/PREPARE | 8 +------
33 files changed, 74 insertions(+), 132 deletions(-)

New commits:
commit 7297f782974b1e6a5f8c794fd5f0c94b4dc66219
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

glibc: Use prepare_select_branch

commit 8376344cc1a7033d935de99b83d49966f7f3c547
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

quill: Use prepare_select_branch

commit 4ca8a2e2e40480c7ab852850bbf2b310e278db4e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

castfs: Use prepare_select_branch

commit ff408df0a7dd6bfdecd5213177dded9066504065
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mplayer: Use prepare_select_branch

commit 0dbe1d8504a89d3e7e0e6ae6c982d6fe1e55b70d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mplayer: Remove DOWNLOAD, sorcery supports Subversion URLs now

commit 4c93c083a99618954ec13a2922078b4d61bfffaf
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

codeblocks: Use prepare_select_branch

commit 26ebd13f472ba33c0a3abf0b85ccb9328f68246f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

choqok: Use prepare_select_branch

commit 296d9d70d36c0a5d890f5d84a08601b1f14b9ddd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

rsync: Use prepare_select_branch

commit e446b12de848850f6a2265cb3a3943f5aa5d4d6d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cdrdao: Use prepare_select_branch

diff --git a/chat-im/choqok/DETAILS b/chat-im/choqok/DETAILS
index 7fc0ab3..cefd432 100755
--- a/chat-im/choqok/DETAILS
+++ b/chat-im/choqok/DETAILS
@@ -1,6 +1,6 @@
SPELL=choqok
-if [ "$CHOQOK_SCM" = y ]; then
- if [ "$CHOQOK_AUTOUPDATE" = y ]; then
+if [[ "$CHOQOK_BRANCH" = scm ]]; then
+ if [[ "$CHOQOK_AUTOUPDATE" = y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/chat-im/choqok/HISTORY b/chat-im/choqok/HISTORY
index 4c61460..d330970 100644
--- a/chat-im/choqok/HISTORY
+++ b/chat-im/choqok/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE, DETAILS: Use prepare_select_branch
+
2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 1.1
diff --git a/chat-im/choqok/PREPARE b/chat-im/choqok/PREPARE
index e6bf0e6..98d27e4 100755
--- a/chat-im/choqok/PREPARE
+++ b/chat-im/choqok/PREPARE
@@ -1,5 +1,2 @@
-config_query CHOQOK_SCM "Build SCM version?" n &&
-if [[ "$CHOQOK_SCM" == "y" ]]; then
- config_query CHOQOK_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/devel/codeblocks/DETAILS b/devel/codeblocks/DETAILS
index d5ff64b..41345f4 100755
--- a/devel/codeblocks/DETAILS
+++ b/devel/codeblocks/DETAILS
@@ -1,6 +1,6 @@
SPELL=codeblocks
-if [[ $CODEBLOCKS_SVN = "y" ]]; then
- if [[ $SVN_AUTOUPDATE = y ]]; then
+if [[ $CODEBLOCKS_BRANCH = scm ]]; then
+ if [[ $CODEBLOCKS_AUTOUPDATE = y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/devel/codeblocks/HISTORY b/devel/codeblocks/HISTORY
index da0182b..b7fa00b 100644
--- a/devel/codeblocks/HISTORY
+++ b/devel/codeblocks/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2010-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: moved execution of autotools there
* BUILD: use default_build
diff --git a/devel/codeblocks/PREPARE b/devel/codeblocks/PREPARE
index 1ef6e7c..98d27e4 100755
--- a/devel/codeblocks/PREPARE
+++ b/devel/codeblocks/PREPARE
@@ -1,4 +1,2 @@
-config_query CODEBLOCKS_SVN "Do you want to use the development version from
svn?" n &&
-if [[ $CODEBLOCKS_SVN == "y" ]]; then
- config_query SVN_AUTOUPDATE "Do you want to cast $SPELL on system
upgrade?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/devel/codeblocks/PRE_BUILD b/devel/codeblocks/PRE_BUILD
index 54e95e0..a7c0f78 100755
--- a/devel/codeblocks/PRE_BUILD
+++ b/devel/codeblocks/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
-if [[ $CODEBLOCKS_SVN == "y" ]]; then
+if [[ $CODEBLOCKS_BRANCH == scm ]]; then
cd ${SOURCE_DIRECTORY} &&
./bootstrap || return 1
fi
diff --git a/disk/cdrdao/BUILD b/disk/cdrdao/BUILD
index 0fec124..be57128 100755
--- a/disk/cdrdao/BUILD
+++ b/disk/cdrdao/BUILD
@@ -1,4 +1,4 @@
-if [ "$CVS" == "n" ]; then
+if [[ "$CDRDAO_BRANCH" != "scm" ]]; then
##### Patch needed for building on x86_64 ######
ARCH=$(uname -m) &&
if [ "${ARCH:0:6}" = "x86_64" ]; then
@@ -7,10 +7,7 @@ if [ "$CVS" == "n" ]; then
cd $SOURCE_DIRECTORY
fi
################################################
-fi &&
-
-if [ "$CVS" == "y" ]
-then
+else
sedit "/^AM_GCONF_SOURCE_2$/d" configure.ac &&
touch xdao/gcdmaster.schemas.in &&
./autogen.sh
diff --git a/disk/cdrdao/DEPENDS b/disk/cdrdao/DEPENDS
index 1fba8fc..8da3339 100755
--- a/disk/cdrdao/DEPENDS
+++ b/disk/cdrdao/DEPENDS
@@ -1,5 +1,5 @@
-if [ "$CVS" == "y" ]
-then depends CVS
+if [[ "$CDRDAO_BRANCH" == "scm" ]]; then
+ depends CVS
fi &&

optional_depends pccts \
diff --git a/disk/cdrdao/DETAILS b/disk/cdrdao/DETAILS
index c104a08..d50e664 100755
--- a/disk/cdrdao/DETAILS
+++ b/disk/cdrdao/DETAILS
@@ -1,6 +1,6 @@
SPELL=cdrdao
-if [ "$CVS" == "y" ]; then
- if [ "$CDRDAO_CVS_AUTOUPDATE" == "y" ]; then
+if [[ "$CDRDAO_BRANCH" == "scm" ]]; then
+ if [[ "$CDRDAO_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=sfcvs
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index 950969e..9d8ae51 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use
prepare_select_branch
+
2011-01-11 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added if statement for CVS
* BUILD: added if statement for CVS
diff --git a/disk/cdrdao/PREPARE b/disk/cdrdao/PREPARE
index d54d1c1..98d27e4 100755
--- a/disk/cdrdao/PREPARE
+++ b/disk/cdrdao/PREPARE
@@ -1,7 +1,2 @@
-config_query CVS "Use the CVS version?" n
-
-if [ "$CVS" == "y" ]; then
- config_query CDRDAO_CVS_AUTOUPDATE \
- "Update to the latest CVS automatically on every cast?" \
- n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/disk/cdrdao/PRE_BUILD b/disk/cdrdao/PRE_BUILD
index 18d7ab7..55a1bdc 100755
--- a/disk/cdrdao/PRE_BUILD
+++ b/disk/cdrdao/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [ "$CVS" == "n" ]; then
+if [[ "$CDRDAO_BRANCH" == "scm" ]]; then
patch -p0 < "$SPELL_DIRECTORY/stat.patch"
fi
diff --git a/ftp/rsync/DETAILS b/ftp/rsync/DETAILS
index 9b9425f..23c861b 100755
--- a/ftp/rsync/DETAILS
+++ b/ftp/rsync/DETAILS
@@ -1,6 +1,6 @@
SPELL=rsync
-if [[ $RSYNC_GIT == y ]]; then
- if [[ $RSYNC_GIT_AUTOUPDATE == y ]]; then
+if [[ $RSYNC_BRANCH == scm ]]; then
+ if [[ $RSYNC_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/ftp/rsync/HISTORY b/ftp/rsync/HISTORY
index 2a99ebb..bd44324 100644
--- a/ftp/rsync/HISTORY
+++ b/ftp/rsync/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+
2011-08-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: global PATCHLEVEL=1
* INSTALL: added, to install init script
diff --git a/ftp/rsync/PREPARE b/ftp/rsync/PREPARE
index 924ad06..98d27e4 100755
--- a/ftp/rsync/PREPARE
+++ b/ftp/rsync/PREPARE
@@ -1,6 +1,2 @@
-config_query RSYNC_GIT "Build latest version from development tree?" n &&
-
-if [[ $RSYNC_GIT == y ]]; then
- config_query RSYNC_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/libs/glibc/DEPENDS b/libs/glibc/DEPENDS
index 218280f..299866a 100755
--- a/libs/glibc/DEPENDS
+++ b/libs/glibc/DEPENDS
@@ -7,7 +7,7 @@ depends smgl-fhs &&
depends smgl-archspecs &&
optional_depends libselinux '--with-selinux' '--without-selinux' 'for
selinux support' &&

-if [ "$GLIBC_GIT" = "y" ]; then
+if [ "${GLIBC_BRANCH/-*}" = "scm" ]; then
depends git
fi &&

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 0219656..44cbac3 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -20,18 +20,16 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
PATCHLEVEL=1
else
- if [[ "$GLIBC_GIT" == "y" ]]; then
-local GLIBC_VERSION
- GLIBC_VERSION=2.13
- if [[ "${GLIBC_GIT_AUTOUPDATE}" == "y" ]]; then
- VERSION=${GLIBC_VERSION}-git-$(date +%Y%m%d)
+ if [[ "${GLIBC_BRANCH/-*}" == "scm" ]]; then
+ if [[ "${GLIBC_AUTOUPDATE}" == "y" ]]; then
+ VERSION=${GLIBC_BRANCH}-$(date +%Y%m%d)
else
- VERSION=${GLIBC_VERSION}-git
+ VERSION=${GLIBC_BRANCH}
fi
FORCE_DOWNLOAD=on
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
-
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git:release/${GLIBC_VERSION}/master"
+
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git:release/${GLIBC_BRANCH#scm-}/master"
SOURCE_IGNORE=volatile
else
VERSION=2.13
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 642b1f9..7cc3658 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-09-12 Bor Kraljič <pyrobor AT ver.si>
* PREPARE,DETAILS: changed cvs url to git (uses 2.13 branch) (fixes
#195)
* DEPENDS: replaced CVS with git
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 39ce0cc..5387658 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -1,3 +1,4 @@
+. ${GRIMOIRE}/FUNCTIONS &&
if [[ $(uname -r) = 2.6.* ]] || [[ $(uname -r) = 3.* ]]; then
if test "$HOST" == "i386-pc-linux-gnu"; then
message "[[ ${QUERY_COLOR}Not building with NPTL as that's unsupported
on i386; use i486 or higher.${DEFAULT} ]]" &&
@@ -5,10 +6,7 @@ if [[ $(uname -r) = 2.6.* ]] || [[ $(uname -r) = 3.*
]]; then
else
config_query GLIBC_NPTL "As you are running a $(uname -r | cut -f1,2
-d.) kernel, would you like to use the new nptl (Native Posix Thread
Libary)?" y &&
if [[ "$GLIBC_NPTL" == "y" ]]; then
- config_query GLIBC_GIT "Do you want to install the latest unstable
(requires git)?" n &&
- if [[ "$GLIBC_GIT" == "y" ]]; then
- config_query GLIBC_GIT_AUTOUPDATE "Update on every system update?" n
- fi
+ prepare_select_branch stable scm-2.13
fi &&
config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y &&
config_query GLIBC_SANITIZE_HEADERS "Do you want to use sanitized linux
kernel headers from the latest stable release" n
diff --git a/smgl/castfs/DEPENDS b/smgl/castfs/DEPENDS
index e9e1225..0c698b5 100755
--- a/smgl/castfs/DEPENDS
+++ b/smgl/castfs/DEPENDS
@@ -2,7 +2,7 @@ depends fuse &&
depends libtool &&
depends pkgconfig &&
depends texinfo &&
-if [[ $CASTFS_GIT == y ]]
+if [[ $CASTFS_BRANCH == scm ]]
then
depends git
fi
diff --git a/smgl/castfs/DETAILS b/smgl/castfs/DETAILS
index 104b32a..642fe46 100755
--- a/smgl/castfs/DETAILS
+++ b/smgl/castfs/DETAILS
@@ -1,7 +1,7 @@
SPELL=castfs
-if [[ $CASTFS_GIT == y ]]
+if [[ $CASTFS_BRANCH == scm ]]
then
- if [[ $CASTFS_GIT_AUTOUPDATE == y ]]
+ if [[ $CASTFS_AUTOUPDATE == y ]]
then
VERSION=$(date +%Y%m%d)
else
diff --git a/smgl/castfs/HISTORY b/smgl/castfs/HISTORY
index 191bf96..57f4112 100644
--- a/smgl/castfs/HISTORY
+++ b/smgl/castfs/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2010-03-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.6.1 (Fix Bug #15636)

diff --git a/smgl/castfs/PREPARE b/smgl/castfs/PREPARE
index e221cce..98d27e4 100755
--- a/smgl/castfs/PREPARE
+++ b/smgl/castfs/PREPARE
@@ -1,7 +1,2 @@
-config_query CASTFS_GIT "Use git version?" n &&
-
-if [[ "$CASTFS_GIT" == "y" ]]
-then
- config_query CASTFS_GIT_AUTOUPDATE \
- "Automatically update every day?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/smgl/quill/DEPENDS b/smgl/quill/DEPENDS
index f0ac067..29a56a0 100755
--- a/smgl/quill/DEPENDS
+++ b/smgl/quill/DEPENDS
@@ -1,5 +1,5 @@
depends -sub SSL wget &&
-if [[ $QUILL_GIT == y ]]
+if [[ $QUILL_BRANCH == scm ]]
then
depends git
fi &&
diff --git a/smgl/quill/DETAILS b/smgl/quill/DETAILS
index 1f855e5..0b0145a 100755
--- a/smgl/quill/DETAILS
+++ b/smgl/quill/DETAILS
@@ -1,7 +1,7 @@
SPELL=quill
-if [[ $QUILL_GIT == y ]]
+if [[ $QUILL_BRANCH == scm ]]
then
- if [[ $QUILL_GIT_AUTOUPDATE == y ]]
+ if [[ $QUILL_AUTOUPDATE == y ]]
then
VERSION=$(date +%Y%m%d)
else
diff --git a/smgl/quill/HISTORY b/smgl/quill/HISTORY
index 4d55dd7..1a5abb8 100644
--- a/smgl/quill/HISTORY
+++ b/smgl/quill/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2009-04-20 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 0.3.0-rc16

diff --git a/smgl/quill/PREPARE b/smgl/quill/PREPARE
index d3a54cc..98d27e4 100755
--- a/smgl/quill/PREPARE
+++ b/smgl/quill/PREPARE
@@ -1,7 +1,2 @@
-config_query QUILL_GIT "Use the development (git) version?" n &&
-
-if [[ "$QUILL_GIT" == "y" ]]
-then
- config_query QUILL_GIT_AUTOUPDATE \
- "Automatically update every day?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 3ac911b..5be8477 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -8,11 +8,14 @@ elif [ "$MPLAYER_GUI" == "gtk+2" ]; then
depends mplayer-gui
fi &&

-if [ "$MPLAYER_SVN" == "y" ]; then
+if [[ $MPLAYER_BRANCH == scm ]]; then
depends subversion &&

optional_depends ffmpeg-svn \
- "--disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a
--disable-libavutil_a" "" "to use system ffmpeg instead of internal one"
+ "--disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a
+ --disable-libavutil_a" "" "to use system ffmpeg instead of internal one"
&&
+
+ optional_depends libxscrnsaver "" "--disable-xss" "to inhibit screensaver
start while playing"
else
optional_depends libdvdnav "" "--disable-dvdnav" "support for DVD
navigation"
fi &&
@@ -65,10 +68,6 @@ optional_depends libxv "--enable-xv" "--disable-xv" "for
xv output support" &&
optional_depends libxvmc "--enable-xvmc" "--disable-xvmc" "for xvmc 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" &&
diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index f65d74f..d59de9b 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -1,6 +1,6 @@
SPELL=mplayer
-if [ "$MPLAYER_SVN" == "y" ]; then
- if [ "$MPLAYER_SVN_AUTOUPDATE" == "y" ]; then
+if [[ $MPLAYER_BRANCH == scm ]]; then
+ if [[ $MPLAYER_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/video/mplayer/DOWNLOAD b/video/mplayer/DOWNLOAD
deleted file mode 100755
index a9b6ac0..0000000
--- a/video/mplayer/DOWNLOAD
+++ /dev/null
@@ -1,47 +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}
-
-}
-
-if [[ $(url_get_prefix $SOURCE_URL[0]) != svn ]]; then
- default_download
- return $?
-fi &&
-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/video/mplayer/HISTORY b/video/mplayer/HISTORY
index c7a3640..3db5d0e 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,7 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: Removed, sorcery supports Subversion URLs now
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-01-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0rc4
* DEPENDS: added --extra-libs=-lvorbisenc to libvorbis
diff --git a/video/mplayer/PREPARE b/video/mplayer/PREPARE
index 08386a5..26a2312 100755
--- a/video/mplayer/PREPARE
+++ b/video/mplayer/PREPARE
@@ -1,9 +1,5 @@
# changed CVS -> SVN, remove from test when it's in stable
# 2006-06-05 Arwed v. Merkatz
-config_query MPLAYER_SVN "Build SVN version?" ${MPLAYER_CVS:-n}
-if [[ $MPLAYER_SVN = y ]]; then
- config_query MPLAYER_SVN_AUTOUPDATE \
- "Update to the latest SVN on every system-update?" \
- ${MPLAYER_CVS_AUTOUPDATE:-n}
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
persistent_remove MPLAYER_CVS MPLAYER_CVS_AUTOUPDATE



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (7297f782974b1e6a5f8c794fd5f0c94b4dc66219), Ismael Luceno, 09/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page