diff --git a/srcpkgs/SDL_mixer/SDL_mixer-devel.template b/srcpkgs/SDL_mixer/SDL_mixer-devel.template index 63291acd1c..d27748672f 100644 --- a/srcpkgs/SDL_mixer/SDL_mixer-devel.template +++ b/srcpkgs/SDL_mixer/SDL_mixer-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=2 - Add_dependency run SDL-devel Add_dependency run libvorbis-devel Add_dependency run libmikmod-devel @@ -14,10 +12,8 @@ Add_dependency run libflac-devel Add_dependency run smpeg-devel Add_dependency run SDL_mixer -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/SDL_mixer/SDL_mixer.rshlibs b/srcpkgs/SDL_mixer/SDL_mixer.rshlibs index 03eaa624bf..1f071d2e55 100644 --- a/srcpkgs/SDL_mixer/SDL_mixer.rshlibs +++ b/srcpkgs/SDL_mixer/SDL_mixer.rshlibs @@ -1,3 +1,4 @@ libSDL-1.2.so.0 libpthread.so.0 libc.so.6 +libm.so.6 diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template index 04bff228f2..325ec14027 100644 --- a/srcpkgs/SDL_mixer/template +++ b/srcpkgs/SDL_mixer/template @@ -1,12 +1,13 @@ # Template file for 'SDL_mixer' pkgname=SDL_mixer -version=1.2.11 -revision=2 +version=1.2.12 +homepage="http://www.libsdl.org/projects/SDL_mixer/" distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz" build_style=gnu-configure short_desc="Multi-channel audio mixer library" maintainer="Juan RP " -checksum=86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9 +license="BSD" +checksum=1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a long_desc=" SDL_mixer is a sample multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus @@ -14,20 +15,27 @@ long_desc=" Ogg Vorbis, and SMPEG MP3 libraries." subpackages="$pkgname-devel" +# The following are dlopen(3)ed at runtime. Add_dependency run libvorbis Add_dependency run libmikmod Add_dependency run smpeg Add_dependency run libflac +Add_dependency run libfluidsynth + Add_dependency build SDL-devel Add_dependency build libvorbis-devel Add_dependency build libmikmod-devel Add_dependency build libflac-devel Add_dependency build smpeg-devel +Add_dependency build fluidsynth-devel -pre_configure() -{ - sed -i 's|/usr/local/lib/timidity|/usr/lib/timidity|' \ - ${wrksrc}/timidity/config.h || return 1 - sed -i 's|/etc/timidity/timidity.cfg|/etc/timidity++/timidity.cfg|' \ - ${wrksrc}/timidity/config.h || return 1 +pre_configure() { + sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \ + -e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \ + -e "/DEFAULT_PATH2/s|/usr/local/lib/timidity|/usr/lib/timidity|" \ + -i timidity/config.h +} + +post_install() { + vinstall COPYING 644 usr/share/licenses/${pkgname} }