[SCM] mplayer2/master: Enable libbluray support, thanks to Andrea De Pirro for the report.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3630f9ff531baaff0da65c562accefbdf8456d05
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 30 12:48:43 2011 +0200

    Enable libbluray support, thanks to Andrea De Pirro for the report.

diff --git a/debian/control b/debian/control
index be4eba6..0c7324c 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
  libavcodec-dev (>= 4:0.7~rc1~),
  libavformat-dev (>= 4:0.7~rc1~),
  libavutil-dev (>= 4:0.7~rc1~),
+ libbluray-dev,
  libcaca-dev,
  libcdparanoia-dev | libcdparanoia0-dev,
  libdirectfb-dev,
diff --git a/debian/patches/0001-new_libbluray_api.patch b/debian/patches/0001-new_libbluray_api.patch
new file mode 100644
index 0000000..b85413c
--- /dev/null
+++ b/debian/patches/0001-new_libbluray_api.patch
@@ -0,0 +1,83 @@
+Description: Update to new libbluray API.
+Origin: upstream, http://git.mplayer2.org/mplayer2/commit/?id=10efda3b37d9d8f
+---
+ configure              |    2 +-
+ stream/stream_bluray.c |   14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- mplayer2.orig/configure
++++ mplayer2/configure
+@@ -5200,7 +5200,7 @@ echores "$_vcd"
+ echocheck "Blu-ray support"
+ if test "$_bluray" = auto ; then
+   _bluray=no
+-  statement_check libbluray/bluray.h 'bd_get_title_info(0, 0)' -lbluray && _bluray=yes
++  statement_check libbluray/bluray.h 'bd_get_title_info(0, 0, 0)' -lbluray && _bluray=yes
+ fi
+ if test "$_bluray" = yes ; then
+   def_bluray='#define CONFIG_LIBBLURAY 1'
+--- mplayer2.orig/stream/stream_bluray.c
++++ mplayer2/stream/stream_bluray.c
+@@ -116,7 +116,7 @@ static int bluray_stream_control(stream_
+     case STREAM_CTRL_GET_NUM_CHAPTERS: {
+         BLURAY_TITLE_INFO *ti;
+ 
+-        ti = bd_get_title_info(b->bd, b->current_title);
++        ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
+         if (!ti)
+             return STREAM_UNSUPPORTED;
+ 
+@@ -137,7 +137,7 @@ static int bluray_stream_control(stream_
+         int64_t pos;
+         int r;
+ 
+-        ti = bd_get_title_info(b->bd, b->current_title);
++        ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
+         if (!ti)
+             return STREAM_UNSUPPORTED;
+ 
+@@ -156,7 +156,7 @@ static int bluray_stream_control(stream_
+     case STREAM_CTRL_GET_NUM_ANGLES: {
+         BLURAY_TITLE_INFO *ti;
+ 
+-        ti = bd_get_title_info(b->bd, b->current_title);
++        ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
+         if (!ti)
+             return STREAM_UNSUPPORTED;
+ 
+@@ -175,7 +175,7 @@ static int bluray_stream_control(stream_
+         BLURAY_TITLE_INFO *ti;
+         int angle = *((int *) arg);
+ 
+-        ti = bd_get_title_info(b->bd, b->current_title);
++        ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
+         if (!ti)
+             return STREAM_UNSUPPORTED;
+ 
+@@ -238,7 +238,7 @@ static int bluray_stream_open(stream_t *
+     }
+ 
+     /* check for available titles on disc */
+-    title_count = bd_get_titles(bd, TITLES_RELEVANT);
++    title_count = bd_get_titles(bd, TITLES_RELEVANT, angle);
+     mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BLURAY_TITLES=%d\n", title_count);
+     if (!title_count) {
+         mp_msg(MSGT_OPEN, MSGL_ERR,
+@@ -253,7 +253,7 @@ static int bluray_stream_open(stream_t *
+         BLURAY_TITLE_INFO *ti;
+         int sec, msec;
+ 
+-        ti = bd_get_title_info(bd, i);
++        ti = bd_get_title_info(bd, i, angle);
+         if (!ti)
+             continue;
+ 
+@@ -287,7 +287,7 @@ static int bluray_stream_open(stream_t *
+            "ID_BLURAY_CURRENT_TITLE=%d\n", title + 1);
+ 
+     /* Get current title information */
+-    info = bd_get_title_info(bd, title);
++    info = bd_get_title_info(bd, title, angle);
+     if (!info)
+         goto err_no_info;
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f4135b9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-new_libbluray_api.patch

-- 
mplayer2 packaging