From a3279a9bf589ef16c803abb85f867605a29222c1458299e00101c49b202a96a7 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 30 Oct 2009 16:00:09 +0000 Subject: [PATCH] Accepting request 23400 from X11:XOrg Copy from X11:XOrg/libdrm based on submit request 23400 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/23400 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdrm?expand=0&rev=18 --- enable_test_tools.diff | 36 ++++++++++++++++++++++++++++++++++++ libdrm.changes | 7 +++++++ libdrm.spec | 8 +++++++- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 enable_test_tools.diff diff --git a/enable_test_tools.diff b/enable_test_tools.diff new file mode 100644 index 0000000..8b9ab8f --- /dev/null +++ b/enable_test_tools.diff @@ -0,0 +1,36 @@ +diff -x .deps -x Makefile.in -x Makefile -u -p -r tests.orig//Makefile.am tests/Makefile.am +--- tests.orig//Makefile.am 2009-10-29 10:42:14.000000000 +0000 ++++ tests/Makefile.am 2009-10-29 10:48:29.000000000 +0000 +@@ -4,7 +4,7 @@ AM_CPPFLAGS = \ + + LDADD = $(top_builddir)/libdrm/libdrm.la + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + dristat \ + drmstat + +diff -x .deps -x Makefile.in -x Makefile -u -p -r tests.orig//modeprint/Makefile.am tests/modeprint/Makefile.am +--- tests.orig//modeprint/Makefile.am 2009-10-29 10:42:14.000000000 +0000 ++++ tests/modeprint/Makefile.am 2009-10-29 10:50:16.000000000 +0000 +@@ -3,7 +3,7 @@ AM_CFLAGS = \ + -I$(top_srcdir)/libdrm/intel/ \ + -I$(top_srcdir)/libdrm + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + modeprint + + modeprint_SOURCES = \ +diff -x .deps -x Makefile.in -x Makefile -u -p -r tests.orig//modetest/Makefile.am tests/modetest/Makefile.am +--- tests.orig//modetest/Makefile.am 2009-10-29 10:42:14.000000000 +0000 ++++ tests/modetest/Makefile.am 2009-10-29 10:50:33.000000000 +0000 +@@ -4,7 +4,7 @@ AM_CFLAGS = \ + -I$(top_srcdir)/libdrm \ + $(CAIRO_CFLAGS) + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + modetest + + modetest_SOURCES = \ diff --git a/libdrm.changes b/libdrm.changes index 83060f5..b1f1857 100644 --- a/libdrm.changes +++ b/libdrm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 29 11:54:08 CET 2009 - sndirsch@suse.de + +- enable_test_tools.diff + * enabled build of test tools (dristat, drmstat, modeprint, + modeset) + ------------------------------------------------------------------- Tue Sep 29 20:56:36 CEST 2009 - sndirsch@suse.de diff --git a/libdrm.spec b/libdrm.spec index db49854..01528a3 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -32,9 +32,10 @@ Obsoletes: libdrm-64bit %endif # Version: 2.4.14 -Release: 1 +Release: 2 Summary: Userspace Interface for Kernel DRM Services Source: %{name}-%{version}.tar.bz2 +Patch: enable_test_tools.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -114,6 +115,7 @@ Authors: %prep %setup -q +%patch %build autoreconf -fi @@ -139,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_lib}/libdrm_intel.so.1.0.0 /usr/%{_lib}/libdrm_nouveau.so.1 /usr/%{_lib}/libdrm_nouveau.so.1.0.0 +/usr/bin/dristat +/usr/bin/drmstat +/usr/bin/modeprint +/usr/bin/modetest %files devel %defattr(-,root,root)