Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b8dca3979434c6048c18c0a9ec45c40a5eb3f83d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b8dca3979434c6048c18c0a9ec45c40a5eb3f83d)
  • Date: Mon, 13 Feb 2012 03:27:08 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

gnome2-libs/pygobject/DEPENDS | 1
gnome2-libs/pygobject/HISTORY | 3 ++
video-libs/xine-lib/HISTORY | 4 +++
video-libs/xine-lib/PRE_BUILD | 6 ++++-
video-libs/xine-lib/zlib126.patch | 41
++++++++++++++++++++++++++++++++++++++
5 files changed, 54 insertions(+), 1 deletion(-)

New commits:
commit b8dca3979434c6048c18c0a9ec45c40a5eb3f83d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pygobject: fixed bug #361

commit a2b3def1d0c11eada80a1896f909edbf9692ab3a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xine-lib: fixed build with zlib 1.2.6

diff --git a/gnome2-libs/pygobject/DEPENDS b/gnome2-libs/pygobject/DEPENDS
index 559fd57..909d1a4 100755
--- a/gnome2-libs/pygobject/DEPENDS
+++ b/gnome2-libs/pygobject/DEPENDS
@@ -1,5 +1,6 @@
depends python &&
depends glib2 &&
+depends pycairo &&

optional_depends gobject-introspection \
"--enable-introspection" \
diff --git a/gnome2-libs/pygobject/HISTORY b/gnome2-libs/pygobject/HISTORY
index 042f516..45aed17 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,6 @@
+2012-02-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing pycairo dep (fixes #361)
+
2011-07-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.6

diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 0a25469..db57df8 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,7 @@
+2012-02-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * zlib126.patch: added, to fix build with zlib 1.2.6
+ * PRE_BUILD: apply the patch
+
2012-01-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.1.20.1

diff --git a/video-libs/xine-lib/PRE_BUILD b/video-libs/xine-lib/PRE_BUILD
index 1e812ee..b7155a1 100755
--- a/video-libs/xine-lib/PRE_BUILD
+++ b/video-libs/xine-lib/PRE_BUILD
@@ -1,4 +1,8 @@
default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/zlib126.patch" &&
+
message "${MESSAGE_COLOR}Fixing libXvMc 1.0.6 support...${DEFAULT_COLOR}" &&
sed -i '/xxmc.h/a#include <X11/extensions/XvMClib.h>' \
- "$SOURCE_DIRECTORY"/src/video_out/{xvmc_mocomp.c,video_out_xxmc.c}
+ src/video_out/{xvmc_mocomp.c,video_out_xxmc.c}
diff --git a/video-libs/xine-lib/zlib126.patch
b/video-libs/xine-lib/zlib126.patch
new file mode 100644
index 0000000..5348b82
--- /dev/null
+++ b/video-libs/xine-lib/zlib126.patch
@@ -0,0 +1,41 @@
+--- misc/xine-fontconv.c.orig
++++ misc/xine-fontconv.c
+@@ -109,7 +109,7 @@
+ osd_font_t font;
+
+
+-static int gzwrite_i16(gzFile *fp, uint16_t number) {
++static int gzwrite_i16(gzFile fp, uint16_t number) {
+ return gzputc(fp, number & 0xFF) != -1 &&
+ gzputc(fp, (number >> 8) & 0xFF) != -1;
+ }
+@@ -341,7 +341,7 @@
+
+ char filename[1024];
+ FT_Bitmap *out_bitmap;
+- gzFile *fp;
++ gzFile fp;
+ int error;
+ int error_counter;
+ int glyph_index;
+--- src/xine-engine/osd.c.orig
++++ src/xine-engine/osd.c
+@@ -650,7 +650,7 @@
+ osd->display_y = y;
+ }
+
+-static uint16_t gzread_i16(gzFile *fp) {
++static uint16_t gzread_i16(gzFile fp) {
+ uint16_t ret;
+ ret = gzgetc(fp);
+ ret |= (gzgetc(fp)<<8);
+@@ -663,7 +663,7 @@
+
+ static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
+
+- gzFile *fp;
++ gzFile fp;
+ osd_font_t *font = NULL;
+ int i, ret = 0;
+
+



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b8dca3979434c6048c18c0a9ec45c40a5eb3f83d), Vlad Glagolev, 02/13/2012

Archive powered by MHonArc 2.6.24.

Top of Page