~jjohansen/xorg-server:master

Last commit made on 2016-04-21
Get this branch:
git clone -b master https://git.launchpad.net/~jjohansen/xorg-server
Only John Johansen can upload to this branch. If you are John Johansen please log in for upload directions.

Branch merges

Branch information

Name:
master
Repository:
lp:~jjohansen/xorg-server

Recent commits

fdb19f0... by John Johansen

Base apparmor patch for Xace to set up a per profile containment

This is based on the X-selinux extension but more like the X security
extension with each domain based on the applications security context

There will need to be work to extend this to have policy that allows
sharing, etc.

Signed-off-by: John Johansen <email address hidden>

577bebe... by Emil Velikov <email address hidden>

xfree86/parser: simplify #ifdef ladder

Rather than 'hacking' around symbol names and providing macros such as
'Local' just fold things and make the code more readable.

Signed-off-by: Emil Velikov <email address hidden>
Reviewed-by: Alex Deucher <email address hidden>

537276a... by Emil Velikov <email address hidden>

xfree86/parser: reuse StringToToken() in xf86getToken()

Reviewed-by: Alex Deucher <email address hidden>
Signed-off-by: Emil Velikov <email address hidden>

944ea03... by Emil Velikov <email address hidden>

xfree86/parser: move StringToToken() definition further up

... so that we can use it without the forward declaration. Plus we're
doing to reuse it in the next commit ;-)

Reviewed-by: Alex Deucher <email address hidden>
Signed-off-by: Emil Velikov <email address hidden>

b93be14... by Emil Velikov <email address hidden>

xfree86/parser: annotate xf86ConfigSymTabRec as constant data

Add the const notation to all the static storage as well as the
functions that use it - xf86getToken(), xf86getSubTokenWithTab(),
StringToToken() and xf86getStringToken().

Reviewed-by: Alex Deucher <email address hidden>
Signed-off-by: Emil Velikov <email address hidden>

3981dcd... by Emil Velikov <email address hidden>

dri3: remove unused file dri3int.h

Copied during the prototyping stage and never used.

Cc: Keith Packard <email address hidden>
Signed-off-by: Emil Velikov <email address hidden>
Reviewed-by: Alex Deucher <email address hidden>

a1b13cd... by Adam Jackson <email address hidden>

xfree86: Remove xf86RegisterRootWindowProperty

All consumers have been ported to the root window callback, so this can
all be nuked.

Reviewed-by: Michel Dänzer <email address hidden>
Signed-off-by: Adam Jackson <email address hidden>

e89c7f1... by Adam Jackson <email address hidden>

xfree86: Create EDID atom from the root window callback (v2)

v2: Fix swapped callback args

Reviewed-by: Michel Dänzer <email address hidden>
Signed-off-by: Adam Jackson <email address hidden>

8e3010d... by Adam Jackson <email address hidden>

xfree86: Remove a never-hit diagnostic message

Practically speaking, the EDID major version is never not 1.

Reviewed-by: Michel Dänzer <email address hidden>
Signed-off-by: Adam Jackson <email address hidden>

7961377... by Adam Jackson <email address hidden>

xfree86: Make xf86SetDDCproperties work more than once (v2)

We can call this more than once via xf86OutputSetEDID since hotplug is
actually a thing in RANDR 1.2, but xf86RegisterRootWindowProperty merely
adds the data to a list to be applied to the root at CreateWindow time,
so calls past the first (for a given screen) would have no effect until
server regen.

Once we've initialised pScrn->pScreen is filled in, so we can just set
the property directly.

v2: Removed pointless version check, deobfuscate math (Walter Harms)

Reviewed-by: Michel Dänzer <email address hidden>
Signed-off-by: Adam Jackson <email address hidden>