Sun Jul 1 22:20:28 2012 UTC ()
Pullup ticket #3840 - requested by dholland
multimedia/xfmedia: build fix

Revisions pulled up:
- multimedia/xfmedia/Makefile                                   1.29
- multimedia/xfmedia/distinfo                                   1.5
- multimedia/xfmedia/patches/patch-src_xfmedia_xine_c           1.1
- multimedia/xfmedia/patches/patch-src_xfmedia_xine_h           1.1

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sun Jul  1 02:02:53 UTC 2012

   Modified Files:
   	pkgsrc/multimedia/xfmedia: Makefile distinfo
   Added Files:
   	pkgsrc/multimedia/xfmedia/patches: patch-src_xfmedia_xine_c
   	    patch-src_xfmedia_xine_h

   Log Message:
   Remove references to xine_trick_mode(), which was not actually used
   here and got removed from xine-lib. While here, add desktopdb.mk and
   set BUILDLINK_DEPMETHOD.libXt correctly. PKGREVISION -> 10.


(tron)
diff -r1.28 -r1.28.4.1 pkgsrc/multimedia/xfmedia/Makefile
diff -r1.4 -r1.4.46.1 pkgsrc/multimedia/xfmedia/distinfo
diff -r0 -r1.1.2.2 pkgsrc/multimedia/xfmedia/patches/patch-src_xfmedia_xine_c
diff -r0 -r1.1.2.2 pkgsrc/multimedia/xfmedia/patches/patch-src_xfmedia_xine_h
cvs diff -r1.28 -r1.28.4.1 pkgsrc/multimedia/xfmedia/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xfmedia/Attic/Makefile 2012/03/03 00:13:42 1.28
+++ pkgsrc/multimedia/xfmedia/Attic/Makefile 2012/07/01 22:20:28 1.28.4.1
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1# $NetBSD: Makefile,v 1.28 2012/03/03 00:13:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.28.4.1 2012/07/01 22:20:28 tron Exp $
2# 2#
3 3
4DISTNAME= xfmedia-0.9.2 4DISTNAME= xfmedia-0.9.2
5#PKGREVISION= 1 5PKGREVISION= 10
6PKGREVISION= 9 
7CATEGORIES= multimedia 6CATEGORIES= multimedia
8MASTER_SITES= http://spuriousinterrupt.org/projects/xfmedia/files/ 7MASTER_SITES= http://spuriousinterrupt.org/projects/xfmedia/files/
9EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
10 9
11MAINTAINER= dhowland@users.sourceforge.net 10MAINTAINER= dhowland@users.sourceforge.net
12HOMEPAGE= http://spuriousinterrupt.org/projects/xfmedia/ 11HOMEPAGE= http://spuriousinterrupt.org/projects/xfmedia/
13COMMENT= Xfce media player based on xine 12COMMENT= Xfce media player based on xine
14 13
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 17USE_LIBTOOL= yes
19USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
20USE_TOOLS+= gmake intltool msgfmt pkg-config 19USE_TOOLS+= gmake intltool msgfmt pkg-config
21 20
22OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/xfmedia 21OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/xfmedia
23 22
24CONF_FILES= ${PREFIX}/share/xfmedia/keybindings.rc \ 23CONF_FILES= ${PREFIX}/share/xfmedia/keybindings.rc \
25 ${PKG_SYSCONFDIR}/xdg/xfmedia/keybindings.rc 24 ${PKG_SYSCONFDIR}/xdg/xfmedia/keybindings.rc
26 25
27post-install: 26post-install:
28 ${INSTALL} ${WRKSRC}/src/keybindings.rc \ 27 ${INSTALL} ${WRKSRC}/src/keybindings.rc \
29 ${DESTDIR}${PREFIX}/share/xfmedia/keybindings.rc 28 ${DESTDIR}${PREFIX}/share/xfmedia/keybindings.rc
30 29
31BUILDLINK_DEPMETHOD.libXt?= build 30BUILDLINK_DEPMETHOD.libXt= build
32 31
33.include "../../audio/taglib/buildlink3.mk" 32.include "../../audio/taglib/buildlink3.mk"
34.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 33.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
35.include "../../multimedia/xine-lib/buildlink3.mk" 34.include "../../multimedia/xine-lib/buildlink3.mk"
36.include "../../sysutils/dbus-glib/buildlink3.mk" 35.include "../../sysutils/dbus-glib/buildlink3.mk"
37.include "../../x11/libSM/buildlink3.mk" 36.include "../../x11/libSM/buildlink3.mk"
38.include "../../x11/libX11/buildlink3.mk" 37.include "../../x11/libX11/buildlink3.mk"
39.include "../../x11/libXtst/buildlink3.mk" 38.include "../../x11/libXtst/buildlink3.mk"
40.include "../../x11/libXt/buildlink3.mk" 39.include "../../x11/libXt/buildlink3.mk"
41.include "../../x11/libxfce4gui/buildlink3.mk" 40.include "../../x11/libxfce4gui/buildlink3.mk"
42.include "../../x11/xfce4-exo/buildlink3.mk" 41.include "../../x11/xfce4-exo/buildlink3.mk"
 42.include "../../sysutils/desktop-file-utils/desktopdb.mk"
