diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/Depends.mk | 1 | ||||
| -rw-r--r-- | package/Makefile | 1 | ||||
| -rw-r--r-- | package/mplayer/Config.in | 3 | ||||
| -rw-r--r-- | package/xf86-video-cirrus/Config.in | 8 | ||||
| -rw-r--r-- | package/xf86-video-cirrus/Makefile | 28 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c | 17 |
7 files changed, 58 insertions, 1 deletions
diff --git a/package/Config.in b/package/Config.in index 3055b2e00..2e3aee10c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -492,6 +492,7 @@ endmenu menu "X" source "package/xorg-server/Config.in" +source "package/xf86-video-cirrus/Config.in" source "package/xf86-video-geode/Config.in" menu "X Libraries" diff --git a/package/Depends.mk b/package/Depends.mk index cf139b4da..35e426786 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -258,6 +258,7 @@ xfsprogs-compile: e2fsprogs-compile libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile xkeyboard-config-compile: xkbcomp-compile xf86-video-geode-compile: xorg-server-compile +xf86-video-cirrus-compile: xorg-server-compile xf86dga-compile: libXxf86dga-compile xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \ damageproto-compile scrnsaverproto-compile resourceproto-compile \ diff --git a/package/Makefile b/package/Makefile index 3684a77ed..e4df19ce3 100644 --- a/package/Makefile +++ b/package/Makefile @@ -440,6 +440,7 @@ package-$(ADK_PACKAGE_XCMISCPROTO) += xcmiscproto package-$(ADK_PACKAGE_XEXTPROTO) += xextproto package-$(ADK_PACKAGE_XKBCOMP) += xkbcomp package-$(ADK_PACKAGE_XKEYBOARD_CONFIG) += xkeyboard-config +package-$(ADK_PACKAGE_XF86_VIDEO_CIRRUS) += xf86-video-cirrus package-$(ADK_PACKAGE_XF86_VIDEO_GEODE) += xf86-video-geode package-$(ADK_PACKAGE_XF86DGA) += xf86dga package-$(ADK_PACKAGE_XF86DGAPROTO) += xf86dgaproto diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in index 963e2c0ba..edc4f291f 100644 --- a/package/mplayer/Config.in +++ b/package/mplayer/Config.in @@ -12,7 +12,8 @@ config ADK_PACKAGE_MPLAYER select ADK_PACKAGE_LIBFAAD2 select ADK_PACKAGE_LIBVORBIS select ADK_PACKAGE_ZLIB - depends on ADK_LINUX_X86_ALIX1C + depends on ADK_LINUX_X86_ALIX1C || \ + ADK_LINUX_X86_QEMU help http://www.mplayerhq.hu diff --git a/package/xf86-video-cirrus/Config.in b/package/xf86-video-cirrus/Config.in new file mode 100644 index 000000000..4df3074b3 --- /dev/null +++ b/package/xf86-video-cirrus/Config.in @@ -0,0 +1,8 @@ +config ADK_PACKAGE_XF86_VIDEO_CIRRUS + prompt "xf86-video-cirrus.......................... X11 driver for Cirrus chips" + tristate + default n + depends on ADK_LINUX_X86_QEMU || ADK_LINUX_X86_64_QEMU + select ADK_PACKAGE_XORG_SERVER + help + http://www.x.org diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile new file mode 100644 index 000000000..4e40f4d0b --- /dev/null +++ b/package/xf86-video-cirrus/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xf86-video-cirrus +PKG_VERSION:= 1.3.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c63a29917c48d0c317445991fc36d09a +PKG_DESCR:= X11 driver for Cirrus VGA chips +PKG_SECTION:= x11 +PKG_DEPENDS:= xorg-server +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_XF86_VIDEO_CIRRUS}/usr/lib/xorg/modules/drivers + ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/cirrus_*.so \ + ${IDIR_XF86_VIDEO_CIRRUS}/usr/lib/xorg/modules/drivers/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c new file mode 100644 index 000000000..411d7b2e2 --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c @@ -0,0 +1,17 @@ +--- xorg-server-1.7.1.orig/hw/xfree86/common/xf86VGAarbiter.c 2009-10-09 06:08:28.000000000 +0200 ++++ xorg-server-1.7.1/hw/xfree86/common/xf86VGAarbiter.c 2009-12-10 17:14:01.000000000 +0100 +@@ -38,14 +38,8 @@ + #include "xf86Priv.h" + #include "pciaccess.h" + +-#ifdef DEBUG +-#error "no, really, you dont want to do this" +-#define DPRINT_S(x,y) ErrorF(x ": %i\n",y); +-#define DPRINT(x) ErrorF(x "\n"); +-#else + #define DPRINT_S(x,y) + #define DPRINT(x) +-#endif + + static GCFuncs VGAarbiterGCFuncs = { + VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC, |