From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-sound/bpmdetect/Manifest | 8 +++ media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild | 49 ++++++++++++++++ .../files/bpmdetect-0.6.1-fix-buildsystem.patch | 67 ++++++++++++++++++++++ .../files/bpmdetect-0.6.1-fix-printf-format.patch | 37 ++++++++++++ .../bpmdetect-0.6.1-gcc44_and_fmodex_path.patch | 36 ++++++++++++ media-sound/bpmdetect/metadata.xml | 11 ++++ 6 files changed, 208 insertions(+) create mode 100644 media-sound/bpmdetect/Manifest create mode 100644 media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild create mode 100644 media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch create mode 100644 media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch create mode 100644 media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch create mode 100644 media-sound/bpmdetect/metadata.xml (limited to 'media-sound/bpmdetect') diff --git a/media-sound/bpmdetect/Manifest b/media-sound/bpmdetect/Manifest new file mode 100644 index 000000000000..7b8bc9ec7583 --- /dev/null +++ b/media-sound/bpmdetect/Manifest @@ -0,0 +1,8 @@ +AUX bpmdetect-0.6.1-fix-buildsystem.patch 1903 SHA256 d38a74d0810a08b438a75ff75375d5a8ba2ea224756f8f1ac8f670df97a0e5d9 SHA512 52500e1be213b19d2081e5a0d444afb3f55c955ba29fddd9c799cfe0d2359962c19fc64bc8d6649e8a5261fbf9ec8f16efe83b7decdbcf5b71abfd3ecbf15a4d WHIRLPOOL d7f19990dd49c4b1084f15c82eb646c1e6e0fd7821475cf247447032f59a60a65ee88f664564f9fee24e45deeea59c9af1e58ced1a2ebe60df0c54138b61e167 +AUX bpmdetect-0.6.1-fix-printf-format.patch 1328 SHA256 bf4b31fe663306ac46ab2f5a0d1020928731653eb26dabd3621c9bbc19aff58a SHA512 fa12b7daaf76e04d20b2a681e4e0849e99c93f2aa7a750aadec32c57d478d97005db294e1b613c29f7ad707a361b120863bf3dd69c18dac1be2bf8cbd61d9254 WHIRLPOOL 87094658a1774fefe9797a531fd19c89aae431da003220134b9c4c2b00128d1fec2947d9e9224164c4f1f18cb78e7977721919114b4772e71387313b853e0df9 +AUX bpmdetect-0.6.1-gcc44_and_fmodex_path.patch 1439 SHA256 7848687ce6e58a3307ac608061c7d8a30530b103f00cd35240057293ffb60a70 SHA512 abd719d7bb3f6bd773643b6cf082fcd7cb39f48d5f6a4143d5f6ec650e2496f97a311ef9c8f762622e04aeea7fbbe79cd7941615499ce655ab434ae69b46d297 WHIRLPOOL 33c5ec9dc759c217db456b6320e4c8f051fda651954588c649aa15b957415636bcb0ff7b7bb5b0e17e06d0e7faa92708b5213a55dfacafd6d5f807bec4b5dfd3 +DIST bpmdetect-0.6.1-src.tar.bz2 1433211 SHA256 2b7fb3e0595b5b9dd63381c079140656df196be1bee3365807f18ef4593c0b8f SHA512 9018b81d4ccca94d000a304ae640b071a0ac748c9c7922f4d3c6894a647594dd712964870898e01ee1d93fb8890491ed62b1d4e5f60f07dae74bda7525f0672a WHIRLPOOL f76ff18a9a3093aed7a965a2a97df7d5e29dcdf96c449091981de2805ce95452297692222fdc97180057dc7d06d076e969c4d66babd52fb3b1a3bc722288182f +EBUILD bpmdetect-0.6.1-r1.ebuild 945 SHA256 4857e030d26a77c56692f2521bfd7033da7314b6779f0a7411885cca4da72f53 SHA512 883cd4d0ae80882d5039804398bb8740bc1cf04dab86d4afab56ddb3768b4e22519fd49253909fe8f93de8fd65cabad18aad0a25e5a3932b54faf896a7344238 WHIRLPOOL 242d396f2e450a4c89a1f2a7f1874ddbf209dfd8bb710c2ae55803783511e322ee5d8c37f6c47625d171934611ab603dd91fe8c7f0b847a1491fcff79f67fcfe +MISC ChangeLog 3346 SHA256 4b048c27a2d25ab344cc0f61094a4f663c5c8fcc64ff21fd61bb4361347481e5 SHA512 0bd381b93095f7249974abad906097497fe0bd3addc7e6073b8afe5b169a50767998dbfa97fb046d1df0ff3a63babc273600781702ba81aed37abc7837a586a4 WHIRLPOOL 44a75f7eee07a38b5ebba0459d1b063d33222e9789ce3da9f911a1e37fbca8467b6a488d809d728d32a9b0a86aa4effd1c81aaaf0b9a52de8c8f5a20fa5fcb0c +MISC ChangeLog-2015 898 SHA256 86714e34b579323e006a549289bf4011700a5c73b8b3b107075772f9f987d78f SHA512 9598b660e5fafefce45636da0b2d0ce9969d279b6bf7d32b4a1362d957d551814bbdf697e86897296e2020fe221b79e3d9aee15e816867edf5a24553a824b6b2 WHIRLPOOL eb7058eebb55e13e20900a0b0f71e24de8e70e9e5a4b409dfeb8a1d882b536d5540651b5c2a855e2d9af0414e0709992b8720cf15bbd19fbd8972c7af6480b37 +MISC metadata.xml 332 SHA256 150ac5e90b862d17749b725484b4c9fc38e3f26ad07bd73dcc8a6bd61afaf130 SHA512 7a6f93e001d436f33d8ee55b467eb2e398b65193ee0c77c0d087916372cba7a5b9693d15aec27e738ea05d54901c1f4f855722384bb9f86d59e10b7d6b6b17d7 WHIRLPOOL 7697e7d3c4dbe3879bc828127a834094fe93513b629afa14a640e187e63481d958c53d02ff9d72e0b29483de7689da583df39be8ba2ded3d918328b2cb4772af diff --git a/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild b/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild new file mode 100644 index 000000000000..03402a37eec2 --- /dev/null +++ b/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils scons-utils toolchain-funcs + +DESCRIPTION="Automatic BPM detection utility" +HOMEPAGE="https://sourceforge.net/projects/bpmdetect" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="media-libs/taglib + media-libs/id3lib + >=media-libs/fmod-4.25.07-r1:1 + dev-qt/qtgui:4" +DEPEND="${RDEPEND} + sys-apps/sed + dev-util/scons + virtual/pkgconfig" + +S=${WORKDIR}/${PN} +PATCHES=( + "${FILESDIR}/${P}-gcc44_and_fmodex_path.patch" + "${FILESDIR}/${P}-fix-buildsystem.patch" + "${FILESDIR}/${P}-fix-printf-format.patch" +) + +src_configure() { + myscons=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + QTDIR="/usr/$(get_libdir)" + prefix="${D}/usr" + ) +} + +src_compile() { + escons "${myscons[@]}" +} + +src_install() { + escons "${myscons[@]}" install + dodoc authors readme todo +} diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch new file mode 100644 index 000000000000..fa6c0e59db68 --- /dev/null +++ b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch @@ -0,0 +1,67 @@ +* Fix QA issues in desktop file +* Make buildsystem respect CXX, CXXFLAGS and LDFLAGS +https://bugs.gentoo.org/show_bug.cgi?id=334465 + +--- bpmdetect/src/bpmdetect.desktop ++++ bpmdetect/src/bpmdetect.desktop +@@ -2,7 +2,7 @@ + Encoding=UTF-8 + Name=BPMDetect + Exec=bpmdetect +-Icon=bpmdetect-icon.png ++Icon=bpmdetect-icon + Type=Application + Comment=Automatic BPM detection utility +-Categories=Application;AudioVideo;Audio: ++Categories=AudioVideo;Audio; +--- bpmdetect/src/SConscript ++++ bpmdetect/src/SConscript +@@ -1,5 +1,6 @@ + #! /usr/bin/env python + import os, sys, glob ++import SCons.Util + + if not sys.platform.startswith('win'): + BOLD ="\033[1m" +@@ -156,17 +157,18 @@ + env.__delitem__('CPPPATH') + if env.has_key('CPPDEFINES'): + env.__delitem__('CPPDEFINES') +- if env.has_key('CXXFLAGS'): +- env.__delitem__('CXXFLAGS') + if env.has_key('LIBPATH'): + env.__delitem__('LIBPATH') + if env.has_key('LIBS'): + env.__delitem__('LIBS') +- if env.has_key('LINKFLAGS'): +- env.__delitem__('LINKFLAGS') + if env.has_key('QT3'): + env.__delitem__('QT3') + ++ if os.environ.has_key('CXXFLAGS'): ++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) ++ if os.environ.has_key('LDFLAGS'): ++ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) ++ + print BOLD + """ + --------------------------------------------------""" + NORMAL + print "Use MinGW compiler : ", +@@ -189,7 +191,6 @@ + env.Append(CXXFLAGS = '-g') + else: + print 'no ' +- env.Append(CXXFLAGS = '-O2' ) + env.Append(CPPDEFINES = ['NDEBUG', 'NO_DEBUG']) + env['DEBUG'] = 0 + +@@ -309,6 +310,10 @@ + ( 'LINKFLAGS', 'linker flags'), + ( 'QT3', 'use qt3') + ) ++if os.environ.has_key('CC'): ++ env['CC'] = os.environ['CC'] ++if os.environ.has_key('CXX'): ++ env['CXX'] = os.environ['CXX'] + opts.Update(env) + + # to avoid an error message 'how to make target configure... ?' diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch new file mode 100644 index 000000000000..89bf64445e76 --- /dev/null +++ b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch @@ -0,0 +1,37 @@ +Fix broken printf statements: +* src/main.cpp:49:62: warning: too many arguments for format [-Wformat-extra-args] +* printf("Usage:\n bpmdetect [switches] [files]\n\n", version); +* +* src/track.cpp:111:57: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘double’ [-Wformat=] +* snprintf(buffer, BPM_LEN, "%05d", (int) dBPM * 100. ); + +--- bpmdetect/src/main.cpp ++++ bpmdetect/src/main.cpp +@@ -34,6 +34,7 @@ + #endif + + #include ++#include + + #include "track.h" + #include "trackfmod.h" // for FMOD system +@@ -46,7 +47,7 @@ + + void display_help() { + printf("BPMDetect version %s\n\n", version); +- printf("Usage:\n bpmdetect [switches] [files]\n\n", version); ++ fputs("Usage:\n bpmdetect [switches] [files]\n\n", stdout); + printf("Switches:\n"); + #ifndef NO_GUI + printf("-c --console - run in console mode\n"); +--- bpmdetect/src/track.cpp ++++ bpmdetect/src/track.cpp +@@ -108,7 +108,7 @@ + } else if( format == "000" ) { + snprintf(buffer, BPM_LEN, "%03d", (int) dBPM ); + } else if( format == "00000" ) { +- snprintf(buffer, BPM_LEN, "%05d", (int) dBPM * 100. ); ++ snprintf(buffer, BPM_LEN, "%05d", static_cast(dBPM * 100.) ); + } else { // all other formats are converted to "0.00" + snprintf(buffer, BPM_LEN, "%.2f", dBPM ); + } diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch new file mode 100644 index 000000000000..c29961645615 --- /dev/null +++ b/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch @@ -0,0 +1,36 @@ +diff -ur bpmdetect.orig/src/main.cpp bpmdetect/src/main.cpp +--- bpmdetect.orig/src/main.cpp 2008-05-01 12:50:18.000000000 +0300 ++++ bpmdetect/src/main.cpp 2009-06-03 22:24:56.000000000 +0300 +@@ -20,6 +20,8 @@ + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + ++#include ++ + #ifndef NO_GUI + #ifdef USE_QT3 + #include "dlgbpmdetect3.h" +diff -ur bpmdetect.orig/src/SConscript bpmdetect/src/SConscript +--- bpmdetect.orig/src/SConscript 2008-04-24 19:49:52.000000000 +0300 ++++ bpmdetect/src/SConscript 2009-06-03 22:33:57.000000000 +0300 +@@ -234,7 +234,7 @@ + + env.Append(LIBS = ['id3', 'fmodex', 'z']) + env.Append(CPPPATH = ['.', '..', '../includes']) +- env.Append(LIBPATH = ['.', '../libs']) ++ env.Append(LIBPATH = ['.', '../libs', '/opt/fmodex/api/lib']) + env['ISCONFIGURED']=1 + # And finally save the options in the cache + opts.Save(cachefile, env) +diff -ur bpmdetect.orig/src/track.cpp bpmdetect/src/track.cpp +--- bpmdetect.orig/src/track.cpp 2008-04-25 22:33:18.000000000 +0300 ++++ bpmdetect/src/track.cpp 2009-06-03 22:26:24.000000000 +0300 +@@ -20,6 +20,8 @@ + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + ++#include ++ + #include "track.h" + #include "trackfmod.h" + #include "BPMDetect.h" diff --git a/media-sound/bpmdetect/metadata.xml b/media-sound/bpmdetect/metadata.xml new file mode 100644 index 000000000000..9a466099f162 --- /dev/null +++ b/media-sound/bpmdetect/metadata.xml @@ -0,0 +1,11 @@ + + + + + sound@gentoo.org + Gentoo Sound project + + + bpmdetect + + -- cgit v1.2.3