[SCM] mplayer/master.experimental: add 01_switch-to-new-libbluray-api.patch (taken from mplayer2)

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 357b49480d4fdc8695cbf6a1ea49804c34bec494
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Thu Sep 8 21:53:57 2011 +0200

    add 01_switch-to-new-libbluray-api.patch (taken from mplayer2)

diff --git a/debian/patches/01_switch-to-new-libbluray-api.patch b/debian/patches/01_switch-to-new-libbluray-api.patch
new file mode 100644
index 0000000..62733b7
--- /dev/null
+++ b/debian/patches/01_switch-to-new-libbluray-api.patch
@@ -0,0 +1,89 @@
+From 10efda3b37d9d8f08f097ce335b2f5b1c25dac72 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz at ubuntu.com>
+Date: Sun, 10 Jul 2011 08:21:35 +0000
+Subject: stream_bluray: switch to new libbluray API
+
+Switch to new libbluray API with three parameters to
+bd_get_title_info(). libbluray versions using the old API are no
+longer supported.
+---
+Index: mplayer/configure
+===================================================================
+--- mplayer.orig/configure
++++ mplayer/configure
+@@ -5830,7 +5830,7 @@
+ 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'
+Index: mplayer/stream/stream_bluray.c
+===================================================================
+--- mplayer.orig/stream/stream_bluray.c
++++ mplayer/stream/stream_bluray.c
+@@ -116,7 +116,7 @@
+     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 @@
+         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 @@
+     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 @@
+         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;
+ 
+@@ -236,7 +236,7 @@
+     }
+ 
+     /* 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, MSGTR_BlurayNoTitles);
+@@ -250,7 +250,7 @@
+         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;
+ 
+@@ -284,7 +284,7 @@
+            "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
index 456959d..3d52005 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+01_switch-to-new-libbluray-api.patch
 23mplayer-debug-printf.patch

-- 
mplayer packaging