summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-04-30 18:06:05 +0000
committerjstebbins <[email protected]>2015-04-30 18:06:05 +0000
commit29607855a2ce13dbd843b1d270b4e5bd0adeac35 (patch)
treef905958149d3a2b7ac831a6f82934703f093a08b /contrib
parentdfd798df39d70f6e6f544d658552bd1b9b5a40a3 (diff)
libbluray: use official 0.8.0 release
And add MINGW_HAS_SECURE_API to defines during build git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7139 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
-rw-r--r--contrib/libbluray/A01-filter-dup.patch0
-rw-r--r--contrib/libbluray/A02-m2ts-trace.patch0
-rw-r--r--contrib/libbluray/module.defs8
3 files changed, 5 insertions, 3 deletions
diff --git a/contrib/libbluray/A01-filter-dup.patch b/contrib/libbluray/A01-filter-dup.patch
deleted file mode 100644
index e69de29bb..000000000
--- a/contrib/libbluray/A01-filter-dup.patch
+++ /dev/null
diff --git a/contrib/libbluray/A02-m2ts-trace.patch b/contrib/libbluray/A02-m2ts-trace.patch
deleted file mode 100644
index e69de29bb..000000000
--- a/contrib/libbluray/A02-m2ts-trace.patch
+++ /dev/null
diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs
index c4bd6201d..010681591 100644
--- a/contrib/libbluray/module.defs
+++ b/contrib/libbluray/module.defs
@@ -1,9 +1,7 @@
$(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,PKGCONFIG LIBXML2 FREETYPE))
$(eval $(call import.CONTRIB.defs,LIBBLURAY))
-LIBBLURAY.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libbluray-0.8.0-0-g2a815e6.tar.gz
-
-LIBBLURAY.CONFIGURE.bootstrap = ./bootstrap;
+LIBBLURAY.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libbluray-0.8.0.tar.bz2
ifneq (max,$(LIBBLURAY.GCC.g))
LIBBLURAY.CONFIGURE.extra += --disable-debug
@@ -21,3 +19,7 @@ ifeq (1,$(FEATURE.local_pkgconfig))
LIBBLURAY.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
LIBBLURAY.BUILD.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
endif
+
+ifeq (mingw,$(BUILD.system))
+ LIBBLURAY.GCC.D += MINGW_HAS_SECURE_API=1
+endif