rpm/libbluray
SHA256
1
0
Fork 0
forked from pool/libbluray
Code Pull Requests Activity

Accepting request 265868 from multimedia:libs

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/265868
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libbluray?expand=0&rev=15
This commit is contained in:
Stephan Kulow 2014-12-21 11:00:55 +00:00 committed by Git OBS Bridge
commit a5abb89b62
6 changed files with 101 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libbluray-0.4.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:63a3218d69f179f4834ef3b48bfa95268ad62c302ff38bfc052e2fc6916ae3f8
size 549758

3
libbluray-0.6.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ca410c8a4a1e2e8344014a67e2c908182cff3e04ece4e3b9ef196cf6bca5cd0
size 582227

32
libbluray-autotools.patch
View File

@ -1,18 +1,19 @@
--- libbluray-0.4.0.orig/configure.ac
+++ libbluray-0.4.0/configure.ac
@@ -99,8 +99,9 @@ AC_ARG_WITH([bdj-bootclasspath],
--- configure.ac.orig 2014-12-17 18:01:33.515364222 +0100
+++ configure.ac 2014-12-17 18:01:33.523364060 +0100
@@ -102,9 +102,10 @@
[BDJ_BOOTCLASSPATH=])
dnl required programs
-AC_PROG_CC
-AC_PROG_LIBTOOL
+AC_PROG_CC_STDC
AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
+AC_USE_SYSTEM_EXTENSIONS
+LT_INIT([disable-static pic-only])
dnl required types
AC_TYPE_SIGNAL
@@ -115,23 +116,12 @@ AC_STRUCT_DIRENT_D_TYPE
@@ -119,23 +120,12 @@
dnl required system services
AC_SYS_LARGEFILE
@ -38,11 +39,11 @@
dnl libxml2 for metadata parser
AS_IF([test "x$with_libxml2" != "xno"], [
--- libbluray-0.4.0.orig/src/Makefile.am
+++ libbluray-0.4.0/src/Makefile.am
--- src/Makefile.am.orig 2014-12-17 18:01:35.803318166 +0100
+++ src/Makefile.am 2014-12-17 18:01:35.831317614 +0100
@@ -1,7 +1,7 @@
-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray -Ilibbluray/bdnav
SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray -Ilibbluray/bdnav $(BDJAVA_CFLAGS)
-AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS)
+AM_CFLAGS = -pthread $(LIBXML2_CFLAGS) $(FT2_CFLAGS)
@ -50,7 +51,7 @@
EXTRA_DIST = \
libbluray/bdj/build.xml \
@@ -109,8 +109,8 @@ endif
@@ -120,8 +120,8 @@
endif
@ -61,16 +62,3 @@
pkginclude_HEADERS = \
file/filesystem.h \
--- libbluray-0.4.0.orig/src/examples/Makefile.am
+++ libbluray-0.4.0/src/examples/Makefile.am
@@ -1,7 +1,8 @@
-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
+SET_FEATURES = -D_REENTRANT
SET_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/file -I$(top_srcdir)/src/libbluray/bdnav
-AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES)
+AM_CFLAGS = $(SET_FEATURES) $(SET_INCLUDES)
+AM_CPPFLAGS = -include config.h
if USING_EXAMPLES

60
libbluray.changes
View File

@ -1,3 +1,63 @@
-------------------------------------------------------------------
Thu Dec 18 11:15:47 UTC 2014 - joerg.lorenzen@ki.tng.de
- Enable BD-J support.
-------------------------------------------------------------------
Wed Dec 17 16:17:23 UTC 2014 - joerg.lorenzen@ki.tng.de
- Update to version 0.6.2:
+ Fix possible subtitle corruption after seek.
+ Fix some main path embedded HDMV menus.
+ Fix reading outside of source image in BD-J drawImage().
+ Fix missing BD_EVENT_ERROR when BD-J is not supported.
+ Several stability and code quality fixes.
- Version 0.6.1:
+ Fix stream position when seamless angle change point is at
clip boundary.
+ Fix Mac OS X jni compilation
+ Fix bd_seek() jumping outside of clip/playlist.
+ Fix crash when stream selection is changed after playlist end.
+ Fix J2ME build.
+ Fix seamless angle change.
+ Fix freetype2 resource leaks on shutdown.
+ Improve duplicate playlist detection.
- Version 0.6.0:
+ Improved BD-J support (Most BD-J discs are correctly played).
+ Mark BD-J titles supported in BLURAY_DISC_INFO if BD-J is
functional.
+ Install .jar files to datadir (/usr/share/java/) instead of
libdir.
+ Added version number to .jar file names.
+ Added JNI headers for BD-J (cross) compilation.
+ Added HDMV/BD-J title information to BLURAY_DISC_INFO.
+ Added disc application info to BLURAY_DISC_INFO.
+ Added bd_set_rate().
+ Added color keys (RED, GREEN, YELLOW, BLUE).
+ Improved error resilence.
+ Fix build without libxml.
- Version 0.5.0:
+ Portability fixes.
+ Build system updates.
+ Improved BD-J support (still alpha).
+ Improved updating of application-allocated ARGB frame buffer.
+ Get JRE library location from registry (Windows).
+ Added bd_get_main_title().
+ Added BD_EVENT_ERROR when title playback fails.
+ Added BD-J flags to disc info.
+ Added support for user timeout in HDMV menus.
+ Added cropping of RLE images. Cropping values in overlay are
now always 0.
+ Added support for LIBAACS_PATH and LIBBDPLUS_PATH environment
variables.
+ Added timestamp based m2ts stream filtering.
- Removed patch use-recommended-freetype-include.patch,
fixed upstream.
-------------------------------------------------------------------
Wed Jan 1 22:21:18 UTC 2014 - crrodriguez@opensuse.org

