Update to 1-beta10.

6 files changed, 11 insertions, 33 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 4b60abd8c03c..0e4addf799e1 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	1.0.b9
-PORTREVISION=	2
+PORTVERSION=	1.0.b10
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	lib
-DISTNAME=	${PORTNAME}-lib-1-beta9
+DISTNAME=	${PORTNAME}-lib-1-beta10
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 0836b719c12c..0f70cf8b64e9 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1 +1 @@
-MD5 (xine-lib-1-beta9.tar.gz) = bd921a5098443fe4f138a41fb79caf9c
+MD5 (xine-lib-1-beta10.tar.gz) = 752ba2997c2db69dc4790c0e9c7d7138
diff --git a/multimedia/libxine/files/patch-configure b/multimedia/libxine/files/patch-configure
deleted file mode 100644
index c1537099f90e..000000000000
--- a/multimedia/libxine/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun Feb  9 23:46:52 2003
-+++ configure	Sun Feb  9 23:47:08 2003
-@@ -17057,7 +17057,7 @@
-   fi
-   ALSA_CFLAGS="$ALSA_CFLAGS"
- 
--  ac_save_CPPFLAGS="$CPPLAGS"
-+  ac_save_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $ALSA_CFLAGS"
-   if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
-   echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
diff --git a/multimedia/libxine/files/patch-src:dxr3:video_out_dxr3.c b/multimedia/libxine/files/patch-src:dxr3:video_out_dxr3.c
deleted file mode 100644
index 717c5438acf7..000000000000
--- a/multimedia/libxine/files/patch-src:dxr3:video_out_dxr3.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dxr3/video_out_dxr3.c.orig	Sat Feb  1 22:26:00 2003
-+++ src/dxr3/video_out_dxr3.c	Sat Feb  1 22:26:38 2003
-@@ -278,7 +278,7 @@
-   }
-   
-   snprintf (tmpstr, sizeof(tmpstr), "%s_mv%s", class->devname, class->devnum);
--  if ((this->fd_video = open (tmpstr, O_WRONLY | O_SYNC )) < 0) {
-+  if ((this->fd_video = open (tmpstr, O_WRONLY | O_FSYNC )) < 0) {
-     printf("video_out_dxr3: Failed to open video device %s (%s)\n",
-       tmpstr, strerror(errno));
-     return 0;
diff --git a/multimedia/libxine/files/patch-src:input:Makefile.in b/multimedia/libxine/files/patch-src:input:Makefile.in
index 7a5c1cf5c1a8..044416e44a1d 100644
--- a/multimedia/libxine/files/patch-src:input:Makefile.in
+++ b/multimedia/libxine/files/patch-src:input:Makefile.in
@@ -1,6 +1,6 @@
---- src/input/Makefile.in.orig	Wed Mar 26 00:50:17 2003
-+++ src/input/Makefile.in	Wed Mar 26 00:59:08 2003
-@@ -213,8 +213,8 @@
+--- src/input/Makefile.in.orig	Sun Apr 13 12:14:19 2003
++++ src/input/Makefile.in	Sun Apr 13 12:20:18 2003
+@@ -219,8 +219,8 @@
  
  EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c input_rtp.c
  
@@ -11,7 +11,7 @@
  XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
  
  
-@@ -233,15 +233,13 @@
+@@ -239,15 +239,13 @@
  
  # For DVD
  @HAVE_DVDNAV_TRUE@DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
@@ -30,12 +30,12 @@
  
  AM_CFLAGS = $(GNOME_VFS_CFLAGS) $(DVD_CFLAGS) @ANSI_FLAGS@
  
-@@ -355,7 +353,7 @@
+@@ -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
+ 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 = \
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 4d643887c5ed..b0d828a20019 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.5
+lib/libxine.so.6
 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
@@ -137,6 +137,7 @@ share/locale/cs/LC_MESSAGES/libxine1.mo
 share/locale/de/LC_MESSAGES/libxine1.mo
 share/locale/es/LC_MESSAGES/libxine1.mo
 share/locale/fr/LC_MESSAGES/libxine1.mo
+share/locale/it/LC_MESSAGES/libxine1.mo
 share/locale/pl_PL/LC_MESSAGES/libxine1.mo
 share/locale/pt_BR/LC_MESSAGES/libxine1.mo
 share/locale/sk/LC_MESSAGES/libxine1.mo