mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
libusbmuxd: bump version
SONAME bump
This commit is contained in:
@@ -8,9 +8,8 @@ LICENSE="GNU GPL v2
|
|||||||
GNU LGPL v2.1"
|
GNU LGPL v2.1"
|
||||||
REVISION="1"
|
REVISION="1"
|
||||||
SOURCE_URI="https://github.com/libimobiledevice/libusbmuxd/archive/$portVersion.tar.gz"
|
SOURCE_URI="https://github.com/libimobiledevice/libusbmuxd/archive/$portVersion.tar.gz"
|
||||||
CHECKSUM_SHA256="8ae3e1d9340177f8f3a785be276435869363de79f491d05d8a84a59efc8a8fdc"
|
CHECKSUM_SHA256="3bda6abb2167e7818bd449aa03c5cfe175c6f965bab3979fda6d58e698df19af"
|
||||||
SOURCE_FILENAME="libusbmuxd-$portVersion.tar.gz"
|
SOURCE_FILENAME="libusbmuxd-$portVersion.tar.gz"
|
||||||
PATCHES="libusbmuxd-$portVersion.patchset"
|
|
||||||
|
|
||||||
ARCHITECTURES="all !x86_gcc2"
|
ARCHITECTURES="all !x86_gcc2"
|
||||||
SECONDARY_ARCHITECTURES="x86"
|
SECONDARY_ARCHITECTURES="x86"
|
||||||
@@ -22,7 +21,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
|
|||||||
commandBinDir=$prefix/bin
|
commandBinDir=$prefix/bin
|
||||||
fi
|
fi
|
||||||
|
|
||||||
libVersion="6.0.0"
|
libVersion="7.0.0"
|
||||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||||
|
|
||||||
PROVIDES="
|
PROVIDES="
|
||||||
@@ -33,10 +32,8 @@ PROVIDES="
|
|||||||
"
|
"
|
||||||
REQUIRES="
|
REQUIRES="
|
||||||
haiku$secondaryArchSuffix
|
haiku$secondaryArchSuffix
|
||||||
lib:libz$secondaryArchSuffix
|
lib:libimobiledevice_glue_1.0$secondaryArchSuffix
|
||||||
lib:libxml2$secondaryArchSuffix
|
|
||||||
lib:libplist_2.0$secondaryArchSuffix
|
lib:libplist_2.0$secondaryArchSuffix
|
||||||
lib:libplist++_2.0$secondaryArchSuffix
|
|
||||||
"
|
"
|
||||||
|
|
||||||
PROVIDES_devel="
|
PROVIDES_devel="
|
||||||
@@ -49,10 +46,8 @@ REQUIRES_devel="
|
|||||||
|
|
||||||
BUILD_REQUIRES="
|
BUILD_REQUIRES="
|
||||||
haiku${secondaryArchSuffix}_devel
|
haiku${secondaryArchSuffix}_devel
|
||||||
devel:libxml2$secondaryArchSuffix
|
devel:libimobiledevice_glue_1.0$secondaryArchSuffix
|
||||||
devel:libplist_2.0$secondaryArchSuffix
|
devel:libplist_2.0$secondaryArchSuffix
|
||||||
devel:libplist++_2.0$secondaryArchSuffix
|
|
||||||
devel:libz$secondaryArchSuffix
|
|
||||||
"
|
"
|
||||||
BUILD_PREREQUIRES="
|
BUILD_PREREQUIRES="
|
||||||
cmd:aclocal
|
cmd:aclocal
|
||||||
@@ -71,6 +66,7 @@ defineDebugInfoPackage libusbmuxd$secondaryArchSuffix \
|
|||||||
|
|
||||||
BUILD()
|
BUILD()
|
||||||
{
|
{
|
||||||
|
export RELEASE_VERSION=$portVersion
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
|
runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
|
||||||
make
|
make
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
From 81f8204d4960f33d50c30f449d9809be8a6d4f0a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Calvin Hill <calvin@hakobaito.co.uk>
|
|
||||||
Date: Fri, 6 Jan 2017 16:31:27 +0000
|
|
||||||
Subject: Haiku compilation fixes
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/common/socket.c b/common/socket.c
|
|
||||||
index fd89c56..4846523 100644
|
|
||||||
--- a/common/socket.c
|
|
||||||
+++ b/common/socket.c
|
|
||||||
@@ -412,10 +412,12 @@ static int32_t _sockaddr_in6_scope_id(struct sockaddr_in6* addr)
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifndef __HAIKU__
|
|
||||||
/* skip if not running */
|
|
||||||
if ((ifa->ifa_flags & IFF_RUNNING) == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
struct sockaddr_in6* addr_in = (struct sockaddr_in6*)ifa->ifa_addr;
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index f66b890..f640c9c 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -8,7 +8,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
|
|
||||||
AC_CONFIG_SRCDIR([src/])
|
|
||||||
AC_CONFIG_HEADERS([config.h])
|
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
|
||||||
-
|
|
||||||
+AC_SEARCH_LIBS(socket, network)
|
|
||||||
dnl libtool versioning
|
|
||||||
# +1 : 0 : +1 == adds new functions to the interface
|
|
||||||
# +1 : 0 : 0 == changes or removes functions (changes include both
|
|
||||||
--
|
|
||||||
2.30.0
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user