diff --git a/packages/extras-buildpkgs/07-xf86-video-armsoc.conf b/packages/extras-buildpkgs/07-xf86-video-armsoc.conf index 09939e6c07..17ba9b297b 100644 --- a/packages/extras-buildpkgs/07-xf86-video-armsoc.conf +++ b/packages/extras-buildpkgs/07-xf86-video-armsoc.conf @@ -3,7 +3,7 @@ local package_name="xf86-video-armsoc" local package_repo="https://anongit.freedesktop.org/git/xorg/driver/xf86-video-armsoc.git" local package_ref="tag:1.4.1" local package_upstream_version="1.4.1" -local package_builddeps="quilt dh-autoreconf libdrm-dev libudev-dev libxext-dev pkg-config x11proto-core-dev x11proto-fonts-dev x11proto-gl-dev x11proto-xf86dri-dev xutils-dev xserver-xorg-dev" +local package_builddeps="dh-autoreconf libdrm-dev libudev-dev libxext-dev pkg-config x11proto-core-dev x11proto-fonts-dev x11proto-gl-dev x11proto-xf86dri-dev xutils-dev xserver-xorg-dev" local package_install_target="xserver-xorg-video-armsoc-sun4i" local package_component="${release}-desktop" diff --git a/packages/extras-buildpkgs/xf86-video-armsoc/debian/control b/packages/extras-buildpkgs/xf86-video-armsoc/debian/control index 0cac32a6cd..a1fdf10ceb 100644 --- a/packages/extras-buildpkgs/xf86-video-armsoc/debian/control +++ b/packages/extras-buildpkgs/xf86-video-armsoc/debian/control @@ -4,7 +4,6 @@ Priority: optional XSBC-Original-Maintainer: Marcin Juszkiewicz Maintainer: Ubuntu Developers Build-Depends: debhelper (>= 8), - quilt, dh-autoreconf, libdrm-dev, libudev-dev, diff --git a/packages/extras-buildpkgs/xf86-video-armsoc/debian/patches/0002-Fix-UMP_LOCK-status-logging.patch b/packages/extras-buildpkgs/xf86-video-armsoc/debian/patches/0002-Fix-UMP_LOCK-status-logging.patch new file mode 100644 index 0000000000..025f90d836 --- /dev/null +++ b/packages/extras-buildpkgs/xf86-video-armsoc/debian/patches/0002-Fix-UMP_LOCK-status-logging.patch @@ -0,0 +1,13 @@ +diff --git a/src/armsoc_driver.c b/src/armsoc_driver.c +index 83e74a7..5c988ec 100644 +--- a/src/armsoc_driver.c ++++ b/src/armsoc_driver.c +@@ -892,7 +892,7 @@ ARMSOCPreInit(ScrnInfoPtr pScrn, int flags) + pARMSOC->useUmplock = xf86ReturnOptValBool(pARMSOC->pOptionInfo, + OPTION_UMP_LOCK, FALSE); + INFO_MSG("umplock is %s", +- pARMSOC->useUmplock ? "Disabled" : "Enabled"); ++ pARMSOC->useUmplock ? "Enabled" : "Disabled"); + + /* + * Select the video modes: diff --git a/packages/extras-buildpkgs/xf86-video-armsoc/debian/patches/series b/packages/extras-buildpkgs/xf86-video-armsoc/debian/patches/series index 334c1d6923..25b82bb057 100644 --- a/packages/extras-buildpkgs/xf86-video-armsoc/debian/patches/series +++ b/packages/extras-buildpkgs/xf86-video-armsoc/debian/patches/series @@ -1 +1,2 @@ 0001-Add-sun4i-drmmode-driver.patch +0002-Fix-UMP_LOCK-status-logging.patch