diff options
author | Sam James <sam@gentoo.org> | 2021-07-25 23:24:29 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2021-07-25 23:25:11 +0100 |
commit | a67da1b9b8a2db19a2b4645124b495cc90ba9046 (patch) | |
tree | a0053f6ad54e29c6add74e300c1ce9adf644451c /media-sound | |
parent | profiles: last-rite media-libs/ctl, media-libs/openexr_ctl (diff) | |
download | gentoo-a67da1b9b8a2db19a2b4645124b495cc90ba9046.tar.gz gentoo-a67da1b9b8a2db19a2b4645124b495cc90ba9046.tar.bz2 gentoo-a67da1b9b8a2db19a2b4645124b495cc90ba9046.zip |
media-sound/sc2mpd: treeclean
Bug: https://bugs.gentoo.org/795999
Bug: https://bugs.gentoo.org/787902
Bug: https://bugs.gentoo.org/766033
Bug: https://bugs.gentoo.org/724674
Bug: https://bugs.gentoo.org/713206
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/sc2mpd/Manifest | 3 | ||||
-rw-r--r-- | media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch | 64 | ||||
-rw-r--r-- | media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch | 72 | ||||
-rw-r--r-- | media-sound/sc2mpd/metadata.xml | 7 | ||||
-rw-r--r-- | media-sound/sc2mpd/sc2mpd-1.1.7.ebuild | 97 | ||||
-rw-r--r-- | media-sound/sc2mpd/sc2mpd-1.1.8.ebuild | 93 |
6 files changed, 0 insertions, 336 deletions
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest deleted file mode 100644 index e15087d642d4..000000000000 --- a/media-sound/sc2mpd/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST openhome-sc2-20200704.tar.gz 22352681 BLAKE2B a5131f3b5c3400ff0ca58f0ce9b45c25db6fc13dcf6827ed9e4531effd3b35026d59495adf690ba65c09624c12f7755b9373ec4e4309de73f17fdeb866beeba7 SHA512 04586fbfd8053c7f01d2c3dbf421f75d0d93ac179cf5f58bc7966d364a3477a87985a1a2db1b35018aa5193a07977b7b4be60d317e7c10b275234adf9a2bd5d2 -DIST sc2mpd-1.1.7.tar.gz 238674 BLAKE2B 35fd57797612e3883ad5cc04be3f5328dbf4ec9aedb0461a801fe79566ef20de4026ad653eec6e7d932ffcd0385bb618331a519ec54838fd856d09c20f1971b8 SHA512 0b39e200f013602c851bec1ba41210c40d1a984638c86bd8dd5d61286aff19b315f282182753426e4470c8e6ccb60265b16dc6ba2e5117f59a3d40194464b4b3 -DIST sc2mpd-1.1.8.tar.gz 244898 BLAKE2B 81c3ff1b25db25cbd1bdb50f2343acb07740611dbad504fcc4670a6d351c1daace481de5292f291bdf208a911f67f4ebcc0884c0ef9eece962114860941e1941 SHA512 214b60ee154ab84e9a7ace285afa71b015987c6b6838fb2686cc81f65800f10228cc3f52e5f5e7e836fa181ea6fea5b0c4c83acc5c6eff989c82c79990f19497 diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch deleted file mode 100644 index d4103a522451..000000000000 --- a/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ur work.orig/ohNet/bundle_binaries.py work/ohNet/bundle_binaries.py ---- a/openhome/ohNet/bundle_binaries.py 2020-11-10 00:24:29.640122646 -0600 -+++ b/openhome/ohNet/bundle_binaries.py 2020-11-10 00:26:38.441470487 -0600 -@@ -121,22 +121,22 @@ - parser.add_option("-m", "--managed-only", default=False, action="store_true", help="Package only the managed assembly.")
- options, args = parser.parse_args()
- if len(args)>0:
-- print "Too many arguments."
-+ print("Too many arguments.")
- sys.exit(1)
- if options.system not in ALL_SYSTEMS:
-- print "Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS)))
-+ print("Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS))))
- sys.exit(1)
- if options.architecture not in ALL_ARCHITECTURES:
-- print "Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system))))
-+ print("Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system)))))
- sys.exit(1)
- if options.configuration not in ALL_CONFIGURATIONS:
-- print "Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS)))
-+ print("Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS))))
- sys.exit(1)
- target = BuildTarget(options.system, options.architecture, options.configuration)
- if target not in ALL_TARGETS:
-- print "Unrecognized target combination. Valid combinations are:"
-+ print("Unrecognized target combination. Valid combinations are:")
- for valid_target in sorted(ALL_TARGETS.keys()):
-- print " " + get_target_as_option_string(valid_target)
-+ print(" " + get_target_as_option_string(valid_target))
- sys.exit(1)
-
- buildinfo = ALL_TARGETS[target]
-diff -ur work.orig/ohNetGenerated/bundle_binaries.py work/ohNetGenerated/bundle_binaries.py ---- a/openhome/ohNetGenerated/bundle_binaries.py 2020-11-10 00:24:29.847123204 -0600 -+++ b/openhome/ohNetGenerated/bundle_binaries.py 2020-11-10 00:26:11.793398395 -0600 -@@ -96,22 +96,22 @@ - parser.add_option("-m", "--managed-only", default=False, action="store_true", help="Package only the managed assembly.")
- options, args = parser.parse_args()
- if len(args)>0:
-- print "Too many arguments."
-+ print("Too many arguments.")
- sys.exit(1)
- if options.system not in ALL_SYSTEMS:
-- print "Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS)))
-+ print("Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS))))
- sys.exit(1)
- if options.architecture not in ALL_ARCHITECTURES:
-- print "Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system))))
-+ print("Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system)))))
- sys.exit(1)
- if options.configuration not in ALL_CONFIGURATIONS:
-- print "Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS)))
-+ print("Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS))))
- sys.exit(1)
- target = BuildTarget(options.system, options.architecture, options.configuration)
- if target not in ALL_TARGETS:
-- print "Unrecognized target combination. Valid combinations are:"
-+ print("Unrecognized target combination. Valid combinations are:")
- for valid_target in sorted(ALL_TARGETS.keys()):
-- print " " + get_target_as_option_string(valid_target)
-+ print(" " + get_target_as_option_string(valid_target))
- sys.exit(1)
-
- buildinfo = ALL_TARGETS[target]
diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch deleted file mode 100644 index fd079e26fb8a..000000000000 --- a/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -ur ohNet/Makefile ohNet/Makefile ---- a/openhome/ohNet/Makefile 2020-11-09 23:46:21.295605850 -0600 -+++ b/openhome/ohNet/Makefile 2020-11-09 23:48:05.977868337 -0600 -@@ -344,13 +344,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 -@@ -407,7 +407,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 ohNetGenerated/Makefile ohNetGenerated/Makefile ---- a/openhome/ohNetGenerated/Makefile 2020-11-09 23:46:21.344605971 -0600 -+++ b/openhome/ohNetGenerated/Makefile 2020-11-09 23:47:44.656814158 -0600 -@@ -276,13 +276,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 -@@ -337,7 +337,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 ohSongcast/Makefile ohSongcast/Makefile ---- a/openhome/ohSongcast/Makefile 2020-11-09 23:46:21.256605754 -0600 -+++ b/openhome/ohSongcast/Makefile 2020-11-09 23:47:23.130759816 -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/ diff --git a/media-sound/sc2mpd/metadata.xml b/media-sound/sc2mpd/metadata.xml deleted file mode 100644 index 411334230662..000000000000 --- a/media-sound/sc2mpd/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>stasibear@gentoo.org</email> -</maintainer> -</pkgmetadata> diff --git a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild deleted file mode 100644 index 6c6cbd7a893b..000000000000 --- a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd" -HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html" - -openhome_packageversion="20200704" - -SRC_URI=" - https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz - https://www.lesbonscomptes.com/upmpdcli/downloads/openhome-sc2-${openhome_packageversion}.tar.gz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - dev-libs/expat - media-libs/alsa-lib - media-libs/libsamplerate - media-libs/libmpdclient - <=net-libs/libmicrohttpd-0.9.70 -" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${P}.tar.gz - mkdir openhome || die "Can't create openhome directory" - cd openhome || die "Can't enter openhome directory" - unpack openhome-sc2-${openhome_packageversion}.tar.gz -} - -src_prepare() { - cd "${WORKDIR}" || die "Couldn't cd to WORKDIR" - eapply "${FILESDIR}/${P}-python.patch" - eapply "${FILESDIR}/${P}-werror.patch" - eapply_user -} - -src_configure() { - econf "--with-openhome=${WORKDIR}/openhome" -} - -src_compile() { - - #### Begin ohbuild.sh reverse engineer - - # build_ohNet - cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir" - make native_only=yes || die "ohnet make failed" - - # build_ohNetGenerated - cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir" - # TODO: get from environment/make target - deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release" - mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps" - cd $deps || die "Couldn't cd to deps dir" - - ohnet="${WORKDIR}/openhome/ohNet" - find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \ - -exec cp '{}' lib ';' \ - || die "Couldn't cp binary libs" - - cd "$ohnet/Build/Include" || die "Couldn't cd to include" - cp -R * "${deps}/include/ohnet" || die "Couldn't cp include" - # cd "$ohnet/Build/Tools" || die "Couldn't cd to tools" - # cp -R * "${deps}/lib/t4" || die "Couldn't cp tools" - cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates" - cp -R * "${deps}/lib/t4" || die "Couldn't cp templates" - cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui" - cp -R * "${deps}/lib/ui" || die "Couldn't cp ui" - cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py" - cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py" - - cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir" - make native_only=yes || die "ohnetgenerated make failed" - - cd "Build/Include" || die "Couldn't cd later to include" - cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes" - - # build_ohTopology - cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir" - mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av" - cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av" - - # build_ohSongcast - cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir" - make release=1 library_static || die "Failed to build ohSongcast" - - #### End ohbuild.sh reverse engineer - - cd "${S}" || die "Failed to cd to source directory" - make || die "Failed to make sc2mpd" -} diff --git a/media-sound/sc2mpd/sc2mpd-1.1.8.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.8.ebuild deleted file mode 100644 index ef6557395fe1..000000000000 --- a/media-sound/sc2mpd/sc2mpd-1.1.8.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd" -HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html" - -openhome_packageversion="20200704" - -SRC_URI=" - https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz - https://www.lesbonscomptes.com/upmpdcli/downloads/openhome-sc2-${openhome_packageversion}.tar.gz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-libs/expat - media-libs/alsa-lib - media-libs/libsamplerate - media-libs/libmpdclient - <=net-libs/libmicrohttpd-0.9.70 -" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${P}.tar.gz - mkdir openhome || die "Can't create openhome directory" - cd openhome || die "Can't enter openhome directory" - unpack openhome-sc2-${openhome_packageversion}.tar.gz -} - -src_configure() { - econf "--with-openhome=${WORKDIR}/openhome" -} - -src_compile() { - #### Begin ohbuild.sh reverse engineer - - # build_ohNet - cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir" - einfo "Building ohnet" - emake native_only=yes - - # build_ohNetGenerated - cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir" - # TODO: get from environment/make target - deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release" - mkdir -p ${deps}/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps" - cd ${deps} || die "Couldn't cd to deps dir" - - ohnet="${WORKDIR}/openhome/ohNet" - find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \ - -exec cp '{}' lib ';' \ - || die "Couldn't cp binary libs" - - cd "$ohnet/Build/Include" || die "Couldn't cd to include" - cp -R * "${deps}/include/ohnet" || die "Couldn't cp include" - # cd "$ohnet/Build/Tools" || die "Couldn't cd to tools" - # cp -R * "${deps}/lib/t4" || die "Couldn't cp tools" - cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates" - cp -R * "${deps}/lib/t4" || die "Couldn't cp templates" - cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui" - cp -R * "${deps}/lib/ui" || die "Couldn't cp ui" - cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py" - cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py" - - cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir" - einfo "Building ohnetgenerated" - emake native_only=yes - - cd "Build/Include" || die "Couldn't cd later to include" - cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes" - - # build_ohTopology - cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir" - mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av" - cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av" - - # build_ohSongcast - cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir" - einfo "Building ohSongcast" - emake release=1 library_static - - #### End ohbuild.sh reverse engineer - - cd "${S}" || die "Failed to cd to source directory" - einfo "Building sc2mpd" - emake -} |