diff options
-rw-r--r-- | media-libs/libvorbis/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/libvorbis/files/libvorbis-1.2.3-optional_examples_and_tests.patch | 46 |
2 files changed, 51 insertions, 1 deletions
diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog index e3796a5b8976..366e933a4d53 100644 --- a/media-libs/libvorbis/ChangeLog +++ b/media-libs/libvorbis/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libvorbis # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.118 2009/07/10 15:41:17 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.119 2009/07/22 22:29:02 ssuominen Exp $ + + 22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> libvorbis-1.2.3.ebuild: + Compile test/ only if "make check" is called. Compile examples/ only if + --enable-examples is passed wrt #226285. *libvorbis-1.2.3 (10 Jul 2009) diff --git a/media-libs/libvorbis/files/libvorbis-1.2.3-optional_examples_and_tests.patch b/media-libs/libvorbis/files/libvorbis-1.2.3-optional_examples_and_tests.patch new file mode 100644 index 000000000000..141be680331e --- /dev/null +++ b/media-libs/libvorbis/files/libvorbis-1.2.3-optional_examples_and_tests.patch @@ -0,0 +1,46 @@ +diff -ur libvorbis-1.2.3.orig/configure.ac libvorbis-1.2.3/configure.ac +--- libvorbis-1.2.3.orig/configure.ac 2009-07-09 13:02:25.000000000 +0300 ++++ libvorbis-1.2.3/configure.ac 2009-07-23 01:08:54.000000000 +0300 +@@ -77,6 +77,11 @@ + + AM_CONDITIONAL(BUILD_DOCS, [test "x$enable_docs" = xyes]) + ++AC_ARG_ENABLE(examples, ++ AS_HELP_STRING([--enable-examples], [build the examples])) ++ ++AM_CONDITIONAL(BUILD_EXAMPLES, [test "x$enable_examples" = xyes]) ++ + dnl -------------------------------------------------- + dnl Set build flags based on environment + dnl -------------------------------------------------- +diff -ur libvorbis-1.2.3.orig/Makefile.am libvorbis-1.2.3/Makefile.am +--- libvorbis-1.2.3.orig/Makefile.am 2008-02-20 22:33:47.000000000 +0200 ++++ libvorbis-1.2.3/Makefile.am 2009-07-23 01:09:09.000000000 +0300 +@@ -2,7 +2,11 @@ + + AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2 + +-SUBDIRS = m4 include vq lib examples test doc ++SUBDIRS = m4 include vq lib test doc ++ ++if BUILD_EXAMPLES ++SUBDIRS += examples ++endif + + m4datadir = $(datadir)/aclocal + m4data_DATA = vorbis.m4 +diff -ur libvorbis-1.2.3.orig/test/Makefile.am libvorbis-1.2.3/test/Makefile.am +--- libvorbis-1.2.3.orig/test/Makefile.am 2008-04-25 22:14:29.000000000 +0300 ++++ libvorbis-1.2.3/test/Makefile.am 2009-07-23 01:01:37.000000000 +0300 +@@ -4,9 +4,9 @@ + + INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@ + +-noinst_PROGRAMS = test ++check_PROGRAMS = test + +-check: $(noinst_PROGRAMS) ++check: $(check_PROGRAMS) + ./test$(EXEEXT) + + test_SOURCES = util.c util.h write_read.c write_read.h test.c |