public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/multilib-portage:master commit in: media-sound/jack-audio-connection-kit/, ...
@ 2012-10-14  1:29 Nathan Phillip Brink
  0 siblings, 0 replies; only message in thread
From: Nathan Phillip Brink @ 2012-10-14  1:29 UTC (permalink / raw
  To: gentoo-commits

commit:     b2c8b283adc74d781228f54ab32456b57a86b010
Author:     Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 01:29:22 2012 +0000
Commit:     Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 01:29:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=b2c8b283

media-sound/jack-audio-connection-kit: Add media-sound/jack-audio-connection-kit-0.121.3 patched according to bug #378999.

(Portage version: 2.2.0_alpha135-r1/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 6BA81050)

---
 media-sound/jack-audio-connection-kit/Manifest     |   26 +++++++
 .../files/jack-audio-connection-kit-freebsd.patch  |   13 ++++
 .../jack-audio-connection-kit-sparc-cpuinfo.patch  |   17 +++++
 .../files/jack-r4778-simd-CFLAGS-a.patch           |   56 +++++++++++++++
 .../jack-audio-connection-kit-0.121.3.ebuild       |   71 ++++++++++++++++++++
 media-sound/jack-audio-connection-kit/metadata.xml |   11 +++
 6 files changed, 194 insertions(+), 0 deletions(-)

diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
new file mode 100644
index 0000000..16e23ca
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX jack-audio-connection-kit-freebsd.patch 496 SHA256 7834f5ec198f8e69e2ac119fc2c4ee349ed7e38d003e473fcb41257e7b605df8 SHA512 7c0cf60ddd3d07e12e036082ab10299308d1e112c6190d008a739ab0374c8ecf9e2dcb703055a58f8098e5187044e2351a1786271cecdeae23cbed72e6d68cd6 WHIRLPOOL 3d11baf0f4ebe0613c378d79efcb6b81f94c28e9070471b9a496dda5f0ba90a2eac1e789a621d7ec5d109f018a7f67b0adbd53bbce9e059f3e18b04ca4fb7cd1
+AUX jack-audio-connection-kit-sparc-cpuinfo.patch 659 SHA256 256d48109d32ce8af89042401508392fbb90c499d4cf8b056104dc1a47522fe5 SHA512 c5964413c99fb1dd20dfe52dd40f857dab1cef123b26f74500e2f5607eda870b563595d39c4e4e0684428971e7295c847253d045b2d9ba0183f358630cfa9888 WHIRLPOOL 01d88bfce0394628fab10c48a4b80f0a025b741c5785f05bd22658fd95594e472439f569a450043cf7cc53700149d0d8b785bb7adc74711474fd3f6bcbc6d66f
+AUX jack-r4778-simd-CFLAGS-a.patch 1905 SHA256 cd3e15d009c6614e06d42542eda5ce7ab0196c44ea57f4a1569ea21940f542e3 SHA512 bc3fb201e0328666bd88e905201865c5397212d7da3b9d3c12df7de89f8f3d8808a1490c23a3fdd1d68ee8ced07f9edba721ed3bf929794466f0518dac9aac43 WHIRLPOOL 19deb9302cae9aabc00d2e3fb249291a75a01a62bd901c2786ede2ba23e7d1036f6fd7db4fa5ef4b4d2bd04bd221dc7ccebd8abd1e40e03af79e8e9f5c54790d
+DIST jack-audio-connection-kit-0.121.3.tar.gz 1083545 SHA256 b7095d3deabeecd19772b37241e89c6c79de6afd6c031ba7567513cfe51beafa SHA512 57323393d5209baefe73cc0cd9a0e818b1cfd260cf9aa36cd6ad800252e22e3ddb7fc46649c54b8e840696878147c2d06c8d39fd7300b5bb92aeb69f44ed710f WHIRLPOOL a256cfb7c3546cb06d6003313802b02812d8da9c13671be9b0341a10442cd348a8b3f7fe65e8d27cc47b4e29ded799fa6cc0efa51d81d01f342c7c8eefbc9c55
+EBUILD jack-audio-connection-kit-0.121.3.ebuild 2009 SHA256 f951f937105e214142893a53527ad061d457538b0ff68713dd7843bd3bba1473 SHA512 6cf824a3acf1625696e0abd0955883fb84d809bd2f08255410ca9d701c66677d535208e70bc478251c7c15155f719f731c8dda7ff6e3f59736d3a549ea9f0cae WHIRLPOOL b865c909b56993bbb335fb4b4687d0e7d2e752f4ccc2a590c6acca4cf93d97fe35cf044d4a711747a284d79f5be9cf29aeaf11a6f613f7e1710c081bc453d52f
+MISC metadata.xml 518 SHA256 7feea095a2e298dafe6804cf19bb4b6d50058c54a7d9f5dc8f6d9772fe6f8cec SHA512 e4070a7024fc514d6194c6e8ad7bbd6408cecc41acc756a2c8dbe1006197ffda615509576b551de4eb1434d222b2a315581c99313f41f3aa34aefb1e3d8ffb30 WHIRLPOOL da12b5b3e8aeccbf3bc5ab6287a3ba2a038c468240f60085303045461cc43d404e9086899fca42cfd4445cc85dd6e31474d59e4facbd4991caa1c1e5e0d7006b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQehVyAAoJEHQ6UuhrqBBQH1UQAKfWRFutUPR0Mag9vXtKKxuN
+b3dHEkPZ6OeU9KqxAyd1+rhHvoxzjU96nBZrbFF07yTMSRfTH2mSkC2NZ5nq6CzW
+QEpLWY/PJc+h7vwqfc5d91dAbblPx/I+4eqLQCIrK+Rph3mKlU/r3TXaSxmipils
+YPlBXuVh0W6fEkBVmTLnkRFtYP3bs+2U0jozAlmURdQhPK2s/sAFpSssIVtGdmlp
+W0QonQJzeVQxiEhHWHJMIF9Bp8jeXx2QM9zzainl3fTWBjx6Teu2p0s5qPj34pM+
+/9VxfXdpnuLIHF8v5gX/xUgDE4iflsiidFzgUStZ+TaeXRCJYsheLE8rfbR8qACi
+XBpm3vup2RVOyExZ2y48Zhnwo9A2VFMPL+G60Dkcu7Vj0xFj4yVCencQbexBmczj
+sLFVGwJy9aZ1YD4cLh/zxWMia5wrzB1/6sbz1UW2iIlcUV19ktnU7WUq8DtXPDwa
+dLKf9b2fLRBzL6GlH2YKbMlegs2oGfboO/C4g5hrY4TTYFg24kpKw+Ezr6tKTU/d
+D44f/dXt2QHIuuUaNQCMlfBFOBNLqsyaCU9n9mP8gIxTfiQPIXpI/3Z+IqqqApZP
+QjraMpVSVU1dJurK41imJHl/4h7qrkghACKcMZE5rytkk9vH3xC2DNRi1qtIpajp
+Q5OUnfsrlmEJf7KdPVnA
+=un1K
+-----END PGP SIGNATURE-----

diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-freebsd.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-freebsd.patch
new file mode 100644
index 0000000..a884ac6
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-freebsd.patch
@@ -0,0 +1,13 @@
+--- jack-audio-connection-kit-0.121.3/configure.old	2012-05-29 11:10:22.000000000 -0400
++++ jack-audio-connection-kit-0.121.3/configure	2012-05-29 11:10:46.000000000 -0400
+@@ -14903,7 +14903,9 @@
+   freebsd*)
+     # current FreeBSD header files conflict with the OSS driver's
+     # barrier code, this may be fixed in 5.3, stay tuned.
+-    USE_BARRIER="no"
++    # USE_BARRIER="no"
++    TRY_POSIX_SHM=yes
++    HOST_DEFAULT_TMP_DIR=/tmp
+     ;;
+   openbsd*)
+     # pthread_barrier* not implemented

diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch
new file mode 100644
index 0000000..8017f90
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch
@@ -0,0 +1,17 @@
+On Linux/SPARC, /proc/cpuinfo doesn't include "Cpu0Bogo" anymore,
+use "Cpu0ClkTck" instead to determine the processor speed.
+
+linux upstream commit 8b99cfb8cc51adae7f5294c8962a026c63100959
+
+--- old/config/os/gnu-linux/time.c
++++ new/config/os/gnu-linux/time.c
+@@ -152,7 +152,8 @@
+       defined(__x86_64__)
+ 		ret = sscanf(buf, "cpu MHz         : %" SCNu64, &mhz);
+ #elif defined( __sparc__ )
+-		ret = sscanf(buf, "Cpu0Bogo        : %" SCNu64, &mhz);
++		ret = sscanf(buf, "Cpu0ClkTck	: %" PRIx16, &mhz);
++		mhz = mhz / 1000 / 1000; // hz -> mhz
+ #elif defined( __mc68000__ )
+ 		ret = sscanf(buf, "Clocking:       %" SCNu64, &mhz);
+ #elif defined( __s390__  )

diff --git a/media-sound/jack-audio-connection-kit/files/jack-r4778-simd-CFLAGS-a.patch b/media-sound/jack-audio-connection-kit/files/jack-r4778-simd-CFLAGS-a.patch
new file mode 100644
index 0000000..57e5578
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-r4778-simd-CFLAGS-a.patch
@@ -0,0 +1,56 @@
+Index: libjack/Makefile.am
+===================================================================
+--- libjack/Makefile.am	(revision 4778)
++++ libjack/Makefile.am	(working copy)
+@@ -24,19 +24,19 @@
+ 	     transclient.c \
+ 	     unlock.c
+ 
+-simd.lo: $(srcdir)/simd.c
+-	$(LIBTOOL) --mode=compile $(CC) -I$(top_builddir) $(JACK_CORE_CFLAGS) $(SIMD_CFLAGS) -c -o simd.lo $(srcdir)/simd.c
+-
+ lib_LTLIBRARIES	= libjack.la
++noinst_LTLIBRARIES = libsimd.la
+ 
+ noinst_HEADERS	= local.h
+ 
+ AM_CFLAGS = $(JACK_CFLAGS) -DJACK_LOCATION=\"$(bindir)\"
+ AM_CXXFLAGS = $(JACK_CFLAGS)
+ 
++libsimd_la_SOURCES = simd.c
++libsimd_la_CFLAGS = $(AM_CFLAGS) $(SIMD_CFLAGS)
++
+ libjack_la_CFLAGS = $(AM_CFLAGS)
+ 
+ libjack_la_SOURCES = $(SOURCE_FILES)
+-libjack_la_LIBADD  = simd.lo @OS_LDFLAGS@
++libjack_la_LIBADD  = libsimd.la $(OS_LDFLAGS)
+ libjack_la_LDFLAGS  = -export-dynamic -version-info @JACK_SO_VERSION@
+-
+Index: jackd/Makefile.am
+===================================================================
+--- jackd/Makefile.am	(revision 4778)
++++ jackd/Makefile.am	(working copy)
+@@ -41,6 +41,7 @@
+ jackstart_LDFLAGS = -lcap
+ 
+ lib_LTLIBRARIES	= libjackserver.la
++noinst_LTLIBRARIES	= libsimd.la
+ 
+ libjackserver_la_CFLAGS = $(AM_CFLAGS)
+ 
+@@ -51,11 +52,11 @@
+         ../libjack/midiport.c ../libjack/ringbuffer.c ../libjack/shm.c \
+         ../libjack/thread.c ../libjack/time.c  ../libjack/transclient.c \
+         ../libjack/unlock.c
+-libjackserver_la_LIBADD  = simd.lo @OS_LDFLAGS@ 
++libjackserver_la_LIBADD  = libsimd.la @OS_LDFLAGS@
+ libjackserver_la_LDFLAGS  = -export-dynamic -version-info @JACK_SO_VERSION@
+ 
+-simd.lo: $(srcdir)/../libjack/simd.c
+-	$(LIBTOOL) --mode=compile $(CC) -I$(top_builddir) $(JACK_CORE_CFLAGS) $(SIMD_CFLAGS) -c -o simd.lo $(srcdir)/../libjack/simd.c
++libsimd_la_SOURCES = ../libjack/simd.c
++libsimd_la_CFLAGS = $(AM_CFLAGS) $(SIMD_CFLAGS)
+ 
+ man_MANS = jackd.1 jackstart.1
+ EXTRA_DIST = $(man_MANS)

diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
new file mode 100644
index 0000000..abdfe11
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild,v 1.14 2012/07/15 17:57:38 armin76 Exp $
+
+EAPI=2
+
+inherit autotools flag-o-matic eutils multilib
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org"
+SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd"
+IUSE="3dnow altivec alsa coreaudio doc debug examples mmx oss sse cpudetection pam"
+
+RDEPEND=">=media-libs/libsndfile-1.0.0
+	sys-libs/ncurses
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	media-libs/libsamplerate
+	!media-sound/jack-cvs"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${RDEPEND}
+	pam? ( sys-auth/realtime-base )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-sparc-cpuinfo.patch"
+	epatch "${FILESDIR}/${PN}-freebsd.patch"
+	epatch "${FILESDIR}"/jack-r4778-simd-CFLAGS-a.patch #bug #378999
+
+	eautomake
+}
+
+src_configure() {
+	local myconf=""
+
+	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
+	if use cpudetection && use 3dnow && use mmx && use sse ; then
+		einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
+		myconf="${myconf} --enable-dynsimd"
+		append-flags -mmmx -msse -m3dnow -O2
+	fi
+
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable mmx) \
+		$(use_enable oss) \
+		--disable-portaudio \
+		$(use_enable sse) \
+		--with-html-dir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		${myconf} || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS TODO README
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/example-clients"
+	fi
+}

diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
new file mode 100644
index 0000000..7d8d867
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <use>
+    <flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
+    <flag name="cpudetection">Enables runtime cpudetection</flag>
+    <flag name="netjack">Build with support for Realtime Audio Transport over generic IP</flag>
+	<flag name="pam">Add basic realime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+  </use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-10-14  1:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-14  1:29 [gentoo-commits] proj/multilib-portage:master commit in: media-sound/jack-audio-connection-kit/, Nathan Phillip Brink

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox