diff --git a/libbluray-autotools.patch b/libbluray-autotools.patch deleted file mode 100644 index 6da14d3..0000000 --- a/libbluray-autotools.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- 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-11-25 09:00:27.000000000 +0100 -+++ Makefile.am 2015-12-03 12:49:33.000000000 +0100 -@@ -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 \ -@@ -151,7 +151,7 @@ - endif - - libbluray_la_LDFLAGS= -no-undefined -version-info $(LT_VERSION_INFO) -export-symbols-regex "^bd_" --libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS) -+libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS) -ldl - - noinst_HEADERS = \ - jni/jni.h \ diff --git a/libbluray.changes b/libbluray.changes index 109e299..9e64e89 100644 --- a/libbluray.changes +++ b/libbluray.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 16 07:46:49 UTC 2016 - tchvatal@suse.com + +- Drop libbluray-autotools.patch as it has no real benefit and if + something should be upstreamed + ------------------------------------------------------------------- Thu May 19 10:14:13 UTC 2016 - tchvatal@suse.com diff --git a/libbluray.spec b/libbluray.spec index 0a7ad85..0882c26 100644 --- a/libbluray.spec +++ b/libbluray.spec @@ -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 Source99: baselibs.conf -Patch1: libbluray-autotools.patch Patch2: libbluray-jvm_dir.patch BuildRequires: ant BuildRequires: java-devel >= 1.6 @@ -76,9 +75,7 @@ Summary: Library to access Blu-Ray disk - BD-J support Group: Development/Libraries/Java Requires: java >= 1.6 Requires: jpackage-utils -%if 0%{?suse_version} > 1110 BuildArch: noarch -%endif %description bdj This library is written for the purpose of playing Blu-ray movies. It is @@ -87,11 +84,9 @@ MPlayer). We, the authors of this library, do not condone nor endorse piracy. %prep %setup -q -%patch1 %patch2 %build -autoreconf -fiv %configure \ --disable-static \ --enable-bdjava \