root
11 years ago
parent
7423dec2ca
commit
4e427dc9d8
@ -0,0 +1,60 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r1.ebuild,v 1.4 2013/07/16 01:26:22 ssuominen Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
DESCRIPTION="Programmable Completion for bash"
|
||||
HOMEPAGE="http://bash-completion.alioth.debian.org/"
|
||||
SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="|| ( >=app-shells/bash-4.1 app-shells/zsh )
|
||||
sys-apps/miscfiles
|
||||
!<app-shells/gentoo-bashcomp-20130101" #472938#c1
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# use the copies from >=sys-apps/util-linux-2.23 wrt #468544 -> hd and ncal
|
||||
# becomes dead symlinks as a result
|
||||
local file
|
||||
for file in cal dmesg eject hd hexdump hwclock ionice look ncal renice rtcwake; do
|
||||
rm -f "${ED}"/usr/share/bash-completion/completions/${file}
|
||||
done
|
||||
|
||||
# use the copy from app-editors/vim-core:
|
||||
rm -f "${ED}"/usr/share/bash-completion/completions/xxd
|
||||
|
||||
# use the copy from net-misc/networkmanager:
|
||||
rm -f "${ED}"/usr/share/bash-completion/completions/nmcli
|
||||
|
||||
dodoc AUTHORS CHANGES README
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -z ${REPLACING_VERSIONS} ]]; then
|
||||
elog "If you use non-login shells you still need to source"
|
||||
elog "/usr/share/bash-completion/bash_completion in your ~/.bashrc."
|
||||
else
|
||||
ewarn "Please re-emerge all packages on your system which install"
|
||||
ewarn "completions in /usr/share/bash-completion."
|
||||
ewarn "They should now be in their own completions/ sub directory."
|
||||
ewarn
|
||||
ewarn "One way to do this is to run the following command:"
|
||||
ewarn "emerge -av1 \$(qfile -q -S -C /usr/share/bash-completion)"
|
||||
ewarn "Note that qfile can be found in app-portage/portage-utils"
|
||||
fi
|
||||
|
||||
if has_version 'app-shells/zsh'; then
|
||||
elog
|
||||
elog "If you are interested in using the provided bash completion functions with"
|
||||
elog "zsh, valuable tips on the effective use of bashcompinit are available:"
|
||||
elog " http://www.zsh.org/mla/workers/2003/msg00046.html"
|
||||
elog
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST contextlib2-0.4.0.tar.gz 18741 SHA256 55a5dc78f7a742a0e756645134ffb39bbe11da0fea2bc0f7070d40dac208b732 SHA512 622762c5490f0ff3e4b421a63bccce8fe0753977112ee0db9640dad31093c40c8a331f3d7cade9925f17903eaeaa376925ef607d7a440170c7c5ec1c8e04f56a WHIRLPOOL b1b2b753b15cb5124ebc378acf6b959839e727a53d3a096eea5b04404fc059f6a1b49b9fa23cc6310ad1b9bcfa655a82088af0906a74f8326d7bf57f3793440c
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/contextlib2/contextlib2-0.4.0.ebuild,v 1.1 2013/07/15 19:46:14 mgorny Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Backports and enhancements for the contextlib module"
|
||||
HOMEPAGE="https://pypi.python.org/pypi/contextlib2"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="PSF-2.4"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
|
||||
|
||||
python_test() {
|
||||
"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>python</herd>
|
||||
</pkgmetadata>
|
||||
@ -1,2 +1,2 @@
|
||||
DIST django-ldapdb-0.1.0_p20120424.tar.bz2 12627 SHA256 ff98287da2b564cea7d02b8757b60b1f2366da09a7d5abf736098d249795047a SHA512 48b0319812e1731971d1d0ac0991e049b7e614a3c1d7e86fcbb47707b0c0317bd6a6f8ff414850d57175fb1c8c095521bfd20feaf4c5aa38b0af395471f3e92d WHIRLPOOL ddb31df8f5771e19e5e0a43ed8839eeafac7ac24f012ab7a92d9b30a89556d525ad2d79c2a428308a9ce616e4057dde15257acec32eba0ad20d4cb0ae5f49503
|
||||
DIST django-ldapdb-0.2.0_p20130712.tar.gz 14003 SHA256 c2378a2307cdb5304181afc4ab2e5ad46783235c34ba5c3e65c21f302884dfaa SHA512 0b2d045260e5b2d322db11d54e69c8770d12aa680e1a885e0a8485fe6ba55d18df84fc51a001c1a6c07c256bc11d2861ae2881af4437b1f75c32714d7c7a116d WHIRLPOOL 379d10a363ee370552df7170e7c1921d31f2b54ce89ea54527b9bec34c8346b534604e710254e316bdf3cf03a16e22dc2b498a8221c9512dd86fc49cc9d4735d
|
||||
DIST django-ldapdb-0.1.0_p20130712.tar.gz 14003 SHA256 c2378a2307cdb5304181afc4ab2e5ad46783235c34ba5c3e65c21f302884dfaa SHA512 0b2d045260e5b2d322db11d54e69c8770d12aa680e1a885e0a8485fe6ba55d18df84fc51a001c1a6c07c256bc11d2861ae2881af4437b1f75c32714d7c7a116d WHIRLPOOL 379d10a363ee370552df7170e7c1921d31f2b54ce89ea54527b9bec34c8346b534604e710254e316bdf3cf03a16e22dc2b498a8221c9512dd86fc49cc9d4735d
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
DIST UrbanTerror-4.2.012-to-4.2.013.zip 103786786 SHA256 ea88a4fcba89bff56caaa982884bbd10977902a71f61c29a36ce50024cdbe017 SHA512 3c9d256df659888c94c4174e923c5dc331d6a4f19845c954b454e04eb42e6a690fb4cd5c71597659f6cae113c2a301483220fd65efc7d2d82122a8a50634a2e9 WHIRLPOOL bd03ea14e00eb65de61cbb0d33636855330f2bc941c3ade2cb95ca6e59e6f675bf98e84eba6ccf80234a191c960ab3f26c8c4a4a32c997efb4536725f540b781
|
||||
DIST UrbanTerror-4.2.013-to-4.2.014.zip 21228975 SHA256 a389bbd14f3d11f294b7f3af6d543cf7d9001983ea7b71c167e6b5b7954b1db6 SHA512 f31fd4ae95f6270d7400a3e3bbdbf2fcdfb8e61016a1854d598c3d248208dc6a67bb2df8b5e1cc5461fe30caace1a827062030ce4d3e86af7035098590b9664e WHIRLPOOL 919fd5d8884b59398971ead09b60624cbcf73d85c3fe8b3860b12c36ac790ba3e475613b2e9878fc5349ea0a8274ae6554522a43dad20bda69dcb1b87a6b7a07
|
||||
DIST UrbanTerror42_full012.zip 1529738026 SHA256 5b66e623ae5d065f8fb265e581c3640d3010af30457344874f4970d2d9092e6a SHA512 23d8ac966f6f0fbd52b633b31fc0f333151be0e64b8698b424e9f7a3524034339dd66e95c33ed1e1f451e22baa2522d30fdbc83091a3340b2ed42a55908f31ee WHIRLPOOL b438efe82d621b1800445e30c5eae5df4cfbe8ee02f1c8f58a5e33f0cf3d8261628f2100bb0e7d2782bdba0f578dcd6e626e1d3c775124d304c1c22246bad77a
|
||||
DIST UrbanTerror42_full_009.zip 1316330716 SHA256 7090820ad72cbeb556402da637a770943e64523a0eb30a3d78c8f25ed9c7025f SHA512 95241facd437224541dc0d1af5c4412b7e3ebb49a1f75f4ef7c9c779fb8ef57f8e0d9e58b71f927c9a6125a6dfbb01bcad79706cf8b84e659bd90c8e514dd1f6 WHIRLPOOL 595a9ece67a0cc7f9718f2329c50daef055e7c9794ad709186e7ab94a4cbbbfc704cbc44801c7bfa7127aad7396001beb1afcb6bc077bb64336223df3f04d95c
|
||||
DIST UrbanTerror_41_FULL.zip 754307397 SHA256 5706957783d0e4e77fcc4bbbc2df83aefc0f9a6388f6a63b60947e84f9ed265f SHA512 4ff729df5472b9bd3138e62fe2e03c794dd9293ba08106c026a120d6c9971ea2420c3e81abb99e2b2ae8a082a07e96468154958b36a770cce0e931f9a499e623 WHIRLPOOL 4752ff4455d2c69fcc732ee4035b097aed852e55bf1077c59e650297f69b87ea59ff53573b653f22843ffe7fe35e524eb66f1033049dcc364ca554bf875dad18
|
||||
DIST ioq3-1807-urt-251210-git-nobumpy.tar.xz 276824 SHA256 9f14d629f2a9c8fe0a593b5a08d1ceadec6a22c387806d9e5f50e22a537c2b74 SHA512 e190f60d9c3275d285c75ba2947734cf9f555d373618a37f3b38464d10fa85a4af6460918676b18a96885fe7280c856f6c9877175dbbe82929f5f7c1704fc6a3 WHIRLPOOL 104960ca4066726cdd5dbd0d4d93998e6fc648c4e969109b3a1634232f6d4e3556c3107dd0f78860444ed3635bd3f4a979cb67d90a650b1dd8f51175b9b8e10d
|
||||
DIST ioquake3-1807.tar.bz2 7054317 SHA256 10d3fcee3cf41a063e686048740417c8d58496f3dff5745f897a8803318850c2 SHA512 5fe54b628c66bd8becab259d133825e762a0814c7060c8d1f48e2b662f07f80e50fba8c7ae0677b02e231eae59eba65e143eb802baa79a7de89a7a612ae9682d WHIRLPOOL 03ed102b386b33ceff1588966409f1d4c6be1d980b40cac0eda1d2a7e763e45b3cd21a9817f77d60157cf741f4d7479926aac118f5972bb7d5fd6bc72517faa8
|
||||
DIST release-4.2.007.tar.gz 26640879 SHA256 96f39ad2b952b38d1fc53dd04198352fe0b396eb2a3fb696a827199222902989 SHA512 1b57a94b986e159672b7befc49771df1c5cb1637757c4e4502ca276c6d067004cac047eee0de53ad15a68c87ffb2ad995517a028f66fe3c646f3335c74866802 WHIRLPOOL a8a54c586a3e533c0090d38d1708999212e6e1e338cd97b56b3cb4a9520fed7fd8b72c8fc898e8673097b0d46a98b62f42ddbcd02d6bb908bd7ce67a9e985101
|
||||
DIST urbanterror-4.2.012.tar.gz 25867411 SHA256 d46a2f9895e196fb64d59c1cd81384a9851e60f1abb7701f2cde50771cbf99d8 SHA512 6f070983ff2b9c2da0764819f09ec4da01f4e9ea7d27a9ad55cd15d8a924c88757b5020fe8b87dc0f162ce485fe22e0fab075a187cb10225efa561e036222983 WHIRLPOOL 082a6a04d30c8ed24a0a82f9b99b500d4224d806962ca73812b653df13a810105920613f7ecfe6ba06cddccfaed057167d46347ba866eef84095ef7ea2943073
|
||||
DIST urbanterror-4.2.013.tar.gz 9444597 SHA256 da7ceb860b8c87a776e005b5b26c8cc064cb68ab8a730e6c1fc94bb607cb88a8 SHA512 0a4a38e00b269254df3596f1b224bd18a90429983381d4e48cb4f2fde6ea8a5a60dd74f7ae4de5c36ac83c6a4cb25ad6ce675eee69d4474c6fe52c03e5a8f10b WHIRLPOOL d344040c5be517c59805ea014f04eba133dbaf3358dff0c6f34ff643ff7defa93e5c63aca5462178f3add6189af23d1724562ef6490571f8611cf1709f4e6556
|
||||
DIST urbanterror-4.2.014.tar.gz 9466024 SHA256 2f1701f5775a048defc77d5987107d8f532157f47fea3a6193ec20e84ab248d8 SHA512 952ee57c385be3381b6c96cc4ea3233d425529f3d46e5e445c09a172187990ac9303493daaf46c73ec33a555d241f9bae890d8202808dc6dceccfd3e6a374c62 WHIRLPOOL 0a8556b8b1ae724aadeea1cc5f44008b1050863521df4b054d98cc2a187ef0e3c32a1d935c270b6ed14603995f4e69ff63513f1d07869526ecb1c94efd32a6e0
|
||||
DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
--- Makefile
|
||||
+++ Makefile
|
||||
@@ -213,7 +213,7 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
|
||||
+ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
|
||||
|
||||
ifeq ($(USE_OPENAL),1)
|
||||
BASE_CFLAGS += -DUSE_OPENAL=1
|
||||
@@ -239,19 +239,15 @@
|
||||
BASE_CFLAGS += -I/usr/X11R6/include
|
||||
endif
|
||||
|
||||
- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
|
||||
+ OPTIMIZE = -ffast-math -funroll-loops
|
||||
|
||||
ifeq ($(ARCH),x86_64)
|
||||
- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
|
||||
- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
|
||||
- -fstrength-reduce
|
||||
+ OPTIMIZE = -ffast-math -funroll-loops
|
||||
# experimental x86_64 jit compiler! you need GNU as
|
||||
HAVE_VM_COMPILED = true
|
||||
else
|
||||
ifeq ($(ARCH),i386)
|
||||
- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
|
||||
- -funroll-loops -falign-loops=2 -falign-jumps=2 \
|
||||
- -falign-functions=2 -fstrength-reduce
|
||||
+ OPTIMIZE = -ffast-math -funroll-loops
|
||||
HAVE_VM_COMPILED=true
|
||||
else
|
||||
ifeq ($(ARCH),ppc)
|
||||
@@ -265,7 +261,7 @@
|
||||
BASE_CFLAGS += -DNO_VM_COMPILED
|
||||
endif
|
||||
|
||||
- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
|
||||
+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
|
||||
|
||||
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
|
||||
|
||||
@@ -274,7 +270,7 @@
|
||||
SHLIBLDFLAGS=-shared $(LDFLAGS)
|
||||
|
||||
THREAD_LDFLAGS=-lpthread
|
||||
- LDFLAGS=-ldl -lm
|
||||
+ LDFLAGS+=-ldl -lm
|
||||
|
||||
ifeq ($(USE_SDL),1)
|
||||
CLIENT_LDFLAGS=$(shell sdl-config --libs)
|
||||
@@ -1153,13 +1149,13 @@
|
||||
|
||||
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
|
||||
$(echo_cmd) "LD $@"
|
||||
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
|
||||
- $(LDFLAGS) $(LIBSDLMAIN)
|
||||
+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) \
|
||||
+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
|
||||
|
||||
$(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
|
||||
$(echo_cmd) "LD $@"
|
||||
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
|
||||
- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
|
||||
+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
|
||||
+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
|
||||
|
||||
ifneq ($(strip $(LIBSDLMAIN)),)
|
||||
ifneq ($(strip $(LIBSDLMAINSRC)),)
|
||||
@ -0,0 +1,78 @@
|
||||
commit dc89402ef3305202a2ec51e6c2c073bb1f65fb54
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Wed Jul 10 01:25:27 2013 +0200
|
||||
|
||||
respect CFLAGS/LDFLAGS
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 3c134d5..54989f3 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -213,7 +213,7 @@ ifeq ($(PLATFORM),linux)
|
||||
endif
|
||||
endif
|
||||
|
||||
- BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -pipe
|
||||
+ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
|
||||
|
||||
ifeq ($(USE_OPENAL),1)
|
||||
BASE_CFLAGS += -DUSE_OPENAL=1
|
||||
@@ -238,18 +238,17 @@ ifeq ($(PLATFORM),linux)
|
||||
else
|
||||
BASE_CFLAGS += -I/usr/X11R6/include
|
||||
endif
|
||||
- #Anything more then -O2 and *mmx *msse/2/ causes hitching with urbanterror\
|
||||
-#also -march is illrelavent unless you know your target cpu
|
||||
- OPTIMIZE = -O2 -mmmx -msse -msse2 -msse3
|
||||
+ # what an idiotic comment
|
||||
+ OPTIMIZE =
|
||||
#having x86_x64 implys having full SSE support up to SSE3 so we will use it,\
|
||||
#for old cpus we don't care because anything pre Pentium 4/Althlon 1600+ won't run UrbanTerror
|
||||
ifeq ($(ARCH),x86_64)
|
||||
- OPTIMIZE = -O2 -msse -msse2 -msse3
|
||||
+ OPTIMIZE =
|
||||
# experimental x86_64 jit compiler! you need GNU as
|
||||
HAVE_VM_COMPILED = true
|
||||
else
|
||||
ifeq ($(ARCH),i386)
|
||||
- OPTIMIZE = -O2 -mmmx
|
||||
+ OPTIMIZE =
|
||||
|
||||
HAVE_VM_COMPILED=true
|
||||
else
|
||||
@@ -264,7 +263,7 @@ ifeq ($(PLATFORM),linux)
|
||||
BASE_CFLAGS += -DNO_VM_COMPILED
|
||||
endif
|
||||
|
||||
- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -wall
|
||||
+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
|
||||
|
||||
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
|
||||
|
||||
@@ -273,7 +272,7 @@ ifeq ($(PLATFORM),linux)
|
||||
SHLIBLDFLAGS=-shared $(LDFLAGS)
|
||||
|
||||
THREAD_LDFLAGS=-lpthread
|
||||
- LDFLAGS=-ldl -lm
|
||||
+ LDFLAGS+=-ldl -lm
|
||||
|
||||
ifeq ($(USE_SDL),1)
|
||||
CLIENT_LDFLAGS=$(shell sdl-config --libs)
|
||||
@@ -1157,13 +1156,13 @@ endif
|
||||
|
||||
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
|
||||
$(echo_cmd) "LD $@"
|
||||
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
|
||||
- $(LDFLAGS) $(LIBSDLMAIN)
|
||||
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \
|
||||
+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
|
||||
|
||||
$(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
|
||||
$(echo_cmd) "LD $@"
|
||||
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
|
||||
- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
|
||||
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
|
||||
+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
|
||||
|
||||
ifneq ($(strip $(LIBSDLMAIN)),)
|
||||
ifneq ($(strip $(LIBSDLMAINSRC)),)
|
||||
@ -1 +1,2 @@
|
||||
DIST homerun-1.0.0.tar.bz2 192788 SHA256 7748fde872263dc66203d03cdcd3b71f3aae1d83718881ae7e08548d357a65a9 SHA512 bfeaa9bed75260d0ff0a739a0358832ee242e6d0698e3bacba26973911912ba5ed7bccace06f1809e58555aeb9c7c5bb12457da25fbad724ff49237e15f1a2e1 WHIRLPOOL 57b7ba6dda1b2add5181184d84dab291e7da890753e0f3377fdd6c7e2176213ce54647ace5ad406cbce2b814a345212706085a0686edf4764dd2bcfd2a6279d2
|
||||
DIST homerun-1.1.0.tar.xz 171844 SHA256 8c6306c731ce0466116bd2efe948c329dec66882449333d6836d0575ea19e4b4 SHA512 ef4988514c15257be72a429396fd52dbdfbc48ccd034054147ca4aed308582c03d80323b890f66d7adb8b8b87b151e63afd6475cdbd23b5e29e27031b1117fb7 WHIRLPOOL ee744031bcacdf01b7f459eab40064a3e606daf5c40cfc7c1ea4a7134f44608085bebd0bfdf88ebe3538e7fbefc2fcfd74622504aad7cdd6a5b808f8905022c7
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/kde-misc/homerun/homerun-1.1.0.ebuild,v 1.1 2013/07/15 21:33:02 johu Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
DECLARATIVE_REQUIRED="always"
|
||||
VIRTUALX_REQUIRED="test"
|
||||
VIRTUALDBUS_TEST="true"
|
||||
KDE_LINGUAS="cs da de el es fi lt mr nl pl pt pt_BR ru sk sl sv tr uk"
|
||||
KDE_MINIMAL="4.10"
|
||||
inherit kde4-base
|
||||
|
||||
DESCRIPTION="Application launcher for KDE Plasma desktop"
|
||||
HOMEPAGE="https://projects.kde.org/projects/playground/base/homerun"
|
||||
[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 BSD"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="4"
|
||||
IUSE="debug"
|
||||
|
||||
DEPEND="
|
||||
$(add_kdebase_dep libkonq)
|
||||
$(add_kdebase_dep libkworkspace)
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
$(add_kdebase_dep plasma-workspace)
|
||||
"
|
||||
|
||||
# Fails 2 out of 6, check later again.
|
||||
# With virtualx/virtualdbus it hangs
|
||||
RESTRICT="test"
|
||||
@ -1 +1,2 @@
|
||||
DIST kshutdown-source-3.0.zip 421712 SHA256 71295e88e30538e6bc9aceb0ba2d60c2bb6c47739a97ee76f7f1f767044493ee SHA512 e3d7d0d870bed6b107daaa9d26a1e6638892367d9470c28fe6ebeb0ee322934a7680ad8a0fbdd70e0c54797b42a1f9629ac883da2ec5666f3b16499d6ccce7fc WHIRLPOOL 70c6365ca09a7d1c39ad24578860ae3f702ae14f9f7adfd1d143b676b7260d520c0845fea5dd0379eb7d8485f016aeb25260ec9c0bd3507775f30efb8b20f2f5
|
||||
DIST kshutdown-source-3.0beta8.zip 421807 SHA256 5b4242777943574e0607687af6e6270ff655f16612c8b35400a872de35c2a4bd SHA512 9f8de47fbe6c9be0d9cbfdf39ee53bd1de2e40bf37d5862ccff0fc38d84b30464f8df872174c494aa0853a766dc5a7e455f9033478f5cbc08dbb5ea6322e9a4f WHIRLPOOL 6f21e528adc900d98e629424c15c8bd2efed9d7a55eb46203e7d7db91d81c4d072858de0f1f4ee58d85ce94be21dd98f1cd8ae1e03692d6230dc23976237d8e3
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/kshutdown-3.0.ebuild,v 1.1 2013/07/15 22:17:04 mrueg Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
KDE_MINIMAL="4.8"
|
||||
KDE_LINGUAS="ar bg cs da de el es fr hu it nb nl pl pt pt_BR ru sk sr
|
||||
sr@ijekavian sr@ijekavianlatin sr@latin sv tr zh_CN"
|
||||
inherit kde4-base
|
||||
|
||||
MY_P=${PN}-source-${PV/_}
|
||||
|
||||
DESCRIPTION="A shutdown manager for KDE"
|
||||
HOMEPAGE="http://kshutdown.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="4"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="debug"
|
||||
|
||||
RDEPEND="
|
||||
$(add_kdebase_dep libkworkspace)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${P/_}
|
||||
@ -1,79 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27-r2.ebuild,v 1.2 2013/05/06 13:50:28 ssuominen Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit autotools eutils multilib python-single-r1
|
||||
|
||||
DESCRIPTION="Advanced Linux Sound Architecture Library"
|
||||
HOMEPAGE="http://www.alsa-project.org/"
|
||||
SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="doc debug alisp python"
|
||||
|
||||
RDEPEND="python? ( ${PYTHON_DEPS} )"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( >=app-doc/doxygen-1.2.6 )"
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# dlclose, pcm, kernel, inline, inline-2 are all from upstream
|
||||
epatch \
|
||||
"${FILESDIR}"/1.0.25-extraneous-cflags.diff \
|
||||
"${FILESDIR}"/${P}-{dlclose,pcm,kernel}.patch \
|
||||
"${FILESDIR}"/${P}-inline{,-2}.patch
|
||||
|
||||
sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #466980
|
||||
|
||||
epatch_user
|
||||
|
||||
eautoreconf
|
||||
# if eautoreconf'd with recent autoconf, then epunt_cxx is
|
||||
# unncessary wrt #460974
|
||||
# epunt_cxx
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
use elibc_uclibc && myconf="--without-versioned"
|
||||
|
||||
econf \
|
||||
--enable-shared \
|
||||
--disable-resmgr \
|
||||
--enable-rawmidi \
|
||||
--enable-seq \
|
||||
--enable-aload \
|
||||
$(use_with debug) \
|
||||
$(use_enable alisp) \
|
||||
$(use_enable python) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
if use doc; then
|
||||
emake doc
|
||||
fgrep -Zrl "${S}" "${S}/doc/doxygen/html" | \
|
||||
xargs -0 sed -i -e "s:${S}::"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
prune_libtool_files --all
|
||||
find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
|
||||
|
||||
dodoc ChangeLog TODO
|
||||
use doc && dohtml -r doc/doxygen/html/*
|
||||
}
|
||||
@ -1,102 +0,0 @@
|
||||
From e1e40c25535af35fa5cdf7ffc95a01fbff098ddd Mon Sep 17 00:00:00 2001
|
||||
From: Takashi Iwai <tiwai@suse.de>
|
||||
Date: Mon, 15 Apr 2013 18:12:17 +0200
|
||||
Subject: [PATCH] Fix doubly call of dlclose() in dlobj caching code
|
||||
|
||||
When multiple dlobj_cache items point to the same dlobj, dlclose() may
|
||||
be called wrongly multiple times when these items are cleared, because
|
||||
we manage the dlobj_cache list as a flat list. This results in a bad
|
||||
segfault we've seen in openal-soft, for example.
|
||||
|
||||
For fixing this, we need the refcounting of dlobj itself. But, in
|
||||
this case, we don't have to manage yet another list, since dlopen()
|
||||
does a proper refcounting by itself. That is, we can just call always
|
||||
dlopen() at each time a new function is assigned, and also call
|
||||
dlclose() for each released dlobj_cache item at cleanup.
|
||||
|
||||
Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=814250
|
||||
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
src/dlmisc.c | 31 +++++++++++--------------------
|
||||
1 file changed, 11 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/src/dlmisc.c b/src/dlmisc.c
|
||||
index 3788382..2de0234 100644
|
||||
--- a/src/dlmisc.c
|
||||
+++ b/src/dlmisc.c
|
||||
@@ -208,8 +208,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
|
||||
{
|
||||
struct list_head *p;
|
||||
struct dlobj_cache *c;
|
||||
- void *func, *dlobj = NULL;
|
||||
- int dlobj_close = 0;
|
||||
+ void *func, *dlobj;
|
||||
|
||||
snd_dlobj_lock();
|
||||
list_for_each(p, &pcm_dlobj_list) {
|
||||
@@ -220,7 +219,6 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
|
||||
continue;
|
||||
if (!lib && c->lib)
|
||||
continue;
|
||||
- dlobj = c->dlobj;
|
||||
if (strcmp(c->name, name) == 0) {
|
||||
c->refcnt++;
|
||||
func = c->func;
|
||||
@@ -228,17 +226,16 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
|
||||
return func;
|
||||
}
|
||||
}
|
||||
+
|
||||
+ dlobj = snd_dlopen(lib, RTLD_NOW);
|
||||
if (dlobj == NULL) {
|
||||
- dlobj = snd_dlopen(lib, RTLD_NOW);
|
||||
- if (dlobj == NULL) {
|
||||
- if (verbose)
|
||||
- SNDERR("Cannot open shared library %s",
|
||||
+ if (verbose)
|
||||
+ SNDERR("Cannot open shared library %s",
|
||||
lib ? lib : "[builtin]");
|
||||
- snd_dlobj_unlock();
|
||||
- return NULL;
|
||||
- }
|
||||
- dlobj_close = 1;
|
||||
+ snd_dlobj_unlock();
|
||||
+ return NULL;
|
||||
}
|
||||
+
|
||||
func = snd_dlsym(dlobj, name, version);
|
||||
if (func == NULL) {
|
||||
if (verbose)
|
||||
@@ -257,8 +254,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
|
||||
free((void *)c->lib);
|
||||
free(c);
|
||||
__err:
|
||||
- if (dlobj_close)
|
||||
- snd_dlclose(dlobj);
|
||||
+ snd_dlclose(dlobj);
|
||||
snd_dlobj_unlock();
|
||||
return NULL;
|
||||
}
|
||||
@@ -298,16 +294,11 @@ void snd_dlobj_cache_cleanup(void)
|
||||
struct list_head *p, *npos;
|
||||
struct dlobj_cache *c;
|
||||
|
||||
- /* clean up caches only when really no user is present */
|
||||
snd_dlobj_lock();
|
||||
- list_for_each(p, &pcm_dlobj_list) {
|
||||
- c = list_entry(p, struct dlobj_cache, list);
|
||||
- if (c->refcnt)
|
||||
- goto unlock;
|
||||
- }
|
||||
-
|
||||
list_for_each_safe(p, npos, &pcm_dlobj_list) {
|
||||
c = list_entry(p, struct dlobj_cache, list);
|
||||
+ if (c->refcnt)
|
||||
+ continue;
|
||||
list_del(p);
|
||||
snd_dlclose(c->dlobj);
|
||||
free((void *)c->name); /* shut up gcc warning */
|
||||
--
|
||||
1.7.11.7
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From a8f405b8f90d752c3609b9e918dc949c4efadf87 Mon Sep 17 00:00:00 2001
|
||||
From: Takashi Iwai <tiwai@suse.de>
|
||||
Date: Thu, 25 Apr 2013 09:55:49 +0200
|
||||
Subject: [PATCH] Add definition of __inline__ for non-GCC
|
||||
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
include/asoundlib-head.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h
|
||||
index 6edbab0..71b5c29 100644
|
||||
--- a/include/asoundlib-head.h
|
||||
+++ b/include/asoundlib-head.h
|
||||
@@ -40,6 +40,10 @@
|
||||
#include <errno.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
+#ifndef __GNUC__
|
||||
+#define __inline__ inline
|
||||
+#endif
|
||||
+
|
||||
#include <alsa/asoundef.h>
|
||||
#include <alsa/version.h>
|
||||
#include <alsa/global.h>
|
||||
--
|
||||
1.7.11.7
|
||||
|
||||
@ -1,155 +0,0 @@
|
||||
From 30122df4faf7ccc79b9525db95f55c5a8ed6fe4d Mon Sep 17 00:00:00 2001
|
||||
From: Takashi Iwai <tiwai@suse.de>
|
||||
Date: Thu, 25 Apr 2013 09:52:33 +0200
|
||||
Subject: [PATCH] Use __inline__ for exported headers
|
||||
|
||||
Some programs are still using C90.
|
||||
|
||||
Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=817077
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
include/control.h | 4 ++--
|
||||
include/iatomic.h | 14 +++++++-------
|
||||
include/pcm.h | 2 +-
|
||||
include/pcm_extplug.h | 4 ++--
|
||||
include/use-case.h | 4 ++--
|
||||
5 files changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/include/control.h b/include/control.h
|
||||
index 27fe2ac..5fdf379 100644
|
||||
--- a/include/control.h
|
||||
+++ b/include/control.h
|
||||
@@ -234,7 +234,7 @@ int snd_ctl_open_lconf(snd_ctl_t **ctl, const char *name, int mode, snd_config_t
|
||||
int snd_ctl_open_fallback(snd_ctl_t **ctl, snd_config_t *root, const char *name, const char *orig_name, int mode);
|
||||
int snd_ctl_close(snd_ctl_t *ctl);
|
||||
int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock);
|
||||
-static inline int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); }
|
||||
+static __inline__ int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); }
|
||||
int snd_async_add_ctl_handler(snd_async_handler_t **handler, snd_ctl_t *ctl,
|
||||
snd_async_callback_t callback, void *private_data);
|
||||
snd_ctl_t *snd_async_handler_get_ctl(snd_async_handler_t *handler);
|
||||
@@ -532,7 +532,7 @@ int snd_hctl_open(snd_hctl_t **hctl, const char *name, int mode);
|
||||
int snd_hctl_open_ctl(snd_hctl_t **hctlp, snd_ctl_t *ctl);
|
||||
int snd_hctl_close(snd_hctl_t *hctl);
|
||||
int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock);
|
||||
-static inline int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); }
|
||||
+static __inline__ int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); }
|
||||
int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl);
|
||||
int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space);
|
||||
int snd_hctl_poll_descriptors_revents(snd_hctl_t *ctl, struct pollfd *pfds, unsigned int nfds, unsigned short *revents);
|
||||
diff --git a/include/iatomic.h b/include/iatomic.h
|
||||
index e92dbfd..5711fe8 100644
|
||||
--- a/include/iatomic.h
|
||||
+++ b/include/iatomic.h
|
||||
@@ -980,7 +980,7 @@ static __inline__ int atomic_dec_and_test(volatile atomic_t *v)
|
||||
return result;
|
||||
}
|
||||
|
||||
-static inline int atomic_add_negative(int i, volatile atomic_t *v)
|
||||
+static __inline__ int atomic_add_negative(int i, volatile atomic_t *v)
|
||||
{
|
||||
unsigned long flags;
|
||||
int result;
|
||||
@@ -1160,36 +1160,36 @@ typedef struct {
|
||||
|
||||
void snd_atomic_read_wait(snd_atomic_read_t *t);
|
||||
|
||||
-static inline void snd_atomic_write_init(snd_atomic_write_t *w)
|
||||
+static __inline__ void snd_atomic_write_init(snd_atomic_write_t *w)
|
||||
{
|
||||
w->begin = 0;
|
||||
w->end = 0;
|
||||
}
|
||||
|
||||
-static inline void snd_atomic_write_begin(snd_atomic_write_t *w)
|
||||
+static __inline__ void snd_atomic_write_begin(snd_atomic_write_t *w)
|
||||
{
|
||||
w->begin++;
|
||||
wmb();
|
||||
}
|
||||
|
||||
-static inline void snd_atomic_write_end(snd_atomic_write_t *w)
|
||||
+static __inline__ void snd_atomic_write_end(snd_atomic_write_t *w)
|
||||
{
|
||||
wmb();
|
||||
w->end++;
|
||||
}
|
||||
|
||||
-static inline void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w)
|
||||
+static __inline__ void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w)
|
||||
{
|
||||
r->write = w;
|
||||
}
|
||||
|
||||
-static inline void snd_atomic_read_begin(snd_atomic_read_t *r)
|
||||
+static __inline__ void snd_atomic_read_begin(snd_atomic_read_t *r)
|
||||
{
|
||||
r->end = r->write->end;
|
||||
rmb();
|
||||
}
|
||||
|
||||
-static inline int snd_atomic_read_ok(snd_atomic_read_t *r)
|
||||
+static __inline__ int snd_atomic_read_ok(snd_atomic_read_t *r)
|
||||
{
|
||||
rmb();
|
||||
return r->end == r->write->begin;
|
||||
diff --git a/include/pcm.h b/include/pcm.h
|
||||
index e440030..95b8aed 100644
|
||||
--- a/include/pcm.h
|
||||
+++ b/include/pcm.h
|
||||
@@ -451,7 +451,7 @@ int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm);
|
||||
int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space);
|
||||
int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents);
|
||||
int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock);
|
||||
-static inline int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); }
|
||||
+static __inline__ int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); }
|
||||
int snd_async_add_pcm_handler(snd_async_handler_t **handler, snd_pcm_t *pcm,
|
||||
snd_async_callback_t callback, void *private_data);
|
||||
snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler);
|
||||
diff --git a/include/pcm_extplug.h b/include/pcm_extplug.h
|
||||
index 884f322..e3b71bc 100644
|
||||
--- a/include/pcm_extplug.h
|
||||
+++ b/include/pcm_extplug.h
|
||||
@@ -188,7 +188,7 @@ int snd_pcm_extplug_set_slave_param_minmax(snd_pcm_extplug_t *extplug, int type,
|
||||
/**
|
||||
* set the parameter constraint with a single value
|
||||
*/
|
||||
-static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
|
||||
+static __inline__ int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
|
||||
{
|
||||
return snd_pcm_extplug_set_param_list(extplug, type, 1, &val);
|
||||
}
|
||||
@@ -196,7 +196,7 @@ static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type
|
||||
/**
|
||||
* set the parameter constraint for slave PCM with a single value
|
||||
*/
|
||||
-static inline int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
|
||||
+static __inline__ int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
|
||||
{
|
||||
return snd_pcm_extplug_set_slave_param_list(extplug, type, 1, &val);
|
||||
}
|
||||
diff --git a/include/use-case.h b/include/use-case.h
|
||||
index defd4ea..93b3456 100644
|
||||
--- a/include/use-case.h
|
||||
+++ b/include/use-case.h
|
||||
@@ -354,7 +354,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr);
|
||||
* \param list Returned allocated list
|
||||
* \return Number of list entries if success, otherwise a negative error code
|
||||
*/
|
||||
-static inline int snd_use_case_card_list(const char **list[])
|
||||
+static __inline__ int snd_use_case_card_list(const char **list[])
|
||||
{
|
||||
return snd_use_case_get_list(NULL, NULL, list);
|
||||
}
|
||||
@@ -365,7 +365,7 @@ static inline int snd_use_case_card_list(const char **list[])
|
||||
* \param list Returned list of verbs
|
||||
* \return Number of list entries if success, otherwise a negative error code
|
||||
*/
|
||||
-static inline int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr,
|
||||
+static __inline__ int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr,
|
||||
const char **list[])
|
||||
{
|
||||
return snd_use_case_get_list(uc_mgr, "_verbs", list);
|
||||
--
|
||||
1.7.11.7
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
From 886f0cc3c274643de464e646535afb4ceee1d816 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Mack <zonque@gmail.com>
|
||||
Date: Thu, 18 Apr 2013 10:37:50 +0200
|
||||
Subject: [PATCH] bring pcm.h and pcm.c in sync with the kernel list
|
||||
|
||||
In particular, this adds definitions and descriptions for G.723 and
|
||||
DSD types.
|
||||
|
||||
Signed-off-by: Daniel Mack <zonque@gmail.com>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
include/pcm.h | 14 +++++++++++++-
|
||||
src/pcm/pcm.c | 12 ++++++++++++
|
||||
2 files changed, 25 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/pcm.h b/include/pcm.h
|
||||
index d94ba90..e440030 100644
|
||||
--- a/include/pcm.h
|
||||
+++ b/include/pcm.h
|
||||
@@ -199,7 +199,19 @@ typedef enum _snd_pcm_format {
|
||||
SND_PCM_FORMAT_U18_3LE,
|
||||
/** Unsigned 18bit Big Endian in 3bytes format */
|
||||
SND_PCM_FORMAT_U18_3BE,
|
||||
- SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_U18_3BE,
|
||||
+ /* G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes */
|
||||
+ SND_PCM_FORMAT_G723_24,
|
||||
+ /* G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte */
|
||||
+ SND_PCM_FORMAT_G723_24_1B,
|
||||
+ /* G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes */
|
||||
+ SND_PCM_FORMAT_G723_40,
|
||||
+ /* G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte */
|
||||
+ SND_PCM_FORMAT_G723_40_1B,
|
||||
+ /* Direct Stream Digital (DSD) in 1-byte samples (x8) */
|
||||
+ SND_PCM_FORMAT_DSD_U8,
|
||||
+ /* Direct Stream Digital (DSD) in 2-byte samples (x16) */
|
||||
+ SND_PCM_FORMAT_DSD_U16_LE,
|
||||
+ SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_DSD_U16_LE,
|
||||
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
/** Signed 16 bit CPU endian */
|
||||
diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
|
||||
index 2a87a7b..438fb3f 100644
|
||||
--- a/src/pcm/pcm.c
|
||||
+++ b/src/pcm/pcm.c
|
||||
@@ -1558,6 +1558,12 @@ static const char *const snd_pcm_format_names[] = {
|
||||
FORMAT(S18_3BE),
|
||||
FORMAT(U18_3LE),
|
||||
FORMAT(U18_3BE),
|
||||
+ FORMAT(G723_24),
|
||||
+ FORMAT(G723_24_1B),
|
||||
+ FORMAT(G723_40),
|
||||
+ FORMAT(G723_40_1B),
|
||||
+ FORMAT(DSD_U8),
|
||||
+ FORMAT(DSD_U16_LE),
|
||||
};
|
||||
|
||||
static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = {
|
||||
@@ -1611,6 +1617,12 @@ static const char *const snd_pcm_format_descriptions[] = {
|
||||
FORMATD(S18_3BE, "Signed 18 bit Big Endian in 3bytes"),
|
||||
FORMATD(U18_3LE, "Unsigned 18 bit Little Endian in 3bytes"),
|
||||
FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"),
|
||||
+ FORMATD(G723_24, "G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes"),
|
||||
+ FORMATD(G723_24_1B, "G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte"),
|
||||
+ FORMATD(G723_40, "G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes"),
|
||||
+ FORMATD(G723_40_1B, "G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte"),
|
||||
+ FORMATD(DSD_U8, "Direct Stream Digital, 1-byte (x8), oldest bit in MSB"),
|
||||
+ FORMATD(DSD_U16_LE, "Direct Stream Digital, 2-byte (x16), little endian, oldest bits in MSB"),
|
||||
};
|
||||
|
||||
static const char *const snd_pcm_type_names[] = {
|
||||
--
|
||||
1.7.11.7
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From 697f8c296ccb4b38cec930782b5ef1419aaf4245 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Mack <zonque@gmail.com>
|
||||
Date: Thu, 18 Apr 2013 10:37:49 +0200
|
||||
Subject: [PATCH] pcm.c: fix indentation
|
||||
|
||||
Signed-off-by: Daniel Mack <zonque@gmail.com>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
src/pcm/pcm.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
|
||||
index 38febb9..2a87a7b 100644
|
||||
--- a/src/pcm/pcm.c
|
||||
+++ b/src/pcm/pcm.c
|
||||
@@ -1638,11 +1638,11 @@ static const char *const snd_pcm_type_names[] = {
|
||||
PCMTYPE(LADSPA),
|
||||
PCMTYPE(DMIX),
|
||||
PCMTYPE(JACK),
|
||||
- PCMTYPE(DSNOOP),
|
||||
- PCMTYPE(IEC958),
|
||||
+ PCMTYPE(DSNOOP),
|
||||
+ PCMTYPE(IEC958),
|
||||
PCMTYPE(SOFTVOL),
|
||||
- PCMTYPE(IOPLUG),
|
||||
- PCMTYPE(EXTPLUG),
|
||||
+ PCMTYPE(IOPLUG),
|
||||
+ PCMTYPE(EXTPLUG),
|
||||
PCMTYPE(MMAP_EMUL),
|
||||
};
|
||||
|
||||
--
|
||||
1.7.11.7
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.27-r1.ebuild,v 1.3 2013/05/02 00:15:14 ssuominen Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils systemd udev
|
||||
|
||||
DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
|
||||
HOMEPAGE="http://www.alsa-project.org/"
|
||||
SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2
|
||||
mirror://alsaproject/driver/alsa-driver-1.0.25.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0.9"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
|
||||
IUSE="doc +libsamplerate +ncurses nls selinux"
|
||||
|
||||
RDEPEND=">=media-libs/alsa-lib-${PV}
|
||||
libsamplerate? ( media-libs/libsamplerate )
|
||||
ncurses? ( >=sys-libs/ncurses-5.7-r7 )
|
||||
selinux? ( sec-policy/selinux-alsa )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? ( app-text/xmlto )"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PN}-1.0.25-separate-usr-var-fs.patch \
|
||||
"${FILESDIR}"/${P}-service.patch \
|
||||
"${FILESDIR}"/${P}-arecord.patch \
|
||||
"${FILESDIR}"/${P}-alsactl.patch
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
use doc || myconf='--disable-xmlto'
|
||||
|
||||
# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
|
||||
econf \
|
||||
$(use_enable libsamplerate alsaloop) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable ncurses alsamixer) \
|
||||
--disable-alsaconf \
|
||||
"$(systemd_with_unitdir)" \
|
||||
--with-udev-rules-dir="$(get_udevdir)"/rules.d \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dodoc ChangeLog README TODO seq/*/README.*
|
||||
|
||||
newbin "${WORKDIR}"/alsa-driver-*/utils/alsa-info.sh alsa-info
|
||||
|
||||
newinitd "${FILESDIR}"/alsasound.initd-r5 alsasound
|
||||
newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
|
||||
|
||||
insinto /etc/modprobe.d
|
||||
newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
|
||||
|
||||
keepdir /var/lib/alsa
|
||||
|
||||
# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
|
||||
# scan directory /usr/share/alsa/ucm: No such file or directory
|
||||
# alsaucm: unable to obtain card list: No such file or directory
|
||||
keepdir /usr/share/alsa/ucm
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -z ${REPLACING_VERSIONS} ]]; then
|
||||
elog
|
||||
elog "To take advantage of the init script, and automate the process of"
|
||||
elog "saving and restoring sound-card mixer levels you should"
|
||||
elog "add alsasound to the boot runlevel. You can do this as"
|
||||
elog "root like so:"
|
||||
elog "# rc-update add alsasound boot"
|
||||
ewarn
|
||||
ewarn "The ALSA core should be built into the kernel or loaded through other"
|
||||
ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
|
||||
fi
|
||||
}
|
||||
@ -1,78 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.27.1.ebuild,v 1.1 2013/05/27 13:59:35 ssuominen Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils systemd udev
|
||||
|
||||
DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
|
||||
HOMEPAGE="http://www.alsa-project.org/"
|
||||
SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2
|
||||
mirror://alsaproject/driver/alsa-driver-1.0.25.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0.9"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
|
||||
IUSE="doc +libsamplerate +ncurses nls selinux"
|
||||
|
||||
RDEPEND=">=media-libs/alsa-lib-1.0.27-r2
|
||||
libsamplerate? ( media-libs/libsamplerate )
|
||||
ncurses? ( >=sys-libs/ncurses-5.7-r7 )
|
||||
selinux? ( sec-policy/selinux-alsa )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? ( app-text/xmlto )"
|
||||
|
||||
src_prepare() {
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
use doc || myconf='--disable-xmlto'
|
||||
|
||||
# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
|
||||
econf \
|
||||
--disable-maintainer-mode \
|
||||
$(use_enable libsamplerate alsaloop) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable ncurses alsamixer) \
|
||||
--disable-alsaconf \
|
||||
"$(systemd_with_unitdir)" \
|
||||
--with-udev-rules-dir="$(get_udevdir)"/rules.d \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dodoc ChangeLog README TODO seq/*/README.*
|
||||
|
||||
newbin "${WORKDIR}"/alsa-driver-*/utils/alsa-info.sh alsa-info
|
||||
|
||||
newinitd "${FILESDIR}"/alsasound.initd-r5 alsasound
|
||||
newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
|
||||
|
||||
insinto /etc/modprobe.d
|
||||
newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
|
||||
|
||||
keepdir /var/lib/alsa
|
||||
|
||||
# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
|
||||
# scan directory /usr/share/alsa/ucm: No such file or directory
|
||||
# alsaucm: unable to obtain card list: No such file or directory
|
||||
keepdir /usr/share/alsa/ucm
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -z ${REPLACING_VERSIONS} ]]; then
|
||||
elog
|
||||
elog "To take advantage of the init script, and automate the process of"
|
||||
elog "saving and restoring sound-card mixer levels you should"
|
||||
elog "add alsasound to the boot runlevel. You can do this as"
|
||||
elog "root like so:"
|
||||
elog "# rc-update add alsasound boot"
|
||||
ewarn
|
||||
ewarn "The ALSA core should be built into the kernel or loaded through other"
|
||||
ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
|
||||
fi
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
http://bugs.gentoo.org/468160
|
||||
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200)
|
||||
Subject: alsactl: Fix the string size for the lock file contents
|
||||
X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b
|
||||
|
||||
alsactl: Fix the string size for the lock file contents
|
||||
|
||||
The string length is 10 characters + LF + '\0' = 12 characters.
|
||||
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
|
||||
diff --git a/alsactl/lock.c b/alsactl/lock.c
|
||||
index d34d013..fce208b 100644
|
||||
--- a/alsactl/lock.c
|
||||
+++ b/alsactl/lock.c
|
||||
@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout)
|
||||
int fd = -1, err = 0;
|
||||
struct flock lck;
|
||||
struct stat st;
|
||||
- char lcktxt[11];
|
||||
+ char lcktxt[12];
|
||||
char *nfile;
|
||||
|
||||
if (!do_lock)
|
||||
@ -1,24 +0,0 @@
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200)
|
||||
Subject: arecord: add a missing break to the capture loop
|
||||
X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977
|
||||
|
||||
arecord: add a missing break to the capture loop
|
||||
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
|
||||
diff --git a/aplay/aplay.c b/aplay/aplay.c
|
||||
index 5bdc39c..000d25b 100644
|
||||
--- a/aplay/aplay.c
|
||||
+++ b/aplay/aplay.c
|
||||
@@ -3021,6 +3021,9 @@ static void capture(char *orig_name)
|
||||
fd = -1;
|
||||
}
|
||||
|
||||
+ if (in_aborting)
|
||||
+ break;
|
||||
+
|
||||
/* repeat the loop when format is raw without timelimit or
|
||||
* requested counts of data are recorded
|
||||
*/
|
||||
@ -1,12 +0,0 @@
|
||||
http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff;h=3616b1fe3ca603832b2f88abeb722cba2f0dde7e
|
||||
|
||||
--- alsactl/alsa-restore.service.in
|
||||
+++ alsactl/alsa-restore.service.in
|
||||
@@ -12,6 +12,6 @@
|
||||
Conflicts=shutdown.target
|
||||
|
||||
[Service]
|
||||
-Type=oneshop
|
||||
+Type=oneshot
|
||||
ExecStart=-@sbindir@/alsactl restore
|
||||
StandardOutput=syslog
|
||||
@ -1 +1 @@
|
||||
Mon, 15 Jul 2013 18:36:56 +0000
|
||||
Tue, 16 Jul 2013 04:36:56 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 15 Jul 2013 18:36:56 +0000
|
||||
Tue, 16 Jul 2013 04:36:56 +0000
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue