mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
libupnp: bump version
keep lib:libupnp version 15 for compatibility
This commit is contained in:
@@ -11,7 +11,7 @@ COPYRIGHT="2000-2003 Intel Corporation
|
||||
LICENSE="BSD (3-clause)"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/pupnp/pupnp/archive/release-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="de04f501ccae0f776c5a3b6878ef26b84631bc1c10183822794508d912cd9e53"
|
||||
CHECKSUM_SHA256="8f8ef5eb7c434984a32b2fd614262855652b402418d4c453b5204823de1aa2de"
|
||||
SOURCE_DIR="pupnp-release-$portVersion"
|
||||
PATCHES="libupnp-$portVersion.patchset"
|
||||
|
||||
@@ -21,7 +21,7 @@ SECONDARY_ARCHITECTURES="x86"
|
||||
PROVIDES="
|
||||
libupnp$secondaryArchSuffix = $portVersion
|
||||
lib:libixml$secondaryArchSuffix = 11.0.0 compat >= 11
|
||||
lib:libupnp$secondaryArchSuffix = 15.0.1 compat >= 15
|
||||
lib:libupnp$secondaryArchSuffix = 17.0.0 compat >= 17
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -30,7 +30,7 @@ REQUIRES="
|
||||
PROVIDES_devel="
|
||||
libupnp${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libixml$secondaryArchSuffix = 11.0.0 compat >= 11
|
||||
devel:libupnp$secondaryArchSuffix = 15.0.1 compat >= 15
|
||||
devel:libupnp$secondaryArchSuffix = 17.0.0 compat >= 17
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libupnp$secondaryArchSuffix == $portVersion base
|
||||
68
net-libs/libupnp/libupnp15-1.10.1.recipe
Normal file
68
net-libs/libupnp/libupnp15-1.10.1.recipe
Normal file
@@ -0,0 +1,68 @@
|
||||
SUMMARY="Portable SDK for UPnP* Devices"
|
||||
DESCRIPTION="The Portable SDK for UPnP Devices is an SDK for development of \
|
||||
UPnP device and control point applications. It consists of the core UPnP \
|
||||
protocols along with a UPnP-specific eXtensible Markup Language (XML) parser \
|
||||
supporting the Document Object Model (DOM) Level 2 API and an optional, \
|
||||
integrated mini web server for serving UPnP related documents."
|
||||
HOMEPAGE="http://pupnp.sourceforge.net"
|
||||
COPYRIGHT="2000-2003 Intel Corporation
|
||||
2005-2006 Rémi Turboult
|
||||
2006 Michel Pfeiffer and others"
|
||||
LICENSE="BSD (3-clause)"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/pupnp/pupnp/archive/release-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="de04f501ccae0f776c5a3b6878ef26b84631bc1c10183822794508d912cd9e53"
|
||||
SOURCE_DIR="pupnp-release-$portVersion"
|
||||
PATCHES="libupnp-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
libupnp15$secondaryArchSuffix = $portVersion
|
||||
lib:libupnp$secondaryArchSuffix = 15.0.1 compat >= 15
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libixml$secondaryArchSuffix == 11.0.0
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
runConfigure ./configure
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm -f $libDir/lib*.la
|
||||
rm -f $libDir/libixml*
|
||||
|
||||
# prepare development lib links
|
||||
prepareInstalledDevelLibs libupnp
|
||||
fixPkgconfig
|
||||
|
||||
# devel package
|
||||
rm -rf $developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
37
net-libs/libupnp/patches/libupnp-1.14.0.patchset
Normal file
37
net-libs/libupnp/patches/libupnp-1.14.0.patchset
Normal file
@@ -0,0 +1,37 @@
|
||||
From 1b0b6ab96ee67fc2db4c01a357978a0626730b9d Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 23 Dec 2019 12:42:10 +0300
|
||||
Subject: Haiku build fix
|
||||
|
||||
|
||||
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
|
||||
index 20f26d1..0859d56 100644
|
||||
--- a/upnp/src/api/upnpapi.c
|
||||
+++ b/upnp/src/api/upnpapi.c
|
||||
@@ -3871,6 +3871,10 @@ int UpnpGetIfInfo(const char *IfName)
|
||||
gIF_IPV6_ULA_GUA,
|
||||
sizeof(gIF_IPV6_ULA_GUA));
|
||||
gIF_IPV6_ULA_GUA_PREFIX_LENGTH = v6ulagua_prefix;
|
||||
+#elif defined(__HAIKU__)
|
||||
+ UpnpPrintf(UPNP_CRITICAL, API, __FILE__, __LINE__,
|
||||
+ "failed to find list of addresses\n");
|
||||
+ return UPNP_E_INIT;
|
||||
#else /* (defined(BSD) && BSD >= 199306) || defined(__FreeBSD_kernel__) */ /* _WIN32 */
|
||||
struct ifreq ifArray[MAX_INTERFACES];
|
||||
struct ifconf ifConf;
|
||||
diff --git a/upnp/src/threadutil/ThreadPool.c b/upnp/src/threadutil/ThreadPool.c
|
||||
index 8e69977..918ba74 100644
|
||||
--- a/upnp/src/threadutil/ThreadPool.c
|
||||
+++ b/upnp/src/threadutil/ThreadPool.c
|
||||
@@ -419,7 +419,7 @@ static void SetSeed(void)
|
||||
srand((unsigned int)t.tv_usec + (unsigned int)ithread_get_current_thread_id().p);
|
||||
#elif defined(BSD) || defined(__APPLE__) || defined(__FreeBSD_kernel__)
|
||||
srand((unsigned int)t.tv_usec + (unsigned int)ithread_get_current_thread_id());
|
||||
-#elif defined(__linux__) || defined(__sun) || defined(__CYGWIN__) || defined(__GLIBC__)
|
||||
+#elif defined(__linux__) || defined(__sun) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__HAIKU__)
|
||||
srand((unsigned int)t.tv_usec + (unsigned int)ithread_get_current_thread_id());
|
||||
#else
|
||||
{
|
||||
--
|
||||
2.28.0
|
||||
|
||||
Reference in New Issue
Block a user