diff --git a/media-sound/naspro/naspro-0.2.91.recipe b/media-sound/naspro/naspro-0.2.91.recipe deleted file mode 100644 index 55c181738..000000000 --- a/media-sound/naspro/naspro-0.2.91.recipe +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY="Architecture for Sound PROcessing" -DESCRIPTION="NASPRO core is the portable runtime library at the bottom of \ -the NASPRO Sound PROcessing Architecture" -HOMEPAGE="http://naspro.sourceforge.net/" -COPYRIGHT="2007-2011, NASPRO Development Team" -LICENSE="GNU LGPL v2.1" -REVISION="1" -SOURCE_URI="https://downloads.sf.net/naspro/naspro-core-$portVersion.tar.bz2" -CHECKSUM_SHA256="00d61a9a18aacb8d0fc3e21ae56f005484111a52bdc47ce64677d568908bfe2f" -SOURCE_DIR="naspro-core-$portVersion" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -libVersion="3.1.0" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -PROVIDES=" - naspro$secondaryArchSuffix = $portVersion - lib:libnacore$secondaryArchSuffix = $libVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - naspro${secondaryArchSuffix}_devel = $portVersion - devel:libnacore$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - naspro$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoreconf - cmd:awk - cmd:gcc$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -defineDebugInfoPackage naspro$secondaryArchSuffix \ - "$libDir"/libnacore.so.$libVersion - -BUILD() -{ - autoreconf -vfi - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install - - rm "$libDir"/lib*.la - - prepareInstalledDevelLib libnacore - fixPkgconfig - - packageEntries devel \ - "$developDir" -} - -TEST() -{ - make check -} diff --git a/media-sound/naspro/naspro-0.5.1.recipe b/media-sound/naspro/naspro-0.5.1.recipe index c78ec045e..b50d88e87 100644 --- a/media-sound/naspro/naspro-0.5.1.recipe +++ b/media-sound/naspro/naspro-0.5.1.recipe @@ -4,13 +4,13 @@ the NASPRO Sound PROcessing Architecture" HOMEPAGE="http://naspro.sourceforge.net/" COPYRIGHT="2007-2011, NASPRO Development Team" LICENSE="GNU LGPL v2.1" -REVISION="1" +REVISION="2" SOURCE_URI="https://downloads.sf.net/naspro/naspro-core-$portVersion.tar.bz2" CHECKSUM_SHA256="cc8ddb02441a5d347ca63a8a2310b1f3b99610bdf76689ed25f417cbf6b154b0" SOURCE_DIR="naspro-core-$portVersion" PATCHES="naspro-$portVersion.patchset" -ARCHITECTURES="?all !x86_gcc2 x86" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" libVersion="5.0.2" @@ -51,7 +51,7 @@ defineDebugInfoPackage naspro$secondaryArchSuffix \ BUILD() { autoreconf -vfi - runConfigure ./configure + runConfigure ./configure --disable-static make $jobArgs } @@ -61,7 +61,7 @@ INSTALL() rm $libDir/lib*.la - prepareInstalledDevelLibs libnacore + prepareInstalledDevelLib libnacore fixPkgconfig packageEntries devel \ diff --git a/media-sound/naspro/patches/naspro-0.5.1.patchset b/media-sound/naspro/patches/naspro-0.5.1.patchset index c3ea74980..8b138e353 100644 --- a/media-sound/naspro/patches/naspro-0.5.1.patchset +++ b/media-sound/naspro/patches/naspro-0.5.1.patchset @@ -1,44 +1,22 @@ -From f0fd940f580d259da24bcd1e4923485263ed9194 Mon Sep 17 00:00:00 2001 +From 2b5a6ba794b71da4de049f3ed1b0804a3bbeee8a Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 6 May 2018 09:01:34 +0200 -Subject: don't use -Werror, fix missing locale_t +Subject: Don't use -Werror -diff --git a/include/NASPRO/core/locale.h b/include/NASPRO/core/locale.h -index 1e84585..d9de2b4 100644 ---- a/include/NASPRO/core/locale.h -+++ b/include/NASPRO/core/locale.h -@@ -100,7 +100,29 @@ NACORE_BEGIN_C_DECLS - */ - - /* Don't mess with this stuff!!! */ --#ifdef _WIN32 -+# define LC_ALL_MASK 0 -+# define LC_NUMERIC_MASK 0 -+# define LC_MESSAGES_MASK 0 -+# define LC_GLOBAL_LOCALE ((locale_t)(uintptr_t)1) -+typedef void *locale_t; -+ -+static inline void freelocale(locale_t loc) -+{ -+ (void)loc; -+} -+static inline locale_t newlocale(int mask, const char * locale, locale_t base) -+{ -+ (void)mask; (void)locale; (void)base; -+ return NULL; -+} -+ -+static inline locale_t uselocale(locale_t loc) -+{ -+ (void)loc; -+ return NULL; -+} -+ -+#if defined (_WIN32) || defined (__HAIKU__) - - typedef char *nacore_locale; +diff --git a/src/Makefile.am b/src/Makefile.am +index ce13a23..a149993 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -7,7 +7,7 @@ + # See the COPYING file for license conditions. + # +-AM_CFLAGS = -pedantic -Wall -Werror @THREAD_FLAGS@ ++AM_CFLAGS = -pedantic -Wall @THREAD_FLAGS@ + if WIN32 + AM_CFLAGS += -Wno-error=format + endif diff --git a/src/posix/Makefile.am b/src/posix/Makefile.am index 82c70ab..9b436f5 100644 --- a/src/posix/Makefile.am @@ -66,5 +44,5 @@ index ae2c053..d9abcf7 100644 @WIN32_FALSE@ @THREAD_FLAGS@ -- -2.16.2 +2.37.3