Author: arekm Date: Wed Feb 15 19:19:33 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 11; fix build with xine-lib 1.2
---- Files affected: packages/xfmedia: xfmedia.spec (1.31 -> 1.32) , xfmedia-xine-1.2.0.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xfmedia/xfmedia.spec diff -u packages/xfmedia/xfmedia.spec:1.31 packages/xfmedia/xfmedia.spec:1.32 --- packages/xfmedia/xfmedia.spec:1.31 Wed Feb 15 10:07:26 2012 +++ packages/xfmedia/xfmedia.spec Wed Feb 15 20:19:27 2012 @@ -7,7 +7,7 @@ Summary(pl.UTF-8): Xfmedia - lekki odtwarzacz multimedialny oparty na silniku xine Name: xfmedia Version: 0.9.2 -Release: 10 +Release: 11 License: GPL v2 Group: X11/Applications/Multimedia Source0: http://spuriousinterrupt.org/projects/xfmedia/files/%{name}-%{version}.tar.bz2 @@ -15,6 +15,7 @@ Patch0: %{name}-desktop.patch Patch1: %{name}-exo-1.patch Patch2: %{name}-ui.patch +Patch3: %{name}-xine-1.2.0.patch URL: http://spuriousinterrupt.org/projects/xfmedia/index.php BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1:1.8 @@ -78,6 +79,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__intltoolize} @@ -147,6 +149,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.32 2012/02/15 19:19:27 arekm +- rel 11; fix build with xine-lib 1.2 + Revision 1.31 2012/02/15 09:07:26 arekm - release 10 ================================================================ Index: packages/xfmedia/xfmedia-xine-1.2.0.patch diff -u /dev/null packages/xfmedia/xfmedia-xine-1.2.0.patch:1.1 --- /dev/null Wed Feb 15 20:19:33 2012 +++ packages/xfmedia/xfmedia-xine-1.2.0.patch Wed Feb 15 20:19:27 2012 @@ -0,0 +1,34 @@ +diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c +--- xfmedia-0.9.2/src/xfmedia-xine.c 2006-11-27 10:21:23.000000000 +0300 ++++ xfmedia-0.9.2.my/src/xfmedia-xine.c 2012-01-05 01:23:21.000000000 +0400 +@@ -1450,17 +1450,6 @@ + } + + gboolean +-xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value) +-{ +- +- g_return_val_if_fail(xfx != NULL, 0); +- g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0); +- g_return_val_if_fail(xfx->priv->stream != NULL, 0); +- +- return xine_trick_mode(xfx->priv->stream, mode, value); +-} +- +-gboolean + xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream, + gint *pos_time, gint *length_time) + { +diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h +--- xfmedia-0.9.2/src/xfmedia-xine.h 2006-11-27 10:21:23.000000000 +0300 ++++ xfmedia-0.9.2.my/src/xfmedia-xine.h 2012-01-05 01:20:47.000000000 +0400 +@@ -87,9 +87,6 @@ + gboolean xfmedia_xine_play (XfmediaXine *xfx, + gint pos, + gint start_time); +-gboolean xfmedia_xine_trick_mode (XfmediaXine *xfx, +- gint mode, +- gint value); + gint xfmedia_xine_get_stream_info (XfmediaXine *xfx, + gint info); + G_CONST_RETURN gchar *xfmedia_xine_get_meta_info (XfmediaXine *xfx, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfmedia/xfmedia.spec?r1=1.31&r2=1.32&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
