Accepting request 456631 from home:pbleser:branches:multimedia:libs
- drop patch A02-expopse-clip_id.patch as Handbrake seems to be the only package that needs it, to avoid binary runtime incompatibilities with libbluray packages that would stem from other repositories OBS-URL: https://build.opensuse.org/request/show/456631 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libbluray?expand=0&rev=55
This commit is contained in:
parent
cf955ad378
commit
33de78a4da
@ -1,32 +0,0 @@
|
||||
From: John Stebbins <stebbins@jetheaddev.com>
|
||||
Date: Sat, 14 Jan 2017 18:03:14 +0000 (-0700)
|
||||
Subject: expose clip_id in BLURAY_CLIP_INFO
|
||||
X-Git-Url: http://git.videolan.org/?p=libbluray.git;a=commitdiff_plain;h=da50ad6ee5ceef6e81a96af0f2affcfe961c9d9f
|
||||
|
||||
expose clip_id in BLURAY_CLIP_INFO
|
||||
---
|
||||
|
||||
Index: libbluray-0.9.3/src/libbluray/bluray.c
|
||||
===================================================================
|
||||
--- libbluray-0.9.3.orig/src/libbluray/bluray.c
|
||||
+++ libbluray-0.9.3/src/libbluray/bluray.c
|
||||
@@ -2602,6 +2602,7 @@ static BLURAY_TITLE_INFO* _fill_title_in
|
||||
BLURAY_CLIP_INFO *ci = &title_info->clips[ii];
|
||||
NAV_CLIP *nc = &title->clip_list.clip[ii];
|
||||
|
||||
+ memcpy(ci->clip_id, pi->clip->clip_id, sizeof(ci->clip_id));
|
||||
ci->pkt_count = nc->end_pkt - nc->start_pkt;
|
||||
ci->start_time = (uint64_t)nc->title_time * 2;
|
||||
ci->in_time = (uint64_t)pi->in_time * 2;
|
||||
Index: libbluray-0.9.3/src/libbluray/bluray.h
|
||||
===================================================================
|
||||
--- libbluray-0.9.3.orig/src/libbluray/bluray.h
|
||||
+++ libbluray-0.9.3/src/libbluray/bluray.h
|
||||
@@ -244,6 +244,7 @@ typedef struct bd_clip {
|
||||
uint64_t start_time; /* start media time, 90kHz, ("playlist time") */
|
||||
uint64_t in_time; /* start timestamp, 90kHz */
|
||||
uint64_t out_time; /* end timestamp, 90kHz */
|
||||
+ char clip_id[6];
|
||||
} BLURAY_CLIP_INFO;
|
||||
|
||||
typedef struct bd_chapter {
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 12 14:45:53 UTC 2017 - pascal.bleser@opensuse.org
|
||||
|
||||
- drop patch A02-expopse-clip_id.patch as Handbrake seems to be the only
|
||||
package that needs it, to avoid binary runtime incompatibilities with
|
||||
libbluray packages that would stem from other repositories
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 2 08:22:09 UTC 2017 - pascal.bleser@opensuse.org
|
||||
|
||||
|
@ -27,7 +27,6 @@ Group: Productivity/Multimedia/Other
|
||||
Url: http://www.videolan.org/developers/libbluray.html
|
||||
Source0: http://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
|
||||
# Taken from upstream
|
||||
Patch1: A02-expose-clip_id.patch
|
||||
Source99: baselibs.conf
|
||||
Patch2: libbluray-jvm_dir.patch
|
||||
BuildRequires: ant
|
||||
@ -88,7 +87,6 @@ MPlayer). We, the authors of this library, do not condone nor endorse piracy.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
|
||||
%build
|
||||
|
Loading…
Reference in New Issue
Block a user