[gentoo-commits] gentoo-x86 commit in media-libs/flac/files: flac-1.3.0-dontbuild-examples.patch flac-1.3.0-dontbuild-tests.patch flac-1.3.0-asneeded.patch

[Tim Harder (radhermit)]

radhermit    13/05/29 08:30:22

  Added:                flac-1.3.0-dontbuild-examples.patch
                        flac-1.3.0-dontbuild-tests.patch
                        flac-1.3.0-asneeded.patch
  Log:
  Version bump (bug #471598).
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

Revision  Changes    Path
1.1                  media-libs/flac/files/flac-1.3.0-dontbuild-examples.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/flac/files/flac-1.3.0-dontbuild-examples.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/flac/files/flac-1.3.0-dontbuild-examples.patch?rev=1.1&content-type=text/plain

Index: flac-1.3.0-dontbuild-examples.patch
===================================================================
--- flac-1.3.0/configure.ac
+++ flac-1.3.0/configure.ac
@@ -319,6 +319,12 @@
 fi
 AC_SUBST(OGG_PACKAGE)
 
+dnl Build examples?
+AC_ARG_ENABLE(examples,
+       AS_HELP_STRING([--disable-examples], [Don't build examples during make]),,
+       enable_examples="yes")
+AM_CONDITIONAL(EXAMPLES, [test "$enable_examples" = "yes"])
+
 dnl check for i18n(internationalization); these are from libiconv/gettext
 AM_ICONV
 AM_LANGINFO_CODESET
--- flac-1.3.0/Makefile.am
+++ flac-1.3.0/Makefile.am
@@ -31,7 +31,11 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = doc include m4 man src examples test build objs
+SUBDIRS = doc include m4 man src test build objs
+
+if EXAMPLES
+SUBDIRS += examples
+endif
 
 EXTRA_DIST = \
 	COPYING.FDL \



1.1                  media-libs/flac/files/flac-1.3.0-dontbuild-tests.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/flac/files/flac-1.3.0-dontbuild-tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/flac/files/flac-1.3.0-dontbuild-tests.patch?rev=1.1&content-type=text/plain

Index: flac-1.3.0-dontbuild-tests.patch
===================================================================
--- flac-1.3.0/src/test_grabbag/cuesheet/Makefile.am
+++ flac-1.3.0/src/test_grabbag/cuesheet/Makefile.am
@@ -21,7 +21,7 @@
 	test_cuesheet.vcproj
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
-noinst_PROGRAMS = test_cuesheet
+check_PROGRAMS = test_cuesheet
 test_cuesheet_SOURCES = \
 	main.c
 test_cuesheet_LDADD = \
--- flac-1.3.0/src/test_grabbag/picture/Makefile.am
+++ flac-1.3.0/src/test_grabbag/picture/Makefile.am
@@ -21,7 +21,7 @@
 	test_picture.vcproj
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
-noinst_PROGRAMS = test_picture
+check_PROGRAMS = test_picture
 test_picture_SOURCES = \
 	main.c
 
--- flac-1.3.0/src/test_libFLAC/Makefile.am
+++ flac-1.3.0/src/test_libFLAC/Makefile.am
@@ -22,7 +22,7 @@
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src/libFLAC/include
 
-noinst_PROGRAMS = test_libFLAC
+check_PROGRAMS = test_libFLAC
 
 if OS_IS_WINDOWS
 win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la
--- flac-1.3.0/src/test_libFLAC++/Makefile.am
+++ flac-1.3.0/src/test_libFLAC++/Makefile.am
@@ -21,7 +21,7 @@
 	test_libFLAC++.vcproj
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
-noinst_PROGRAMS = test_libFLAC++
+check_PROGRAMS = test_libFLAC++
 test_libFLAC___LDADD = \
 	$(top_builddir)/src/share/grabbag/libgrabbag.la \
 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
--- flac-1.3.0/src/test_seeking/Makefile.am
+++ flac-1.3.0/src/test_seeking/Makefile.am
@@ -24,7 +24,7 @@
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 
-noinst_PROGRAMS = test_seeking
+check_PROGRAMS = test_seeking
 test_seeking_LDADD = \
 	$(top_builddir)/src/libFLAC/libFLAC.la
 
--- flac-1.3.0/src/test_streams/Makefile.am
+++ flac-1.3.0/src/test_streams/Makefile.am
@@ -21,7 +21,7 @@
 	test_streams.vcproj
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
-noinst_PROGRAMS = test_streams
+check_PROGRAMS = test_streams
 test_streams_SOURCES = \
 	main.c
 



1.1                  media-libs/flac/files/flac-1.3.0-asneeded.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/flac/files/flac-1.3.0-asneeded.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/flac/files/flac-1.3.0-asneeded.patch?rev=1.1&content-type=text/plain

Index: flac-1.3.0-asneeded.patch
===================================================================
--- flac-1.3.0/src/flac/Makefile.am
+++ flac-1.3.0/src/flac/Makefile.am
@@ -51,7 +51,7 @@
 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
 	$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
-	@LIBICONV@ \
+	@LTLIBICONV@ \
 	-lm
 
 CLEANFILES = flac.exe
--- flac-1.3.0/src/metaflac/Makefile.am
+++ flac-1.3.0/src/metaflac/Makefile.am
@@ -48,6 +48,6 @@
 	$(top_builddir)/src/share/getopt/libgetopt.la \
 	$(top_builddir)/src/share/utf8/libutf8.la \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
-	@LIBICONV@
+	@LTLIBICONV@
 
 CLEANFILES = metaflac.exe