* Link libdjbfft to work A/52 decoder plugin correctly.

* Backout removal of files/patch-src:libw32dll:wine:Makefile.am
  and files/patch-src:libw32dll:DirectShow:Makefile.am.
* Add OpenGL support.

5 files changed, 30 insertions, 7 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 25cc8ec71a8c..aae01bffb4e9 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,7 +17,8 @@ DISTNAME=	${PORTNAME}-lib-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/graphics/ffmpeg
+BUILD_DEPENDS=	${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/graphics/ffmpeg \
+		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
 LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		intl.2:${PORTSDIR}/devel/gettext \
@@ -29,10 +31,12 @@ USE_ESOUND=	yes
 USE_IMLIB=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+USE_MESA=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		THREAD_LIBS="${PTHREAD_LIBS}"
+		THREAD_LIBS="${PTHREAD_LIBS}" \
+		X_EXTRA_LIBS="-lGL -lGLU -lXext -lX11 -lm"
 CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32
 INSTALLS_SHLIB=	yes
 
diff --git a/multimedia/libxine/files/patch-src:liba52:Makefile.am b/multimedia/libxine/files/patch-src:liba52:Makefile.am
index 07d0af4922c9..6f5c3a299811 100644
--- a/multimedia/libxine/files/patch-src:liba52:Makefile.am
+++ b/multimedia/libxine/files/patch-src:liba52:Makefile.am
@@ -1,5 +1,5 @@
---- src/liba52/Makefile.am.orig	Fri Oct 19 16:55:18 2001
-+++ src/liba52/Makefile.am	Fri Oct 19 16:57:31 2001
+--- src/liba52/Makefile.am.orig	Tue Mar 26 08:07:16 2002
++++ src/liba52/Makefile.am	Sat May 25 11:03:48 2002
 @@ -8,13 +8,9 @@
  
  lib_LTLIBRARIES = xineplug_decode_a52.la
@@ -8,7 +8,7 @@
 -	parse.c downmix.c imdct.c imdct_mlib.c \
 -	xine_decoder.c
 +xineplug_decode_a52_la_SOURCES = xine_decoder.c
-+xineplug_decode_a52_la_LIBADD = -la52
++xineplug_decode_a52_la_LIBADD = -la52 -ldjbfft
  xineplug_decode_a52_la_LDFLAGS = -avoid-version -module
 -
 -noinst_HEADERS = a52.h a52_internal.h \
diff --git a/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am b/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am
new file mode 100644
index 000000000000..604e19e594e6
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am
@@ -0,0 +1,7 @@
+--- src/libw32dll/DirectShow/Makefile.am.orig	Fri Jan 11 04:59:50 2002
++++ src/libw32dll/DirectShow/Makefile.am	Tue Jan 29 12:12:58 2002
+@@ -1,3 +1,4 @@
++INCLUDES = @INCLUDES@ -I$(srcdir)/..
+ 
+ CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \
+ 	-Wmissing-prototypes -Wimplicit-function-declaration \
diff --git a/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am b/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am
new file mode 100644
index 000000000000..1a426603d07a
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am
@@ -0,0 +1,11 @@
+--- src/libw32dll/wine/Makefile.am.orig	Tue Mar 26 08:07:17 2002
++++ src/libw32dll/wine/Makefile.am	Sat May 25 10:25:26 2002
+@@ -4,6 +4,8 @@
+ 
+ ##
+ ##
++INCLUDES = @INCLUDES@ -I$(srcdir)/..
++
+ CFLAGS = @CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \
+ 	-Wmissing-prototypes -Wimplicit-function-declaration \
+ 	-DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 48f3cec3e52e..eb72b91af124 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -60,6 +60,7 @@ lib/xine/plugins/xineplug_inp_rtp.so
 lib/xine/plugins/xineplug_inp_stdin_fifo.so
 lib/xine/plugins/xineplug_inp_vcd.so
 lib/xine/plugins/xineplug_vo_out_aa.so
+lib/xine/plugins/xineplug_vo_out_opengl.so
 lib/xine/plugins/xineplug_vo_out_syncfb.so
 lib/xine/plugins/xineplug_vo_out_xshm.so
 %%HAVE_LIBXV%%lib/xine/plugins/xineplug_vo_out_xv.so