[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     f87f590afbffa3eb8d347eab9ddb12891197579e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 09:12:52 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 22:43:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87f590a

media-sound/xmms2: tidy patches, remove unused perl patch

Only tidying patches that will still be using, others
are due for cleanup.

Perl patch was kept in a "need porting" state but
perl-core/ExtUtils-ParseXS is gone from the tree and
so should the issues it was causing.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-sound/xmms2/files/xmms2-0.8-rtvg.patch       |  5 ---
 .../files/xmms2-0.8DrO_o-waflib-fix-perl.patch     | 27 -----------
 .../files/xmms2-0.8_p20161122-cpp-client.patch     | 52 ----------------------
 .../xmms2/files/xmms2-0.8_p20161122-faad.patch     |  2 -
 .../xmms2/files/xmms2-0.8_p20161122-mac-4.patch    | 18 ++------
 5 files changed, 3 insertions(+), 101 deletions(-)

diff --git a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
index 20be3427388..e0a970c9186 100644
--- a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
+++ b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
@@ -3,10 +3,7 @@ Add knob to disable valgrind at test runtime.
 When valgrind is installed in system but is not
 working we should still be able to run tests.
 
-Reported-by: Diego Elio Pettenò
 Bug: https://bugs.gentoo.org/424377
-diff --git a/waftools/unittest.py b/waftools/unittest.py
-index 4317287..6179dfd 100644
 --- a/waftools/unittest.py
 +++ b/waftools/unittest.py
 @@ -64,7 +64,8 @@ def generate_coverage(bld):
@@ -19,8 +16,6 @@ index 4317287..6179dfd 100644
      conf.find_program("lcov", var="LCOV", mandatory=False)
      conf.find_program("genhtml", var="GENHTML", mandatory=False)
  
-diff --git a/wscript b/wscript
-index 99c1fa3..a98d5e3 100644
 --- a/wscript
 +++ b/wscript
 @@ -501,6 +501,10 @@ def options(opt):

diff --git a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch
deleted file mode 100644
index 220e91e6813..00000000000
--- a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix build failure when user has non-core xsubpp.
-
-> Could not find a typemap for C type 'xmmsv_t *' in XMMSClientPlaylist.xs, line 132
-> Undefined subroutine &ExtUtils::ParseXS::errors called at /usr/lib/perl5/5.12.4/ExtUtils/xsubpp line 41.
-> Undefined subroutine &ExtUtils::ParseXS::errors called at /usr/lib/perl5/5.12.4/ExtUtils/xsubpp line 41.
-> Could not find a typemap for C type 'const unsigned char *' in XMMSClient.xs, line 1179
-
-Use xsubpp from @INC instead of bundled one with perl.
-
-Original bug: https://bugs.gentoo.org/380469
-Related: https://bugs.gentoo.org/378783
-Updated for perl-5.20.2: https://bugs.gentoo.org/578778
-diff --git a/waflib/Tools/perl.py b/waflib/Tools/perl.py
-index 2c69fe5..a75b069 100644
---- a/waflib/Tools/perl.py
-+++ b/waflib/Tools/perl.py
-@@ -60,8 +60,8 @@ def check_perl_ext_devel(self):
- 	env['LINKFLAGS_PERLEXT']=read_out(" -MConfig -e'print $Config{lddlflags}'")
- 	env['INCLUDES_PERLEXT']=read_out(" -MConfig -e'print \"$Config{archlib}/CORE\"'")
- 	env['CFLAGS_PERLEXT']=read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'")
--	env['XSUBPP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'")
--	env['EXTUTILS_TYPEMAP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'")
-+	env["XSUBPP"]           = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::xsubpp\")'")
-+	env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::typemap\")'")
- 	if not getattr(Options.options,'perlarchdir',None):
- 		env['ARCHDIR_PERL']=self.cmd_and_log(perl+" -MConfig -e'print $Config{sitearch}'")
- 	else:

diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
index cedc87fcc46..df1d1c61657 100644
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
@@ -1,57 +1,8 @@
 https://github.com/xmms2/xmms2-devel/pull/5
 
-From 82741bf3094c8e0bca8eb1b7f3bc147eeb51ea06 Mon Sep 17 00:00:00 2001
 From: Sergei Trofimovich <slyfox@gentoo.org>
 Date: Thu, 6 Dec 2018 07:19:08 +0000
 Subject: [PATCH] OTHER: fix c++ client dangling reference
-
-On #xmm2 Chewi reported c++/tut7 to be broken at start:
-
-```
-GLib-WARNING **: glib-2.56.2/glib/giounix.c:410
-Error while getting flags for FD: Bad file descriptor (9)
-```
-
-valgrind shows the problem as read of uninitialized data:
-
-```
-$ valgrind ./tut7
-
-==32268== Conditional jump or move depends on uninitialised value(s)
-==32268==    at 0x49DC36B: xmmsc_mainloop_gmain_init (xmmsclient-glib.c:80)
-==32268==    by 0x49E11BE: Xmms::GMainloop::GMainloop(xmmsc_connection_St*) (xmmsclient++-glib.cpp:11)
-==32268==    by 0x10C64D: main (in /home/slyfox/dev/git/xmms2-devel/doc/tutorial/c++/tut7)
-==32268==  Uninitialised value was created by a stack allocation
-==32268==    at 0x49E119A: Xmms::GMainloop::GMainloop(xmmsc_connection_St*) (xmmsclient++-glib.cpp:8)
-```
-
-This happens due to use of dangling C++ reference to stack variable:
-
-```
-// somewhere in src/include/xmmsclient/xmmsclient++/mainloop.h
-class MainloopInterface {
-    MainloopInterface( xmmsc_connection_t* conn ) :
-        running_( false ), conn_( conn ) { }
-  protected:
-    bool running_;
-    xmmsc_connection_t*& conn_;
-}
-```
-
-Note: `conn_` refers to dangling local variable of
-`MainloopInterface::MainloopInterface` constructor.
-
-The fix is to pass through pointer reference.
-`MainLoop::MainLoop()` already does it.
-
-Reported-by: James Le Cuirot
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/include/xmmsclient/xmmsclient++/mainloop.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/include/xmmsclient/xmmsclient++/mainloop.h b/src/include/xmmsclient/xmmsclient++/mainloop.h
-index de97e20d..268ca6f7 100644
 --- a/src/include/xmmsclient/xmmsclient++/mainloop.h
 +++ b/src/include/xmmsclient/xmmsclient++/mainloop.h
 @@ -41,7 +41,7 @@ namespace Xmms
@@ -63,6 +14,3 @@ index de97e20d..268ca6f7 100644
  				running_( false ), conn_( conn ) { }
  
  			/** Destructor.  Should also stop the loop.
--- 
-2.19.2
-

diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
index 00aa5d77082..2a206b913fe 100644
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
@@ -4,8 +4,6 @@ it. I've run XMMS2 with this patch for months without issue.
 
 -- Chewi
 
-diff --git a/src/plugins/faad/faad.c b/src/plugins/faad/faad.c
-index 50835d27..7074e1b5 100644
 --- a/src/plugins/faad/faad.c
 +++ b/src/plugins/faad/faad.c
 @@ -242,7 +242,6 @@ xmms_faad_init (xmms_xform_t *xform)

diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
index df3e4d2af85..9785b4198d5 100644
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
@@ -1,15 +1,8 @@
-From e87745721deaf46d7054ac40cc55838561c9f552 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= <cJ@zougloub.eu>
+https://github.com/xmms2/xmms2-devel/pull/2
+
+From: Jérôme Carretero <cJ@zougloub.eu>
 Date: Tue, 24 Oct 2017 18:43:26 -0400
 Subject: [PATCH] plugins: mac: support newer mac API version
-
----
- src/plugins/mac/mac.cpp          | 6 +++++-
- src/plugins/mac/source_adapter.h | 8 +++++++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/mac/mac.cpp b/src/plugins/mac/mac.cpp
-index cec43e52..d8d3d1b9 100644
 --- a/src/plugins/mac/mac.cpp
 +++ b/src/plugins/mac/mac.cpp
 @@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform)
@@ -26,8 +19,6 @@ index cec43e52..d8d3d1b9 100644
  				memset (field_value, 0, 255);
  				int size = 255;
  				p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE);
-diff --git a/src/plugins/mac/source_adapter.h b/src/plugins/mac/source_adapter.h
-index 94f75359..70617514 100644
 --- a/src/plugins/mac/source_adapter.h
 +++ b/src/plugins/mac/source_adapter.h
 @@ -38,7 +38,13 @@ public:
@@ -45,6 +36,3 @@ index 94f75359..70617514 100644
  	int Close () { return ERROR_SUCCESS; }
  
  	// read / write
--- 
-2.15.0
-