- rel 2

- export GetMaster() for tigervnc's libvnc module

Changed files:
    xorg-xserver-server-export-GetMaster.patch -> 1.1
    xorg-xserver-server.spec -> 1.293

diff --git a/xorg-xserver-server-export-GetMaster.patch b/xorg-xserver-server-export-GetMaster.patch
new file mode 100644 (file)
index 0000000..a7b48b7
--- /dev/null
+++ b/xorg-xserver-server-export-GetMaster.patch
@@ -0,0 +1,13 @@
+diff --git a/include/input.h b/include/input.h
+index 6ba1ab2..7c117b6 100644
+--- a/include/input.h
++++ b/include/input.h
+@@ -501,7 +501,7 @@ extern int AttachDevice(ClientPtr client,
+                         DeviceIntPtr master);
+ 
+ extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
+-extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
++extern _X_EXPORT DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
+ 
+ extern _X_EXPORT int AllocDevicePair(ClientPtr client,
+                              char* name,

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index e24679e7270498f06e23af96b2e061b65725c0ec..3a6c359cb87dadc2d5e77d49d8d5c680b6625685 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -19,7 +19,7 @@
 %define        xorg_xserver_server_videodrv_abi        11.0
 %define        xorg_xserver_server_xinput_abi          13.0
 
-%define                rel     1
+%define                rel     2
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
@@ -38,6 +38,7 @@ Patch1:               %{name}-pic-libxf86config.patch
 Patch2:                %{name}-fb-size.patch
 Patch3:                %{name}-less-acpi-brokenness.patch
 Patch4:                %{name}-builtin-SHA1.patch
+Patch5:                %{name}-export-GetMaster.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel >= 7.8.1
 # for glx headers
@@ -378,6 +379,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h