Skip to content

Commit

Permalink
add pointer limit fix, bump rpm spec file versions for rebuild
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@8060 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Nov 5, 2014
1 parent 61f2cfc commit 871e8c7
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 7 deletions.
39 changes: 39 additions & 0 deletions rpmbuild/0003-fix-pointer-limits.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--- xf86-video-dummy-0.3.6/src/dummy_driver.c 2014-11-05 19:24:02.668656601 +0700
+++ xf86-video-dummy-0.3.6.new/src/dummy_driver.c 2014-11-05 19:37:53.076061853 +0700
@@ -55,6 +55,9 @@
#include <X11/extensions/xf86dgaproto.h>
#endif

+/* Needed for fixing pointer limits on resize */
+#include "inputstr.h"
+
/* Mandatory functions */
static const OptionInfoRec * DUMMYAvailableOptions(int chipid, int busid);
static void DUMMYIdentify(int flags);
@@ -713,6 +716,26 @@
RRTellChanged(pScrn->pScreen);
}
#endif
+ //ensure the screen dimensions are also updated:
+ pScrn->pScreen->width = mode->HDisplay;
+ pScrn->pScreen->height = mode->VDisplay;
+ pScrn->virtualX = mode->HDisplay;
+ pScrn->virtualY = mode->VDisplay;
+ pScrn->frameX1 = mode->HDisplay;
+ pScrn->frameY1 = mode->VDisplay;
+
+ //ensure the pointer uses the new limits too:
+ DeviceIntPtr pDev;
+ SpritePtr pSprite;
+ for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
+ if (pDev->spriteInfo!=NULL && pDev->spriteInfo->sprite!=NULL) {
+ pSprite = pDev->spriteInfo->sprite;
+ pSprite->hotLimits.x2 = mode->HDisplay;
+ pSprite->hotLimits.y2 = mode->VDisplay;
+ pSprite->physLimits.x2 = mode->HDisplay;
+ pSprite->physLimits.y2 = mode->VDisplay;
+ }
+ }
return TRUE;
}

9 changes: 7 additions & 2 deletions rpmbuild/xorg-x11-drv-dummy.el6.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Summary: Xorg X11 dummy video driver
Name: xorg-x11-drv-dummy
Version: 0.3.6
Release: 15.xpra3%{?dist}
Release: 15.xpra4%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
Expand All @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Patch0: 0001-Remove-mibstore.h.patch
Patch1: 0002-Constant-DPI.patch
Patch2: 0003-fix-pointer-limits.patch

ExcludeArch: s390 s390x

Expand All @@ -30,6 +31,7 @@ X.Org X11 dummy video driver.
%setup -q -n %{tarball}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1

%build
%configure --disable-static
Expand All @@ -52,7 +54,10 @@ rm -rf $RPM_BUILD_ROOT
%{driverdir}/dummy_drv.so

%changelog
* Thu Oct 30 2014 Antoine Martin <[email protected]> - 0.3.6-16.xpra2
* Wed Nov 05 2014 Antoine Martin <[email protected]> - 0.3.6-15.xpra4
- add cursor limit fix

* Thu Oct 30 2014 Antoine Martin <[email protected]> - 0.3.6-15.xpra3
- force rebuild for CentOS 6.6

* Sat Oct 25 2014 Antoine Martin <[email protected]> - 0.3.6-15.xpra2
Expand Down
7 changes: 6 additions & 1 deletion rpmbuild/xorg-x11-drv-dummy.el7.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
Summary: Xorg X11 dummy video driver
Name: xorg-x11-drv-dummy
Version: 0.3.6
Release: 15.xpra1%{?dist}
Release: 15.xpra2%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support

Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Patch0: 0001-Remove-mibstore.h.patch
Patch1: 0002-Constant-DPI.patch
Patch2: 0003-fix-pointer-limits.patch

ExcludeArch: s390 s390x

Expand All @@ -29,6 +30,7 @@ X.Org X11 dummy video driver.
%setup -q -n %{tarball}-%{version}
%patch0 -p1 -b .mibstore
%patch1 -p1
%patch2 -p1

%build
autoreconf -vif
Expand All @@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%{driverdir}/dummy_drv.so

%changelog
* Wed Nov 05 2014 Antoine Martin <[email protected]> - 0.3.6-15.xpra2
- add cursor limit fix

