Skip to Content.
Sympa Menu

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

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 (00398381e61f79b3e2374e2e2fe5cd66f7ef8de5)
  • Date: Tue, 24 Mar 2009 15:23:58 -0500

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

video-libs/xine-lib/HISTORY | 3 +++
video-libs/xine-lib/PRE_BUILD | 6 ++++++
video/gxine/BUILD | 11 +++--------
video/gxine/DETAILS | 2 +-
video/gxine/HISTORY | 5 +++++
video/gxine/gxine-0.5.903.tar.bz2.sig |binary
6 files changed, 18 insertions(+), 9 deletions(-)

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

gxine: updated to 0.5.903

commit 75823fffa08799047dca53dc60912463640dee53
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

xine-lib: fix compile with current ffmpeg-svn

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/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



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (00398381e61f79b3e2374e2e2fe5cd66f7ef8de5), Arwed von Merkatz, 03/24/2009

Archive powered by MHonArc 2.6.24.

Top of Page