Added new fixed ebuild for bpmdj

8 files changed, 330 insertions, 0 deletions

diff --git a/media-sound/bpmdj/ChangeLog b/media-sound/bpmdj/ChangeLog
new file mode 100644
index 0000000..ee30ee7
--- /dev/null
+++ b/media-sound/bpmdj/ChangeLog
@@ -0,0 +1,43 @@
+# ChangeLog for media-sound/bpmdj
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*bpmdj-4.1-r2 (17 Feb 2011)
+
+  17 Feb 2011; Francisco Blas Izquierdo Riera <klondike@xiscosoft.es>
+  +bpmdj-4.1-r2.ebuild, +files/bpmdj-4-fix_link_flag_order.patch,
+  metadata.xml, +files/bpmdj-new.sh:
+  Fixed Build system (link flags and amd64 builds)
+  Added uses for the midi and external clock features
+  Taking maintenance of the package
+  Removed ppc as it seems to be not supported by the build system
+  Fixed minor QA warnings
+  Reordered stages properly
+  Improved starter script
+  Added the bpmclock exec
+  Installing binaries in /usr/bin
+  Installing sequences in /usr/share/bpmdj
+
+*bpmdj-4.1-r1 (15 May 2010)
+
+  15 May 2010; Emery Hemingway <emery@icmlf.net> +bpmdj-4.1-r1.ebuild:
+  Now requires qt3support USE flag. Added an einfo note so we know how 
+  this release broke the documentation.
+
+*bpmdj-4.1 (31 Mar 2010)
+
+  31 Mar 2010; Viktor Lazarev <taurus101v@gmail.com> -bpmdj-2.9.ebuild,
+  -bpmdj-3.2.ebuild, bpmdj-3.6.ebuild, +files/bpmdj-3.6-include.patch,
+  +files/bpmdj-3-defines.gentoo, +bpmdj-4.1.ebuild,
+  +files/bpmdj-4-defines.gentoo, -files/Makefile-destdir.patch,
+  -files/Makefile-make_install.patch, -files/Makefile-nostrip.patch,
+  -files/Makefile-prefix.patch, -files/defines.gentoo:
+  Version bump. Corrected defines. Fix include in bpmdj-3.6.
+  Remove old ebuilds, patches & define
+
+  06 Aug 2008; Frieder Buerzele <evermind@tuxfamily.org>; bpmdj-3.6.ebuild:
+  fixed qt4_min... QA msg
+
+  17 Dec 2007; Thomas Kuther <gimpel@sonnenkinder.org> ChangeLog:
+  added a changelog
+
diff --git a/media-sound/bpmdj/Manifest b/media-sound/bpmdj/Manifest
new file mode 100644
index 0000000..736585c
--- /dev/null
+++ b/media-sound/bpmdj/Manifest
@@ -0,0 +1,8 @@
+AUX bpmdj-4-add_GNU_stack_sections.patch 993 RMD160 af9157d7801c64eb78b8f81dd5391af434c7fe0c SHA1 49c7db9f90868291a63645d81c9aef92467cd5ad SHA256 dea967df520aef012b6a911605b246707e127084411f533e6419aad79ad1218a
+AUX bpmdj-4-defines.gentoo 324 RMD160 83a034478d95fbba5fe61c28b6988e271208bf02 SHA1 54a894b0a958e52b546cddaeeac0362d309a23f1 SHA256 2dfb58dae6b7819ad8739fdca924274baf11d9da4794187aa51c90f6a0035133
+AUX bpmdj-4-fix_link_flag_order.patch 3338 RMD160 63b090f11ca153a3dd940ce68eed879581b2cb0f SHA1 e9bc4d9c753e7b4aa61c9856b29ecf220f362073 SHA256 869caa132750fef3a1a2588e7881831d706e423be6b701fb7fca27860b165114
+AUX bpmdj-new.sh 314 RMD160 20a2c2a822d07039069263f0dfc3f7a2f48bb4b0 SHA1 9150fbc5995f7a70d77b9ac54d213d948d4bc8dc SHA256 f30554e429fceeb8a633226645efb5c473ee6a3ce969575d0ff2aeb9bb8881c2
+DIST bpmdj-4.1.source.tgz 786420 RMD160 0389cc3b53bd75d04c49f789e5b49b68c24ffe73 SHA1 8928490bc798e72286711562b8b2656f5038c8c5 SHA256 fb43c8dfb5988d5b980b890d762b463721a1d7f5ac13d9e1221e43c4fee1c2b3
+EBUILD bpmdj-4.1-r2.ebuild 2884 RMD160 292a9266943bc0372f82d1a8aace1c6ea778f56d SHA1 37402c06ee02f9f98b0ce924c3b8accdbbaff64a SHA256 498daa9d20dd6c93614fdd50ca3206f5de117ee03cc5830bdb0f2b1416c46df9
+MISC ChangeLog 1624 RMD160 49f8b0a40a4f32c6ded9888064454ac748cdd15b SHA1 43637d43cea48faf7f01d694d2c5f2216979c6ff SHA256 efaa351ffe537c818324c61324aa2babb21c41005973f8691be5e0a4f4ae578f
+MISC metadata.xml 425 RMD160 f247afa484557f1cf08f7eec122673f371bfc120 SHA1 9edeb1c7263aa0f174f377dfd727c2e10275c985 SHA256 9ccce99dd56875e7331ce0d705d6c75f685f458c6fd687375096e553cddfd3ca
diff --git a/media-sound/bpmdj/bpmdj-4.1-r2.ebuild b/media-sound/bpmdj/bpmdj-4.1-r2.ebuild
new file mode 100644
index 0000000..75e7f8b
--- /dev/null
+++ b/media-sound/bpmdj/bpmdj-4.1-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils qt4-r2 toolchain-funcs
+
+DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
+HOMEPAGE="http://bpmdj.sourceforge.net/"
+SRC_URI="ftp://bpmdj.yellowcouch.org/${PN}/${P}.source.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa extclock jack midi oss vorbis"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	 vorbis? ( media-sound/vorbis-tools )
+	 jack? ( media-sound/jack-audio-connection-kit )
+	 =sci-libs/fftw-3*"
+
+DEPEND="${RDEPEND}
+	|| ( ( x11-libs/qt-core[qt3support] x11-libs/qt-gui[qt3support] )
+			>=x11-libs/qt-4.2:4 )
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-4-fix_link_flag_order.patch"
+	epatch "${FILESDIR}/${PN}-4-add_GNU_stack_sections.patch"
+}
+
+src_configure () {
+	# add our defines
+	cp "${FILESDIR}/${PN}-4-defines.gentoo" defines || die "Couldn't copy the defines"
+
+	# and now.. the useflags. What a giant PITA!
+	local flags=""
+	flags="CFLAGS         += -D QT_THREAD_SUPPORT"
+	use alsa && flags="${flags} -D COMPILE_ALSA"
+	use jack && flags="${flags} -D COMPILE_JACK"
+	use oss && flags="${flags} -D COMPILE_OSS"
+	use midi && flags="${flags} -D MIDI"
+	use extclock && flags="${flags} -D EXT_CLOCK"
+	echo "${flags} -D NO_EMPTY_ARRAYS" >> defines
+
+	# and the same for LDFLAGS..
+	local lflags=""
+	lflags="LDFLAGS        += -lpthread -lm -lrt -lfftw3"
+	use alsa && lflags="${lflags} -lasound"
+	use jack && lflags="${lflags} -ljack"
+	echo "${lflags}" >> defines
+	use amd64 && echo "BITS            = 64" >> defines
+	use x86 && echo "BITS            = 32" >> defines
+
+	# not to forget our custom C(XX)FLAGS
+	echo "CPP             = $(tc-getCXX) -g ${CXXFLAGS} ${CPPFLAGS} -Wall" >> defines
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install () {
+	# makefile is absolutly a mess so we use portage features
+	for i in authors changelog copyright readme support; do
+		mv ${i}.txt ${i}; dodoc ${i}; done
+	dodir /usr/share/${PN}
+	#As this is wrapped we change its name
+	newbin bpmdj bpmdj_orig
+	#Those don't need wrapping so we move them into bin
+	dobin bpmcount bpmdj bpmdjraw bpmmerge bpmplay bpmclock
+	# needed too..
+	mv sequences "${D}/usr/share/${PN}" || die "Couldn't copy sequences"
+	# install startup wrapper
+	newbin "${FILESDIR}/${PN}-new.sh" bpmdj
+	# install logo and desktop entry
+	doicon "${PN}-96.png"
+	make_desktop_entry ${PN} "BpmDj" ${PN}-96 "AudioVideo;Audio"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "BpmDj looks for its music and index directory under ~/.bpmdj/,"
+	einfo "move or link your music directory to ~/.bpmdj/music."
+	einfo "If you are upgrading from bpmdj-4.1-r1 or lower you need to"
+	einfo "relink the sequences directory. To do so just run this command"
+        einfo "as the user who is going to run bpmdj"
+	einfo "$ ln -sf /usr/share/bpmdj/sequences ~/.bpmdj"
+	einfo
+}
diff --git a/media-sound/bpmdj/files/bpmdj-4-add_GNU_stack_sections.patch b/media-sound/bpmdj/files/bpmdj-4-add_GNU_stack_sections.patch
new file mode 100644
index 0000000..203995c
--- /dev/null
+++ b/media-sound/bpmdj/files/bpmdj-4-add_GNU_stack_sections.patch
@@ -0,0 +1,34 @@
+2010-11-10	Francisco Blas Izquierdo Riera <klondike@xiscosoft.es>
+
+		(No bug)
+		* compile: 			Add the .note.GNU-stack so there are no problems on hardened
+
+diff -ru -x define bpm2/compile bpm1/compile
+--- bpm2/compile	2009-12-03 13:02:13.000000000 +0100
++++ bpm1/compile	2011-02-17 04:00:52.047625729 +0100
+@@ -31,21 +31,25 @@
+ else
+ OBJCOPYPARMS=-B i386 -O elf32-i386 
+ endif
++OBJCOPYPARMS+= --add-section .note.GNU-stack=GNU-stack
+ 
+ %-ogg.o: %.ogg
+ 	@echo "  [obj] "$@
++	@printf '\000' >GNU-stack
+ 	@objcopy -I binary $(OBJCOPYPARMS)\
+ 		 --rename-section .data=.rodata,alloc,load,readonly,data,contents \
+ 		 $< $@
+ 
+ %-mp3.o: %.mp3
+ 	@echo "  [obj] "$@
++	@printf '\000' >GNU-stack
+ 	@objcopy -I binary $(OBJCOPYPARMS) \
+ 		 --rename-section .data=.rodata,alloc,load,readonly,data,contents \
+ 		 $< $@
+ 
+ %-png.o: %.png
+ 	@echo "  [obj] "$@ 
++	@printf '\000' >GNU-stack
+ 	@objcopy -I binary $(OBJCOPYPARMS) \
+ 		--rename-section .data=.rodata,alloc,load,readonly,data,contents \
+ 		 $< $@
diff --git a/media-sound/bpmdj/files/bpmdj-4-defines.gentoo b/media-sound/bpmdj/files/bpmdj-4-defines.gentoo
new file mode 100644
index 0000000..66581f2
--- /dev/null
+++ b/media-sound/bpmdj/files/bpmdj-4-defines.gentoo
@@ -0,0 +1,13 @@
+UIC3            = /usr/bin/uic3
+RCC             = /usr/bin/rcc
+UIC             = /usr/bin/uic
+MOC             = /usr/bin/moc
+QT_INCLUDE_PATH = -I/usr/include/qt4 -I/usr/include/qt4/Qt
+QT_LIBRARY_PATH = -L/usr/lib/qt4
+QT_LIBS         = -lQtGui -lQtCore
+CP = cp
+MV = mv
+TAR = tar
+MKDIR = mkdir
+STRIP = strip
+INSTALL = install
diff --git a/media-sound/bpmdj/files/bpmdj-4-fix_link_flag_order.patch b/media-sound/bpmdj/files/bpmdj-4-fix_link_flag_order.patch
new file mode 100644
index 0000000..5191209
--- /dev/null
+++ b/media-sound/bpmdj/files/bpmdj-4-fix_link_flag_order.patch
@@ -0,0 +1,116 @@
+2010-11-10	Francisco Blas Izquierdo Riera <klondike@xiscosoft.es>
+
+		(No bug)
+		* compile: 			Separate LINK command and LINKFLAGS so libraries are searched properly.
+		* documenter			Likewise.
+		* makefile			Likewise.
+		* sources			Likewise.
+
+
+diff -ru -x define bpm2/compile bpm1/compile
+--- bpm2/compile	2009-12-03 13:02:13.000000000 +0100
++++ bpm1/compile	2011-02-17 04:00:52.047625729 +0100
+@@ -130,15 +130,15 @@
+ 
+ bpmplay: $(BPMPLAY)
+ 	@echo " [link] "$@
+-	@$(LINK) $(BPMPLAY) -o bpmplay
++	@$(LINK) $(BPMPLAY) -o bpmplay $(LINKFLAGS)
+ 
+ bpmcount: $(BPMCOUNT_OBJECTS)
+ 	@echo " [link] "$@
+-	@$(LINK) $(BPMCOUNT_OBJECTS) -o bpmcount
++	@$(LINK) $(BPMCOUNT_OBJECTS) -o bpmcount $(LINKFLAGS)
+ 
+ bos: bos.o lock.o overseer.o process.o
+ 	@echo " [link] "$@
+-	@$(LINK) $^ -o bos
++	@$(LINK) $^ -o bos $(LINKFLAGS)
+ 
+ bpm.a:  $(BPM_LIB)
+ 	@echo "   [ar] "$@
+@@ -146,7 +146,7 @@
+ 
+ bpmdj: $(BPMDJ_OBJECTS) 
+ 	@echo " [link] "$@
+-	@$(LINK) $(BPMDJ_OBJECTS) -o bpmdj
++	@$(LINK) $(BPMDJ_OBJECTS) -o bpmdj $(LINKFLAGS)
+ 
+ profile-clock: profile-clock.o
+ 	@echo " [link] "$@
+@@ -154,18 +154,18 @@
+ 
+ bpmmerge: $(MERGER_OBJECTS)
+ 	@echo " [link] "$@
+-	@$(LINK)  $(MERGER_OBJECTS) -o bpmmerge
++	@$(LINK)  $(MERGER_OBJECTS) -o bpmmerge $(LINKFLAGS)
+ 
+ bpmclock: $(BPMCLOCK_OBJECTS) 
+ 	@echo " [link] "$@
+-	@$(LINK)  $(BPMCLOCK_OBJECTS) -o bpmclock
++	@$(LINK)  $(BPMCLOCK_OBJECTS) -o bpmclock $(LINKFLAGS)
+ 
+ idx2txt: idx2txt.o data.a
+ 	@echo " [link] "$@
+-	@$(LINK)  $^ -o idx2txt
++	@$(LINK) $^ -o idx2txt $(LINKFLAGS)
+ 
+ index-demo: index-demo.o index.o spectrum-type.o sample4-type.o power-type.o \
+         memory.o data.a types.o common.o song-information.o capacity.o \
+         song-information.moc.o info.o files.o
+ 	@echo " [link] "$@
+-	@$(LINK)  $^ -o $@
++	@$(LINK)  $^ -o $@ $(LINKFLAGS)
+diff -ru -x define bpm2/documenter bpm1/documenter
+--- bpm2/documenter	2009-11-05 11:00:04.000000000 +0100
++++ bpm1/documenter	2011-02-17 03:31:07.643625727 +0100
+@@ -12,7 +12,7 @@
+ 
+ invert: invert.o
+ 	@echo " [link] "$@
+-	@$(LINK) invert.o -o invert
++	@$(LINK) invert.o -o invert $(LINKFLAGS)
+ 
+ %.o: %.cpp
+ 	@echo "  [cpp] "$@
+diff -ru -x define bpm2/makefile bpm1/makefile
+--- bpm2/makefile	2009-12-08 23:07:44.000000000 +0100
++++ bpm1/makefile	2011-02-17 03:30:21.511625729 +0100
+@@ -14,7 +14,8 @@
+ CFLAGS=-DLINUX -DSHORT_ONE
+ JOBS=1
+ include defines
+-LINK =  $(CPP) $(LDFLAGS) $(QT_INCLUDE_PATH) $(QT_LIBRARY_PATH) $(QT_LIBS)
++LINK =  $(CPP) 
++LINKFLAGS = $(LDFLAGS) $(QT_INCLUDE_PATH) $(QT_LIBRARY_PATH) $(QT_LIBS)
+ 
+ # Check all the link targets
+ .link-targets:
+diff -ru -x define bpm2/sources bpm1/sources
+--- bpm2/sources	2009-12-04 13:16:00.000000000 +0100
++++ bpm1/sources	2011-02-17 03:32:04.222625727 +0100
+@@ -44,20 +44,20 @@
+ 
+ aoc: ao-syntax.o ao-lexer.o aoc.o sao-printer.o
+ 	@echo " [link] "$@
+-	@$(LINK) $(CFLAGS) $^ -o $@
++	@$(LINK) $(CFLAGS) $^ -o $@  $(LINKFLAGS)
+ 
+ 
+ doc: do-syntax.o do-lexer.o doc.o do-printer.o doc.o
+ 	@echo " [link] "$@
+-	@$(LINK) $(CFLAGS) $^ -o $@		
++	@$(LINK) $(CFLAGS) $^ -o $@  $(LINKFLAGS)
+ 
+ fixname: fixname.o
+ 	@echo " [link] "$@
+-	@$(LINK) $(CFLAGS) $< -o $@
++	@$(LINK) $(CFLAGS) $< -o $@  $(LINKFLAGS)
+ 
+ profile-clock: profile-clock.o
+ 	@echo " [link] "$@
+-	@$(LINK) $(CFLAGS) $< -o $@
++	@$(LINK) $(CFLAGS) $< -o $@  $(LINKFLAGS)
+ 
+ version.h: profile-clock
+ 	@echo " [test] clock - 10 seconds"
diff --git a/media-sound/bpmdj/files/bpmdj-new.sh b/media-sound/bpmdj/files/bpmdj-new.sh
new file mode 100644
index 0000000..0c11222
--- /dev/null
+++ b/media-sound/bpmdj/files/bpmdj-new.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#set -x
+if [ ! -d ~/.bpmdj ]; then
+        # create needed directories
+        mkdir -p  ~/.bpmdj/fragments
+        mkdir -p  ~/.bpmdj/index
+        mkdir -p  ~/.bpmdj/music
+        # link application to user-directory
+        ln -sf /usr/share/bpmdj/sequences ~/.bpmdj
+fi
+
+(cd ~/.bpmdj && bpmdj_orig)
diff --git a/media-sound/bpmdj/metadata.xml b/media-sound/bpmdj/metadata.xml
new file mode 100644
index 0000000..d480824
--- /dev/null
+++ b/media-sound/bpmdj/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>klondike@xiscosoft.es</email>
+		<name>Francisco Blas Izquierdo Riera</name>
+	</maintainer>
+	<use>
+		<flag name='extclock'>Enables support for external clocks</flag>
+		<flag name='midi'>Enables experimental midi device support</flag>
+	</use>
+</pkgmetadata>