Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (f243dd88f6a3bbdd3fc170beb5a2390cb82a9e5e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (f243dd88f6a3bbdd3fc170beb5a2390cb82a9e5e)
  • Date: Wed, 3 Sep 2008 15:09:56 -0500

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

kde4/kdebase4-runtime/DEPENDS | 1 -
kde4/kdebase4-runtime/DETAILS | 4 ++--
kde4/kdebase4-runtime/HISTORY | 4 ++++
video-libs/xine-lib/HISTORY | 4 ++++
video-libs/xine-lib/PRE_BUILD | 3 ++-
video-libs/xine-lib/xine-lib-gcc.patch | 12 ++++++++++++
6 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit f243dd88f6a3bbdd3fc170beb5a2390cb82a9e5e
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

kdebase4-runtime: updated stable version to 4.1.1,
removed again su_depends on xine-lib with libxcb

commit c1c24e8f2661fff1848c13d5d049041079c8797c
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

xine-lib: added xine-lib-gcc.patch to fix compilation issue with spells
liks kdebase4-runtime

diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index 684ea72..5950f50 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -16,6 +16,5 @@ depends xset &&

source $GRIMOIRE/FUNCTIONS &&
depends xine-lib &&
-sub_depends xine-lib libxcb
optional_depends openexr '' '' 'EXR support for thumbnails' &&
optional_depends samba '' '' 'build smb-ioslave'
diff --git a/kde4/kdebase4-runtime/DETAILS b/kde4/kdebase4-runtime/DETAILS
index 763c415..a4d5b44 100755
--- a/kde4/kdebase4-runtime/DETAILS
+++ b/kde4/kdebase4-runtime/DETAILS
@@ -18,8 +18,8 @@ else
VERSION=4.1.64

SOURCE_HASH=sha512:5d694bd82977b81b666b104b9b7bad00d51c8b971e310665f532c1dba31ffd028b5498c9c3d5eb544946f4e7baced69176edc2aed7829ee6e743a44b5b1f7d05
else
- VERSION=4.1.0
-
SOURCE_HASH=sha512:45f96c0966061ac45b5296fe9c817fd8419d188e0acf06410ada0a9f5260b7054550957421e87c4d586188420cdfe5447ad55db901207af4a77699b0fc2fea20
+ VERSION=4.1.1
+
SOURCE_HASH=sha512:6c678014945cad60ba11f53cff30af8a0caa57b1c0ba017d5a9cba6e08d8965dc2e5f6e09c4c4a9348ddf380613de7f9404c46c191e35e273a78311507a41bb9
fi
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=$KDE_URL/${KDE_VER:-stable}/${VERSION}/src/$SOURCE
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index c4d6093..ae08f67 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,7 @@
+2008-09-03 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated stable version to 4.1.1
+ * DEPENDS: removed again sub_depends on xine-lib with libxcb
+
2008-08-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.1.64

diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 4ec4b97..ad3d939 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,7 @@
+2008-09-03 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PRE_BUILD, xine-lib-gcc.patch: added patch to fix compilation issue
+ with spells like kdebase4-runtime
+
2008-08-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.15
SECURITY_PATCH++ (CVE-2008-3231) - bug# 14641
diff --git a/video-libs/xine-lib/PRE_BUILD b/video-libs/xine-lib/PRE_BUILD
index 8f391dd..57faacf 100755
--- a/video-libs/xine-lib/PRE_BUILD
+++ b/video-libs/xine-lib/PRE_BUILD
@@ -5,4 +5,5 @@ sed -i "32i#include <limits.h>"
src/input/vcd/libcdio/_cdio_linux.c &&
# compiles but fails to run otherwise
sedit 's/x$FFMPEG_POSTPROC_LIBS/"\0"/' configure &&
sedit 's/$(FFMPEG_LIBS)/\0 $(FFMPEG_POSTPROC_LIBS)/' \
- src/libffmpeg/Makefile.in
+ src/libffmpeg/Makefile.in &&
+patch -p1 < $SPELL_DIRECTORY/ansi.patch
diff --git a/video-libs/xine-lib/xine-lib-gcc.patch
b/video-libs/xine-lib/xine-lib-gcc.patch
new file mode 100644
index 0000000..f3f2821
--- /dev/null
+++ b/video-libs/xine-lib/xine-lib-gcc.patch
@@ -0,0 +1,12 @@
+diff -Naur xine-lib-1.1.15/src/xine-engine/buffer.h
xine-lib-1.1.15.new/src/xine-engine/buffer.h
+--- xine-lib-1.1.15/src/xine-engine/buffer.h 2008-07-16 23:01:56.000000000
+0200
++++ xine-lib-1.1.15.new/src/xine-engine/buffer.h 2008-09-03
19:52:41.000000000 +0200
+@@ -676,7 +676,7 @@
+ /* convert xine_waveformatex struct from little endian */
+ void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
+
+-static inline _x_is_fourcc(void *ptr, void *tag) {
++static __inline int _x_is_fourcc(void *ptr, void *tag) {
+ return memcmp(ptr, tag, 4) == 0;
+ }
+



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (f243dd88f6a3bbdd3fc170beb5a2390cb82a9e5e), Julien ROZO, 09/03/2008

Archive powered by MHonArc 2.6.24.

Top of Page