gentoo resync : 17.02.2021

6 files changed, 0 insertions, 178 deletions

diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index e62306d02cf7..f61729420c24 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -1,8 +1,3 @@
-AUX ohnet.makefile.patch 1233 BLAKE2B 1a877c58ec3b37c96dd4ea3830159de8bc3c34cd99223881baf73792569301a3eb82ce5c51e2c943773a4b2a491affa9228994e05d358a674a313b6fe3f14d3f SHA512 d2b99fa95403139a2b79ac4eacd0a1a8581c1a72271a6ae15fa7c3a241ebe58cccdf6a85bba602ace9f572c217f5bf1f01b95a12ad4395b42d4738243dee1b89
-AUX ohnet.optionparser.patch 449 BLAKE2B 55133d193ebb7dc249f71ad8d249b22569c03456e0ad687e3af27e88ed0502e134b8e70128cae4fe1d92b503e52f94c8d567159fca9ff6133f99b25c791044f9 SHA512 fe723ee9f734b5ae3a5d1a2ee3c0cb22b887d154314cc776253d14adff20de86d51a8563ba1dfb2b0f37a9c77e24277d961c45941e23a644f2769a17d050d665
-AUX ohnetgenerated.commonmk.patch 1473 BLAKE2B 6d2d8497fcd7e4e9e0f2210fc24308eab4559f8974f3e6f2d6e39163a54fb7b848455d496b0191e7260c83dc27bdb96e0f1bcbaa124165b3de603b22e5adabea SHA512 a9b6b8e2d23ca661c7590fb55c34b02a248fb4b95b843e4d87fd11ec08b360fcc386d7738fd3a6433bec22cdaaa81932b81342c19d99ac5673dcfb6c29215c9f
-AUX ohnetgenerated.makefile.patch 1138 BLAKE2B a65ff04a64c64ad86625f635990615271a206cb4657fb7eef423a0b04d1718b113eaab0aa57b1b52f7235ec8a1f41dcd6a8f2e949ae45336dd1c55380a19f791 SHA512 4bcd0e5044fd89a51a9be29f2f445f59292a8b36a249f09a74aa9a7ff215b6359be8a526e1ddf9b1c7fab56f6e2453afe5841b543552fe3abf78ce5c84b25e9c
-AUX sc2mpd-1.1.5-werror.patch 4448 BLAKE2B d41c363b6db9ab7b3170e7adf6ebd9e72d94d8e708ecc5a273765ba922b8098f7f706a2245b9f23f8146d253d6c7ad2ac00b28199eb8609be6af121b42c32150 SHA512 ea7805a2a572bd8995418115ea5c256a6897d787dbacc7d31482b39672c78b3b25bc087acb6cf1d0945bacaebed4112e1de19e9484e556978c6c851dac2cac30
 AUX sc2mpd-1.1.7-python.patch 4186 BLAKE2B 8037ab9b33d25a65ec4b72b616de23c8ab12f3e93d6fe3b607039b0ad3f69f3aa37d6e7b39dc0b91767b953307464c7bd9066dc8210ef2a4c3090ad01ece220c SHA512 45b17410a6499cefd7b596c08e5fee288f16a3057e1c84da96e6388132a2fb56060f2010b65ffa38cbef0d179f8fe1c6f88da9d355f177e5524ca674bbdf0b75
 AUX sc2mpd-1.1.7-werror.patch 4237 BLAKE2B f3922de425df679e9b9e7c5249994a39e9fcda6a539f1b3d084ece8f44c8e81546b975375ca3fd8d0e81504bb712791bc99e1aa139d422805ef7dd16d79d8f16 SHA512 28d6ca71fc41ed11fab780f48861f04b28d853240107db2eed6911f3e58710e50e31bbc3f3d5c047599c1d1e544a921bc4ea4bc37e5900a02a4092c7de520fe5
 DIST openhome-sc2-20200704.tar.gz 22352681 BLAKE2B a5131f3b5c3400ff0ca58f0ce9b45c25db6fc13dcf6827ed9e4531effd3b35026d59495adf690ba65c09624c12f7755b9373ec4e4309de73f17fdeb866beeba7 SHA512 04586fbfd8053c7f01d2c3dbf421f75d0d93ac179cf5f58bc7966d364a3477a87985a1a2db1b35018aa5193a07977b7b4be60d317e7c10b275234adf9a2bd5d2
