diff options
| author | Treeve Jelbert | 2015-04-22 21:43:36 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2015-04-25 15:45:56 +0200 |
| commit | 57f559b54c0fa7f81a596c89ca6094876d8c9e79 (patch) | |
| tree | ed2634d9466dc1345de7c906744dfb35ef3c9a1c /xorg-xserver | |
| parent | c6d51f84e4bf96d832dc1d62831c0747b8fe3184 (diff) | |
xorg-server tweaks
Diffstat (limited to 'xorg-xserver')
| -rwxr-xr-x | xorg-xserver/xorg-server/BUILD | 2 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/DEPENDS | 12 | ||||
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 4 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/UP_TRIGGERS | 3 |
4 files changed, 9 insertions, 12 deletions
diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD index e8f28bc9cc..90d8cae4b1 100755 --- a/xorg-xserver/xorg-server/BUILD +++ b/xorg-xserver/xorg-server/BUILD @@ -14,7 +14,7 @@ CXXFLAGS="${CXXFLAGS/-O3/-O0}" fi && VGC=$(installed_version gcc) && VGC=${VGC%.?} && -if [[ "${VGC}" == "4.7" ]] ; then +if [[ "${VGC}" == "4.7" ]] || [[ "${VGC}" == "5.1" ]] ; then CFLAGS+=" -Wno-error=array-bounds" fi && message CFLAGS=$CFLAGS diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS index 1de20a2950..0ffa9f1c0e 100755 --- a/xorg-xserver/xorg-server/DEPENDS +++ b/xorg-xserver/xorg-server/DEPENDS @@ -24,16 +24,11 @@ depends presentproto && # ##Check this on updates depends libxv "--enable-xv" && -# workaround until: https://bugs.freedesktop.org/show_bug.cgi?id=6009 -# get's fixed, bug still on hold 2009-02-28 -if list_find "$XORG_SERVER_OPTS" "--enable-dri"; then - depends libxinerama '--enable-xinerama' -else - optional_depends libxinerama \ + +optional_depends libxinerama \ "--enable-xinerama" \ "--disable-xinerama" \ - "Build Xinerama extension" -fi && + "Multi screen support" && ## optional_depends libselinux \ "" \ @@ -145,7 +140,6 @@ depends xf86bigfontproto && depends xf86dgaproto && depends xf86driproto && depends xf86vidmodeproto && -depends xineramaproto && depends xproto && depends xproxymanagementprotocol && depends libxkbui && diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index e668893d4e..3010edc535 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -2,6 +2,10 @@ * CONFIGURE: added selection of SHA1 implementation * DEPENDS: fixed dependencies on a crypto library +2015-04-22 Treeve Jelbert <treeve@sourcemage.org> + * UP_TRIGGERS: remove things which do not depend on xorg-server + * DEPENDS: libxinerama is optional + 2015-02-11 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: UDEV -> DEVICE-MANAGER diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS b/xorg-xserver/xorg-server/UP_TRIGGERS index 734d31c350..d5b34ef6ec 100755 --- a/xorg-xserver/xorg-server/UP_TRIGGERS +++ b/xorg-xserver/xorg-server/UP_TRIGGERS @@ -7,8 +7,7 @@ case "$(installed_version $SPELL)" in esac && for each in synaptics $(gaze -q -g "$(gaze -q grimoires | tr " " "\n" | \ - grep -Ex "test|stable(-rc|-[0-9]+\.[0-9]+)?")" section xorg-driver) \ - xkbutils xkbcomp xkbprint xkbevd xkeyboard-config setxkbmap; do + grep -Ex "test|stable(-rc|-[0-9]+\.[0-9]+)?")" section xorg-driver);do if spell_ok $each; then if [[ $epicfail == y ]]; then up_trigger $each cast_self |