gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-sound/sc2mpd: remove unused patches

Browse Source 
Closes: https://github.com/gentoo/gentoo/pull/19476
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
2021-02-15 17:54:27 +01:00
committed by Conrad Kostecki
parent f4cc9af894
commit e704e0eb6e
5 changed files with 0 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
media-sound/sc2mpd/files/ohnet.makefile.patch
View File

@@ -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

12
media-sound/sc2mpd/files/ohnet.optionparser.patch
View File

@@ -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);
}

24
media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
View File

@@ -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

30
media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
View File

@@ -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

72
media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
View File

@@ -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/