41
libbluray.spec
View File

@ -17,23 +17,23 @@
#
%define soname 1
Name: libbluray
Version: 0.4.0
Version: 0.6.2
Release: 0
Summary: Library to access Blu-Ray disk
License: LGPL-2.1+
Group: Productivity/Multimedia/Other
Url: http://bd.videolan.org
Source: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with
# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions
Patch0: use-recommended-freetype-include.patch
Patch1: libbluray-autotools.patch
Source99: baselibs.conf
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(libxml-2.0) >= 2.6
BuildRequires: ant
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -41,11 +41,11 @@ This library is written for the purpose of playing Blu-ray movies. It is
intended for software that want to support Blu-ray playback (such as VLC and
MPlayer). We, the authors of this library, do not condone nor endorse piracy.
%package -n libbluray1
%package -n libbluray%{soname}
Summary: Library to access Blu-Ray disk
Group: Productivity/Multimedia/Other
%description -n libbluray1
%description -n libbluray%{soname}
This library is written for the purpose of playing Blu-ray movies. It is
intended for software that want to support Blu-ray playback (such as VLC and
MPlayer). We, the authors of this library, do not condone nor endorse piracy.
@ -62,35 +62,46 @@ MPlayer). We, the authors of this library, do not condone nor endorse piracy.
%package devel
Summary: Library to access Blu-Ray disks - Development files
Group: Development/Languages/C and C++
Requires: libbluray1 = %{version}
Requires: libbluray%{soname} = %{version}
%description devel
This library is written for the purpose of playing Blu-ray movies. It is
intended for software that want to support Blu-ray playback (such as VLC and
MPlayer). We, the authors of this library, do not condone nor endorse piracy.
%package bdj
Summary: Library to access Blu-Ray disk - BD-J support
Group: Development/Libraries/Java
Requires: java >= 1.6
Requires: jpackage-utils
BuildArch: noarch
%description bdj
This library is written for the purpose of playing Blu-ray movies. It is
intended for software that want to support Blu-ray playback (such as VLC and
MPlayer). We, the authors of this library, do not condone nor endorse piracy.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch1 -p0
%build
autoreconf -fiv
%configure --disable-static
%configure --disable-static --enable-bdjava
make %{?_smp_mflags}
%install
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
%post -n libbluray1 -p /sbin/ldconfig
%post -n libbluray%{soname} -p /sbin/ldconfig
%postun -n libbluray1 -p /sbin/ldconfig
%postun -n libbluray%{soname} -p /sbin/ldconfig
%files tools
%defattr(-,root,root)
%{_bindir}/bd_info
%files -n libbluray1
%files -n libbluray%{soname}
%defattr(-, root, root)
%doc COPYING
%{_libdir}/libbluray.so.*
@ -101,4 +112,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/libbluray.so
%{_libdir}/pkgconfig/libbluray.pc
%files bdj
%defattr(-, root, root)
%{_javadir}/libbluray-j2se-%{version}.jar
%changelog

13
use-recommended-freetype-include.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/libbluray/decoders/textst_render.c b/src/libbluray/decoders/textst_render.c
index 780b640..ffcb1bd 100644
--- a/src/libbluray/decoders/textst_render.c
+++ b/src/libbluray/decoders/textst_render.c
@@ -30,7 +30,7 @@
#ifdef HAVE_FT2
#include <ft2build.h>
#include FT_FREETYPE_H
-#include <freetype/ftsynth.h>
+#include FT_SYNTHESIS_H
#endif
#include "textst_render.h"