Skip to content

Commit

Permalink
contrib: Update to libbluray 1.0.1.
Browse files Browse the repository at this point in the history
BD-J is always enabled now, so add patch to fix symbols under mingw.
  • Loading branch information
bradleysepos committed Aug 18, 2017
1 parent 680f04f commit e69f470
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 47 deletions.
37 changes: 0 additions & 37 deletions contrib/libbluray/A02-expose-clip_id.patch

This file was deleted.

13 changes: 13 additions & 0 deletions contrib/libbluray/P00-mingw-lib.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- libbluray-1.0.1/jni/win32/jni_md.h.orig 2017-03-02 08:33:49.000000000 -0500
+++ libbluray-1.0.1/jni/win32/jni_md.h 2017-08-16 12:07:43.000000000 -0400
@@ -38,8 +38,8 @@
#ifndef _JNI_MD_H_
#define _JNI_MD_H_

-#define JNIEXPORT __declspec(dllexport)
-#define JNIIMPORT __declspec(dllimport)
+#define JNIEXPORT
+#define JNIIMPORT
#define JNICALL __stdcall

typedef long jint;
14 changes: 4 additions & 10 deletions contrib/libbluray/module.defs
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
$(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,PKGCONFIG LIBXML2 FREETYPE))
$(eval $(call import.CONTRIB.defs,LIBBLURAY))

LIBBLURAY.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libbluray-0.9.3.tar.bz2
LIBBLURAY.FETCH.url += https://download.videolan.org/pub/videolan/libbluray/0.9.3/libbluray-0.9.3.tar.bz2
LIBBLURAY.FETCH.sha256 = a6366614ec45484b51fe94fcd1975b3b8716f90f038a33b24d59978de3863ce0

ifneq (max,$(LIBBLURAY.GCC.g))
LIBBLURAY.CONFIGURE.extra += --disable-debug
else
LIBBLURAY.CONFIGURE.extra += --enable-debug
endif
LIBBLURAY.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libbluray-1.0.1.tar.bz2
LIBBLURAY.FETCH.url += https://download.videolan.org/pub/videolan/libbluray/1.0.1/libbluray-1.0.1.tar.bz2
LIBBLURAY.FETCH.sha256 = 0f9f9a1db2f48cafc70ed2596ff3594b597e2027408f5f2be6191c245d67853a

ifeq (none,$(LIBBLURAY.GCC.O))
LIBBLURAY.CONFIGURE.extra += --disable-optimizations
endif

LIBBLURAY.CONFIGURE.extra += --disable-examples --disable-bdjava --enable-udf --without-freetype --without-fontconfig
LIBBLURAY.CONFIGURE.extra += --disable-doxygen-doc --disable-examples --disable-bdjava-jar --without-freetype --without-fontconfig

ifeq (1,$(FEATURE.local_pkgconfig))
LIBBLURAY.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
Expand Down

0 comments on commit e69f470

Please sign in to comment.