diff --git a/srcpkgs/swc-git/template b/srcpkgs/swc-git/template index 3d4aa994ce3..23bae2431a5 100644 --- a/srcpkgs/swc-git/template +++ b/srcpkgs/swc-git/template @@ -5,7 +5,7 @@ _gitshort="${_githash:0:7}" pkgname=swc-git version=20141130 -revision=1 +revision=2 homepage="https://github.com/michaelforney/swc" distfiles="https://github.com/michaelforney/swc/archive/${_githash}.tar.gz" short_desc="A library for making a simple Wayland compositor" @@ -18,11 +18,6 @@ checksum="fe0aa027f9b30323b779aef699d20649865fe50fa018ab30744fd223cd9c070b" license="MIT" wrksrc=swc-${_githash} -case "$XBPS_TARGET_MACHINE" in - arm*) _drm_drivers="nouveau";; - i686*|x86_64*) _drm_drivers="intel nouveau";; -esac - do_build() { sed -i '/^ENABLE_STATIC /d' config.mk sed -i '/^CC /d' config.mk @@ -32,13 +27,10 @@ do_build() { LDFLAGS="$BUILD_LDFLAGS" cursor/convert_font make ${makejobs} CC="$CC" CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" OBJCOPY="$OBJCOPY" \ - DRM_DRIVERS="$_drm_drivers" \ all example/wm } - do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR DRM_DRIVERS="$_drm_drivers" install - vbin example/wm swc-wm + make PREFIX=/usr DESTDIR=$DESTDIR install } swc-git-devel_package() { @@ -48,12 +40,12 @@ swc-git-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" + vmove "usr/lib/*.a" } } - swc-wm-git_package() { short_desc="Simple Wayland compositor" pkg_install() { - vmove usr/bin/swc-wm + vbin ${wrksrc}/example/wm swc-wm } }