summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/libosinfo/libosinfo.SlackBuild40
-rw-r--r--libraries/libosinfo/libosinfo.info6
2 files changed, 22 insertions, 24 deletions
diff --git a/libraries/libosinfo/libosinfo.SlackBuild b/libraries/libosinfo/libosinfo.SlackBuild
index fc3de0b18b..ee066ea588 100644
--- a/libraries/libosinfo/libosinfo.SlackBuild
+++ b/libraries/libosinfo/libosinfo.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for libosinfo
-# Copyright 2014-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2014-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libosinfo
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.8.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -74,25 +74,23 @@ find -L . \
# add slackware metadata
patch -p1 < $CWD/add_slackware_data.patch
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-static \
- --disable-tests \
- --enable-vala \
- --enable-introspection=yes \
- --with-usb-ids-path=/usr/share/hwdata/usb.ids \
- --with-pci-ids-path=/usr/share/hwdata/pci.ids \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ meson .. \
+ --buildtype=release \
+ --infodir=/usr/info \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ -D with-usb-ids-path=/usr/share/hwdata/usb.ids \
+ -D with-pci-ids-path=/usr/share/hwdata/pci.ids
+ ninja
+ DESTDIR=$PKG ninja install
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/libraries/libosinfo/libosinfo.info b/libraries/libosinfo/libosinfo.info
index 2ea47982f4..ead4925ad7 100644
--- a/libraries/libosinfo/libosinfo.info
+++ b/libraries/libosinfo/libosinfo.info
@@ -1,8 +1,8 @@
PRGNAM="libosinfo"
-VERSION="1.6.0"
+VERSION="1.8.0"
HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://releases.pagure.org/libosinfo/libosinfo-1.6.0.tar.gz"
-MD5SUM="f6d92dc26b1b641f59679e5eecb37887"
+DOWNLOAD="https://releases.pagure.org/libosinfo/libosinfo-1.8.0.tar.xz"
+MD5SUM="e64964aea86e40afae2ad9b5077c7378"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="osinfo-db vala"