From 3021c9528848f660e9a0e6ae24b6a44e200f293d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 3 Jul 2017 21:46:33 +0200 Subject: [PATCH] libbluray: bump version. --- ...ay-1.0.0.recipe => libbluray-1.0.1.recipe} | 11 +-- .../patches/libbluray-1.0.1.patchset | 77 +++++++++++++++++++ 2 files changed, 83 insertions(+), 5 deletions(-) rename media-libs/libbluray/{libbluray-1.0.0.recipe => libbluray-1.0.1.recipe} (90%) create mode 100644 media-libs/libbluray/patches/libbluray-1.0.1.patchset diff --git a/media-libs/libbluray/libbluray-1.0.0.recipe b/media-libs/libbluray/libbluray-1.0.1.recipe similarity index 90% rename from media-libs/libbluray/libbluray-1.0.0.recipe rename to media-libs/libbluray/libbluray-1.0.1.recipe index bc53e6147..00fe691b5 100644 --- a/media-libs/libbluray/libbluray-1.0.0.recipe +++ b/media-libs/libbluray/libbluray-1.0.1.recipe @@ -3,16 +3,17 @@ DESCRIPTION="This library is simply a tool for playback of Blu-ray movies." HOMEPAGE="https://www.videolan.org/developers/libbluray.html" COPYRIGHT="2010-2016 VideoLAN" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.videolan.org/pub/videolan/libbluray/$portVersion/libbluray-$portVersion.tar.bz2" -CHECKSUM_SHA256="f7e3add335c7bbef45824fcd2249a9bf293868598c13f8479352c44ec95374cc" +CHECKSUM_SHA256="0f9f9a1db2f48cafc70ed2596ff3594b597e2027408f5f2be6191c245d67853a" +PATCHES="libbluray-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" libbluray$secondaryArchSuffix = $portVersion compat >= 1 - lib:libbluray$secondaryArchSuffix = 2.0.0 compat >= 2 + lib:libbluray$secondaryArchSuffix = 2.0.1 compat >= 2 cmd:bd_info$secondaryArchSuffix " REQUIRES=" @@ -28,7 +29,7 @@ REQUIRES=" PROVIDES_devel=" libbluray${secondaryArchSuffix}_devel = $portVersion compat >= 1 - devel:libbluray$secondaryArchSuffix = 2.0.0 compat >= 2 + devel:libbluray$secondaryArchSuffix = 2.0.1 compat >= 2 " REQUIRES_devel=" libbluray$secondaryArchSuffix == $portVersion base @@ -61,7 +62,7 @@ BUILD_PREREQUIRES=" BUILD() { - runConfigure ./configure --disable-bdjava + runConfigure ./configure --disable-bdjava-jar make $jobArgs } diff --git a/media-libs/libbluray/patches/libbluray-1.0.1.patchset b/media-libs/libbluray/patches/libbluray-1.0.1.patchset new file mode 100644 index 000000000..2eabeedf6 --- /dev/null +++ b/media-libs/libbluray/patches/libbluray-1.0.1.patchset @@ -0,0 +1,77 @@ +From e0fd7082a0f734783a768f500bfb335d7c58ad25 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 3 Jul 2017 21:43:49 +0200 +Subject: add jni_md.h for haiku. + + +diff --git a/configure.ac b/configure.ac +index 98a5226..7fc4938 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -206,6 +206,7 @@ case $host_os in + freebsd*) java_os=freebsd ;; + solaris*) java_os=solaris ;; + darwin*) java_os=darwin ;; ++ haiku*) java_os=haiku ;; + *) java_os=$host_os ;; + esac + +diff --git a/jni/haiku/jni_md.h b/jni/haiku/jni_md.h +new file mode 100644 +index 0000000..070ddc0 +--- /dev/null ++++ b/jni/haiku/jni_md.h +@@ -0,0 +1,50 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is the Java Runtime Interface. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation and Sun Microsystems, Inc. ++ * Portions created by the Initial Developer are Copyright (C) 1993-1996 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Jean-Baptiste Kempf ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#ifndef _JNI_MD_H_ ++#define _JNI_MD_H_ ++ ++#define JNIEXPORT ++#define JNIIMPORT ++#define JNICALL ++ ++typedef int jint; ++typedef long long jlong; ++ ++typedef signed char jbyte; ++ ++#endif /* !_JNI_MD_H_ */ +-- +2.12.2 +