commit 05d2fe3be9607017133edf0e04a0be68099191b0 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sat Oct 13 08:19:01 2012 +0200
- new - noserver patch not to require xserver at build time - missing patch with file missing in tarball xorg-gtest-missing.patch | 44 ++++++++++++++++++++++++++++++ xorg-gtest-noserver.patch | 31 +++++++++++++++++++++ xorg-gtest.spec | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) --- diff --git a/xorg-gtest.spec b/xorg-gtest.spec new file mode 100644 index 0000000..e4863f2 --- /dev/null +++ b/xorg-gtest.spec @@ -0,0 +1,68 @@ +Summary: X.Org GTest testing environment for Google Test +Summary(pl.UTF-8): Środowisko testowe X.Org GTest dla szkieletu Google Test +Name: xorg-gtest +Version: 0.5.0 +Release: 1 +License: MIT +Group: X11/Libraries +Source0: http://xorg.freedesktop.org/releases/individual/test/%{name}-%{version}.tar.bz2 +# Source0-md5: bcd34ec5e5dea25687b01b110fccdcae +Patch0: %{name}-noserver.patch +Patch1: %{name}-missing.patch +URL: http://xorg.freedesktop.org/ +BuildRequires: autoconf >= 2.60 +BuildRequires: automake +BuildRequires: evemu-devel >= 1.0.10 +BuildRequires: gtest-devel >= 1.6.0-3 +BuildRequires: libstdc++-devel +BuildRequires: pkgconfig >= 1:0.19 +BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXi-devel +BuildRequires: xorg-util-util-macros >= 1.17 +Requires: evemu >= 1.0.10 +Requires: gtest-devel >= 1.6.0-3 +Requires: xorg-xserver-server +Requires: xorg-driver-video-dummy +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +X.Org GTest provides a Google Test environment for starting and +stopping a X server for testing purposes. + +%description -l pl.UTF-8 +X.Org GTest udostępnia środowisko Google Test do uruchamiania i +zatrzymywania serwera X do celów testowych. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +%{__aclocal} -I m4 +%{__autoconf} +%{__automake} +%configure + +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc COPYING ChangeLog README +%{_includedir}/xorg/gtest +%{_prefix}/src/xorg-gtest +%{_pkgconfigdir}/xorg-gtest.pc +%{_aclocaldir}/xorg-gtest.m4 +%dir %{_datadir}/xorg +%{_datadir}/xorg/gtest +%{_datadir}/X11/xorg.conf.d/99-virtual-test-devices.conf +%{_docdir}/xorg-gtest diff --git a/xorg-gtest-missing.patch b/xorg-gtest-missing.patch new file mode 100644 index 0000000..13fb8d5 --- /dev/null +++ b/xorg-gtest-missing.patch @@ -0,0 +1,44 @@ +--- xorg-gtest-0.5.0/test/PIXART-USB-OPTICAL-MOUSE.desc.orig 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-gtest-0.5.0/test/PIXART-USB-OPTICAL-MOUSE.desc 2012-10-12 20:57:16.028321087 +0200 +@@ -0,0 +1,41 @@ ++# standard USB mouse ++# Input driver version is 1.0.1 ++# Input device ID: bus 0x3 vendor 0x93a product 0x2510 version 0x110 ++# Input device name: "PIXART USB OPTICAL MOUSE" ++# Supported events: ++# Event type 0 (EV_SYN) ++# Event type 1 (EV_KEY) ++# Event code 272 (BTN_LEFT) ++# Event code 273 (BTN_RIGHT) ++# Event code 274 (BTN_MIDDLE) ++# Event type 2 (EV_REL) ++# Event code 0 (REL_X) ++# Event code 1 (REL_Y) ++# Event code 8 (REL_WHEEL) ++# Event type 4 (EV_MSC) ++# Event code 4 (MSC_SCAN) ++# ++N: PIXART USB OPTICAL MOUSE ++I: 0003 093a 2510 0110 ++P: 00 00 00 00 00 00 00 00 ++B: 00 17 00 00 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 01 00 00 07 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 01 00 00 00 00 00 00 00 00 ++B: 02 03 01 00 00 00 00 00 00 ++B: 03 00 00 00 00 00 00 00 00 ++B: 04 10 00 00 00 00 00 00 00 ++B: 05 00 00 00 00 00 00 00 00 ++B: 11 00 00 00 00 00 00 00 00 ++B: 12 00 00 00 00 00 00 00 00 ++B: 15 00 00 00 00 00 00 00 00 ++B: 15 00 00 00 00 00 00 00 00 diff --git a/xorg-gtest-noserver.patch b/xorg-gtest-noserver.patch new file mode 100644 index 0000000..5c84190 --- /dev/null +++ b/xorg-gtest-noserver.patch @@ -0,0 +1,31 @@ +--- xorg-gtest-0.5.0/configure.ac.orig 2012-10-02 06:14:45.000000000 +0200 ++++ xorg-gtest-0.5.0/configure.ac 2012-10-12 19:52:38.641817153 +0200 +@@ -53,27 +53,7 @@ + AC_SUBST(SOURCEDIR, ['${prefix}/src/xorg-gtest']) + AC_SUBST(DUMMY_CONF_PATH, ['${datarootdir}/xorg/gtest/dummy.conf']) + +-# Check if we can build integration tests +-AS_IF([test "x$enable_integration_tests" != xno], +- [AC_MSG_CHECKING([for X.org server])] +- [PKG_CHECK_EXISTS([xorg-server], +- [have_xorg_server=yes], +- [have_xorg_server=no])] +- [AC_MSG_RESULT([$have_xorg_server])]) +-AS_IF([test "x$enable_integration_tests" = xyes -a \ +- "x$have_xorg_server" != xyes], +- [AC_MSG_ERROR([X.org server required for integration tests])]) +- +-AS_IF([test "x$have_xorg_server" = xyes], +- [MODULES=`$PKG_CONFIG --variable=moduledir --print-errors xorg-server` +- test "x$?" = "x0" && have_modules=yes]) +-AS_IF([test "x$have_modules" = xyes], +- [AC_CHECK_FILE([$MODULES/drivers/dummy_drv.so], [have_dummy_module=yes])]) +-AS_IF([test "x$enable_integration_tests" = xyes -a \ +- "x$have_dummy_module" != xyes], +- [AC_MSG_ERROR([X.org Dummy video driver required for integration tests])]) +- +-AM_CONDITIONAL(ENABLE_XORG_GTEST_TESTS, [test "x$have_dummy_module" = xyes ]) ++AM_CONDITIONAL(ENABLE_XORG_GTEST_TESTS, [true]) + + AC_CONFIG_FILES([Makefile + aclocal/Makefile ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-gtest.git/commitdiff/05d2fe3be9607017133edf0e04a0be68099191b0 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit