[gentoo-commits] repo/gentoo:master commit in: media-libs/audiofile/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/audiofile/files/

[Lars Wendler]

commit:     7bdad57c38b8d002a1adc5d3d73cbd4ea6c6ccea
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 23 05:39:42 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 16:59:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bdad57c

media-libs/audiofile: Fix dependence on bundled gtest

Removes the last vestiges of autotools' dependence on the bundled gtest
and fixes the build to correct testing without USE="static-libs".

Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Closes: https://bugs.gentoo.org/511882
Closes: https://github.com/gentoo/gentoo/pull/9953
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/audiofile-0.3.6-system-gtest.patch       | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

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
index 31e77e11271..f2421bdfcac 100644
--- a/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch
+++ b/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch
@@ -1,3 +1,38 @@
+--- 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 @@

[gentoo-commits] repo/gentoo:master commit in: media-libs/audiofile/files/

[Lars Wendler]

commit:     9e3ac4da44223dd11e0f948d98a42b87595c8590
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 23 05:17:48 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 16:59:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e3ac4da

media-libs/audiofile: Fix audiofile-0.3.6-CVE-2015-7747.patch

Fixes audiofile-0.3.6-CVE-2015-7747.patch which
otherwise depends on changes from a previous Debian patch.

Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9953
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch b/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch
index 33256395910..4f1a0d95bec 100644
--- a/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch
+++ b/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch
@@ -35,7 +35,7 @@ Bug-Debian: https://bugs.debian.org/801102
  
 --- /dev/null
 +++ b/test/sixteen-stereo-to-eight-mono.c
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,117 @@
 +/*
 +	Audio File Library
 +
@@ -95,8 +95,8 @@ Bug-Debian: https://bugs.debian.org/801102
 +	afInitSampleFormat(setup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
 +	afInitChannels(setup, AF_DEFAULT_TRACK, 2);
 +
-+	char *testFileName;
-+	if (!createTemporaryFile("sixteen-to-eight", &testFileName))
++	char testFileName[PATH_MAX];
++	if (!createTemporaryFile("sixteen-to-eight", testFileName))
 +	{
 +		fprintf(stderr, "Could not create temporary file.\n");
 +		exit(EXIT_FAILURE);
@@ -150,7 +150,6 @@ Bug-Debian: https://bugs.debian.org/801102
 +
 +	afCloseFile(file);
 +	unlink(testFileName);
-+	free(testFileName);
 +
 +	exit(EXIT_SUCCESS);
 +}

[gentoo-commits] repo/gentoo:master commit in: media-libs/audiofile/files/

[Aaron Bauman]

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
- 

[gentoo-commits] repo/gentoo:master commit in: media-libs/audiofile/files/

[Sam James]

commit:     7a3620bbf11ca091249fb40f523f0f3444d9065f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  9 00:47:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  9 00:47:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3620bb

media-libs/audiofile: add upstream bug ref to patch

Bug: https://bugs.gentoo.org/914349
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/audiofile/files/audiofile-0.3.6-clang-deprecation.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/audiofile/files/audiofile-0.3.6-clang-deprecation.patch b/media-libs/audiofile/files/audiofile-0.3.6-clang-deprecation.patch
index bccb9c1948e9..1fd2655d2e80 100644
--- a/media-libs/audiofile/files/audiofile-0.3.6-clang-deprecation.patch
+++ b/media-libs/audiofile/files/audiofile-0.3.6-clang-deprecation.patch
@@ -1,3 +1,4 @@
+https://github.com/mpruett/audiofile/issues/65
 https://bugs.gentoo.org/914349
 --- a/libaudiofile/modules/SimpleModule.h
 +++ b/libaudiofile/modules/SimpleModule.h