Back port the Blu-ray input plugin.

from Brad
2012-04-08 07:37:25 +00:00 · 2012-04-08 07:37:25 +00:00 · a3f8cb2fd6
commit a3f8cb2fd6
parent 6b1ed72399
6 changed files with 1921 additions and 14 deletions
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.87 2012/04/07 17:24:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.88 2012/04/08 07:37:25 ajacoutot Exp $

 SHARED_ONLY=	Yes

 COMMENT=	multimedia decoding library

 DISTNAME=	xine-lib-1.1.20.1
-REVISION=	0
+REVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=	.tar.xz
@ -23,17 +23,21 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

 WANTLIB=	FLAC GL GLU SDL X11 Xau Xdamage Xdmcp Xext Xfixes Xinerama \
-		Xv XvMCW Xxf86vm a52 avcodec avutil c cdio dca drm dvdnav \
-		dvdread expat faad fontconfig freetype gsm iso9660 jpeg \
-		lcms m mad modplug mpcdec mng mp3lame ogg orc-0.4 postproc \
-		pthread-stubs pthread schroedinger-1.0 sndio speex stdc++ \
-		theora theoradec theoraenc usbhid vcdinfo vorbis vorbisenc \
-		vpx wavpack x264 xcb-shape xcb-shm xcb-xv xcb z
+		Xv XvMCW Xxf86vm a52 avcodec avutil bluray c cdio dca drm \
+		dvdnav dvdread expat faad fontconfig freetype gsm iso9660 \
+		jpeg lcms m mad modplug mpcdec mng mp3lame ogg orc-0.4 \
+		postproc pthread-stubs pthread schroedinger-1.0 sndio speex \
+		stdc++ theora theoradec theoraenc usbhid vcdinfo vorbis \
+		vorbisenc vpx wavpack x264 xcb-shape xcb-shm xcb-xv xcb \
+		xml2 z

 XINEAPI_REV=	1.30
 SUBST_VARS+=	XINEAPI_REV

 MODULES=	devel/gettext
+BUILD_DEPENDS=	devel/libtool \
+		${MODGNU_AUTOCONF_DEPENDS} \
+		${MODGNU_AUTOMAKE_DEPENDS}
 LIB_DEPENDS=	audio/faad \
 		audio/flac \
 		audio/liba52 \
@ -47,17 +51,20 @@ LIB_DEPENDS=	audio/faad \
 		audio/speex \
 		audio/wavpack \
 		devel/sdl \
+		multimedia/libbluray \
 		multimedia/libdvdnav \
 		multimedia/libtheora \
 		graphics/ffmpeg>=20111126 \
 		graphics/libmng \
 		graphics/vcdimager

+AUTOCONF_VERSION= 2.68
+AUTOMAKE_VERSION= 1.11
+
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
 USE_GROFF=	Yes
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.68
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+=--disable-aalib \
 		--disable-dxr3 \
 		--disable-fb \
@ -94,6 +101,10 @@ NO_REGRESS=	Yes
 post-extract:
 	@perl -pi -e 's/\r\n/\n/g' ${WRKSRC}/src/demuxers/asfheader.c

+post-patch:
+	@cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+	    sh autogen.sh noconfig
+
 post-install:
 	@find ${PREFIX}/lib/xine/plugins -name '*.a' -print | xargs rm