* Sun Jul 20 2014 Antoine Martin <[email protected]> - 0.3.6-15.xpra1
- Add DPI override via root window property
- Add "ConstantDPI" support
Expand Down
7 changes: 6 additions & 1 deletion rpmbuild/xorg-x11-drv-dummy.fc19.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
Summary: Xorg X11 dummy video driver
Name: xorg-x11-drv-dummy
Version: 0.3.6
Release: 10.xpra2%{?dist}
Release: 10.xpra3%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support

Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Patch0: 0001-Remove-mibstore.h.patch
Patch1: 0002-Constant-DPI.patch
Patch2: 0003-fix-pointer-limits.patch

ExcludeArch: s390 s390x

Expand All @@ -29,6 +30,7 @@ X.Org X11 dummy video driver.
%setup -q -n %{tarball}-%{version}
%patch0 -p1 -b .mibstore
%patch1 -p1
%patch2 -p1

%build
autoreconf -vif
Expand All @@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%{driverdir}/dummy_drv.so

%changelog
* Wed Nov 05 2014 Antoine Martin <[email protected]> - 0.3.6-10.xpra3
- add cursor limit fix

* Tue Sep 30 2014 Antoine Martin <[email protected]> - 0.3.6-10.xpra2
- Rebuild with bumped release

Expand Down
7 changes: 6 additions & 1 deletion rpmbuild/xorg-x11-drv-dummy.fc20.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
Summary: Xorg X11 dummy video driver
Name: xorg-x11-drv-dummy
Version: 0.3.6
Release: 11.xpra2%{?dist}
Release: 11.xpra3%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support

Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Patch0: 0001-Remove-mibstore.h.patch
Patch1: 0002-Constant-DPI.patch
Patch2: 0003-fix-pointer-limits.patch

ExcludeArch: s390 s390x

Expand All @@ -29,6 +30,7 @@ X.Org X11 dummy video driver.
%setup -q -n %{tarball}-%{version}
%patch0 -p1 -b .mibstore
%patch1 -p1
%patch2 -p1

%build
autoreconf -vif
Expand All @@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%{driverdir}/dummy_drv.so

%changelog
* Wed Nov 05 2014 Antoine Martin <[email protected]> - 0.3.6-11.xpra3
- add cursor limit fix

* Tue Sep 30 2014 Antoine Martin <[email protected]> - 0.3.6-11.xpra2
- Rebuild with bumped release

Expand Down
7 changes: 6 additions & 1 deletion rpmbuild/xorg-x11-drv-dummy.fc21.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
Summary: Xorg X11 dummy video driver
Name: xorg-x11-drv-dummy
Version: 0.3.6
Release: 19.xpra2%{?dist}
Release: 20.xpra1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support

Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Patch0: 0001-Remove-mibstore.h.patch
Patch1: 0002-Constant-DPI.patch
Patch2: 0003-fix-pointer-limits.patch

ExcludeArch: s390 s390x

Expand All @@ -29,6 +30,7 @@ X.Org X11 dummy video driver.
%setup -q -n %{tarball}-%{version}
%patch0 -p1 -b .mibstore
%patch1 -p1
%patch2 -p1

%build
autoreconf -vif
Expand All @@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%{driverdir}/dummy_drv.so

%changelog
* Wed Nov 05 2014 Antoine Martin <[email protected]> - 0.3.6-20.xpra1
- add cursor limit fix, bump release number

* Tue Sep 30 2014 Antoine Martin <[email protected]> - 0.3.6-19.xpra2
- Rebuild with bumped release

Expand Down
7 changes: 6 additions & 1 deletion rpmbuild/xorg-x11-drv-dummy.fc22.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
Summary: Xorg X11 dummy video driver
Name: xorg-x11-drv-dummy
Version: 0.3.6
Release: 19.xpra2%{?dist}
Release: 20.xpra3%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support

Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Patch0: 0001-Remove-mibstore.h.patch
Patch1: 0002-Constant-DPI.patch
Patch2: 0003-fix-pointer-limits.patch

ExcludeArch: s390 s390x

Expand All @@ -29,6 +30,7 @@ X.Org X11 dummy video driver.
%setup -q -n %{tarball}-%{version}
%patch0 -p1 -b .mibstore
%patch1 -p1
%patch2 -p1

%build
autoreconf -vif
Expand All @@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%{driverdir}/dummy_drv.so

%changelog
* Wed Nov 05 2014 Antoine Martin <[email protected]> - 0.3.6-20.xpra1
- add cursor limit fix, bump release number

* Tue Sep 30 2014 Antoine Martin <[email protected]> - 0.3.6-19.xpra2
- Rebuild with bumped release

Expand Down

0 comments on commit 871e8c7

Please sign in to comment.