On 12/13/2011 07:44 PM, Xavier Bachelot wrote:
I'll do local builds of mplayer and xbmc to make sure nothing breaks.
mplayer needs the attached patch.
I will look at xbmc next.
Regards,
Xavier
? mplayer-1.0-0.126.20110816svn.fc17.src.rpm
? mplayer-1.0-0.127.20110816svn.fc17.src.rpm
? mplayer-1_0-0_126_20110816svn_fc17
? mplayer-1_0-0_127_20110816svn_fc17
? mplayer-export-2011-08-16
? mplayer-fix_configure_for_libbluray.patch
? mplayer.patch
Index: mplayer-new_libbluray_api.patch
===================================================================
RCS file: mplayer-new_libbluray_api.patch
diff -N mplayer-new_libbluray_api.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mplayer-new_libbluray_api.patch 14 Dec 2011 00:23:25 -0000
@@ -0,0 +1,80 @@
+Index: stream/stream_bluray.c
+===================================================================
+--- stream/stream_bluray.c (revision 34125)
++++ stream/stream_bluray.c (revision 34126)
+@@ -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;
+
+Index: configure
+===================================================================
+--- configure (revision 34125)
++++ configure (revision 34126)
+@@ -5738,7 +5738,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.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.40
diff -a -u -r1.40 mplayer.spec
--- mplayer.spec 23 Sep 2011 20:54:45 -0000 1.40
+++ mplayer.spec 14 Dec 2011 00:23:25 -0000
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.126.%{pre}%{?dist}
+Release: 0.127.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -32,6 +32,9 @@
Patch14: %{name}-nodvdcss.patch
# use system FFmpeg libraries
Patch18: %{name}-ffmpeg.patch
+# New libbluray API (changeset 34126)
+Patch19: %{name}-new_libbluray_api.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -229,6 +232,7 @@
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
%patch18 -p1 -b .ffmpeg
+%patch19 -p0 -b .bluray
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -401,6 +405,9 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Tue Dec 13 2011 Xavier Bachelot <xav...@bachelot.org> - 1.0-0.127.20110816svn
+- Add patch for new libbluray API.
+
* Fri Sep 23 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.126.20110816svn
- 20110816 snapshot
- drop obsolete pause crash patch
