Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.31 grimoire by Jaka Kranjc (0722657cae6dd4016eca311bd40a3a8a6eeefe48)

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.31 grimoire by Jaka Kranjc (0722657cae6dd4016eca311bd40a3a8a6eeefe48)
  • Date: Tue, 24 Mar 2009 15:51:23 -0500

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

video-libs/xine-lib/HISTORY | 3 +++
video-libs/xine-lib/PRE_BUILD | 6 ++++++
video/ffmpeg-svn/BUILD | 2 --
video/ffmpeg-svn/CONFIGURE | 5 -----
video/ffmpeg-svn/HISTORY | 4 ++++
video/gxine/BUILD | 11 +++--------
video/gxine/DETAILS | 2 +-
video/gxine/HISTORY | 5 +++++
video/gxine/gxine-0.5.903.tar.bz2.sig |binary
video/mplayer/BUILD | 4 ----
video/mplayer/HISTORY | 4 ++++
11 files changed, 26 insertions(+), 20 deletions(-)

New commits:
commit 0722657cae6dd4016eca311bd40a3a8a6eeefe48
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

xine-lib: fix compile with current ffmpeg-svn
(cherry picked from commit 75823fffa08799047dca53dc60912463640dee53)

commit 640fad0fad5269c26a67c720039cb83c71afca31
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

mplayer: removed unknown configure option
(cherry picked from commit 689b9f622ae1b5ad288d694ad9feab9139a54303)

commit 6e41f32de0396bfe165b09a582068125ff699448
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

ffmpeg-svn: removed swscale configure option, bug 15129
(cherry picked from commit d11acc202caed178c71a42da88af52096ab9c8f6)

commit 7a4ca2679905db0c49fe96b3b28947f9b66b1ee7
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gxine: updated to 0.5.903
(cherry picked from commit 00398381e61f79b3e2374e2e2fe5cd66f7ef8de5)

diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index cfd7177..8b626a2 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,6 @@
+2009-03-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: added to make this compile with current ffmpeg-svn
+
2009-02-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.16.2, SECURITY_PATCH=11

diff --git a/video-libs/xine-lib/PRE_BUILD b/video-libs/xine-lib/PRE_BUILD
new file mode 100755
index 0000000..76f38e8
--- /dev/null
+++ b/video-libs/xine-lib/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ $(get_spell_provider $SPELL LIBAVCODEC) == "ffmpeg-svn" ]]; then
+ sedit "s/PIX_FMT_RGBA32/PIX_FMT_RGB32/" \
+ src/combined/ffmpeg/ff_video_decoder.c
+fi
diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
index edf217c..f867c41 100755
--- a/video/ffmpeg-svn/BUILD
+++ b/video/ffmpeg-svn/BUILD
@@ -4,8 +4,6 @@ disable_pic &&
# OPTS="--enable-lib$FFAMR $FFMPEG_SWSCALE $OPTS"
#fi &&

-OPTS="$FFMPEG_SWSCALE $OPTS" &&
-
./configure --prefix=${INSTALL_ROOT}/usr \
--mandir=${INSTALL_ROOT}/usr/share/man \
--enable-shared \
diff --git a/video/ffmpeg-svn/CONFIGURE b/video/ffmpeg-svn/CONFIGURE
deleted file mode 100755
index c0c144f..0000000
--- a/video/ffmpeg-svn/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-default_configure &&
-# this option name changed, 20080313
-FFMPEG_SWSCALE=${FFMPEG_SWSCALE/swscaler/swscale} &&
-config_query_option FFMPEG_SWSCALE 'enable software scaler support?' y \
- '--enable-swscale' '--disable-swscale'
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index bbd762c..375d479 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,7 @@
+2009-03-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: removed FFMPEG_SWSCALE opts, always built now, bug #15129
+ * CONFIGURE: removed
+
2008-10-07 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: liba52 wrapper removed upstream

