pool/libbluray
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 454105 from home:pbleser:branches:multimedia:libs

Browse Source 
add patch to expose clip_id (as applied by Debian), which is necessary to build packages that depend on it (such as Handbrake)

OBS-URL: https://build.opensuse.org/request/show/454105
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libbluray?expand=0&rev=51
This commit is contained in:
Tomáš Chvátal 2017-02-02 11:36:12 +00:00 committed by Git OBS Bridge
parent 285a4c0c38
commit 0f7bcacbd1
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
A02-expose-clip_id.patch Normal file
View File

@ -0,0 +1,37 @@
From 1a113167733091fe325152a5ece4d57ee1b89dc0 Mon Sep 17 00:00:00 2001
From: John Stebbins <stebbins@jetheaddev.com>
Date: Wed, 18 May 2016 15:40:17 -0600
Subject: [PATCH] expose clip_id in BLURAY_CLIP_INFO
---
src/libbluray/bluray.c | 1 +
src/libbluray/bluray.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
index b7598b9..3478ade 100644
--- a/src/libbluray/bluray.c
+++ b/src/libbluray/bluray.c
@@ -2602,6 +2602,7 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx,
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;
diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
index 3cd7118..177b3d4 100644
--- a/src/libbluray/bluray.h
+++ b/src/libbluray/bluray.h
@@ -225,6 +225,7 @@ typedef struct bd_stream_info {
} BLURAY_STREAM_INFO;
typedef struct bd_clip {
+ char clip_id[6];
uint32_t pkt_count;
uint8_t still_mode;
uint16_t still_time; /* seconds */
--
2.5.5

6
libbluray.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 2 08:22:09 UTC 2017 - pascal.bleser@opensuse.org
- add patch to expose clip_id (as applied by Debian), which is
necessary to build packages that depend on it (such as Handbrake)
-------------------------------------------------------------------
Tue Aug 16 07:46:49 UTC 2016 - tchvatal@suse.com

4
libbluray.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libbluray
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands
#
# All modifications and additions to the file contributed by third parties
@ -26,6 +26,7 @@ License: LGPL-2.1+
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
Patch1: https://raw.githubusercontent.com/HandBrake/HandBrake/master/contrib/libbluray/A02-expose-clip_id.patch
Source99: baselibs.conf
Patch2: libbluray-jvm_dir.patch
BuildRequires: ant
@ -86,6 +87,7 @@ MPlayer). We, the authors of this library, do not condone nor endorse piracy.
%prep
%setup -q
%patch1 -p1
%patch2
%build