--- a/multimedia/xine-lib/patches/patch-autogen_sh
+++ b/multimedia/xine-lib/patches/patch-autogen_sh
@ -0,0 +1,88 @@
+$OpenBSD: patch-autogen_sh,v 1.1 2012/04/08 07:37:25 ajacoutot Exp $
+--- autogen.sh.orig	Tue Oct  4 17:42:52 2011
+++ autogen.sh	Sat Apr  7 14:22:42 2012
+@@ -70,18 +70,7 @@ detect_autoconf() {
+   RETVAL=$?
+   NUM_RESULT=$#
+   RESULT_FILE=$3
+-  if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
+-    AC="`autoconf --version | parse_version_no`"
+-    if [ `expr $AC` -ge "`echo $AUTOCONF_MIN | parse_version_no`" ]; then
+-      autoconf_ok=yes
+-    fi
+-  else
+-    echo
+-    echo "**Error**: You must have \`autoconf' >= $AUTOCONF_MIN installed to" 
+-    echo "           compile $PROG. Download the appropriate package"
+-    echo "           for your distribution or source from ftp.gnu.org."
+-    exit 1
+-  fi
+  autoconf_ok=yes
+ }
+ 
+ run_autoheader () {
+@@ -107,7 +96,9 @@ run_autoconf () {
+ 
+   echo $_echo_n " + Running autoconf: $_echo_c";
+     autoconf;
+-    sed -i -e '/gnu_ld/,/;;/ s/--rpath \${wl}/--rpath,/' configure
+    sed -e '/gnu_ld/,/;;/ s/--rpath \${wl}/--rpath,/' configure > configure.new
+    mv configure.new configure
+    chmod +x configure
+   echo "done."
+ }
+ 
+@@ -120,12 +111,7 @@ try_libtool_executable() {
+   RETVAL=$?
+   NUM_RESULT=$#
+   RESULT_FILE=$3
+-  if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
+-    LT="`$libtool --version | awk '{ print $4 }' | parse_version_no`"
+-    if [ `expr $LT` -ge "`echo $LIBTOOL_MIN | parse_version_no`" ]; then
+-      libtool_ok=yes
+-    fi
+-  fi
+  libtool_ok=yes
+ }
+ 
+ detect_libtool() {
+@@ -168,18 +154,7 @@ detect_automake() {
+   RETVAL=$?
+   NUM_RESULT=$#
+   RESULT_FILE=$3
+-  if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
+-    AM="`automake --version | parse_version_no`"
+-    if [ `expr $AM` -ge "`echo $AUTOMAKE_MIN | parse_version_no`" ]; then
+-      automake_ok=yes
+-    fi
+-  else
+-    echo
+-    echo "**Error**: You must have \`automake' >= $AUTOMAKE_MIN installed to" 
+-    echo "           compile $PROG. Download the appropriate package"
+-    echo "           for your distribution or source from ftp.gnu.org."
+-    exit 1
+-  fi
+  automake_ok=yes
+ }
+ 
+ run_automake () {
+@@ -206,18 +181,7 @@ detect_aclocal() {
+   RETVAL=$?
+   NUM_RESULT=$#
+   RESULT_FILE=$3
+-  if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
+-    AC="`aclocal --version | parse_version_no`"
+-    if [ `expr $AC` -ge "`echo $AUTOMAKE_MIN | parse_version_no`" ]; then
+-      aclocal_ok=yes
+-    fi
+-  else
+-    echo
+-    echo "**Error**: You must have \`aclocal' >= $AUTOMAKE_MIN installed to" 
+-    echo "           compile $PROG. Download the appropriate package"
+-    echo "           for your distribution or source from ftp.gnu.org."
+-    exit 1
+-  fi
+  aclocal_ok=yes
+ }
+ 
+ run_aclocal () {
--- a/multimedia/xine-lib/patches/patch-configure_ac
+++ b/multimedia/xine-lib/patches/patch-configure_ac
@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_ac,v 1.10 2012/01/05 08:52:26 ajacoutot Exp $
+$OpenBSD: patch-configure_ac,v 1.11 2012/04/08 07:37:25 ajacoutot Exp $
 --- configure.ac.orig	Sun Jan  1 12:30:52 2012
-+++ configure.ac	Sun Jan  1 17:19:01 2012
+++ configure.ac	Sat Apr  7 13:58:35 2012
@@ -558,9 +558,9 @@ t q
 b
 :q
@ -26,3 +26,26 @@ $OpenBSD: patch-configure_ac,v 1.10 2012/01/05 08:52:26 ajacoutot Exp $
   AC_SUBST(MNG_LIBS)
 else
   have_libmng=no
+@@ -1672,6 +1673,22 @@ else
+   no_gdkpixbuf=yes
+ fi
+ AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "x$no_gdkpixbuf" != "xyes")
+
+dnl ---------------------------------------------
+dnl libbluray support 
+dnl ---------------------------------------------
+AC_ARG_ENABLE([bluray],
+  AS_HELP_STRING([--disable-bluray], [Do not build BluRay support]),
+  [with_bluray=$enableval], [with_bluray=yes])
+
+if test "x$with_bluray" != "xno"; then
+  PKG_CHECK_MODULES([LIBBLURAY], [libbluray >= 0.2.1],
+    [have_libbluray=yes],
+    AC_MSG_RESULT(*** All of the libbluray dependent parts will be disabled ***))
+  AC_SUBST(LIBBLURAY_CFLAGS)
+  AC_SUBST(LIBBLURAY_LIBS)
+fi
+AM_CONDITIONAL(HAVE_LIBBLURAY, test "x$have_libbluray" = "xyes")
+ 
+ dnl ---------------------------------------------
+ dnl libsmbclient support
--- a/multimedia/xine-lib/patches/patch-src_input_Makefile_am
+++ b/multimedia/xine-lib/patches/patch-src_input_Makefile_am
@ -0,0 +1,34 @@
+$OpenBSD: patch-src_input_Makefile_am,v 1.1 2012/04/08 07:37:25 ajacoutot Exp $
+--- src/input/Makefile.am.orig	Sat Apr  7 13:15:19 2012
+++ src/input/Makefile.am	Sat Apr  7 13:16:28 2012
+@@ -56,6 +56,10 @@ if DVB
+ in_dvb = xineplug_inp_dvb.la
+ endif
+ 
+if HAVE_LIBBLURAY
+in_bluray = xineplug_inp_bluray.la
+endif
+
+ AM_CFLAGS = -D_LARGEFILE64_SOURCE $(GNOME_VFS_CFLAGS) $(ALSA_CFLAGS) $(DVD_CFLAGS)
+ 
+ xineplug_LTLIBRARIES = \
+@@ -75,6 +79,7 @@ xineplug_LTLIBRARIES = \
+ 	xineplug_inp_net.la \
+ 	$(in_pvr) \
+ 	$(in_dvb) \
+	$(in_bluray) \
+ 	xineplug_inp_cdda.la
+ 
+ 
+@@ -162,6 +167,11 @@ xineplug_inp_pvr_la_SOURCES = input_pvr.c
+ xineplug_inp_pvr_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
+ xineplug_inp_pvr_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
+ xineplug_inp_pvr_la_LDFLAGS = $(xineplug_ldflags)
+
+xineplug_inp_bluray_la_SOURCES = input_bluray.c media_helper.c
+xineplug_inp_bluray_la_LIBADD = $(XINE_LIB) $(LIBBLURAY_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL)
+xineplug_inp_bluray_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) $(LIBBLURAY_CFLAGS)
+xineplug_inp_bluray_la_LDFLAGS = $(xineplug_ldflags)
+ 
+ xineinclude_HEADERS = input_plugin.h
+ noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h http_helper.h
--- a/multimedia/xine-lib/patches/patch-src_input_input_bluray_c
+++ b/multimedia/xine-lib/patches/patch-src_input_input_bluray_c
--- a/multimedia/xine-lib/pkg/PLIST
+++ b/multimedia/xine-lib/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.15 2012/01/05 08:52:26 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.16 2012/04/08 07:37:25 ajacoutot Exp $
@conflict xine-lib-arts-*
@conflict xine-lib-esd-*
@conflict xine-lib-jack-*
@ -64,7 +64,6 @@ lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_planar.so
 lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_switch.so
 lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_tvtime.so
 lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_visualizations.so
-@comment lib/xine/plugins/${XINEAPI_REV}/vidix/
 lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_file.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_none.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_sndio.so
@ -116,6 +115,7 @@ lib/xine/plugins/${XINEAPI_REV}/xineplug_dmx_sputext.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_dmx_yuv4mpeg2.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_dmx_yuv_frames.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_flac.so
+lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_bluray.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_cdda.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_dvb.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_dvd.so