From 939b08a6432df7ed9f0ebc4d7521cfe6f0507b12 Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 23 Mar 2018 13:09:32 +0100 Subject: [PATCH] dumb: update to 2.0.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #12843 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- common/shlibs | 2 ++ srcpkgs/dumb/template | 61 +++++++++++++++---------------------------- 2 files changed, 23 insertions(+), 40 deletions(-) diff --git a/common/shlibs b/common/shlibs index 0baf4fe03d3..5b1b74894b3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1725,6 +1725,8 @@ libportmidi.so portmidi-217_1 libsox.so.3 sox-14.4.2_1 libsoxr.so.0 libsoxr-0.1.2_1 libsoxr-lsr.so.0 libsoxr-0.1.2_1 +libdumb.so.2 dumb-2.0.3_1 +libaldmb.so.2 dumb-2.0.3_1 libframe.so.6 frame-2.5.0_1 libgrail.so.6 grail-3.1.0_1 libgeis.so.1 geis-2.2.16_1 diff --git a/srcpkgs/dumb/template b/srcpkgs/dumb/template index 0d6ad780d92..fd42fe68aab 100644 --- a/srcpkgs/dumb/template +++ b/srcpkgs/dumb/template @@ -1,56 +1,36 @@ # Template file for 'dumb' pkgname=dumb -version=1.0 -revision=3 -create_wrksrc=yes -wrksrc=sources - -_library_wrksrc=${pkgname}-${version}/${pkgname} -_example_wrksrc=${pkgname}-0.9.3/examples -build_wrksrc=${_library_wrksrc}/cmake - +version=2.0.3 +revision=1 build_style=cmake -configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" +configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -GNinja" +make_cmd="ninja" +hostmakedepends="ninja" +makedepends="allegro4-devel" short_desc="IT, XM, S3M and MOD player library" -maintainer="beefcurtains " +maintainer="Orphaned " license="BSD" -homepage="http://${pkgname}.sourceforge.net/" -distfiles=" - https://github.com/kode54/${pkgname}/archive/${version}.tar.gz - ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/0.9.3/${pkgname}-0.9.3.tar.gz -" -checksum=" - 09ea62fd01f6e71cb28a8a8c1c1e356e7eb38f5e003b684e12eb1944c6d35fa5 - 8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33 -" +homepage="http://dumb.sourceforge.net/" +distfiles="https://github.com/kode54/dumb/archive/${version}.tar.gz" +checksum=99bfac926aeb8d476562303312d9f47fd05b43803050cd889b44da34a9b2a4f9 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) - CFLAGS="-D_USE_SSE -msse" + configure_args+=" -DUSE_SSE=ON" + ;; + *) + configure_args+=" -DUSE_SSE=OFF" ;; esac -pre_configure() { - sed -i ${wrksrc}/${_library_wrksrc}/cmake/CMakeLists.txt \ - -e '/^set(CMAKE_C_FLAGS /s|-Wall|${CMAKE_C_FLAGS} -Wall|' \ - -e '/^set(CMAKE_C_FLAGS /s| -D_USE_SSE -msse||' \ - -e '/^add_library(dumb ${SOURCES})/a set_target_properties(dumb PROPERTIES VERSION 1.0)' - sed -i ${wrksrc}/${_example_wrksrc}/dumb2wav.c \ - -e '/.*dumb_load_mod(fn/s|)|,0)|' +do_install() { + cd build + DESTDIR=${DESTDIR} ${make_cmd} install } -post_build() { - ( set -x - ${CC} ${wrksrc}/${_example_wrksrc}/dumb2wav.c \ - ${CFLAGS} ${CPPFLAGS} -I../include \ - ${LDFLAGS} -Lbuild -ldumb -lm -o dumb2wav ) -} - -pre_install() { - vbin dumb2wav - vdoc ../readme.txt - vdoc ../release.txt - vlicense ../licence.txt +post_install() { + vdoc README.md + vlicense LICENSE } dumb-devel_package() { @@ -59,5 +39,6 @@ dumb-devel_package() { pkg_install() { vmove "usr/lib/*.so" vmove usr/include + vmove usr/lib/pkgconfig } }