diff --git a/media-sound/sc2mpd/files/ohnet.makefile.patch b/media-sound/sc2mpd/files/ohnet.makefile.patch
deleted file mode 100644
index 29a29bcc9bb5..000000000000
--- a/media-sound/sc2mpd/files/ohnet.makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 29f2d6a..038b05e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -82,12 +82,19 @@ else
-     ifneq (,$(findstring arm,$(gcc_machine)))
-         ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
-             detected_openhome_architecture = armhf
-+        else ifneq (,$(findstring armv7hl,$(gcc_machine)))
-+            # cubox: armv7hl-redhat-linux-gnueabi
-+            detected_openhome_architecture = armhf
-         else ifeq (${detected_openhome_system},Qnap)
-             detected_openhome_architecture = x19
-         else
-             detected_openhome_architecture = armel
-         endif
-     endif
-+    ifneq (,$(findstring aarch64,$(gcc_machine)))
-+      # odroid64: aarch64-linux-gnu
-+      detected_openhome_architecture = arm64
-+    endif
-     ifneq (,$(findstring i686,$(gcc_machine)))
-       detected_openhome_architecture = x86
-     endif
-@@ -375,6 +382,10 @@ mkdir = mkdir -p
- rmdir = rm -rf
- uset4 = no
- 
-+# This avoids errors in Generated/Devices.mak (they apparently have no
-+# consequences anyway because we use make native_only=yes)
-+t4 = echo
-+
- ifeq ($(managed_only), yes)
- build_targets_base = make_obj_dir ohNet.net.dll CpProxyDotNetAssemblies DvDeviceDotNetAssemblies
- else
diff --git a/media-sound/sc2mpd/files/ohnet.optionparser.patch b/media-sound/sc2mpd/files/ohnet.optionparser.patch
deleted file mode 100644
index a31657684271..000000000000
--- a/media-sound/sc2mpd/files/ohnet.optionparser.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/OpenHome/TestFramework/OptionParser.cpp b/OpenHome/TestFramework/OptionParser.cpp
-index fe90233..644fc0b 100644
---- a/OpenHome/TestFramework/OptionParser.cpp
-+++ b/OpenHome/TestFramework/OptionParser.cpp
-@@ -282,6 +282,6 @@ void OptionParser::SetUsage(const TChar* aUsage)
- {
-     delete iUsage;
-     iUsage = NULL;
--    iUsage = new TChar[strlen(iUsage)];
-+    iUsage = new TChar[strlen(aUsage)];
-     (void)strcpy(iUsage, aUsage);
- }
diff --git a/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch b/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
deleted file mode 100644
index a4f28f9a7009..000000000000
--- a/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u ./Common.mak ../../openhome/ohNetGenerated/Common.mak
---- ./Common.mak	2017-09-19 10:51:13.000000000 +0200
-+++ ./Common.mak	2017-09-19 13:21:25.984071432 +0200
-@@ -17,20 +17,6 @@
- $(objdir)ohnet-generated.jar : CpProxyJavaClasses DvDeviceJavaClasses

- 	$(jar) $(jarflags) $(objdir)ohnet-generated.jar -C $(objdir) org

- 

--Generated$(dirsep)GenerateSourceFiles.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/UpnpMakeT4.tt

--	$(mkdir) Generated

--	$(t4) -o Generated$(dirsep)GenerateSourceFiles.mak OpenHome/Net/T4/Templates/UpnpMakeT4.tt -a xml:OpenHome/Net/Service/Services.xml

--	@echo Attention: a makefile has been re-generated.

--

--Generated$(dirsep)Proxies.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt

--	$(mkdir) Generated

--	$(t4) -o Generated$(dirsep)Proxies.mak OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt -a xml:OpenHome/Net/Service/Services.xml

--	@echo Attention: a makefile has been re-generated.

--

--Generated$(dirsep)Devices.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt

--	$(mkdir) Generated

--	$(t4) -o Generated$(dirsep)Devices.mak OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt -a xml:OpenHome/Net/Service/Services.xml

--	@echo Attention: a makefile has been re-generated.

- 

- native_targets = make_obj_dir copy_build_includes proxies devices

- 

