- update libbluray to 0.2.1

PR:		163721 [based on]
Submitted by:	Kurt Jaeger <fbsd-ports at opsec dot eu>
Approved by:    maintainer (timeout; 1 month+)

9 files changed, 25 insertions, 38 deletions

diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile
index 132168b940b..700ec7687d3 100644
--- a/multimedia/libbluray/Makefile
+++ b/multimedia/libbluray/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	libbluray
-PORTVERSION=	0.2.20110219
+PORTVERSION=	0.2.1
+PORTEPOCH=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	CRITICAL
+MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/libbluray/0.2.1/
 
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Blu-Ray discs playback library for media players
@@ -20,6 +21,7 @@ LIB_DEPENDS+=	aacs.0:${PORTSDIR}/multimedia/libaacs
 # libiconv.so.3
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
+USE_BZIP2=	yes
 USE_AUTOTOOLS=	autoconf aclocal automake libtool
 
 HAS_CONFIGURE=	yes
diff --git a/multimedia/libbluray/distinfo b/multimedia/libbluray/distinfo
index ec623f4b202..81fb5abf7e9 100644
--- a/multimedia/libbluray/distinfo
+++ b/multimedia/libbluray/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libbluray-0.2.20110219.tar.gz) = f14c83886d82b1ba36e97aa5912e44775b72396c73bb7da6e8ef879615d31f9d
-SIZE (libbluray-0.2.20110219.tar.gz) = 237648
+SHA256 (libbluray-0.2.1.tar.bz2) = 20eb1d352e9d26e8b5b639f82c218a0c350b78cdbcb741f89d237e2202bd113a
+SIZE (libbluray-0.2.1.tar.bz2) = 396405
diff --git a/multimedia/libbluray/files/patch-configure.ac b/multimedia/libbluray/files/patch-configure.ac
index 4dc24a0d89e..79aeb845769 100644
--- a/multimedia/libbluray/files/patch-configure.ac
+++ b/multimedia/libbluray/files/patch-configure.ac
@@ -1,28 +1,11 @@
---- configure.ac.orig	2011-02-13 16:21:47.000000000 +0100
-+++ configure.ac	2011-02-20 03:32:38.000000000 +0100
-@@ -35,7 +35,7 @@
- pkg_config_missing="Could not find pkg-config.  Assuming..."
- 
- # configure options
--AC_ARG_ENABLE([dlopen-crypto-libs],
-+AC_ARG_WITH([dlopen-crypto-libs],
-   [AS_HELP_STRING([--with-dlopen-crypto-libs],
-   [use libaacs and libbdplus via dlopen (default is auto)])],
-   [use_dlopen_crypto_libs=$withval],
-@@ -120,7 +120,7 @@
+--- configure.ac.orig	2011-12-01 02:53:02.000000000 +0400
++++ configure.ac	2012-02-23 15:32:47.000000000 +0400
+@@ -136,7 +136,7 @@
+ fi
  
  # dlopen check
- if [[ $use_dlopen_crypto_libs = "auto" ]]; then
--  if test "${SYS}" != "mingw32" ; then
-+  if test "${SYS}" != "mingw32" -a "${SYS}" == "${SYS#freebsd}" ; then
-       AC_CHECK_LIB([dl], [dlopen],
-         [DLOPEN_LDFLAGS="-ldl"; AC_MSG_NOTICE($using_dlopen_crypto_libs)
-          AC_DEFINE([DLOPEN_CRYPTO_LIBS], [1], ["Define to 1 if dlopening crypto libs"])],
-@@ -236,6 +236,7 @@
-   case $target_os in
-        linux*) java_os=linux ;;
-        win*)   java_os=win32 ;;
-+       freebsd*) java_os=freebsd ;;
-        *)      java_os=$target_os ;;
-   esac
- 
+-if test "${SYS}" != "mingw32" ; then
++if test "${SYS}" != "mingw32" -a "${SYS}" == "${SYS#freebsd}" ; then
+   AC_CHECK_FUNCS(
+     [dlopen],
+     [DLOPEN_LDFLAGS=""],
diff --git a/multimedia/libbluray/pkg-descr b/multimedia/libbluray/pkg-descr
index fdc13256581..007f86ba9db 100644
--- a/multimedia/libbluray/pkg-descr
+++ b/multimedia/libbluray/pkg-descr
@@ -4,4 +4,4 @@ media players, like VLC or MPlayer.
 This research project is developed by an international team of developers from
 Doom9.
 
-WWW: http://www.videolan.org/developers/libbluray.html
+WWW:	http://www.videolan.org/developers/libbluray.html
diff --git a/multimedia/libbluray/pkg-plist b/multimedia/libbluray/pkg-plist
index 6a9c2e9dc5f..33f55e86e81 100644
--- a/multimedia/libbluray/pkg-plist
+++ b/multimedia/libbluray/pkg-plist
@@ -1,4 +1,6 @@
+include/libbluray/bluray-version.h
 include/libbluray/bluray.h
+include/libbluray/clpi_data.h
 include/libbluray/filesystem.h
 include/libbluray/keys.h
 include/libbluray/log_control.h
@@ -7,6 +9,6 @@ include/libbluray/overlay.h
 lib/libbluray.a
 lib/libbluray.la
 lib/libbluray.so
-lib/libbluray.so.0
+lib/libbluray.so.1
 libdata/pkgconfig/libbluray.pc
 @dirrm include/libbluray
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index 85b18cec407..ab819994f25 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -151,7 +151,7 @@ CONFIGURE_ARGS+=	--disable-pulse
 .endif
 
 .if defined(WITH_BLURAY)
-LIB_DEPENDS+=		bluray.0:${PORTSDIR}/multimedia/libbluray
+LIB_DEPENDS+=		bluray.1:${PORTSDIR}/multimedia/libbluray
 .else
 CONFIGURE_ARGS+=	--disable-bluray
 .endif
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index 337cd712aa9..c5b0e09ba06 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -51,7 +51,7 @@ CONFIGURE_OPTS+=	--disable-libextractor
 
 .if defined(WITH_LIBBLURAY)
 CONFIGURE_OPTS+=	--enable-libbluray
-LIB_DEPENDS+=	bluray.0:${PORTSDIR}/multimedia/libbluray
+LIB_DEPENDS+=	bluray.1:${PORTSDIR}/multimedia/libbluray
 .else
 CONFIGURE_OPTS+=	--disable-libbluray
 .endif
diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile
index 53468b6866a..baa42660014 100644
--- a/multimedia/xbmc-pvr/Makefile
+++ b/multimedia/xbmc-pvr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbmc
 PORTVERSION=	65
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/nox
 PKGNAMESUFFIX=	-pvr-ppa-odk
@@ -134,7 +134,7 @@ CONFIGURE_ARGS+=	--disable-avahi
 
 .if !defined(WITHOUT_LIBBLURAY)
 CONFIGURE_ARGS+=	--enable-libbluray
-LIB_DEPENDS+=	bluray.0:${PORTSDIR}/multimedia/libbluray
+LIB_DEPENDS+=	bluray.1:${PORTSDIR}/multimedia/libbluray
 .else
 CONFIGURE_ARGS+=	--disable-libbluray
 .endif
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 65b852f50be..24a0ec69cd9 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbmc
 PORTVERSION=	11.0.b2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
 DISTNAME=	${PORTNAME}-11.0-Eden_beta2
@@ -120,7 +120,7 @@ CONFIGURE_ARGS+=	--disable-avahi
 
 .if !defined(WITHOUT_LIBBLURAY)
 CONFIGURE_ARGS+=	--enable-libbluray
-LIB_DEPENDS+=	bluray.0:${PORTSDIR}/multimedia/libbluray
+LIB_DEPENDS+=	bluray.1:${PORTSDIR}/multimedia/libbluray
 .else
 CONFIGURE_ARGS+=	--disable-libbluray
 .endif