[meego-commits] 5564: Changes to Trunk:Testing/mrstouch

[Li Peng]

Hi,
I have made the following changes to mrstouch in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Li Peng

[This message was auto-generated]

---

Request #5564:

  submit:   devel:x11:Trunk/mrstouch(r5) -> Trunk:Testing/mrstouch


Message:
    switch to spectacle, modify xorg.conf_mrst to fix BMC #2950 (mouse doesn't work on CDK)

State:   new          2010-07-11T20:26:18 pli1
Comment: None



changes files:
--------------
--- mrstouch.changes
+++ mrstouch.changes
@@ -0,0 +1,4 @@
+* Fri Jul 09 2010 Li Peng <peng.li at intel.com> - 0.0.3
+- switch to spectacle, modify xorg.conf_mrst to fix BMC #2950 
+  (mouse doesn't work on CDK)
+

old:
----
  img-driver-fix.patch

new:
----
  Makefile
  mrstouch.yaml
  xorg.conf_mrst

spec files:
-----------
--- mrstouch.spec
+++ mrstouch.spec
@@ -1,51 +1,82 @@
-Summary: A xorg driver for MID (Mobile Internet Devices) Moorestown platform
+# 
+# Do not Edit! Generated by:
+# spectacle version 0.17
+# 
+# >> macros
+# << macros
+
 Name: mrstouch
+Summary:    A xorg driver for MID (Mobile Internet Devices) Moorestown platform
 Version: 0.0.3
 Release: 1
 Group: System/Base
-ExclusiveArch: %{ix86}
-Source: mrstouch-0.0.3.tar.gz
-Patch1: xserver-compatibility-fix.patch 
 License: GPLv2
 URL: http://www.moblin.org/
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-server-Xorg libX11-devel xorg-x11-server-devel
-BuildRequires: xorg-x11-proto-inputproto xorg-x11-proto-randrproto xorg-x11-proto-xextproto
+Source0:    mrstouch-0.0.3.tar.gz
+Source1:    xorg.conf_mrst
+Source100:  mrstouch.yaml
+Patch0:     xserver-compatibility-fix.patch
+BuildRequires:  pkgconfig(inputproto)
+BuildRequires:  pkgconfig(randrproto)
+BuildRequires:  pkgconfig(xextproto)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xorg-server)
+
 
 %description
 This is combined driver of plpevtch-0.0.3 and evtouch-0.8.8.
 
+
+
 %prep
-%setup -q
-#%patch0 -p1 -b .img-driver-fix
-%patch1 -p1 -b .xserver-compatibility-fix
-touch -m *
-touch -r *
+%setup -q -n %{name}-%{version}
+
+# xserver-compatibility-fix.patch
+%patch0 -p1
+# >> setup
+# << setup
 
 %build
-%configure
-make 
-make -f Makefile.calib
+# >> build pre
+# << build pre
 
+%configure --disable-static
+make %{?jobs:-j%jobs}
+
+# >> build post
+make -f Makefile.calib
+# << build post
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+# >> install pre
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/etc/X11
 mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d
 
-make install DESTDIR=$RPM_BUILD_ROOT
+# << install pre
+%make_install
+mkdir -p %{buildroot}/etc/X11
+cp -a %{SOURCE1} %{buildroot}/etc/X11
+
+
+# >> install post
 cp -f calibrate $RPM_BUILD_ROOT%{_bindir}
 cp -f 10-touchscreen.rules $RPM_BUILD_ROOT/lib/udev/rules.d
-cp -f xorg.conf_mrst $RPM_BUILD_ROOT/etc/X11
+# << install post
+
+
+
+
 
-%clean
-rm -rf %{buildroot}
 
 %files 
 %defattr(-,root,root,-)  
+# >> files
 %doc README
 %{_libdir}/xorg/modules/input/*
 %{_bindir}/calibrate
 /etc/X11/xorg.conf_mrst
 /lib/udev/rules.d/10-touchscreen.rules
+# << files
+
 

other changes:
--------------

++++++ Makefile (new)
--- Makefile
+++ Makefile
+PKG_NAME := mrstouch
+SPECFILE = $(addsuffix .spec, $(PKG_NAME))
+YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
+
+include /usr/share/packaging-tools/Makefile.common
+

++++++ mrstouch.yaml (new)
--- mrstouch.yaml
+++ mrstouch.yaml
+Name: mrstouch
+Summary: A xorg driver for MID (Mobile Internet Devices) Moorestown platform
+Version: 0.0.3
+Release: 1
+Group: System/Base
+License: GPLv2
+URL: http://www.moblin.org/
+Sources:
+    - mrstouch-0.0.3.tar.gz
+Patches:
+    - xserver-compatibility-fix.patch
+Description: This is combined driver of plpevtch-0.0.3 and evtouch-0.8.8.
+
+PkgConfigBR:
+    - inputproto
+    - randrproto
+    - xextproto
+    - x11
+    - xorg-server
+Configure: configure
+Builder: make
+ExtraSources:
+    - xorg.conf_mrst;/etc/X11

++++++ xorg.conf_mrst (new)
--- xorg.conf_mrst
+++ xorg.conf_mrst
+Section "ServerLayout"
+	Identifier     "X.org Configured"
+	Screen      0  "Screen0" 0 0
+	InputDevice	"touchscreen"	"CorePointer"
+EndSection
+
+Section "Files"
+	ModulePath   "/usr/lib/xorg/modules"
+	FontPath     "catalogue:/etc/X11/fontpath.d"
+	FontPath     "built-ins"
+EndSection
+
+Section "Module"
+	Load  "dri2"
+	Load  "extmod"
+	Load  "dbe"
+	Load  "glx"
+	Load  "dri"
+ 	Load  "vgahw"
+EndSection
+
+Section "InputDevice"
+        Identifier      "touchscreen"
+        Driver          "plpevtch"
+        Option          "Device"        "/dev/input/touchscreen"
+	Option	"MinX"	"5"
+	Option	"MaxX"	"884"
+	Option	"MinY"	"18"
+	Option	"MaxY"	"464"
+        Option          "SendCoreEvents" "On"
+        Option          "TapTimer"      "750"   #Right-click timer
+        #Option         "Calibrate"
+	Option	"InvX"	"0"
+	Option	"InvY"	"0"
+        Option         "XY2YX"          "0" #1 to intercahnge x and y
+
+        #MoveLimit - Threshold of clicking vs. dragging - if our X or Y coord moves >= MoveLimit,
+        #we go into dragging mode (unless we are already in Right-click mode due to a Rt-click timer elapsing)
+        #Option         "MoveLimit"     "30"
+EndSection
+
+Section "Device"
+	Identifier  "Videocard0"
+	Driver      "pvr"
+	VendorName  "Intel Corporation"
+	BoardName   "Unknown Board"
+	BusID       "PCI:0:2:0"
+EndSection
+
+Section "Screen"
+	Identifier "Screen0"
+	Device     "Videocard0"
+EndSection
+
+Section "InputClass"
+        Identifier "default"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection

++++++ deleted files:
--- img-driver-fix.patch