diff --git a/video/gxine/BUILD b/video/gxine/BUILD
index 4dcf025..590e802 100755
--- a/video/gxine/BUILD
+++ b/video/gxine/BUILD
@@ -1,15 +1,10 @@
-if test "$(get_spell_provider $SPELL GECKO)" = "firefox"; then
- JS_CFLAGS="-I/usr/include/firefox/js/" &&
- LDFLAGS="-L/usr/lib/firefox -Wl,-rpath -Wl,/usr/lib/firefox"
-elif test "$(get_spell_provider $SPELL GECKO)" = "seamonkey"; then
+if test "$(get_spell_provider $SPELL GECKO)" = "seamonkey"; then
JS_CFLAGS="-I/usr/include/seamonkey-$(installed_version seamonkey)/js" &&
LDFLAGS="-L/usr/lib/seamonkey -Wl,-rpath -Wl,/usr/lib/seamonkey"
elif test "$(get_spell_provider $SPELL GECKO)" = "xulrunner"; then
- JS_CFLAGS="-I/usr/include/xulrunner-$(installed_version xulrunner)/js" &&
+ xulversion=$(installed_version xulrunner) &&
+ JS_CFLAGS="-I/usr/include/xulrunner-${xulversion:0:3}/unstable" &&
LDFLAGS="-L/usr/lib/xulrunner -Wl,-rpath -Wl,/usr/lib/xulrunner"
-else
- JS_CFLAGS="-I/usr/include/mozilla-$(installed_version mozilla)/js" &&
- LDFLAGS="-L/usr/lib/mozilla -Wl,-rpath -Wl,/usr/lib/mozilla"
fi &&
# JS1_LIBS is used to completely ignore the madness of gxines JS lib
detection,
# whatever configure does, the one actually used in the build is JS1_LIBS
diff --git a/video/gxine/DETAILS b/video/gxine/DETAILS
index 2606def..73131d6 100755
--- a/video/gxine/DETAILS
+++ b/video/gxine/DETAILS
@@ -1,5 +1,5 @@
SPELL=gxine
- VERSION=0.5.11
+ VERSION=0.5.903
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/xine/$SOURCE
diff --git a/video/gxine/HISTORY b/video/gxine/HISTORY
index 269c59c..62d1fe0 100644
--- a/video/gxine/HISTORY
+++ b/video/gxine/HISTORY
@@ -1,3 +1,8 @@
+2009-03-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.5.903
+ * BUILD: fixed xulrunner include dir, removed firefox and mozilla
+ parts as they don't provide GECKO anymore
+
2007-02-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.5.11
* BUILD, PRE_BUILD: yet again fix the broken spidermonkey detection
diff --git a/video/gxine/gxine-0.5.903.tar.bz2.sig
b/video/gxine/gxine-0.5.903.tar.bz2.sig
new file mode 100644
index 0000000..860d7f2
Binary files /dev/null and b/video/gxine/gxine-0.5.903.tar.bz2.sig differ
diff --git a/video/mplayer/BUILD b/video/mplayer/BUILD
index 273fb6c..f23250c 100755
--- a/video/mplayer/BUILD
+++ b/video/mplayer/BUILD
@@ -1,7 +1,3 @@
-if [[ $MPLAYER_SVN = y ]]; then
- OPTS="$OPTS --with-extraincdir=${INSTALL_ROOT}/usr/include/ffmpeg"
-fi &&
-
disable_pic &&

OPTS="$MPLAYER_OPTS $MPLAYER_IVTV $OPTS" &&
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index c0197a8..34a155c 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,7 @@
+2009-03-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: removed --with-extraincdir option, not necessary anymore,
+ breaks the build, bug #15132
+
2009-02-06 Eric Sandall <sandalle AT sourcemage.org>
* CONFIGURE: Add query (default n) for IVTV, fix from Vasil Yonkov
Fixes Bug #14977



  • [SM-Commit] GIT changes to stable-0.31 grimoire by Jaka Kranjc (0722657cae6dd4016eca311bd40a3a8a6eeefe48), Jaka Kranjc, 03/24/2009

Archive powered by MHonArc 2.6.24.

Top of Page