libbluray: bump to 1.0.2, add debuginfo. (#2243)

Also define commandBinDir for cmd:bd_info.
This commit is contained in:
fbrosson
2018-02-23 12:54:00 +00:00
committed by GitHub
parent 9cf57764e3
commit b4bf155550
2 changed files with 26 additions and 10 deletions

View File

@@ -5,16 +5,27 @@ COPYRIGHT="2010-2016 VideoLAN"
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="https://download.videolan.org/pub/videolan/libbluray/$portVersion/libbluray-$portVersion.tar.bz2"
CHECKSUM_SHA256="0f9f9a1db2f48cafc70ed2596ff3594b597e2027408f5f2be6191c245d67853a"
CHECKSUM_SHA256="6d9e7c4e416f664c330d9fa5a05ad79a3fb39b95adfc3fd6910cbed503b7aeff"
PATCHES="libbluray-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
commandSuffix=$secondaryArchSuffix
commandBinDir="$binDir"
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir="$prefix"/bin
fi
libVersion="2.0.2"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
PROVIDES="
libbluray$secondaryArchSuffix = $portVersion compat >= 1
lib:libbluray$secondaryArchSuffix = 2.0.1 compat >= 2
cmd:bd_info$secondaryArchSuffix
libbluray$secondaryArchSuffix = $portVersionCompat
lib:libbluray$secondaryArchSuffix = $libVersionCompat
cmd:bd_info$commandSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -28,8 +39,8 @@ REQUIRES="
"
PROVIDES_devel="
libbluray${secondaryArchSuffix}_devel = $portVersion compat >= 1
devel:libbluray$secondaryArchSuffix = 2.0.1 compat >= 2
libbluray${secondaryArchSuffix}_devel = $portVersionCompat
devel:libbluray$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
libbluray$secondaryArchSuffix == $portVersion base
@@ -60,9 +71,14 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix
"
defineDebugInfoPackage libbluray$secondaryArchSuffix \
"$commandBinDir"/bd_info \
"$libDir"/libbluray.so.$libVersion
BUILD()
{
runConfigure ./configure --disable-bdjava-jar
runConfigure --omit-dirs binDir ./configure -bindir "$commandBinDir" \
--disable-bdjava-jar
make $jobArgs
}

View File

@@ -5,10 +5,10 @@ Subject: add jni_md.h for haiku.
diff --git a/configure.ac b/configure.ac
index 98a5226..7fc4938 100644
index 5fd3c8d..e43a358 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,6 +206,7 @@ case $host_os in
@@ -209,6 +209,7 @@ case $host_os in
freebsd*) java_os=freebsd ;;
solaris*) java_os=solaris ;;
darwin*) java_os=darwin ;;
@@ -73,5 +73,5 @@ index 0000000..070ddc0
+
+#endif /* !_JNI_MD_H_ */
--
2.12.2
2.16.2