Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (e46c32400862554f12b1ee3af2c15cecf02da60e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (e46c32400862554f12b1ee3af2c15cecf02da60e)
  • Date: Sun, 10 Jun 2007 08:35:48 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

video/ffmpeg-svn/.HISTORY.swp |binary
video/ffmpeg-svn/.INSTALL.swp |binary
video/ffmpeg-svn/DEPENDS | 6 ++---
video/ffmpeg-svn/DOWNLOAD | 49
++++++++++++++++++++++++++++++++++++++++++
video/ffmpeg-svn/HISTORY | 5 ++++
video/ffmpeg-svn/INSTALL | 5 ++--
video/mplayer/DOWNLOAD | 2 -
video/mplayer/HISTORY | 4 +++
8 files changed, 65 insertions(+), 6 deletions(-)

New commits:
commit e46c32400862554f12b1ee3af2c15cecf02da60e
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ffmpeg-svn: added DOWNLOAD file for stable sorcery

commit 22eb3972a76e88e54e4a70502a74811ef891b481
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

mplayer: fixed DOWNLOAD file to actually work for svn version

diff --git a/video/ffmpeg-svn/.HISTORY.swp b/video/ffmpeg-svn/.HISTORY.swp
new file mode 100644
index 0000000..4756c8f
Binary files /dev/null and b/video/ffmpeg-svn/.HISTORY.swp differ
diff --git a/video/ffmpeg-svn/.INSTALL.swp b/video/ffmpeg-svn/.INSTALL.swp
new file mode 100644
index 0000000..3ad5c65
Binary files /dev/null and b/video/ffmpeg-svn/.INSTALL.swp differ
diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
index 9b65a86..ccdb929 100755
--- a/video/ffmpeg-svn/DEPENDS
+++ b/video/ffmpeg-svn/DEPENDS
@@ -23,9 +23,9 @@ optional_depends "freetype2" \
"" \
"" \
"for a text render plugin" &&
-optional_depends "xvid" \
- "--enable-xvid" \
- "" \
+optional_depends "xvid" \
+ "--enable-libxvid" \
+ "" \
"for xvid support" &&
optional_depends sdl \
"" \
diff --git a/video/ffmpeg-svn/DOWNLOAD b/video/ffmpeg-svn/DOWNLOAD
new file mode 100755
index 0000000..873b9fa
--- /dev/null
+++ b/video/ffmpeg-svn/DOWNLOAD
@@ -0,0 +1,49 @@
+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}"
&&
+
+if [[ $SOURCE2 ]]; then
+ acquire_src 2 &&
+ acquire_src 3 &&
+ acquire_src 4
+fi
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index cf58de9..7d90e05 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,8 @@
+2007-06-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DOWNLOAD: added to support stable sorcery, bug #13693
+ * DEPENDS: enable-xvid option renamed to enable-libxvid
+ * INSTALL: install intreadwrite.h header as mplayer svn needs it
+
2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: removed libdts, replaced by internal dts decoder

diff --git a/video/ffmpeg-svn/INSTALL b/video/ffmpeg-svn/INSTALL
index ba4fac5..f0c9ac4 100755
--- a/video/ffmpeg-svn/INSTALL
+++ b/video/ffmpeg-svn/INSTALL
@@ -1,5 +1,6 @@
make_single &&
install_config_file doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf &&
make install &&
-cp libavutil/bswap.h $INSTALL_ROOT/usr/include/ffmpeg &&
-cp libavformat/riff.h $INSTALL_ROOT/usr/include/ffmpeg
+cp libavutil/intreadwrite.h $INSTALL_ROOT/usr/include/ffmpeg &&
+cp libavutil/bswap.h $INSTALL_ROOT/usr/include/ffmpeg &&
+cp libavformat/riff.h $INSTALL_ROOT/usr/include/ffmpeg
diff --git a/video/mplayer/DOWNLOAD b/video/mplayer/DOWNLOAD
index 1a5913d..a9b6ac0 100755
--- a/video/mplayer/DOWNLOAD
+++ b/video/mplayer/DOWNLOAD
@@ -9,7 +9,7 @@ function url_r_svn_crack() {

}

-if [[ $(url_get_prefix) != svn ]]; then
+if [[ $(url_get_prefix $SOURCE_URL[0]) != svn ]]; then
default_download
return $?
fi &&
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index e18b013..cb9dda8 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,7 @@
+2007-06-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DOWNLOAD: actually check SOURCE_URL[0] in the url_get_prefix call
+ so it works with stable sorcery
+
2007-05-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: --disable-libavodec and similar renamed to libavcodec_a in
ffmpeg-svn dependency




Archive powered by MHonArc 2.6.24.

Top of Page