diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-19 10:49:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-19 10:49:49 +0200 |
commit | 7907e3ee7302ac3fd428989a07b0df74f0c52853 (patch) | |
tree | e6de18488a687707667927065724372b40510d65 /package/xinit | |
parent | b70fdbfbf1139605c22083b647337f2b16f62fc3 (diff) | |
parent | 61355d1f054c15673adeb62d32dfd4563f89c165 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/xinit')
-rw-r--r-- | package/xinit/Makefile | 8 | ||||
-rw-r--r-- | package/xinit/patches/patch-startx_cpp | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/package/xinit/Makefile b/package/xinit/Makefile index a5180511a..6a1461826 100644 --- a/package/xinit/Makefile +++ b/package/xinit/Makefile @@ -5,15 +5,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xinit PKG_VERSION:= 1.2.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 7ad82221ebd6600a8d33712ec3b62efb PKG_DESCR:= X Window System initializer -PKG_SECTION:= x11 -PKG_DEPENDS:= xorg-server mcookie +PKG_SECTION:= x11/apps +PKG_DEPENDS:= xorg-server mcookie xauth xset PKG_BUILDDEP+= xorg-server PKG_URL:= http://xorg.freedesktop.org PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ +PKG_TARGET_DEPENDS:= !foxboard + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XINIT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xinit/patches/patch-startx_cpp b/package/xinit/patches/patch-startx_cpp new file mode 100644 index 000000000..911346c59 --- /dev/null +++ b/package/xinit/patches/patch-startx_cpp @@ -0,0 +1,11 @@ +--- xinit-1.2.1.orig/startx.cpp 2010-03-15 23:35:56.000000000 +0100 ++++ xinit-1.2.1/startx.cpp 2010-07-15 21:25:44.458413180 +0200 +@@ -347,5 +347,8 @@ screenrestore + kbd_mode -a + #endif + ++xset dpms 0 0 60 ++xset s 0 ++ + exit $retval + |