From 616f5adac8cad9420e6ee77f6c7da9c7d585dffd Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sun, 10 Jan 2016 01:55:32 +0100 Subject: [PATCH] wine: enable staging, remove d3d9 --- srcpkgs/wine/template | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 584f6eb624..215dcc73bb 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,7 +1,7 @@ # Template file for 'wine' pkgname=wine version=1.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-gstreamer" short_desc="Run Microsoft Windows applications" @@ -29,32 +29,21 @@ depends="libXi libXinerama libXcomposite libXcursor libOSMesa binfmts="/usr/bin/wine --magic MZ" -build_options="d3d9 staging" -desc_option_d3d9="Enable d3d9 state tracker patchset" +build_options="staging" desc_option_staging="Enable wine-staging patchset" -#build_options_default="staging" +build_options_default="staging" -if [ ${build_option_staging} ] || [ ${build_option_d3d9} ]; then +if [ ${build_option_staging} ]; then hostmakedepends+=" automake" fi if [ ${build_option_staging} ]; then makedepends+=" libva-devel gtk+3-devel" distfiles+=" https://github.com/wine-compholio/${pkgname}-staging/archive/v${version}.tar.gz" - checksum+=" 856b630fe95250e3d2dfc80588529e42e92e37f2e974ce8d3da37b39bf5cc3c3" -fi - -if [ ${build_option_d3d9} ]; then - distfiles+=" https://github.com/NP-Hardass/wine-d3d9-patches/archive/wine-d3d9-${version}.tar.gz" - checksum+=" b9dafc22e86b880c4cb08e3635ef4ea8657489be238373fb01d3f85c8b864446" - configure_args+=" --with-d3dadapter" + checksum+=" c66f3dd6a760d516affe7467c4fb2d15ea8e2f0c72bcda1982219948dcdff11b" fi post_extract() { - if [ ${build_option_d3d9} ]; then - patch -p1 < ${XBPS_BUILDDIR}/wine-d3d9-patches-wine-d3d9-${version}/wine-d3d9.patch - autoreconf -f - fi if [ ${build_option_staging} ]; then cd ${XBPS_BUILDDIR}/${pkgname}-staging-${version}/patches/ DESTDIR="$wrksrc" ./patchinstall.sh --all