From cb3415fd2255f782099a4ce89d6b047108d8e3087ea168fa5340f6d13b037be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 1 May 2015 09:38:52 +0000 Subject: [PATCH] Accepting request 304815 from home:enzokiel:branches:multimedia:libs - Update to version 0.8.0 OBS-URL: https://build.opensuse.org/request/show/304815 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libbluray?expand=0&rev=33 --- libbluray-0.7.0.tar.bz2 | 3 - libbluray-0.8.0.tar.bz2 | 3 + libbluray-autotools.patch | 131 +++++++++++++++++++------------------- libbluray-jvm_dir.patch | 12 ++-- libbluray.changes | 18 ++++++ libbluray.spec | 5 +- 6 files changed, 97 insertions(+), 75 deletions(-) delete mode 100644 libbluray-0.7.0.tar.bz2 create mode 100644 libbluray-0.8.0.tar.bz2 diff --git a/libbluray-0.7.0.tar.bz2 b/libbluray-0.7.0.tar.bz2 deleted file mode 100644 index 3faf282..0000000 --- a/libbluray-0.7.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f79beb9fbb24117cbb1264c919e686ae9e6349c0ad08b48c4b6233b2887eb68d -size 597266 diff --git a/libbluray-0.8.0.tar.bz2 b/libbluray-0.8.0.tar.bz2 new file mode 100644 index 0000000..7b35b56 --- /dev/null +++ b/libbluray-0.8.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b80208b2af54313fedbb49f54b7e13ff7f86f1843a81dddd5e17aa9575bfd08 +size 621606 diff --git a/libbluray-autotools.patch b/libbluray-autotools.patch index 918e18a..89e5756 100644 --- a/libbluray-autotools.patch +++ b/libbluray-autotools.patch @@ -1,64 +1,67 @@ ---- configure.ac.orig 2015-01-26 10:21:27.000000000 +0100 -+++ configure.ac 2015-01-27 12:55:38.278766200 +0100 -@@ -105,9 +105,10 @@ - [BDJ_BOOTCLASSPATH=]) - - dnl required programs --AC_PROG_CC -+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 -@@ -122,23 +123,12 @@ - - dnl required system services - AC_SYS_LARGEFILE -+AC_FUNC_FSEEKO - - dnl required functions - AC_CHECK_FUNC([snprintf],, [AC_MSG_ERROR($function_not_found)]) - --dnl required libraries --dnl pthreads (not on win32) --AS_IF([test "${SYS}" != "mingw32"], [ -- AC_CHECK_HEADERS([pthread.h], , -- [AC_MSG_ERROR([pthread required])]) -- AC_SEARCH_LIBS([pthread_create], [pthread], , -- [AC_MSG_ERROR([pthread required])]) -- AC_SEARCH_LIBS([dlopen], [dl]) -- DLOPEN_LIBS="$ac_cv_search_dlopen" -- AS_CASE([$DLOPEN_LIBS], -- [no|none\ required], [DLOPEN_LIBS=""]) -- AC_SUBST([DLOPEN_LIBS]) --]) -+AC_CHECK_HEADERS_ONCE([pthread.h]) - - dnl libxml2 for metadata parser - AS_IF([test "x$with_libxml2" != "xno"], [ ---- src/Makefile.am.orig 2015-01-26 10:44:55.000000000 +0100 -+++ src/Makefile.am 2015-01-27 12:55:39.622438800 +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 $(BDJAVA_CFLAGS) - --AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) -+AM_CFLAGS = -pthread $(LIBXML2_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) -+AM_CPPFLAGS = $(SET_INCLUDES) -include config.h - - EXTRA_DIST = \ - libbluray/bdj/build.xml \ -@@ -123,8 +123,8 @@ - endif - - --libbluray_la_LDFLAGS= -version-info $(LT_VERSION_INFO) --libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS) -+libbluray_la_LDFLAGS= -no-undefined -version-info $(LT_VERSION_INFO) -+libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS) -ldl - - pkginclude_HEADERS = \ - file/filesystem.h \ +--- configure.ac.orig 2015-04-10 08:48:23.000000000 +0200 ++++ configure.ac 2015-04-30 13:56:24.249955300 +0200 +@@ -111,9 +111,10 @@ + [BDJ_BOOTCLASSPATH=]) + + dnl required programs +-AC_PROG_CC ++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 +@@ -128,23 +129,12 @@ + + dnl required system services + AC_SYS_LARGEFILE ++AC_FUNC_FSEEKO + + dnl required functions + AC_CHECK_FUNC([snprintf],, [AC_MSG_ERROR($function_not_found)]) + +-dnl required libraries +-dnl pthreads (not on win32) +-AS_IF([test "${SYS}" != "mingw32"], [ +- AC_CHECK_HEADERS([pthread.h], , +- [AC_MSG_ERROR([pthread required])]) +- AC_SEARCH_LIBS([pthread_create], [pthread], , +- [AC_MSG_ERROR([pthread required])]) +- AC_SEARCH_LIBS([dlopen], [dl]) +- DLOPEN_LIBS="$ac_cv_search_dlopen" +- AS_CASE([$DLOPEN_LIBS], +- [no|none\ required], [DLOPEN_LIBS=""]) +- AC_SUBST([DLOPEN_LIBS]) +-]) ++AC_CHECK_HEADERS_ONCE([pthread.h]) + + dnl libxml2 for metadata parser + AS_IF([test "x$with_libxml2" != "xno"], [ +--- Makefile.am.orig 2015-03-20 11:50:37.000000000 +0100 ++++ Makefile.am 2015-04-30 13:56:25.578037800 +0200 +@@ -11,10 +11,10 @@ + POSIX_C_SOURCE=200112L + endif + +-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) -D_REENTRANT + SET_INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libbluray -I$(top_builddir)/src/libbluray $(BDJAVA_CFLAGS) + +-AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS) ++AM_CFLAGS = -pthread $(LIBXML2_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS) ++AM_CPPFLAGS = $(SET_INCLUDES) -include config.h + + EXTRA_DIST = \ + bootstrap \ +@@ -149,8 +149,8 @@ + endif + endif + +-libbluray_la_LDFLAGS= -version-info $(LT_VERSION_INFO) -export-symbols-regex "^bd_" +-libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS) ++libbluray_la_LDFLAGS= -no-undefined -version-info $(LT_VERSION_INFO) ++libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS) -ldl + + noinst_HEADERS = \ + jni/jni.h \ diff --git a/libbluray-jvm_dir.patch b/libbluray-jvm_dir.patch index 7a0ef02..50b5dab 100644 --- a/libbluray-jvm_dir.patch +++ b/libbluray-jvm_dir.patch @@ -1,9 +1,9 @@ ---- src/libbluray/bdj/bdj.c.orig 2015-01-26 09:01:57.000000000 +0100 -+++ src/libbluray/bdj/bdj.c 2015-01-27 13:00:09.750270100 +0100 -@@ -166,7 +166,7 @@ - "/usr/lib/jvm/java-6-openjdk", - "/usr/lib/jvm/java-7-openjdk", - "/etc/java-config-2/current-system-vm"}; +--- src/libbluray/bdj/bdj.c.orig 2015-04-06 18:25:09.000000000 +0200 ++++ src/libbluray/bdj/bdj.c 2015-04-30 13:56:26.765499800 +0200 +@@ -169,7 +169,7 @@ + "/usr/lib/jvm/java-6-openjdk", + "/usr/lib/jvm/java-7-openjdk", + "/etc/java-config-2/current-system-vm"}; - static const char jvm_dir[] = "jre/lib/" JAVA_ARCH "/server"; + static const char jvm_dir[] = "lib/" JAVA_ARCH "/server"; static const char jvm_lib[] = "libjvm"; diff --git a/libbluray.changes b/libbluray.changes index a3253e5..eb824ea 100644 --- a/libbluray.changes +++ b/libbluray.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Apr 30 12:06:23 UTC 2015 - joerg.lorenzen@ki.tng.de + +- Update to version 0.8.0: + + Add security checks to BD-J. + + Add support for UDF image files and unmounted discs. + + Add UDF volume identifier to DISC_INFO. + + Add bd_init(), bd_open_disc() and bd_open_stream(). + + Add /usr/share/libbluray/lib/ to .jar file search paths. + + Add BD_EVENT_PLAYLIST_STOP (playlist playback is interrupted). + + Accept directory name (without .jar file name) in LIBBLURAY_CP. + + Improved error resilence. + + Improve BD-J compability. + + Fix Java 8u40 compability. + + Fix infinite loop with some broken HDMV menus. +- Fixed patches libbluray-autotools.patch and libbluray-jvm_dir.patch. +- Build with UDF support. + ------------------------------------------------------------------- Fri Mar 6 10:23:43 UTC 2015 - tchvatal@suse.com diff --git a/libbluray.spec b/libbluray.spec index 7abb508..624a67c 100644 --- a/libbluray.spec +++ b/libbluray.spec @@ -19,7 +19,7 @@ %define soname 1 Name: libbluray -Version: 0.7.0 +Version: 0.8.0 Release: 0 Summary: Library to access Blu-Ray disk License: LGPL-2.1+ @@ -91,7 +91,8 @@ MPlayer). We, the authors of this library, do not condone nor endorse piracy. autoreconf -fiv %configure \ --disable-static \ - --enable-bdjava + --enable-bdjava \ + --enable-udf make %{?_smp_mflags} %install