Should be compilable again, had trouble with all xine-libs versions I tried.

5 files changed, 138 insertions, 4 deletions

diff --git a/media-plugins/xine-vcdx/ChangeLog b/media-plugins/xine-vcdx/ChangeLog
index 4cf5408aadea..c7a38f624792 100644
--- a/media-plugins/xine-vcdx/ChangeLog
+++ b/media-plugins/xine-vcdx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/xine-vcdx
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-vcdx/ChangeLog,v 1.3 2003/10/21 15:29:48 mholzer Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-vcdx/ChangeLog,v 1.4 2004/05/12 11:20:42 phosphan Exp $
+
+*xine-vcdx-1_rc1-r1 (12 May 2004)
+
+  12 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  xine-vcdx-1_rc1-r1.ebuild, files/no_meta_info.patch:
+  Should be compilable again, had trouble with all xine-libs versions I tried.
 
   22 Oct 2003; Martin Holzer <mholzer@gentoo.org> xine-vcdx-1_rc0.ebuild,
   xine-vcdx-1_rc1.ebuild:
diff --git a/media-plugins/xine-vcdx/Manifest b/media-plugins/xine-vcdx/Manifest
index c9bdfc4668ec..c2655550f65b 100644
--- a/media-plugins/xine-vcdx/Manifest
+++ b/media-plugins/xine-vcdx/Manifest
@@ -1,5 +1,8 @@
-MD5 5007a2dd866b7b50dbb1ccf9f29f690b xine-vcdx-1_rc0.ebuild 849
-MD5 58461b005dfff0380a168cead3658c25 ChangeLog 695
+MD5 fc9e032396a05048d14ab9a51b62186b xine-vcdx-1_rc1-r1.ebuild 924
 MD5 b75aa10c838475e089c19a1daace3cdd xine-vcdx-1_rc1.ebuild 829
+MD5 58461b005dfff0380a168cead3658c25 ChangeLog 695
+MD5 5007a2dd866b7b50dbb1ccf9f29f690b xine-vcdx-1_rc0.ebuild 849
+MD5 0cdceaf109e287910380de479b340ab2 files/digest-xine-vcdx-1_rc1-r1 67
+MD5 b88a37d4538fc2cca0cb86251a7d5791 files/no_meta_info.patch 590
 MD5 39a28153f3142e9202a82f0fe38f4b6c files/digest-xine-vcdx-1_rc0 67
 MD5 0cdceaf109e287910380de479b340ab2 files/digest-xine-vcdx-1_rc1 67
