From 5145ecf77413005d8deeb6fe7cf5590434672bc3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 8 Jun 2011 14:28:56 +0200 Subject: [PATCH] Update patch for libva-1.0.13 --- 101_dont_install_test_programs.patch | 58 ---------------------------- libva-1.0.13-backport.patch | 38 ++++++++++++++++++ 2 files changed, 38 insertions(+), 58 deletions(-) delete mode 100644 101_dont_install_test_programs.patch create mode 100644 libva-1.0.13-backport.patch diff --git a/101_dont_install_test_programs.patch b/101_dont_install_test_programs.patch deleted file mode 100644 index 624ba52..0000000 --- a/101_dont_install_test_programs.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit 16864159654cb6c77b3db36dd218e4103e3bd0c2 -Author: Gwenole Beauchesne -Date: Thu Jun 3 09:23:45 2010 +0200 - - Don't install test programs. - -diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am -index a2519a2..8022a36 100644 ---- a/test/basic/Makefile.am -+++ b/test/basic/Makefile.am -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ -+check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ - test_07 test_08 test_09 test_10 test_11 - - AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 -diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am -index ea30643..23a086f 100644 ---- a/test/decode/Makefile.am -+++ b/test/decode/Makefile.am -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = mpeg2vldemo -+check_PROGRAMS = mpeg2vldemo - - AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 - -diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am -index 80c882a..98b2bc4 100644 ---- a/test/encode/Makefile.am -+++ b/test/encode/Makefile.am -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = h264encode -+check_PROGRAMS = h264encode - - AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 - -diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am -index fe18388..d06006c 100644 ---- a/test/putsurface/Makefile.am -+++ b/test/putsurface/Makefile.am -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = putsurface -+check_PROGRAMS = putsurface - - AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 - diff --git a/libva-1.0.13-backport.patch b/libva-1.0.13-backport.patch new file mode 100644 index 0000000..3f1b759 --- /dev/null +++ b/libva-1.0.13-backport.patch @@ -0,0 +1,38 @@ +From 910c51dcae81d4157748cb09798acb958da312ac Mon Sep 17 00:00:00 2001 +From: Austin Yuan +Date: Wed, 08 Jun 2011 01:48:19 +0000 +Subject: test/basic testing programs do not need to be installed + +in /usr/bin; one can run make valgrind here as a check, +or run them under make check too. + +From gimli at dark-green.com + +Signed-off-by: Austin Yuan +--- +diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am +index a2519a2..c84c264 100644 +--- a/test/basic/Makefile.am ++++ b/test/basic/Makefile.am +@@ -20,7 +20,7 @@ + # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ ++check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ + test_07 test_08 test_09 test_10 test_11 + + AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 +@@ -62,7 +62,7 @@ test_11_SOURCES = test_11.c + + EXTRA_DIST = test_common.c + +-valgrind: $(bin_PROGRAMS) +- for a in $(bin_PROGRAMS); do \ ++valgrind: $(check_PROGRAMS) ++ for a in $(check_PROGRAMS); do \ + valgrind --leak-check=full --show-reachable=yes .libs/$$a; \ + done +-- +cgit v0.8.3-6-g21f6 +