1. Update to 1-beta12.

2. Fix build error in GNOME environment.

Submitted by:	Jeremy Messenger <mezz7@cox.net> [2]

4 files changed, 9 insertions, 55 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index e97306b43c92..fbe1e152e164 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	1.0.b11
+PORTVERSION=	1.0.b12
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	lib
-DISTNAME=	${PORTNAME}-lib-1-beta11
+DISTNAME=	${PORTNAME}-lib-1-beta12
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
@@ -69,8 +69,8 @@ PLIST_SUB+=	HAVE_ESOUND=""
 PLIST_SUB+=	HAVE_ESOUND="@comment "
 .endif
 
-.if exists(${X11BASE}/libdata/pkgconfig/gnome-vfs-2.0.pc)
-LIB_DEPENDS+=	gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
+.if ${HAVE_GNOME:Mgnomevfs2} != ""
+USE_GNOME+=	gnomevfs2
 PLIST_SUB+=	HAVE_GNOMEVFS2=""
 .else
 PLIST_SUB+=	HAVE_GNOMEVFS2="@comment "
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 7fe2e70e4e0a..923e1898cfce 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1 +1 @@
-MD5 (xine-lib-1-beta11.tar.gz) = da38e1f3be55a2f4818e53e9a42117cf
+MD5 (xine-lib-1-beta12.tar.gz) = db00ce938944b2f3b334e7c27352eadf
diff --git a/multimedia/libxine/files/patch-src:input:Makefile.in b/multimedia/libxine/files/patch-src:input:Makefile.in
deleted file mode 100644
index 5fc51955718c..000000000000
--- a/multimedia/libxine/files/patch-src:input:Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/input/Makefile.in.orig	Tue Apr 29 12:05:06 2003
-+++ src/input/Makefile.in	Tue Apr 29 12:07:23 2003
-@@ -220,7 +220,7 @@
- EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c input_rtp.c
- 
- @HAVE_DVDNAV_TRUE@SUBDIRS = dvb libreal librtsp
--@HAVE_DVDNAV_FALSE@SUBDIRS = dvb libreal librtsp libdvdread libdvdnav
-+@HAVE_DVDNAV_FALSE@SUBDIRS = dvb libreal librtsp libdvdnav
- XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
- 
- 
-@@ -239,15 +239,13 @@
- 
- # For DVD
- @HAVE_DVDNAV_TRUE@DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
--@HAVE_DVDNAV_TRUE@  $(DVDNAV_CFLAGS) \
--@HAVE_DVDNAV_TRUE@  -I$(top_srcdir)/src/input/libdvdread/
-+@HAVE_DVDNAV_TRUE@  $(DVDNAV_CFLAGS)
- 
- @HAVE_DVDNAV_FALSE@DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
--@HAVE_DVDNAV_FALSE@  -I$(top_srcdir)/src/input/libdvdnav/ \
--@HAVE_DVDNAV_FALSE@  -I$(top_srcdir)/src/input/libdvdread/
-+@HAVE_DVDNAV_FALSE@  -I$(top_srcdir)/src/input/libdvdnav/
- 
- @HAVE_DVDNAV_TRUE@link_dvdnav = $(DVDNAV_LIBS)
--@HAVE_DVDNAV_FALSE@link_dvdnav = libdvdnav/libdvdnav.la libdvdread/libdvdread.la
-+@HAVE_DVDNAV_FALSE@link_dvdnav = libdvdnav/libdvdnav.la -ldvdread
- 
- AM_CFLAGS = $(GNOME_VFS_CFLAGS) $(DVD_CFLAGS) @ANSI_FLAGS@
- 
-@@ -361,7 +359,7 @@
- @HAVE_DVDNAV_FALSE@xineplug_inp_dvd_la_DEPENDENCIES = \
- @HAVE_DVDNAV_FALSE@	$(top_builddir)/src/xine-engine/libxine.la \
- @HAVE_DVDNAV_FALSE@	libdvdnav/libdvdnav.la \
--@HAVE_DVDNAV_FALSE@	libdvdread/libdvdread.la
-+@HAVE_DVDNAV_FALSE@	-ldvdread
- am_xineplug_inp_dvd_la_OBJECTS = input_dvd.lo media_helper.lo
- xineplug_inp_dvd_la_OBJECTS = $(am_xineplug_inp_dvd_la_OBJECTS)
- xineplug_inp_file_la_DEPENDENCIES = \
-@@ -466,7 +464,7 @@
- 	uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
- 	Makefile.in
--DIST_SUBDIRS = dvb libreal librtsp libdvdread libdvdnav
-+DIST_SUBDIRS = dvb libreal librtsp libdvdnav
- SOURCES = $(xineplug_inp_cdda_la_SOURCES) $(xineplug_inp_dvb_la_SOURCES) $(xineplug_inp_dvd_la_SOURCES) $(xineplug_inp_file_la_SOURCES) $(xineplug_inp_gnome_vfs_la_SOURCES) $(xineplug_inp_http_la_SOURCES) $(xineplug_inp_mms_la_SOURCES) $(xineplug_inp_net_la_SOURCES) $(xineplug_inp_pnm_la_SOURCES) $(xineplug_inp_pvr_la_SOURCES) $(xineplug_inp_rtp_la_SOURCES) $(xineplug_inp_rtsp_la_SOURCES) $(xineplug_inp_stdin_fifo_la_SOURCES) $(xineplug_inp_v4l_la_SOURCES) $(xineplug_inp_vcd_la_SOURCES)
- 
- all: all-recursive
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 393e8b928318..13fe0f3d4b3b 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -31,7 +31,7 @@ include/xine/xineutils.h
 include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.so
-lib/libxine.so.6
+lib/libxine.so.7
 lib/xine/plugins/1.0.0/post/xineplug_post_goom.so
 lib/xine/plugins/1.0.0/post/xineplug_post_invert.so
 lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.so
@@ -40,6 +40,7 @@ lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so
 %%HAVE_ARTS%%lib/xine/plugins/1.0.0/xineplug_ao_out_arts.so
 %%HAVE_ESOUND%%lib/xine/plugins/1.0.0/xineplug_ao_out_esd.so
 lib/xine/plugins/1.0.0/xineplug_ao_out_oss.so
+lib/xine/plugins/1.0.0/xineplug_decode_28k8.so
 lib/xine/plugins/1.0.0/xineplug_decode_a52.so
 lib/xine/plugins/1.0.0/xineplug_decode_adpcm.so
 lib/xine/plugins/1.0.0/xineplug_decode_cinepak.so
@@ -126,6 +127,7 @@ share/doc/xine/README.dxr3_pl
 share/doc/xine/README.freebsd
 share/doc/xine/README.irix
 share/doc/xine/README.mrl
+share/doc/xine/README.network_dvd
 share/doc/xine/README.opengl
 share/doc/xine/README.plugins
 share/doc/xine/README.solaris
@@ -171,8 +173,8 @@ share/xine/libxine1/fonts/serif-20.xinefont.gz
 share/xine/libxine1/fonts/serif-24.xinefont.gz
 share/xine/libxine1/fonts/serif-32.xinefont.gz
 @dirrm include/xine
-@dirrm lib/xine/plugins/1.0.0/post
 @dirrm lib/xine/plugins/1.0.0/vidix
+@dirrm lib/xine/plugins/1.0.0/post
 @dirrm lib/xine/plugins/1.0.0
 @dirrm lib/xine/plugins
 @dirrm lib/xine