diff --git a/media-plugins/xine-vcdx/files/digest-xine-vcdx-1_rc1-r1 b/media-plugins/xine-vcdx/files/digest-xine-vcdx-1_rc1-r1
new file mode 100644
index 000000000000..6199f54cf677
--- /dev/null
+++ b/media-plugins/xine-vcdx/files/digest-xine-vcdx-1_rc1-r1
@@ -0,0 +1 @@
+MD5 adcab4a73fbbf6b1b043d17da5cf5dee xine-vcdx-1-rc1.tar.gz 435486
diff --git a/media-plugins/xine-vcdx/files/no_meta_info.patch b/media-plugins/xine-vcdx/files/no_meta_info.patch
new file mode 100644
index 000000000000..039a6134a26a
--- /dev/null
+++ b/media-plugins/xine-vcdx/files/no_meta_info.patch
@@ -0,0 +1,82 @@
+--- input/xineplug_inp_cd.c	2003-10-17 02:15:44.000000000 +0200
++++ input/xineplug_inp_cd.c.new	2004-05-12 13:10:33.574749582 +0200
+@@ -1255,17 +1255,6 @@
+ }
+ 
+ 
+-static void 
+-meta_info_assign(int field, xine_stream_t *stream, const char * info) 
+-{
+-  if (NULL != info) {
+-    if (stream->meta_info[field])
+-      free(stream->meta_info[field]);
+-    dbg_print(INPUT_DBG_META, "meta[%d]: %s\n", field, info);
+-    stream->meta_info[field] = strdup(info);
+-  }
+-}
+-
+ /* Update the xine player title text. */
+ static void 
+ cdda_update_title(cdda_input_plugin_t *this) 
+--- input/xineplug_inp_vcd.c	2003-10-08 04:51:38.000000000 +0200
++++ input/xineplug_inp_vcd.c.new	2004-05-12 13:16:09.319051269 +0200
+@@ -164,37 +164,6 @@
+   return true;
+ }
+ 
+-
+-static void 
+-meta_info_assign(int field, xine_stream_t *stream, const char * info) 
+-{
+-  if (NULL != info) {
+-    if (stream->meta_info[field])
+-      free(stream->meta_info[field]);
+-    dbg_print(INPUT_DBG_META, "meta[%d]: %s\n", field, info);
+-    stream->meta_info[field] = strdup(info);
+-  }
+-}
+-
+-#define stream_info_assign(field, stream, info) \
+-  stream->stream_info[field] = info;
+-
+-/* Set stream information. */
+-static void
+-vcd_set_meta_info (vcd_input_plugin_t *xine_vcd) 
+-{
+-  vcdinfo_obj_t *obj= xine_vcd->player.vcd;
+-  meta_info_assign(XINE_META_INFO_ALBUM, xine_vcd->stream, 
+-                   vcdinfo_get_album_id(obj));
+-  meta_info_assign(XINE_META_INFO_ARTIST,  xine_vcd->stream,
+-                   vcdinfo_get_preparer_id(obj));
+-  meta_info_assign(XINE_META_INFO_COMMENT, xine_vcd->stream,
+-                   vcdplayer_format_str(&xine_vcd->player,
+-                                   xine_vcd->v_config.comment_format));
+-  meta_info_assign(XINE_META_INFO_GENRE, xine_vcd->stream,
+-                   vcdinfo_get_format_version_str(obj));
+-}
+-
+ static void
+ vcd_force_redisplay (void) 
+ {
+@@ -1355,13 +1324,6 @@
+   title_str = vcdplayer_format_str(&my_vcd.player, 
+                                    my_vcd.v_config.title_format);
+ 
+-  meta_info_assign(XINE_META_INFO_TITLE, my_vcd.stream, title_str);
+-  meta_info_assign(XINE_META_INFO_COMMENT, my_vcd.stream,
+-                   vcdplayer_format_str(&my_vcd.player, 
+-                                        my_vcd.v_config.comment_format));
+-  stream_info_assign(XINE_STREAM_INFO_VIDEO_HAS_STILL, my_vcd.stream, 
+-                     my_vcd.player.in_still);
+-
+   /* Set_str title/chapter display */
+   dbg_print((INPUT_DBG_MRL|INPUT_DBG_CALL),
+             "Changing title to read '%s'\n", title_str);
+@@ -1469,7 +1431,6 @@
+   dbg_print(INPUT_DBG_PBC, "Jumping to NUM >%i<, type >%i<\n", 
+             itemid.num, itemid.type);
+ 
+-  vcd_set_meta_info(&my_vcd);
+   vcdplayer_play(&my_vcd.player, itemid);
+   
+ 
diff --git a/media-plugins/xine-vcdx/xine-vcdx-1_rc1-r1.ebuild b/media-plugins/xine-vcdx/xine-vcdx-1_rc1-r1.ebuild
new file mode 100644
index 000000000000..a223b3fc0a11
--- /dev/null
+++ b/media-plugins/xine-vcdx/xine-vcdx-1_rc1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xine-vcdx/xine-vcdx-1_rc1-r1.ebuild,v 1.1 2004/05/12 11:20:42 phosphan Exp $
+
+inherit eutils
+
+IUSE=""
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="Navigation-Capable (S)VCD Plugin for Xine movie player."
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+RESTRICT="nomirror"
+
+DEPEND=">=media-libs/xine-lib-1_rc1
+	~media-video/vcdimager-0.7.19"
+
+SLOT="0"
+KEYWORDS="~x86"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/no_meta_info.patch
+}
+
+src_compile() {
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install || die
+
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
+}