update to latest upstream version

3 files changed, 5 insertions, 82 deletions

diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index 0c661aa17..0fffb5051 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -4,23 +4,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-video-cirrus
-PKG_VERSION:=		1.4.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		439e3f5e29161f503bcfe23229dc7b17
+PKG_VERSION:=		1.5.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a00cf7eb9a9e27e9738cdbe716012b61
 PKG_DESCR:=		x11 driver for cirrus vga chips
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server libstdcxx
-PKG_BUILDDEP:=		xorg-server autotool util-macros
+PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SYSTEM_DEPENDS:=	qemu-x86 qemu-x86_64
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,xf86-video-cirrus,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autoreconf
-
 xf86-video-cirrus-install:
 	${INSTALL_DIR} ${IDIR_XF86_VIDEO_CIRRUS}/usr/lib/xorg/modules/drivers
 	${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/cirrus_*.so \
diff --git a/package/xf86-video-cirrus/patches/patch-src_Makefile_am b/package/xf86-video-cirrus/patches/patch-src_Makefile_am
deleted file mode 100644
index b95028dc3..000000000
--- a/package/xf86-video-cirrus/patches/patch-src_Makefile_am
+++ /dev/null
@@ -1,28 +0,0 @@
---- xf86-video-cirrus-1.4.0.orig/src/Makefile.am	2012-03-24 02:48:16.000000000 +0100
-+++ xf86-video-cirrus-1.4.0/src/Makefile.am	2013-11-14 14:21:47.000000000 +0100
-@@ -34,23 +34,13 @@ cirrus_drv_la_SOURCES = \
-          cir.h \
-          CirrusClk.c \
-          cir_shadow.c \
--         cir_pcirename.h
--
--cirrus_alpine_la_LTLIBRARIES = cirrus_alpine.la
--cirrus_alpine_la_LDFLAGS = -module -avoid-version
--cirrus_alpine_ladir = @moduledir@/drivers
--cirrus_alpine_la_SOURCES = \
-+         cir_pcirename.h \
-          alp_driver.c \
-          alp.h \
-          alp_hwcurs.c \
-          alp_i2c.c \
-          alp_xaa.c \
--         alp_xaam.c
--
--cirrus_laguna_la_LTLIBRARIES = cirrus_laguna.la
--cirrus_laguna_la_LDFLAGS = -module -avoid-version
--cirrus_laguna_ladir = @moduledir@/drivers
--cirrus_laguna_la_SOURCES = \
-+         alp_xaam.c \
-          lg_driver.c \
-          lg.h \
-          lg_hwcurs.c \
diff --git a/package/xf86-video-cirrus/patches/patch-src_cir_driver_c b/package/xf86-video-cirrus/patches/patch-src_cir_driver_c
deleted file mode 100644
index 9fe658863..000000000
--- a/package/xf86-video-cirrus/patches/patch-src_cir_driver_c
+++ /dev/null
@@ -1,48 +0,0 @@
---- xf86-video-cirrus-1.4.0.orig/src/cir_driver.c	2012-03-24 02:48:17.000000000 +0100
-+++ xf86-video-cirrus-1.4.0/src/cir_driver.c	2013-11-14 14:22:54.000000000 +0100
-@@ -206,25 +206,6 @@ CIRProbe(DriverPtr drv, int flags)
-     ErrorF("CirProbe\n");
- #endif
-   
--    /*
--     * For PROBE_DETECT, make sure both sub-modules are loaded before
--     * calling xf86MatchPciInstances(), because the AvailableOptions()
--     * functions may be called before xf86MatchPciInstances() returns.
--     */
--    
--    if (flags & PROBE_DETECT) {
--	if (!lg_loaded) {
--	    if (xf86LoadDrvSubModule(drv, "cirrus_laguna")) {
--		lg_loaded = TRUE;
--	    }
--	}
--	if (!alp_loaded) {
--	    if (xf86LoadDrvSubModule(drv, "cirrus_alpine")) {
--		alp_loaded = TRUE;
--	    }
--	}
--    }
--
-     if ((numDevSections = xf86MatchDevice(CIR_DRIVER_NAME,
- 					  &devSections)) <= 0) {
- 	return FALSE;
-@@ -261,19 +242,8 @@ CIRProbe(DriverPtr drv, int flags)
- 		     PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464 ||
- 		     PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464BD ||
- 		     PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5465)) {
-- 	    
-- 	    if (!lg_loaded) {
-- 		if (!xf86LoadDrvSubModule(drv, "cirrus_laguna")) 
--		    continue;
-- 		lg_loaded = TRUE;
-- 	    }
- 	    pScrn = LgProbe(usedChips[i]);
-  	} else {
-- 	    if (!alp_loaded) {
-- 		if (!xf86LoadDrvSubModule(drv, "cirrus_alpine")) 
-- 		    continue;
-- 		alp_loaded = TRUE;
-- 	    }
-  	    pScrn = AlpProbe(usedChips[i]);
-  	}
-