5 files changed, 25 insertions, 36 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index a3c625dbe784..aec9a4f184c3 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.9.10
+PORTVERSION=	0.9.12
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -22,7 +22,8 @@ LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		SDL-1.1:${PORTSDIR}/devel/sdl12 \
 		intl.2:${PORTSDIR}/devel/gettext \
-		iconv.3:${PORTSDIR}/converters/libiconv
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		divxdecore.1:${PORTSDIR}/graphics/libdivxdecore-devel
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
 
@@ -32,13 +33,16 @@ USE_IMLIB=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 USE_MESA=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" \
 		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}" \
 		X_EXTRA_LIBS="-lGL -lGLU -lXext -lX11 -lm"
-CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32
+CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 \
+		--disable-dxr3 --disable-vidix --disable-dha-kmod \
+		--disable-alsa
 INSTALLS_SHLIB=	yes
 
 MAN1=		xine-config.1
@@ -84,13 +88,17 @@ PLIST_SUB+=	HAVE_OGG="@comment "
 .endif
 
 post-patch:
-	@${PERL} -pi -e \
+	@${REINPLACE_CMD} -i.bak -e \
 		's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
 		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
 		 s|-L/usr/local/lib||g ; \
 		 s|-I/usr/local/include||g ; \
+		 s|-lgiconv|-liconv|g ; \
+		 s|-malign-loops|-falign-loops|g ; \
+		 s|-malign-jumps|-falign-jumps|g ; \
+		 s|-malign-functions|-falign-functions|g ; \
 		 s|-funroll-loops||g' ${WRKSRC}/configure.in
-	@${PERL} -pi -e \
+	@${REINPLACE_CMD} -i.bak -e \
 		's|aclocal,|${ACLOCAL},|g ; \
 		 s|autoconf,|${AUTOCONF},|g ; \
 		 s|automake,|${AUTOMAKE},|g ; \
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 6e360cf0a3aa..9f81e2b9c76c 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1 +1 @@
-MD5 (xine-lib-0.9.10.tar.gz) = 2f17619b58b2e6c84c1421ed36045983
+MD5 (xine-lib-0.9.12.tar.gz) = 8bad647e6ef9c31723129fb95e40c73c
diff --git a/multimedia/libxine/files/patch-src:audio_out:audio_oss_out.c b/multimedia/libxine/files/patch-src:audio_out:audio_oss_out.c
deleted file mode 100644
index dcfab11ae62b..000000000000
--- a/multimedia/libxine/files/patch-src:audio_out:audio_oss_out.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/audio_out/audio_oss_out.c.orig	Sun Jun  2 01:54:46 2002
-+++ src/audio_out/audio_oss_out.c	Sun Jun  2 01:55:37 2002
-@@ -51,6 +51,8 @@
- #elif defined (__FreeBSD__)
- #  if __FreeBSD__ < 4
- #   include <machine/soundcard.h>
-+#  else
-+#   include <sys/soundcard.h>
- #  endif
- #else
- # if defined(__linux__)
diff --git a/multimedia/libxine/files/patch-src:libsputext:xine_decoder.c b/multimedia/libxine/files/patch-src:libsputext:xine_decoder.c
deleted file mode 100644
index e9b94f99831c..000000000000
--- a/multimedia/libxine/files/patch-src:libsputext:xine_decoder.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/libsputext/xine_decoder.c.orig	Thu May 16 22:51:25 2002
-+++ src/libsputext/xine_decoder.c	Thu May 16 22:51:33 2002
-@@ -36,11 +36,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <ctype.h>
--#ifdef __FreeBSD__
--# include <sys/iconv.h>
--#else
--# include <iconv.h>
--#endif
-+#include <iconv.h>
- 
- #include "buffer.h"
- #include "events.h"
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 57d5df51a92d..5ce2ff123d20 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -10,6 +10,7 @@ include/xine/input_plugin.h
 include/xine/lrb.h
 include/xine/metronom.h
 include/xine/osd.h
+include/xine/ppcasm_string.h
 include/xine/resample.h
 include/xine/scratch.h
 include/xine/spu_decoder.h
@@ -24,13 +25,14 @@ include/xine/xmllexer.h
 include/xine/xmlparser.h
 include/xine.h
 lib/libxine.so
-lib/libxine.so.0
+lib/libxine.so.1
 lib/libxineutils.so
-lib/libxineutils.so.0
+lib/libxineutils.so.1
 %%HAVE_ARTS%%lib/xine/plugins/xineplug_ao_out_arts.so
 lib/xine/plugins/xineplug_ao_out_esd.so
 lib/xine/plugins/xineplug_ao_out_oss.so
 lib/xine/plugins/xineplug_decode_a52.so
+lib/xine/plugins/xineplug_decode_adpcm.so
 lib/xine/plugins/xineplug_decode_cinepak.so
 lib/xine/plugins/xineplug_decode_cyuv.so
 lib/xine/plugins/xineplug_decode_divx4.so
@@ -40,20 +42,25 @@ lib/xine/plugins/xineplug_decode_lpcm.so
 lib/xine/plugins/xineplug_decode_mad.so
 lib/xine/plugins/xineplug_decode_mpeg2.so
 lib/xine/plugins/xineplug_decode_msvc.so
+lib/xine/plugins/xineplug_decode_roqaudio.so
+lib/xine/plugins/xineplug_decode_roqvideo.so
 lib/xine/plugins/xineplug_decode_spu.so
 lib/xine/plugins/xineplug_decode_spucc.so
 lib/xine/plugins/xineplug_decode_sputext.so
+lib/xine/plugins/xineplug_decode_svq1.so
 %%HAVE_VORBIS%%lib/xine/plugins/xineplug_decode_vorbis.so
 lib/xine/plugins/xineplug_decode_w32dll.so
 lib/xine/plugins/xineplug_dmx_asf.so
 lib/xine/plugins/xineplug_dmx_avi.so
 lib/xine/plugins/xineplug_dmx_cda.so
+lib/xine/plugins/xineplug_dmx_film.so
 lib/xine/plugins/xineplug_dmx_mpeg.so
 lib/xine/plugins/xineplug_dmx_mpeg_audio.so
 lib/xine/plugins/xineplug_dmx_mpeg_block.so
 lib/xine/plugins/xineplug_dmx_mpeg_elem.so
 lib/xine/plugins/xineplug_dmx_mpeg_pes.so
 lib/xine/plugins/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/xineplug_dmx_roq.so
 %%HAVE_OGG%%lib/xine/plugins/xineplug_dmx_ogg.so
 lib/xine/plugins/xineplug_dmx_qt.so
 lib/xine/plugins/xineplug_inp_dvd.so
@@ -150,9 +157,9 @@ share/xine/fonts/serif-16.xinefont.gz
 share/xine/fonts/serif-20.xinefont.gz
 share/xine/fonts/serif-24.xinefont.gz
 share/xine/fonts/serif-32.xinefont.gz
-share/xine/skins/xine_logo.mpg
-share/xine/skins/xine_logo.png
+share/xine/skins/xine_logo.mpv
 @dirrm include/xine
+@dirrm lib/xine/plugins/vidix
 @dirrm lib/xine/plugins
 @dirrm lib/xine
 @dirrm share/doc/xine/xine-lib-API/html