diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index afc4a2875d35f5..48f6a8c3ff6f02 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=56 +revision=57 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -379,3 +379,7 @@ case "$XBPS_TARGET_MACHINE" in " ;; esac + +if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then + replaces+=" xf86-video-fbturbo-sunxi<=0.4.0" +fi diff --git a/srcpkgs/xf86-video-fbturbo-sunxi/patches/fix-compilation.patch b/srcpkgs/xf86-video-fbturbo-sunxi/patches/fix-compilation.patch deleted file mode 100644 index 5fad5cbcb13510..00000000000000 --- a/srcpkgs/xf86-video-fbturbo-sunxi/patches/fix-compilation.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/fbdev.c -+++ b/src/fbdev.c -@@ -1037,7 +1037,7 @@ - fPtr->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = FBDevCloseScreen; - --#if XV -+#ifdef XV - fPtr->SunxiVideo_private = NULL; - if (xf86ReturnOptValBool(fPtr->Options, OPTION_XV_OVERLAY, TRUE) && - fPtr->sunxi_disp_private) { -@@ -1126,7 +1126,7 @@ - fPtr->SunxiDispHardwareCursor_private = NULL; - } - --#if XV -+#ifdef XV - if (fPtr->SunxiVideo_private) { - SunxiVideo_Close(pScreen); - free(fPtr->SunxiVideo_private); diff --git a/srcpkgs/xf86-video-fbturbo-sunxi/template b/srcpkgs/xf86-video-fbturbo-sunxi/template deleted file mode 100644 index 3da5f84a572cb5..00000000000000 --- a/srcpkgs/xf86-video-fbturbo-sunxi/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'xf86-video-fbturbo-sunxi' -pkgname=xf86-video-fbturbo-sunxi -version=0.4.0 -revision=5 -wrksrc="${pkgname%-sunxi}-${version}" -build_style=gnu-configure -hostmakedepends="pkg-config xorg-server-devel" -makedepends="libXrandr-devel libump-git-devel xorg-server-devel xorg-util-macros" -depends="virtual?xserver-abi-video-24_1 sunxi-mali" -short_desc="Xorg DDX driver for Allwinner SoC (A10/A13/A20)" -license="MIT, GPL-2.0-or-later" -maintainer="Orphaned " -homepage="http://github.com/ssvb/xf86-video-fbturbo" -distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz" -checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f - -archs="armv7l" -conflicts="xf86-video-fbturbo>=0" - -LDFLAGS="-Wl,-z,lazy" - -pre_configure() { - cp /usr/include/xorg/dri2.h src -} - -post_install() { - vinstall xorg.conf 644 usr/share/X11/xorg.conf.d 99-fbturbo.conf - vlicense COPYING -}