diff --git a/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch b/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
deleted file mode 100644
index d320cefbd473..000000000000
--- a/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Makefile b/Makefile
-index bf7a1ba..49bffaf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -70,14 +70,17 @@ else
-     else ifneq (,$(findstring linux,$(gcc_machine)))
-       detected_openhome_system = Linux
-     endif
--    ifeq ($(gcc_machine),arm-none-linux-gnueabi)
--      detected_openhome_architecture = armel
--    endif
--    ifeq ($(gcc_machine),arm-linux-gnueabi)
--      detected_openhome_architecture = armel
--    endif
--    ifeq ($(gcc_machine),arm-linux-gnueabihf)
--      detected_openhome_architecture = armhf
-+    ifneq (,$(findstring arm,$(gcc_machine)))
-+        ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
-+            detected_openhome_architecture = armhf
-+        else ifneq (,$(findstring armv7hl,$(gcc_machine)))
-+            # cubox: armv7hl-redhat-linux-gnueabi
-+            detected_openhome_architecture = armhf
-+        else ifeq (${detected_openhome_system},Qnap)
-+            detected_openhome_architecture = x19
-+        else
-+            detected_openhome_architecture = armel
-+        endif
-     endif
-     ifneq (,$(findstring i686,$(gcc_machine)))
-       detected_openhome_architecture = x86
diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
deleted file mode 100644
index ecc415f91b54..000000000000
--- a/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur sc2mpd-1.1.5/work/openhome/ohNet/Makefile sc2mpd-1.1.5.altered/work/openhome/ohNet/Makefile
---- a/openhome/ohNet/Makefile   2020-11-16 20:49:27.220636318 -0600
-+++ b/openhome/ohNet/Makefile   2020-11-16 20:46:19.822974263 -0600
-@@ -310,13 +310,13 @@
- cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
- cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
- ifeq ($(nocpp11), yes)
--    cppflags = $(cflags_base) -Werror
-+    cppflags = $(cflags_base)
- else ifeq ($(platform),IntelMac)
--    cppflags = $(cflags_base) -std=c++11 -Werror
-+    cppflags = $(cflags_base) -std=c++11
- else
--    cppflags = $(cflags_base) -std=c++0x -Werror
-+    cppflags = $(cflags_base) -std=c++0x
- endif
--cflags = $(cflags_base) -Werror
-+cflags = $(cflags_base)
- inc_build = Build/Include
- includes = -IBuild/Include/ $(version_specific_includes)
- bundle_build = Build/Bundles
-@@ -371,7 +371,7 @@
-        jar = $(JAVA_HOME)/bin/jar
- endif
-
--java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
-+java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
- jarflags = cf
- dirsep = /
- prefix = /usr/local
-diff -ur sc2mpd-1.1.5/work/openhome/ohNetGenerated/Makefile sc2mpd-1.1.5.altered/work/openhome/ohNetGenerated/Makefile
---- a/openhome/ohNetGenerated/Makefile  2020-11-16 20:49:27.262636458 -0600
-+++ b/openhome/ohNetGenerated/Makefile  2020-11-16 20:45:36.594809974 -0600
-@@ -273,13 +273,13 @@
- cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
- cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
- ifeq ($(nocpp11), yes)
--    cppflags = $(cflags_base) -Werror
-+    cppflags = $(cflags_base)
- else ifeq ($(platform),IntelMac)
--    cppflags = $(cflags_base) -std=c++11 -Werror
-+    cppflags = $(cflags_base) -std=c++11
- else
--    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L -Werror
-+    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L
- endif
--cflags = $(cflags_base) -Werror
-+cflags = $(cflags_base)
- depsPlatform = ${openhome_system}-${openhome_architecture}
- header_install = Build/Include
- inc_build = dependencies/$(depsPlatform)/ohNet-$(depsPlatform)-Release/include/ohnet
-@@ -334,7 +334,7 @@
-        jar = $(JAVA_HOME)/bin/jar
- endif
-
--java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
-+java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
- jarflags = cf
- dirsep = /
- prefix = /usr/local
-diff -ur sc2mpd-1.1.5/work/openhome/ohSongcast/Makefile sc2mpd-1.1.5.altered/work/openhome/ohSongcast/Makefile
---- a/openhome/ohSongcast/Makefile      2016-10-18 02:34:33.000000000 -0500
-+++ b/openhome/ohSongcast/Makefile      2020-11-16 20:46:57.123112193 -0600
-@@ -38,7 +38,7 @@
- # Macros used by Common.mak
-
- ar = ${CROSS_COMPILE}ar rc $(objdir)
--cflags = -fexceptions -Wall -Werror -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
-+cflags = -fexceptions -Wall -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
- ohnetdir = ../ohNet/Build/Obj/$(osdir)/$(build_dir)/
- ohnetgenerateddir = ../ohNetGenerated/Build/Obj/$(osdir)/$(build_dir)/
- ohtopologydir = ../ohTopology/build/