43.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.4.46.1 pkgsrc/multimedia/xfmedia/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xfmedia/Attic/distinfo 2007/04/13 12:56:34 1.4
+++ pkgsrc/multimedia/xfmedia/Attic/distinfo 2012/07/01 22:20:28 1.4.46.1
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: distinfo,v 1.4 2007/04/13 12:56:34 martti Exp $ 1$NetBSD: distinfo,v 1.4.46.1 2012/07/01 22:20:28 tron Exp $
2 2
3SHA1 (xfmedia-0.9.2.tar.bz2) = cb8d39f2a4ee6a6164f722162fa45004770a7605 3SHA1 (xfmedia-0.9.2.tar.bz2) = cb8d39f2a4ee6a6164f722162fa45004770a7605
4RMD160 (xfmedia-0.9.2.tar.bz2) = e1d16fe50609475f916594f2b6a885cfed6251e0 4RMD160 (xfmedia-0.9.2.tar.bz2) = e1d16fe50609475f916594f2b6a885cfed6251e0
5Size (xfmedia-0.9.2.tar.bz2) = 893228 bytes 5Size (xfmedia-0.9.2.tar.bz2) = 893228 bytes
6SHA1 (patch-aa) = cdc013c15413d3add02333d8b7f3f829e8335626 6SHA1 (patch-aa) = cdc013c15413d3add02333d8b7f3f829e8335626
7SHA1 (patch-ab) = e41bda068165083c61b2e06f2b185e6f0f93ec9e 7SHA1 (patch-ab) = e41bda068165083c61b2e06f2b185e6f0f93ec9e
 8SHA1 (patch-src_xfmedia_xine_c) = 26869588478ed6178ddfa07d079b2c5fe6c14a33
 9SHA1 (patch-src_xfmedia_xine_h) = d08ddf9ea2320ba36843deefefbab97807805d90
File Added: pkgsrc/multimedia/xfmedia/patches/Attic/patch-src_xfmedia_xine_c
$NetBSD: patch-src_xfmedia_xine_c,v 1.1.2.2 2012/07/01 22:20:28 tron Exp $

Remove references to xine_trick_mode(), which was removed from xine_lib.
(This code is not used in xfmedia.)

--- src/xfmedia-xine.c~	2006-11-27 07:21:23.000000000 +0000
+++ src/xfmedia-xine.c
@@ -1450,17 +1450,6 @@ xfmedia_xine_play(XfmediaXine *xfx, gint
 }
 
 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)
 {
File Added: pkgsrc/multimedia/xfmedia/patches/Attic/patch-src_xfmedia_xine_h
$NetBSD: patch-src_xfmedia_xine_h,v 1.1.2.2 2012/07/01 22:20:28 tron Exp $

Remove references to xine_trick_mode(), which was removed from xine_lib.
(This code is not used in xfmedia.)

--- src/xfmedia-xine.h~	2006-11-27 07:21:23.000000000 +0000
+++ src/xfmedia-xine.h
@@ -87,9 +87,6 @@ gboolean     xfmedia_xine_open          
 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,