From cf172285f142ebce2307b9f7eb1bd5bdc1264215 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 25 Mar 2020 18:29:26 +0100 Subject: [PATCH] opensonic: unbreak --- srcpkgs/opensonic/files/opensonic.sh | 3 --- srcpkgs/opensonic/template | 20 +++++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 srcpkgs/opensonic/files/opensonic.sh diff --git a/srcpkgs/opensonic/files/opensonic.sh b/srcpkgs/opensonic/files/opensonic.sh deleted file mode 100644 index 68b19131f78..00000000000 --- a/srcpkgs/opensonic/files/opensonic.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -exec /usr/share/opensonic/opensonic diff --git a/srcpkgs/opensonic/template b/srcpkgs/opensonic/template index 63cf323be82..c32bb11cb93 100644 --- a/srcpkgs/opensonic/template +++ b/srcpkgs/opensonic/template @@ -1,10 +1,10 @@ # Template file for 'opensonic' pkgname=opensonic version=0.1.4 -revision=8 +revision=9 wrksrc="opensnc-src-${version}" -build_style=gnu-makefile -hostmakedepends="cmake" +build_style=cmake +hostmakedepends="allegro4-devel cmake" makedepends="allegro4-devel libpng-devel libvorbis-devel" depends="${pkgname}-data desktop-file-utils" short_desc="Open-source game based on the Sonic the Hedgehog universe" @@ -16,21 +16,23 @@ distfiles="${SOURCEFORGE_SITE}/opensnc/opensnc-src-${version}.tar.gz https://github.com/t6/loggcompat/archive/${_loggcompat_ver}.tar.gz" checksum="3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9 481fe569959eefa92d0babeca27709b2efcf7a815cd5c49596b6c0403db76a4e" -broken="ELF in /usr/share" post_extract() { mv ${XBPS_BUILDDIR}/loggcompat-${_loggcompat_ver} . } +CFLAGS="-I./../loggcompat-${_loggcompat_ver}" +LDFLAGS="-Wl,--no-as-needed" -do_configure() { - LDFLAGS="-Wl,--no-as-needed" \ - CFLAGS="-Iloggcompat-${_loggcompat_ver}" \ - ./configure -DCMAKE_INSTALL_PREFIX=/usr +pre_configure() { + # mimic what `./configure` would do + export _ALLEGRO_LIBS="$(allegro-config --libs)" + export _ALLEGRO_VERSION="$(allegro-config --version)" } post_install() { + rm ${DESTDIR}/usr/share/opensonic/opensonic + vbin build/opensonic vinstall icon.png 644 usr/share/${pkgname} - vbin ${FILESDIR}/opensonic.sh opensonic vinstall ${FILESDIR}/opensonic.desktop 644 usr/share/applications }