[gentoo-commits] repo/gentoo:master commit in: media-sound/sc2mpd/files/
commit: e704e0eb6e7c95669db6b6a31a020fce756cf429 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Feb 15 16:54:27 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Feb 15 20:13:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e704e0eb media-sound/sc2mpd: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/19476 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> media-sound/sc2mpd/files/ohnet.makefile.patch | 35 --- media-sound/sc2mpd/files/ohnet.optionparser.patch | 12 .../sc2mpd/files/ohnetgenerated.commonmk.patch | 24 .../sc2mpd/files/ohnetgenerated.makefile.patch | 30 - media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch | 72 -- 5 files changed, 173 deletions(-) diff --git a/media-sound/sc2mpd/files/ohnet.makefile.patch b/media-sound/sc2mpd/files/ohnet.makefile.patch deleted file mode 100644 index 29a29bcc9bb..000 --- 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 a3165768427..000 --- 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 a4f28f9a700..000 --- 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.0 +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
[gentoo-commits] repo/gentoo:master commit in: media-sound/sc2mpd/files/, media-sound/sc2mpd/
commit: fd73aedb541baa3215ee5c8d56bb3f3d8b40e3f7 Author: Erik Mackdanz gentoo org> AuthorDate: Sat Feb 3 18:56:21 2018 + Commit: Erik Mackdanz gentoo org> CommitDate: Sun Feb 4 16:51:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd73aedb media-sound/sc2mpd: new package 1.1.4 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-sound/sc2mpd/Manifest| 6 ++ media-sound/sc2mpd/files/ohnet.makefile.patch | 35 +++ media-sound/sc2mpd/files/ohnet.optionparser.patch | 12 +++ .../sc2mpd/files/ohnetgenerated.commonmk.patch | 24 + .../sc2mpd/files/ohnetgenerated.makefile.patch | 30 ++ media-sound/sc2mpd/metadata.xml| 9 ++ media-sound/sc2mpd/sc2mpd-1.1.4.ebuild | 113 + 7 files changed, 229 insertions(+) diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest new file mode 100644 index 000..ae40124eb0d --- /dev/null +++ b/media-sound/sc2mpd/Manifest @@ -0,0 +1,6 @@ +DIST ohdevtools.d35861.tar.gz 1187475 BLAKE2B 82138d9b64f3172d540402e99b716e9b56bde2133b2565b442bfe6ae6b0e2235226027c4b43b17e3eb005b6f52a4d6a278e0895d267222a63f910ea556e4d76c SHA512 25188c3ae837db12e5c7f349ab01a315f8c68909e3eaa530dc9ba09fb2bcb3cd0a671676b3dd4902ef019b7e331d2acac0978649bce29df585e54d13158ff162 +DIST ohnet.1dd641.tar.gz 20831753 BLAKE2B 82724b7f2cd5cd0dcaa54786394a2560b965f5f16df7bb84037795f1334b8052a4cfeff8f5f39bdc5d7a0ccb2093190c38de987957463d10cac407d9694a6a92 SHA512 67ccdbee6d909df30acb7c89aeba75d3accdbb533dda5abc02c66f867e2fad9a360696d5e28dd1decdc575a1396d026824329450e85e3a3b3e4f7af2e144140a +DIST ohnetgenerated.e3edb9.tar.gz 1887473 BLAKE2B 1b878dd743f0b45f69c3eb018ddbd64db60285ee8743bb039f9a794a9e0ecdb516e1138ac622fc7cde3462fe5c3cfc006d71d0b22048496c1bc190cc4f34a906 SHA512 9b48d0ff496acfa4313c1efc90e73f1050fee011b1ab301b9268ba4009fca9a47978cbe2f1f0a1d05d7c939f95b4a38560b9f63464305032c20d36af3ade8811 +DIST ohsongcast.3299ea.tar.gz 831313 BLAKE2B aaa5590af288bbf2b358bad613b983418f6648219bba046113a8c712f3a369fee2894c8aa42f96ead16582b96b982d1696b478950e0e3d0ef6c8e3325e5a3214 SHA512 ac1e81166e5b73a943f78c930ef89fc5b71447c7eb8c4cc509c50c686a360a25f75f1651061a653bf995c15377bee4cb98a97665bf27f04f947940a249e12661 +DIST ohtopology.cc09c0.tar.gz 118703 BLAKE2B ef5b560cb2a272586e8755117b5021d67562bda962b0c6240072ad42876ae71f21c81611521d31b01212d2175637244b8513332858aec3d7e713546587111ed0 SHA512 46f1e4ba6b7553b81c939c2ae691ab89e0bf9b565820e8c65b14b6534f3a9240580cb9fd69f46568c5f0c8d105da825b6f9abbf61a64289a4f553a47902b38d4 +DIST sc2mpd-1.1.4.tar.gz 218128 BLAKE2B 71ff5e95d868c40d5c9fc72d65161d97ccc1ed366e7465c038efb646bb4ab581d24dbab7280fb739029bbaec7ff8f5804006a4cdc8a61ad0395acb9da74db95c SHA512 eebd21198ec2a9b0e1122a9b3316eaefd38daa2e6b6aa4c480e8c1fef0a8600a68c386d1957b4cf9203a61bcc63b7842e145073092f30ec2e81cdf1010e9f1ad diff --git a/media-sound/sc2mpd/files/ohnet.makefile.patch b/media-sound/sc2mpd/files/ohnet.makefile.patch new file mode 100644 index 000..29a29bcc9bb --- /dev/null +++ b/media-sound/sc2mpd/files/ohnet.makefile.patch @@ -0,0 +1,35 @@ +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 new file mode 100644 index 000..a3165768427 --- /dev/null +++ b/media-sound/sc2mpd/files/ohnet.optionparser.patch @@ -0,0 +1,12 @@ +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*