Libmpdclient : bump version (#1530)

* switch to meson
This commit is contained in:
miqlas
2017-07-25 07:46:54 +02:00
committed by Jérôme Duval
parent b6d0f10e61
commit b13493b579
2 changed files with 45 additions and 12 deletions

View File

@@ -5,16 +5,17 @@ of sound files while being controlled by its network protocol."
HOMEPAGE="http://www.musicpd.org/"
COPYRIGHT="2003-2017 The Music Player Daemon Project"
LICENSE="BSD (3-clause)"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/MusicPlayerDaemon/libmpdclient/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="23ad110e82214eec700d77ab5d302c5fba357a7c9d82b7a7b4a8eb0f5a17ccd3"
CHECKSUM_SHA256="ad9803595cb1cba3f8e89e65d7890a5f1859752cadd9fceb350ceae66b9f288c"
PATCHES="libmpdclient-$portVersion.patchset" #already upstreamed
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
PROVIDES="
libmpdclient$secondaryArchSuffix = $portVersion
lib:libmpdclient$secondaryArchSuffix = 2.0.11 compat >= 2
lib:libmpdclient$secondaryArchSuffix = 2.0.12 compat >= 2
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -22,7 +23,7 @@ REQUIRES="
PROVIDES_devel="
libmpdclient${secondaryArchSuffix}_devel = $portVersion
devel:libmpdclient$secondaryArchSuffix = 2.0.11 compat >= 2
devel:libmpdclient$secondaryArchSuffix = 2.0.12 compat >= 2
"
REQUIRES_devel="
libmpdclient$secondaryArchSuffix == $portVersion base
@@ -32,28 +33,36 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:doxygen
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:meson
cmd:ninja
"
BUILD()
{
export NOCONFIGURE=1
./autogen.sh
rm -rf build_haiku || true
mkdir -p build_haiku; cd build_haiku
runConfigure ./configure
make $jobArgs
export LDFLAGS="-lnetwork"
meson --prefix=$prefix \
--libdir=$libDir \
--includedir=$includeDir
ninja $jobArgs
}
INSTALL()
{
make install
cd build_haiku
ninja install
mkdir -p $docDir
mv $prefix/share/doc/libmpdclient/* $docDir
rm -rf $prefix/share || true
# prepare devel/lib
prepareInstalledDevelLibs libmpdclient

View File

@@ -0,0 +1,24 @@
From ad0db0a2e18dc85aa6b9cc81b269510386d71981 Mon Sep 17 00:00:00 2001
From: ilovezfs <ilovezfs@icloud.com>
Date: Sat, 22 Jul 2017 03:50:24 -0700
Subject: [PATCH] meson.build: fix build with meson > 0.38.1
Fixes the error "Tried to form an absolute path to a source dir. You
should not do that but use relative paths instead."
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index e30786e..98047f3 100644
--- a/meson.build
+++ b/meson.build
@@ -89,7 +89,7 @@ inc = include_directories(
'include',
# for the generated config.h
- meson.current_build_dir(),
+ '.',
)
libmpdclient = library('mpdclient',