commit: 92e41e2c1a285e01a156cfe2b817202d10d73198 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Aug 3 16:59:35 2020 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Mon Aug 10 23:14:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e41e2c
media-libs/audiofile: remove unused patch Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16980 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../files/audiofile-0.3.6-system-gtest.patch | 141 --------------------- 1 file changed, 141 deletions(-) diff --git a/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch b/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch deleted file mode 100644 index f2421bdfcac..00000000000 --- a/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- audiofile-0.3.6/configure.ac -+++ audiofile-0.3.6/configure.ac -@@ -160,7 +160,6 @@ - audiofile-uninstalled.pc - sfcommands/Makefile - test/Makefile -- gtest/Makefile - examples/Makefile - libaudiofile/Makefile - libaudiofile/alac/Makefile ---- audiofile-0.3.6/libaudiofile/Makefile.am -+++ audiofile-0.3.6/libaudiofile/Makefile.am -@@ -108,10 +108,9 @@ - TESTS_ENVIRONMENT = $(top_builddir)/libtool --mode=execute $(VALGRIND) $(VALGRIND_FLAGS) - endif - --LIBGTEST = ../gtest/libgtest.la - --UnitTests_SOURCES = modules/UT_RebufferModule.cpp --UnitTests_LDADD = libaudiofile.la $(LIBGTEST) -+UnitTests_SOURCES = modules/UT_RebufferModule.cpp $(libaudiofile_la_SOURCES) -+UnitTests_LDADD = $(libaudiofile_la_LIBADD) -lgtest - UnitTests_CPPFLAGS = -I$(top_srcdir) - UnitTests_CXXFLAGS = -fno-rtti -fno-exceptions -DGTEST_HAS_RTTI=0 -DGTEST_HAS_EXCEPTIONS=0 - UnitTests_LDFLAGS = -static ---- audiofile-0.3.6/Makefile.am -+++ audiofile-0.3.6/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --SUBDIRS = gtest libaudiofile sfcommands test examples docs -+SUBDIRS = libaudiofile sfcommands test examples docs - - EXTRA_DIST = \ - ACKNOWLEDGEMENTS \ ---- audiofile-0.3.6/test/Makefile.am -+++ audiofile-0.3.6/test/Makefile.am -@@ -59,79 +59,77 @@ - - DEPENDENCIES = $(LIBAUDIOFILE) - --LIBGTEST = ../gtest/libgtest.la -- - ADPCM_SOURCES = ADPCM.cpp TestUtilities.cpp TestUtilities.h --ADPCM_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+ADPCM_LDADD = -lgtest $(LIBAUDIOFILE) - - AES_SOURCES = AES.cpp TestUtilities.cpp TestUtilities.h --AES_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+AES_LDADD = -lgtest $(LIBAUDIOFILE) - - ALAC_SOURCES = ALAC.cpp Lossless.h TestUtilities.cpp TestUtilities.h --ALAC_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+ALAC_LDADD = -lgtest $(LIBAUDIOFILE) - - ChannelMatrix_SOURCES = ChannelMatrix.cpp TestUtilities.cpp TestUtilities.h --ChannelMatrix_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+ChannelMatrix_LDADD = -lgtest $(LIBAUDIOFILE) - - Error_SOURCES = Error.cpp TestUtilities.cpp TestUtilities.h --Error_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+Error_LDADD = -lgtest $(LIBAUDIOFILE) - - FLAC_SOURCES = FLAC.cpp Lossless.h TestUtilities.cpp TestUtilities.h --FLAC_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+FLAC_LDADD = -lgtest $(LIBAUDIOFILE) - - FloatToInt_SOURCES = FloatToInt.cpp TestUtilities.cpp TestUtilities.h --FloatToInt_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+FloatToInt_LDADD = -lgtest $(LIBAUDIOFILE) - - Instrument_SOURCES = Instrument.cpp TestUtilities.cpp TestUtilities.h --Instrument_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+Instrument_LDADD = -lgtest $(LIBAUDIOFILE) - - IntToFloat_SOURCES = IntToFloat.cpp TestUtilities.cpp TestUtilities.h --IntToFloat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+IntToFloat_LDADD = -lgtest $(LIBAUDIOFILE) - - InvalidCompressionFormat_SOURCES = InvalidCompressionFormat.cpp TestUtilities.cpp TestUtilities.h --InvalidCompressionFormat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+InvalidCompressionFormat_LDADD = -lgtest $(LIBAUDIOFILE) - - InvalidSampleFormat_SOURCES = InvalidSampleFormat.cpp TestUtilities.cpp TestUtilities.h --InvalidSampleFormat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+InvalidSampleFormat_LDADD = -lgtest $(LIBAUDIOFILE) - - Large_SOURCES = Large.cpp TestUtilities.cpp TestUtilities.h --Large_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+Large_LDADD = -lgtest $(LIBAUDIOFILE) - - Loop_SOURCES = Loop.cpp TestUtilities.cpp TestUtilities.h --Loop_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+Loop_LDADD = -lgtest $(LIBAUDIOFILE) - - Marker_SOURCES = Marker.cpp TestUtilities.cpp TestUtilities.h --Marker_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+Marker_LDADD = -lgtest $(LIBAUDIOFILE) - - Miscellaneous_SOURCES = Miscellaneous.cpp TestUtilities.cpp TestUtilities.h --Miscellaneous_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+Miscellaneous_LDADD = -lgtest $(LIBAUDIOFILE) - - NeXT_SOURCES = NeXT.cpp TestUtilities.cpp TestUtilities.h --NeXT_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+NeXT_LDADD = -lgtest $(LIBAUDIOFILE) - - PCMData_SOURCES = PCMData.cpp TestUtilities.cpp TestUtilities.h --PCMData_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+PCMData_LDADD = -lgtest $(LIBAUDIOFILE) - - PCMMapping_SOURCES = PCMMapping.cpp TestUtilities.cpp TestUtilities.h --PCMMapping_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+PCMMapping_LDADD = -lgtest $(LIBAUDIOFILE) - - Pipe_SOURCES = Pipe.cpp TestUtilities.cpp TestUtilities.h --Pipe_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+Pipe_LDADD = -lgtest $(LIBAUDIOFILE) - - Query_SOURCES = Query.cpp TestUtilities.cpp TestUtilities.h --Query_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+Query_LDADD = -lgtest $(LIBAUDIOFILE) - - SampleFormat_SOURCES = SampleFormat.cpp TestUtilities.cpp TestUtilities.h --SampleFormat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+SampleFormat_LDADD = -lgtest $(LIBAUDIOFILE) - - Seek_SOURCES = Seek.cpp TestUtilities.cpp TestUtilities.h --Seek_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+Seek_LDADD = -lgtest $(LIBAUDIOFILE) - - Sign_SOURCES = Sign.cpp TestUtilities.cpp TestUtilities.h --Sign_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+Sign_LDADD = -lgtest $(LIBAUDIOFILE) - - VirtualFile_SOURCES = VirtualFile.cpp TestUtilities.cpp TestUtilities.h --VirtualFile_LDADD = $(LIBGTEST) $(LIBAUDIOFILE) -+VirtualFile_LDADD = -lgtest $(LIBAUDIOFILE) - - floatto24_SOURCES = floatto24.c TestUtilities.cpp TestUtilities.h -
