* [gentoo-commits] dev/angelos:master commit in: media-sound/oss/files/, media-sound/oss/
@ 2011-06-26 19:34 Christoph Mende
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-06-26 19:34 UTC (permalink / raw
To: gentoo-commits
commit: a9b3b43b20b0fc29807ba6dc91c04764673c0d9f
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 19:34:22 2011 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 19:34:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=a9b3b43b
oss: Add init script
(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 84F20B43)
---
media-sound/oss/Manifest | 9 +++++----
media-sound/oss/files/oss.init | 17 +++++++++++++++++
media-sound/oss/oss-4.2.2004.ebuild | 3 ++-
3 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index 8112a77..0434164 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -1,13 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX oss.init 287 RMD160 b125624500a6fc9c9e250777e90104c50d4c2504 SHA1 793fa41dac4c16b02d203f1dd206e6500269da39 SHA256 5aa3a20185641ba7054765df36b00dd378f551adddd2912cfd0c1e5ecde787d1
DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0
-EBUILD oss-4.2.2004.ebuild 1607 RMD160 23c1494f678c2ca5d3c7d80117240f23810a08c7 SHA1 f9450c41fe87cd338b8bd2a1c698a8c384122969 SHA256 4e8dac15c62caed55fe109f0805769a13739b3096acc6da066c6d0769641cdb3
+EBUILD oss-4.2.2004.ebuild 1632 RMD160 666f2e65a7f6dccc46edfe891fdeaced624b5739 SHA1 cead6caaf52accb1676eed4d35d5bb4495d37c51 SHA256 c7fc6561e3476fb5362fd33f7322381269194c476b3c759a84963c92e4bfcfeb
MISC metadata.xml 255 RMD160 cd8d8cec82e20fbae3ec50adc77e3a847bf1cf59 SHA1 5f93424a5e9854f99452b62eb10fff6f31dd797a SHA256 d51928368dff5a07c452c50b7f1a5866f6ef9fbf578e372ef378363259843f5e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk4HiHwACgkQmWq1bYTyC0O4DAD/XWgOv1EF/WQG/8BtsElJ8Rgx
-nQfthg2nSdmUtEWj/00BALhenLV/PehT/zrA99d9C3S4WOpAgMoCFthgWkKB8sJI
-=fJl/
+iF4EAREIAAYFAk4Hib4ACgkQmWq1bYTyC0NV6QD+PqCW8uE++9XnXJExCrMQ7vnv
+XZLcVZAYUZg1+ZOgBYkA/jzIQLSWCfkRUNy9GkHNLXUUwuvmUMQ6U56mb+ZRszYR
+=ct8S
-----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss.init b/media-sound/oss/files/oss.init
new file mode 100644
index 0000000..d8e546c
--- /dev/null
+++ b/media-sound/oss/files/oss.init
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+start() {
+ ebegin "Starting OSS"
+ /usr/sbin/soundon
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping OSS"
+ /usr/sbin/savemixer
+ /usr/sbin/soundoff
+ eend $?
+}
diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.2.2004.ebuild
index 663ca50..0c40b86 100644
--- a/media-sound/oss/oss-4.2.2004.ebuild
+++ b/media-sound/oss/oss-4.2.2004.ebuild
@@ -29,7 +29,6 @@ BUILD_DIR=${WORKDIR}/${PN}-build
# - (automagic?) gtk+ ossxmix
# - don't install via cp? (see FreeBSD)
# - check libdir paths
-# - init script
# - kernel checks (-> OSS emulation)?
src_prepare() {
@@ -73,4 +72,6 @@ src_install() {
sed -e "s:lib:$(get_libdir):" prototype/etc/oss.conf || die
cp -r prototype/* "${ED}" || die
dodoc RELNOTES.txt
+
+ doinitd "${FILESDIR}"/${PN}.init ${PN}
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/angelos:master commit in: media-sound/oss/files/, media-sound/oss/
@ 2011-07-14 17:53 Christoph Mende
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-07-14 17:53 UTC (permalink / raw
To: gentoo-commits
commit: 67bcdff995206668ab626bfb8a978d7e58d76a23
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 17:53:23 2011 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 17:53:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=67bcdff9
oss: Only install applications and man pages, drivers are in oss-driver
(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key 84F20B43)
---
media-sound/oss/Manifest | 11 ++--
media-sound/oss/files/oss.init | 17 -------
media-sound/oss/metadata.xml | 1 -
media-sound/oss/oss-4.2.2004.ebuild | 90 ++++++++++++++++++++++-------------
4 files changed, 61 insertions(+), 58 deletions(-)
diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index caf80b3..68dd957 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -1,14 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX oss.init 287 RMD160 b125624500a6fc9c9e250777e90104c50d4c2504 SHA1 793fa41dac4c16b02d203f1dd206e6500269da39 SHA256 5aa3a20185641ba7054765df36b00dd378f551adddd2912cfd0c1e5ecde787d1
DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0
-EBUILD oss-4.2.2004.ebuild 1638 RMD160 291bc2fbda0772a9e9d5b8d636244f81be3b868b SHA1 69b7c5e5f029b7f488641fc9a63b7931d9320b26 SHA256 150b2672cf9e28faf1ccb2ce622ec6ce9023288f8cc71ed444c2a52bebe9aef5
-MISC metadata.xml 255 RMD160 cd8d8cec82e20fbae3ec50adc77e3a847bf1cf59 SHA1 5f93424a5e9854f99452b62eb10fff6f31dd797a SHA256 d51928368dff5a07c452c50b7f1a5866f6ef9fbf578e372ef378363259843f5e
+EBUILD oss-4.2.2004.ebuild 2079 RMD160 689b2351ac63b0813a3aa079c8a48b9ae92fb825 SHA1 e3e6461688d7d89b267219b0bafba0f736cc0108 SHA256 9085255282b456b83320adb44ea9898c0ff9337d043764b0a0bf1552f31bec84
+MISC metadata.xml 227 RMD160 1f3fcf9c4a4cba1f09f4fa4d0869d03049a1da52 SHA1 4022447d941f3158cfd612046c05a97494a8e1e4 SHA256 8f4b64f252a02a2209f8573a0c8cfa3d15ecb413eb8b3bd49fbd06890699dc63
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk4HjIMACgkQmWq1bYTyC0PZJAEAyIKd2g71cfkvGHzPRFWR5Tjk
-WdwLduOz0tpc4gekIn4A/20zqrdICa0xnP5GQ3yLcWw6nUl/cnX7TbRypM8VvR+V
-=Y97K
+iF4EAREIAAYFAk4fLRMACgkQmWq1bYTyC0MTvwD+KoFdSSnNwYCLP7gQucI4FJsi
+V78YpBq/jrUz6VvmYK0A/A/yNLy7Cf7prUbaRThfEeDXfto8xXcJDpoeb6bMuicc
+=ivCp
-----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss.init b/media-sound/oss/files/oss.init
deleted file mode 100644
index d8e546c..0000000
--- a/media-sound/oss/files/oss.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-start() {
- ebegin "Starting OSS"
- /usr/sbin/soundon
- eend $?
-}
-
-stop() {
- ebegin "Stopping OSS"
- /usr/sbin/savemixer
- /usr/sbin/soundoff
- eend $?
-}
diff --git a/media-sound/oss/metadata.xml b/media-sound/oss/metadata.xml
index 6140e69..af1af97 100644
--- a/media-sound/oss/metadata.xml
+++ b/media-sound/oss/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>no-herd</herd>
<use>
- <flag name="midi"></flag>
<flag name="salsa">Enable ALSA emulation</flag>
</use>
</pkgmetadata>
diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.2.2004.ebuild
index 944e6a0..4dd0749 100644
--- a/media-sound/oss/oss-4.2.2004.ebuild
+++ b/media-sound/oss/oss-4.2.2004.ebuild
@@ -3,38 +3,30 @@
# $Header: $
EAPI=4
-inherit flag-o-matic multilib toolchain-funcs versionator
+inherit flag-o-matic toolchain-funcs versionator
MY_PV=$(get_version_component_range 1-2)
BUILD=$(get_version_component_range 3)
MY_P=${PN}-v${MY_PV}-build${BUILD}-src-gpl
-DESCRIPTION="Open Sound System"
+DESCRIPTION="Open Sound System - applications and man pages"
HOMEPAGE="http://developer.opensound.com/"
SRC_URI="http://www.4front-tech.com/developer/sources/stable/gpl/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="midi salsa"
+IUSE="gtk salsa"
S=${WORKDIR}/${MY_P}
BUILD_DIR=${WORKDIR}/${PN}-build
### TODO ###
-# - fix --as-needed
-# - respect LDFLAGS
-# - USE_EXPAND for drivers
-# - disable stripping
-# - (automagic?) gtk+ ossxmix
-# - don't install via cp? (see FreeBSD)
-# - check libdir paths
-# - kernel checks (-> OSS emulation)?
+# - fix linking order for --as-needed
src_prepare() {
# the build system forces shadow builds
mkdir "${BUILD_DIR}"
- append-flags -Wl,--no-as-needed
}
src_configure() {
@@ -42,36 +34,66 @@ src_configure() {
local myconf=""
- if use salsa; then
- myconf="--enable-libsalsa=YES"
- else
- myconf="--enable-libsalsa=NO"
- fi
-
- if use midi; then
- myconf+=" --config-midi=YES"
- else
- myconf+=" --config-midi=NO"
- fi
+ use salsa || myconf="--enable-libsalsa=NO"
- "${S}"/configure ${myconf} || die
+ HOSTCC=$(tc-getCC) \
+ "${S}"/configure \
+ --config-midi=YES \
+ ${myconf} || die
- find -name Makefile -exec sed -e "s:-Werror::" -i {} +
+ find -name Makefile -exec sed -e "s:-Werror::" \
+ -e "s:-Wall::" -i {} +
}
src_compile() {
cd "${BUILD_DIR}"
- emake CC=$(tc-getCC) build
+
+ pushd cmd
+ if ! use gtk; then
+ # remove ossxmix from SUBDIRS
+ sed -e "s:ossxmix::" -i Makefile
+ fi
+
+ # disable stripping
+ sed -e "s:-s::" \
+ -i */Makefile
+ #-e "s:LDFLAGS=:LDFLAGS+=:" \
+
+ einfo "Building applications"
+ emake CC=$(tc-getCC)
+ popd
+
+ pushd lib
+ einfo "Building libraries"
+ emake CC=$(tc-getCC)
+ popd
}
src_install() {
cd "${BUILD_DIR}"
- if [ "$(get_libdir)" != "lib" ]; then
- mv prototype/usr/lib prototype/usr/$(get_libdir) || die
- fi
- sed -e "s:lib:$(get_libdir):" prototype/etc/oss.conf || die
- cp -r prototype/* "${ED}" || die
- dodoc RELNOTES.txt
-
- doinitd "${FILESDIR}"/${PN}.init ${PN}
+ use salsa && dolib lib/libsalsa/.libs/libsalsa.so*
+
+ dolib lib/libOSSlib/libOSSlib.so
+
+ # linux-headers ships OSS3 API
+ #insinto /usr/include/linux
+ #doins include/soundcard.h
+
+ # install man pages
+ use gtk || rm cmd/ossxmix/ossxmix.man
+ rename man 1 cmd/*/*.man
+ doman cmd/*/*.1
+ rename .man .7 misc/man7/*.man
+ doman misc/man7/*.7
+ rename man 7 kernel/drv/*/*.man
+ doman kernel/drv/*/*.7
+ newman os_cmd/Linux/ossdetect/ossdetect.man ossdetect.8
+ newman noregparm/cmd/ossdevlinks/ossdevlinks.man ossdevlinks.8
+ newman noregparm/cmd/savemixer/savemixer.man savemixer.8
+ newman noregparm/cmd/vmixctl/vmixctl.man vmixctl.8
+
+ cd "target"
+ dosbin sbin/*
+ dobin bin/*
+ dolib lib/*
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/angelos:master commit in: media-sound/oss/files/, media-sound/oss/
@ 2011-07-14 19:15 Christoph Mende
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-07-14 19:15 UTC (permalink / raw
To: gentoo-commits
commit: 27f5e6e3689a6d13378adfe6f653d736180a1262
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 19:15:05 2011 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 19:15:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=27f5e6e3
oss: Apply debian patches for filesystem layout and install /etc files
(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key 84F20B43)
---
media-sound/oss/Manifest | 10 +-
.../oss/files/oss-4.2.2004-filesystem-layout.patch | 196 ++++++++++++++++++++
media-sound/oss/files/oss-4.2.2004-txt2man.patch | 13 ++
media-sound/oss/oss-4.2.2004.ebuild | 16 ++-
4 files changed, 229 insertions(+), 6 deletions(-)
diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index dbcad81..6eb63fa 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -1,13 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX oss-4.2.2004-filesystem-layout.patch 6703 RMD160 fee44548032c6fd88ddff2a90e514b997918d797 SHA1 33aae9b12ca5cd0bd34beb105ed8ed77da2c207f SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d
+AUX oss-4.2.2004-txt2man.patch 340 RMD160 9211cd9f851843f1354ee6a8eddfab2fe04e3409 SHA1 df56f9001f11a0cb3552c37212ba7732e9640f08 SHA256 66b3895c68a58d419c004240fb915539c32e73f199fc36dcbfd9aa71f4dde28f
DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0
-EBUILD oss-4.2.2004.ebuild 2215 RMD160 bd77b37d2bf05c2d15f4832dd97769fe0f3ae9f9 SHA1 86044cb0ac5532858dd06699b809b127b629a66b SHA256 9bc6a03a5b4a5c50817e7bd57d4b5bc88adc8fdea596a85c45ed9e5f57433390
+EBUILD oss-4.2.2004.ebuild 2500 RMD160 1d4e274b9571d3e2ef632e2546df63d7709d93c0 SHA1 501248c480b684d9f1057ac54efa8c38355314f8 SHA256 0d94029d7597d7141d8f6cdfc006152f02593f7ef4f1a74016e20ac2183b562a
MISC metadata.xml 227 RMD160 1f3fcf9c4a4cba1f09f4fa4d0869d03049a1da52 SHA1 4022447d941f3158cfd612046c05a97494a8e1e4 SHA256 8f4b64f252a02a2209f8573a0c8cfa3d15ecb413eb8b3bd49fbd06890699dc63
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk4fNtkACgkQmWq1bYTyC0NlpwEAx7jx8WBfmDzFl68r75v+xCyb
-+dOSqOzYvY7lLwNXbRsBAJmGqMr9Qxan7Z90vXD8m/Zf37nJw+yFvovyOixC9Yp2
-=fNCU
+iF4EAREIAAYFAk4fQDkACgkQmWq1bYTyC0MKzAD/ejCJ4irJ7cM/Rjl8WGggCSS2
+mDq9Qqw7ClUMOBCqRtcBAKrClYzw21jolX2B8TeKB9mCScNAetLgE2E1F8qv48by
+=giFq
-----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss-4.2.2004-filesystem-layout.patch b/media-sound/oss/files/oss-4.2.2004-filesystem-layout.patch
new file mode 100644
index 0000000..cc5c8a8
--- /dev/null
+++ b/media-sound/oss/files/oss-4.2.2004-filesystem-layout.patch
@@ -0,0 +1,196 @@
+diff --git a/cmd/ossdevlinks/ossdevlinks.c b/cmd/ossdevlinks/ossdevlinks.c
+index a19039f..0fb61a8 100644
+--- a/cmd/ossdevlinks/ossdevlinks.c
++++ b/cmd/ossdevlinks/ossdevlinks.c
+@@ -75,7 +75,7 @@ static int find_midilink (oss_midi_info *);
+ #if defined(sun)
+ #define DEFAULT_OSSLIBDIR "/etc/oss"
+ #else
+-#define DEFAULT_OSSLIBDIR "/usr/lib/oss"
++#define DEFAULT_OSSLIBDIR "/var/lib/oss4"
+ #endif
+
+ static char *
+@@ -99,7 +99,7 @@ get_mapname (void)
+ if (l > 0 && tmp[l - 1] == '\n')
+ tmp[l - 1] = '\0';
+
+- if (strncmp (tmp, "OSSLIBDIR=", 10) == 0)
++ if (strncmp (tmp, "OSSVARDIR=", 10) == 0)
+ {
+ l = snprintf (name, sizeof (name), "%s", &tmp[10]);
+ if ((l >= OSSLIBDIRLEN) || (l < 0))
+@@ -991,7 +991,7 @@ save_links (void)
+ char lfile[PATH_MAX+20], * osslibdir;
+
+ osslibdir = get_mapname ();
+- snprintf (lfile, sizeof (lfile), "%s/%s", osslibdir, "etc/legacy_devices");
++ snprintf (lfile, sizeof (lfile), "%s/%s", osslibdir, "legacy_devices");
+ if ((f = fopen (lfile, "w")) == NULL)
+ {
+ perror (lfile);
+diff --git a/cmd/ossdevlinks/ossdevlinks.man b/cmd/ossdevlinks/ossdevlinks.man
+index 9fb23f9..88b6e70 100644
+--- a/cmd/ossdevlinks/ossdevlinks.man
++++ b/cmd/ossdevlinks/ossdevlinks.man
+@@ -34,7 +34,7 @@ ossinfo(1)
+
+ FILES
+ /usr/sbin/ossdevlinks
+-/usr/lib/oss/etc/legacy_devices
++/var/lib/oss4/legacy_devices
+ /dev/dspN
+ /dev/midiNN
+ /dev/mixerN
+diff --git a/cmd/savemixer/savemixer.c b/cmd/savemixer/savemixer.c
+index f0aaf0e..4d9a021 100644
+--- a/cmd/savemixer/savemixer.c
++++ b/cmd/savemixer/savemixer.c
+@@ -268,14 +268,14 @@ static char *
+ get_mapname (void)
+ {
+ FILE *f;
+- char tmp[ETCDIRLEN+11]; /* Adding 'OSSLIBDIR=' */
+- static char name[ETCDIRLEN+15]; /* Adding '/etc/mixer.save' */
++ char tmp[ETCDIRLEN+11]; /* Adding 'OSSVARDIR=' */
++ static char name[ETCDIRLEN+10]; /* Adding 'mixer.save' */
+ struct stat st;
+
+- if (stat ("/etc/oss", &st) != -1) /* Use /etc/oss/mixer.save */
++ if (stat ("/var/lib/oss4", &st) != -1) /* Use /var/lib/oss4/mixer.save */
+ {
+- strcpy (name, "/etc/oss/mixer.save");
+- strcpy (ossetcdir, "/etc/oss");
++ strcpy (name, "/var/lib/oss4/mixer.save");
++ strcpy (ossetcdir, "/var/lib/oss4");
+ return name;
+ }
+
+@@ -291,15 +291,15 @@ get_mapname (void)
+ if (l > 0 && tmp[l - 1] == '\n')
+ tmp[l - 1] = '\0';
+
+- if (strncmp (tmp, "OSSLIBDIR=", 10) == 0)
++ if (strncmp (tmp, "OSSVARDIR=", 10) == 0)
+ {
+- l = snprintf (name, sizeof (name), "%s/etc/mixer.save", &tmp[10]);
++ l = snprintf (name, sizeof (name), "%s/mixer.save", &tmp[10]);
+ if ((l >= sizeof (name)) || (l < 0))
+ {
+ fprintf (stderr, "String in /etc/oss.conf is too long!\n");
+ goto oexit;
+ }
+- snprintf (ossetcdir, sizeof (ossetcdir), "%s/etc", &tmp[10]);
++ snprintf (ossetcdir, sizeof (ossetcdir), "%s", &tmp[10]);
+ if ((l >= sizeof (ossetcdir)) || (l < 0))
+ {
+ fprintf (stderr, "String in /etc/oss.conf is too long!\n");
+@@ -311,7 +311,7 @@ get_mapname (void)
+ }
+
+ fclose (f);
+- fprintf (stderr, "Error: OSSLIBDIR not set in /etc/oss.conf\n");
++ fprintf (stderr, "Error: OSSVARDIR not set in /etc/oss.conf\n");
+
+ dexit:
+ snprintf (name, sizeof (name), "%s/mixer.save", ossetcdir);
+diff --git a/cmd/savemixer/savemixer.man b/cmd/savemixer/savemixer.man
+index dd43326..708dcde 100644
+--- a/cmd/savemixer/savemixer.man
++++ b/cmd/savemixer/savemixer.man
+@@ -9,8 +9,8 @@ The savemixer program saves mixer settings. It can also load saved mixer
+ settings back into the mixer.
+
+ Running this program without any parameters will save the current mixer
+-settings into /etc/oss/mixer.save or $OSSLIBDIR/etc/mixer.save file.
+-OSSLIBDIR is decided by reading /etc/oss.conf, and defaults to /usr/lib/oss.
++settings into /var/lib/oss4/mixer.save or $OSSVARDIR/mixer.save file.
++OSSVARDIR is decided by reading /etc/oss.conf, and defaults to /var/lib/oss4.
+
+ AUTOMATIC SAVE
+ By default the soundoff command will automatically run savemixer to save
+@@ -29,9 +29,9 @@ soundoff(1), soundon(1), ossdetect(1), ossdevlinks(1), ossmix(1), ossxmix(1)
+ FILES
+ /etc/oss.conf
+ /usr/sbin/savemixer
+-/usr/lib/oss/etc/mixer.save
+-/usr/lib/oss/etc/dspdevs.map
+-/usr/lib/oss/etc/applist.conf
++/var/lib/oss4/mixer.save
++/var/lib/oss4/dspdevs.map
++/var/lib/oss4/applist.conf
+
+ AUTHOR
+ 4Front Technologies
+diff --git a/os_cmd/Linux/ossdetect/ossdetect.c b/os_cmd/Linux/ossdetect/ossdetect.c
+index 43a7c10..170c93b 100644
+--- a/os_cmd/Linux/ossdetect/ossdetect.c
++++ b/os_cmd/Linux/ossdetect/ossdetect.c
+@@ -90,7 +90,7 @@ get_mapname (void)
+ if (l > 0 && tmp[l - 1] == '\n')
+ tmp[l - 1] = '\0';
+
+- if (strncmp (tmp, "OSSLIBDIR=", 10) == 0)
++ if (strncmp (tmp, "OSSETCDIR=", 10) == 0)
+ {
+ l = snprintf (name, sizeof (name), "%s", &tmp[10]);
+ if ((l >= OSSLIBDIRLEN) || (l < 0))
+@@ -109,12 +109,12 @@ get_mapname (void)
+ }
+ }
+
+- fprintf (stderr, "OSSLIBDIR not set in /etc/oss.conf, using default "
+- "/usr/lib/oss\n");
++ fprintf (stderr, "OSSETCDIR not set in /etc/oss.conf, using default "
++ "/etc/oss4\n");
+ oexit:
+ fclose (f);
+ oexit2:
+- snprintf (name, sizeof (name), "/usr/lib/oss");
++ snprintf (name, sizeof (name), "/etc/oss4");
+ return name;
+ }
+
+@@ -648,7 +648,7 @@ main (int argc, char *argv[])
+ exit (0);
+ }
+
+- load_devlist ("etc/devices.list", 0);
++ load_devlist ("devices.list", 0);
+
+ if (stat ("/etc/oss_3rdparty", &st) != -1)
+ load_devlist ("/etc/oss_3rdparty", 1);
+@@ -674,7 +674,7 @@ main (int argc, char *argv[])
+ }
+
+ snprintf (instfname, sizeof (instfname), "%s/%s", osslibdir,
+- "etc/installed_drivers");
++ "installed_drivers");
+
+ if ((f = fopen (instfname, "w")) == NULL)
+ {
+diff --git a/os_cmd/Linux/ossdetect/ossdetect.man b/os_cmd/Linux/ossdetect/ossdetect.man
+index a05cca5..d7424d6 100644
+--- a/os_cmd/Linux/ossdetect/ossdetect.man
++++ b/os_cmd/Linux/ossdetect/ossdetect.man
+@@ -6,9 +6,10 @@ ossdetect [-diuv] [-m<mode>] [-L<path>]
+
+ DESCRIPTION
+ The ossdetect application performs automatic detection of soundcards.
+-The application looks at the /usr/lib/oss/etc/device.list and performs
++The application looks at the $OSSETCDIR/device.list and performs
+ automatic detection. It will create a file with the list of the configured
+-drivers in /usr/lib/oss/etc/installed_drivers.
++drivers in $OSSETCDIR/installed_drivers.
++OSSETCDIR is decided by reading /etc/oss.conf, and defaults to /etc/oss4.
+
+ The Input Multiplexer driver (IMUX) is not configured by default and
+ can be added to the OSS configuration using the -i option.
+@@ -26,6 +27,7 @@ SEE ALSO
+ ossdevlinks(1), ossinfo(1)
+
+ FILES
++/etc/oss.conf
+ /usr/sbin/ossdetect
+
+ AUTHOR
diff --git a/media-sound/oss/files/oss-4.2.2004-txt2man.patch b/media-sound/oss/files/oss-4.2.2004-txt2man.patch
new file mode 100644
index 0000000..cb4022c
--- /dev/null
+++ b/media-sound/oss/files/oss-4.2.2004-txt2man.patch
@@ -0,0 +1,13 @@
+diff --git a/setup/Linux/build.sh b/setup/Linux/build.sh
+index 4b7838c..4931e1f 100644
+--- a/setup/Linux/build.sh
++++ b/setup/Linux/build.sh
+@@ -8,7 +8,7 @@ then
+ else
+ echo "No gawk found. Using lesser replacement" >&2
+ cc -o txt2man origdir/setup/txt2man.c
+- TXT2MAN=./txt2man
++ TXT2MAN=/usr/bin/txt2man
+ fi
+
+ rm -rf prototype
diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.2.2004.ebuild
index 3d64630..74d1ec6 100644
--- a/media-sound/oss/oss-4.2.2004.ebuild
+++ b/media-sound/oss/oss-4.2.2004.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-inherit flag-o-matic toolchain-funcs versionator
+inherit eutils flag-o-matic toolchain-funcs versionator
MY_PV=$(get_version_component_range 1-2)
BUILD=$(get_version_component_range 3)
@@ -19,17 +19,21 @@ KEYWORDS="~amd64 ~x86"
IUSE="gtk salsa"
RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ app-text/txt2man"
S=${WORKDIR}/${MY_P}
BUILD_DIR=${WORKDIR}/${PN}-build
### TODO ###
# - fix linking order for --as-needed
+# - fix man pages
src_prepare() {
# the build system forces shadow builds
mkdir "${BUILD_DIR}"
+ epatch "${FILESDIR}"/${P}-filesystem-layout.patch \
+ "${FILESDIR}"/${P}-txt2man.patch
}
src_configure() {
@@ -100,6 +104,14 @@ src_install() {
newman noregparm/cmd/savemixer/savemixer.man savemixer.8
newman noregparm/cmd/vmixctl/vmixctl.man vmixctl.8
+ insinto /etc/oss4
+ doins devices.list
+ newins .version version.dat
+ cat > "${ED}"/etc/oss.conf << EOF
+ OSSETCDIR=/etc/oss4
+ OSSVARDIR=/var/lib/oss4
+EOF
+
cd "target"
dosbin sbin/*
dobin bin/*
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/angelos:master commit in: media-sound/oss/files/, media-sound/oss/
@ 2011-07-14 22:18 Christoph Mende
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-07-14 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 71eea61a62694efdf5f7b89aff2ad0a68f82cf41
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 21:28:13 2011 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 21:28:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=71eea61a
oss: Fix -Werror, LDFLAGS and stripping properly
(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key 84F20B43)
---
media-sound/oss/Manifest | 9 ++-
.../oss/files/oss-4.2.2004-as-needed-strip.patch | 65 ++++++++++++++++++++
media-sound/oss/oss-4.2.2004.ebuild | 16 +----
3 files changed, 73 insertions(+), 17 deletions(-)
diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index 881425c..a51b2b3 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -1,15 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX oss-4.2.2004-as-needed-strip.patch 2597 RMD160 4948e06fa2f42b7e9d7272a3f293c02693150bb5 SHA1 30eae3caaadadf17d50236d60e5692c25544900f SHA256 1dbe483d08ba25380791f9637b6c95235f71091fd1480580979d72ca4e9c2b6e
AUX oss-4.2.2004-filesystem-layout.patch 6703 RMD160 fee44548032c6fd88ddff2a90e514b997918d797 SHA1 33aae9b12ca5cd0bd34beb105ed8ed77da2c207f SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d
AUX oss-4.2.2004-txt2man.patch 340 RMD160 9211cd9f851843f1354ee6a8eddfab2fe04e3409 SHA1 df56f9001f11a0cb3552c37212ba7732e9640f08 SHA256 66b3895c68a58d419c004240fb915539c32e73f199fc36dcbfd9aa71f4dde28f
DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0
-EBUILD oss-4.2.2004.ebuild 2577 RMD160 2410a1c17b73ea516a81b4f71fa695d5ba457b84 SHA1 4b514c3c862c34ee5696ec2cbeb27db927107c4a SHA256 556c02ad4656656e745256c7b3b73517c48c4f438e9b146a2de55d8295fb086b
+EBUILD oss-4.2.2004.ebuild 2423 RMD160 a10f881c2581e22ee1ca32b3c1fd960d82fb64d4 SHA1 cd5599f20723f276e7eec9fbb02d992501272e3f SHA256 a6154d5bacd9f2215c40e285b8c66cd6296d1320d9be7a366df923425ba2a59b
MISC metadata.xml 227 RMD160 1f3fcf9c4a4cba1f09f4fa4d0869d03049a1da52 SHA1 4022447d941f3158cfd612046c05a97494a8e1e4 SHA256 8f4b64f252a02a2209f8573a0c8cfa3d15ecb413eb8b3bd49fbd06890699dc63
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk4fV0QACgkQmWq1bYTyC0P8IgD/S+Mbz9cJ3Fq+sl/d/waK1V45
-DDWLWd1R+MLZeyztoXgBAJPaKb3TR4LmeJk52DNSsYcFLaHGUlG+DosFIaOyQ/j9
-=xCf/
+iF4EAREIAAYFAk4fX20ACgkQmWq1bYTyC0MIfQEAirMKdjgxCYyxuhgmxaC5amn5
+k7WNMFHlQmbKAfeJ738BALIY60/CjAZjWFWIOOX4jbn8vgHH5P7zMi3fy7sMvKNR
+=8QCy
-----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch b/media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch
new file mode 100644
index 0000000..211028c
--- /dev/null
+++ b/media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch
@@ -0,0 +1,65 @@
+diff --git a/lib/libOSSlib/Makefile b/lib/libOSSlib/Makefile
+index 98029f1..a9bd175 100644
+--- a/lib/libOSSlib/Makefile
++++ b/lib/libOSSlib/Makefile
+@@ -1,6 +1,6 @@
+ OBJS=libmain.o midiparser.o play_event.o
+ INSTALLLIB=/lib
+-LDFLAGS=-shared -fPIC
++LDFLAGS+=-shared -fPIC
+ CFLAGS=-O -fPIC
+ #LDFLAGS=-Bdynamic
+ AROPTS=rc
+diff --git a/lib/libsalsa/Makefile b/lib/libsalsa/Makefile
+index 5f8216b..863ba7f 100644
+--- a/lib/libsalsa/Makefile
++++ b/lib/libsalsa/Makefile
+@@ -46,7 +46,7 @@ rawmidi.lo: rawmidi.c
+ $(LIBTOOL) --mode=compile ${CC} $(CFLAGS) -c rawmidi.c
+
+ libsalsa.la: $(LOBJECTS)
+- $(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -Wl,--version-script=Versions -version-info 2:0:0 -o libsalsa.la $(LOBJECTS) -L../libOSSlib -lOSSlib
++ $(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -Wl,--version-script=Versions -version-info 2:0:0 -o libsalsa.la $(LDFLAGS) $(LOBJECTS) -L../libOSSlib -lOSSlib
+
+ install: libsalsa.la
+ $(LIBTOOL) cp libsalsa.la /usr/lib
+diff --git a/setup/srcconf.c b/setup/srcconf.c
+index 241c590..85bac58 100644
+--- a/setup/srcconf.c
++++ b/setup/srcconf.c
+@@ -928,7 +928,7 @@ printf("Symlink %s -> %s\n", source, target);
+ fprintf (f, "CFLAGS=%s\n", conf.cflags);
+ #endif
+ if (*conf.ldflags != 0)
+- fprintf (f, "LDFLAGS=%s\n", conf.ldflags);
++ fprintf (f, "LDFLAGS+=%s\n", conf.ldflags);
+
+ if (strcmp(conf.endianess, "UNKNOWN") != 0)
+ sprintf (tmp_endian, " -DOSS_%s_ENDIAN", conf.endianess);
+@@ -1170,7 +1170,7 @@ printf("Symlink %s -> %s\n", source, target);
+
+ fprintf (f, "$(BINDIR)/%s:\t$(OBJECTS)\n", name);
+ fprintf (f,
+- "\t$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(BINDIR)/%s $(OBJECTS) %s\n",
++ "\t$(CC) $(CFLAGS) -o $(BINDIR)/%s $(OBJECTS) %s $(LIBRARIES) $(LDFLAGS)\n",
+ name, extra_libraries);
+ fprintf (f, "\n\n");
+ }
+@@ -1199,7 +1199,7 @@ printf("Symlink %s -> %s\n", source, target);
+
+ fprintf (f, "$(SBINDIR)/%s:\t$(OBJECTS)\n", name);
+ fprintf (f,
+- "\t$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(SBINDIR)/%s $(OBJECTS) %s\n",
++ "\t$(CC) $(CFLAGS) -o $(SBINDIR)/%s $(OBJECTS) %s $(LIBRARIES) $(LDFLAGS)\n",
+ name, extra_libraries);
+ fprintf (f, "\n\n");
+ }
+@@ -1226,7 +1226,7 @@ printf("Symlink %s -> %s\n", source, target);
+ obj_src[i], objdir, objects[i]);
+ else
+ fprintf (f,
+- "\t$(CC) -c $(CFLAGS) $(OSFLAGS) $(LIBRARIES) $(INCLUDES) %s -o $(%s)/%s\n",
++ "\t$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) %s -o $(%s)/%s $(LIBRARIES)\n",
+ obj_src[i], objdir, objects[i]);
+ fprintf (f, "\n");
+ }
diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.2.2004.ebuild
index fcc903f..b651a1c 100644
--- a/media-sound/oss/oss-4.2.2004.ebuild
+++ b/media-sound/oss/oss-4.2.2004.ebuild
@@ -33,7 +33,8 @@ src_prepare() {
# the build system forces shadow builds
mkdir "${BUILD_DIR}"
epatch "${FILESDIR}"/${P}-filesystem-layout.patch \
- "${FILESDIR}"/${P}-txt2man.patch
+ "${FILESDIR}"/${P}-txt2man.patch \
+ "${FILESDIR}"/${P}-as-needed-strip.patch
}
src_configure() {
@@ -44,12 +45,10 @@ src_configure() {
use salsa || myconf="--enable-libsalsa=NO"
HOSTCC=$(tc-getCC) \
+ NO_WARNING_CHECKS=1 \
"${S}"/configure \
--config-midi=YES \
${myconf} || die
-
- find -name Makefile -exec sed -e "s:-Werror::" \
- -e "s:-Wall::" -i {} +
}
src_compile() {
@@ -66,20 +65,11 @@ src_compile() {
sed -e "s:ossxmix::" -i Makefile
fi
- # disable stripping
- sed -e "s:-s::" \
- -i */Makefile
- #-e "s:LDFLAGS=:LDFLAGS+=:" \
-
einfo "Building applications"
emake CC=$(tc-getCC)
popd
pushd os_cmd/Linux
- # disable stripping
- sed -e "s:-s::" \
- -i */Makefile
-
einfo "Building ossdetect/ossvermagic"
emake CC=$(tc-getCC)
popd
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/angelos:master commit in: media-sound/oss/files/, media-sound/oss/
@ 2011-07-17 11:37 Christoph Mende
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-07-17 11:37 UTC (permalink / raw
To: gentoo-commits
commit: 28b1c2e86a064d1db17a5a086085b217fbcaa1a3
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 11:37:06 2011 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 11:37:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=28b1c2e8
oss: Install init/conf files and fix gtk+ dependency
(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key 84F20B43)
---
media-sound/oss/Manifest | 10 ++++++----
media-sound/oss/files/oss.conf | 5 +++++
media-sound/oss/files/oss.init | 26 ++++++++++++++++++++++++++
media-sound/oss/oss-4.2.2004.ebuild | 8 ++++++--
4 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index 16251e8..28851de 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -4,13 +4,15 @@ Hash: SHA256
AUX oss-4.2.2004-as-needed-strip.patch 2597 RMD160 4948e06fa2f42b7e9d7272a3f293c02693150bb5 SHA1 30eae3caaadadf17d50236d60e5692c25544900f SHA256 1dbe483d08ba25380791f9637b6c95235f71091fd1480580979d72ca4e9c2b6e
AUX oss-4.2.2004-filesystem-layout.patch 6703 RMD160 fee44548032c6fd88ddff2a90e514b997918d797 SHA1 33aae9b12ca5cd0bd34beb105ed8ed77da2c207f SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d
AUX oss-4.2.2004-txt2man.patch 340 RMD160 9211cd9f851843f1354ee6a8eddfab2fe04e3409 SHA1 df56f9001f11a0cb3552c37212ba7732e9640f08 SHA256 66b3895c68a58d419c004240fb915539c32e73f199fc36dcbfd9aa71f4dde28f
+AUX oss.conf 103 RMD160 aa2bb42cfd9137ab7cdf546267dca9dd1f3448dd SHA1 61ff7da9e8d87680d71651beb93b16a7b0fbcd9e SHA256 d135e1b36855e9c6ef1c110150b91df16cc1fe31e08ebec8bdaa5bb7dc95699f
+AUX oss.init 344 RMD160 7a90f308376ed44f8f5074ff5febe93977eec862 SHA1 d1b869f10343670fb2f93260c487533778da46ce SHA256 28f72cd8208211e41f2bfa60556157a45f2bc685ce6c13568be3f20b0f5466f5
DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0
-EBUILD oss-4.2.2004.ebuild 2492 RMD160 42add509c13edb7b7ff47536a23b2eb48c91d344 SHA1 b828553a87bfac527e4578ee09af9f992f52e6ab SHA256 658f2b0246f54fa318f2aa98a546d7fd1ebdb4dc4af2f5a1acb22a36db0e555e
+EBUILD oss-4.2.2004.ebuild 2622 RMD160 782b0ca9596c6a4f9e6e81ec485e4cb812b2c302 SHA1 a9e7e01cf3afe0b5d00477a79ecdb70fb678cf64 SHA256 edcb916eb35cd317c95ece38839fdd0c16609b0e2ac5824450357f6ba8f102bf
MISC metadata.xml 227 RMD160 1f3fcf9c4a4cba1f09f4fa4d0869d03049a1da52 SHA1 4022447d941f3158cfd612046c05a97494a8e1e4 SHA256 8f4b64f252a02a2209f8573a0c8cfa3d15ecb413eb8b3bd49fbd06890699dc63
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk4fa0IACgkQmWq1bYTyC0N6YAEAvgMcebi7GRzL6npvp+/lioSB
-qZmTUjjaG3VcrRMe+ysA/jOhoyeM7s0JxsCNAAo60mjsFSaM4gb40H3O+lftPH7k
-=MVKp
+iF4EAREIAAYFAk4iyWIACgkQmWq1bYTyC0M7QQD/SKVHWI+JyHKpaq9Wa4jLClNM
+0BM0JgnTMmI4PBJdbckA/121jrZQrkdF0CpYAPEs6nMKDd58k+7Ja8rlGKJeC7ke
+=fEPr
-----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss.conf b/media-sound/oss/files/oss.conf
new file mode 100644
index 0000000..a0bc12a
--- /dev/null
+++ b/media-sound/oss/files/oss.conf
@@ -0,0 +1,5 @@
+# /etc/conf.d/oss
+# $Header: $
+
+# Space-spearated list of drivers to load on startup
+DRIVERS="hdaudio"
diff --git a/media-sound/oss/files/oss.init b/media-sound/oss/files/oss.init
new file mode 100644
index 0000000..23d864c
--- /dev/null
+++ b/media-sound/oss/files/oss.init
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+opts="save"
+
+start() {
+ for i in ${DRIVERS}; do
+ modprobe oss_${i}
+ done
+ ossdetect -d
+ ossdevlinks
+}
+
+stop() {
+ modprobe -r osscore
+
+ save
+}
+
+save() {
+ ebegin "Saving mixer levels"
+ savemixer
+ eend $?
+}
diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.2.2004.ebuild
index adf97a0..bac11eb 100644
--- a/media-sound/oss/oss-4.2.2004.ebuild
+++ b/media-sound/oss/oss-4.2.2004.ebuild
@@ -18,7 +18,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gtk salsa"
-RDEPEND="x11-libs/gtk+:2"
+RDEPEND="media-sound/oss-driver
+ gtk? ( x11-libs/gtk+:2 )"
DEPEND="${RDEPEND}
app-text/txt2man"
@@ -27,7 +28,7 @@ BUILD_DIR=${WORKDIR}/${PN}-build
### TODO ###
# - fix linking order for --as-needed
-# - fix man pages
+# - fix man pages (savemixer installed twice)
src_prepare() {
# the build system forces shadow builds
@@ -113,4 +114,7 @@ EOF
dolib lib/*
dodir /var/lib/oss4
+
+ doinitd "${FILESDIR}"/${PN}.init
+ doconfd "${FILESDIR}"/${PN}.conf
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/angelos:master commit in: media-sound/oss/files/, media-sound/oss/
@ 2012-07-20 11:43 Christoph Mende
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2012-07-20 11:43 UTC (permalink / raw
To: gentoo-commits
commit: 07a562df8393d3a19de8548791284b90da2e3f2a
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 11:30:05 2012 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 11:30:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=07a562df
oss: Version bump
(Portage version: 2.2.0_alpha120/git/Linux x86_64, signed Manifest commit with key 84F20B43)
---
media-sound/oss/Manifest | 26 ++---
...ip.patch => oss-4.2.2006-as-needed-strip.patch} | 10 +-
....patch => oss-4.2.2006-filesystem-layout.patch} | 0
...04-txt2man.patch => oss-4.2.2006-txt2man.patch} | 0
media-sound/oss/oss-4.2.2005.ebuild | 120 --------------------
.../{oss-4.2.2004.ebuild => oss-4.2.2006.ebuild} | 2 +-
6 files changed, 18 insertions(+), 140 deletions(-)
diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index 81a7722..5d38ba0 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -1,20 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX oss-4.2.2004-as-needed-strip.patch 2597 RMD160 4948e06fa2f42b7e9d7272a3f293c02693150bb5 SHA1 30eae3caaadadf17d50236d60e5692c25544900f SHA256 1dbe483d08ba25380791f9637b6c95235f71091fd1480580979d72ca4e9c2b6e
-AUX oss-4.2.2004-filesystem-layout.patch 6703 RMD160 fee44548032c6fd88ddff2a90e514b997918d797 SHA1 33aae9b12ca5cd0bd34beb105ed8ed77da2c207f SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d
-AUX oss-4.2.2004-txt2man.patch 340 RMD160 9211cd9f851843f1354ee6a8eddfab2fe04e3409 SHA1 df56f9001f11a0cb3552c37212ba7732e9640f08 SHA256 66b3895c68a58d419c004240fb915539c32e73f199fc36dcbfd9aa71f4dde28f
-AUX oss.conf 103 RMD160 aa2bb42cfd9137ab7cdf546267dca9dd1f3448dd SHA1 61ff7da9e8d87680d71651beb93b16a7b0fbcd9e SHA256 d135e1b36855e9c6ef1c110150b91df16cc1fe31e08ebec8bdaa5bb7dc95699f
-AUX oss.init 344 RMD160 7a90f308376ed44f8f5074ff5febe93977eec862 SHA1 d1b869f10343670fb2f93260c487533778da46ce SHA256 28f72cd8208211e41f2bfa60556157a45f2bc685ce6c13568be3f20b0f5466f5
-DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0
-DIST oss-v4.2-build2005-src-gpl.tar.bz2 1790056 RMD160 d70d85b407f66c8e884996d9bbefc5a4e3f84f06 SHA1 7924d8893f3af94c5c73c651ae0a6d5073a94bae SHA256 41c493eda1c1b93787085f36f8e68630af6112523216f3664ca1da8b7ece9bca
-EBUILD oss-4.2.2004.ebuild 2636 RMD160 a6a43448701fe908dabb9bdf4311d700b1d3eb29 SHA1 69acf8f09decfaff64adcbc4ec0e26a764ee49e9 SHA256 c4838d3d1316610aeb135da5e595d281ebd281bb3c07a2ed53e233002dd84b5b
-EBUILD oss-4.2.2005.ebuild 2666 RMD160 9a2fa218d4860498db2ee1fa118626d59daf278e SHA1 83975cc1cdfa18931407c85f12adb03129ac6f25 SHA256 e124709ae11dba74904d2a9960bed45bdb3b543418821f027b18e28fefc7fbed
-MISC metadata.xml 205 RMD160 107c06020a486b352e3a1fe310af323a5764bc2a SHA1 91c73725685fb8fb5a9630275f17ec106d2c3cfd SHA256 370b4bb14b4fa4b9e8d4eb74d51d653f12f1c7c3e210282a886ae871304f0769
+AUX oss-4.2.2006-as-needed-strip.patch 2597 SHA256 5b344eddb32d08cd6aea7778cd0482c9a8b0244671c872265c69db5d1793af64 SHA512 f7ae55a65a1d52f6d1e2a8f36313bb0311481f57357faabc737342679dd60c3d25e4471e42e1f19c0e100735a7177a88ff89f6c18f2e226a88c2dd30e100d491 WHIRLPOOL 4a9ed230b0a2e9862b1ea3192938122c9383413d3bdf0b6b22722247443449523a3c8dc38fc40587ed75f88df948d5c0a9b9f8091f969434f2e974fd17ed7fa1
+AUX oss-4.2.2006-filesystem-layout.patch 6703 SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d SHA512 014dbb99f56361f88f6705ae885fc87faa59f6384b89cc045edf9e3c6c52203fc0d3e3a2fce1e89b4005d3c57a107f315c5aaf66fdba7fe13fdb18a8e2a0b1d7 WHIRLPOOL 8e2209635427b27f5ce6d15028ed85c35f402dbc1711d469ecf914b26b42849a75a9c51c4c5c8dd919002643a2e3fa19e2bf59e638269459605c7b5a4d3ed452
+AUX oss-4.2.2006-txt2man.patch 340 SHA256 66b3895c68a58d419c004240fb915539c32e73f199fc36dcbfd9aa71f4dde28f SHA512 540a9e75e3f6b7c60aa37468fe09111fdeb63f6d569878a02ead8c7ea468bfeae42c820c163e2585a860095fa2753c1f90dd5bf856b94d248449a90987fed577 WHIRLPOOL 546c1ab7f81a88bf7e910efc762b165638253de1fea708430b910508f68b6fee61ff6b6b5dd2ef1611caadd0d73ca17fa330f184abc9f39cda1b380ba9ec6196
+AUX oss.conf 103 SHA256 d135e1b36855e9c6ef1c110150b91df16cc1fe31e08ebec8bdaa5bb7dc95699f SHA512 0f65912d7a802a300182f635a6fc98f02045a4a776050980a01e887d88d01d37f4a325d7a314a01e4b8a8f14603e10f766c4716dcd4a7f090d0f3f2e5e3db6eb WHIRLPOOL 0da9282cde53f8356d35856b212e184fbe96465872c3b0de3ac2490419ed5da045c72dd640c2c6ba4cec72112e816b090ebbebefbe94aa67e9ea7896f706f4ca
+AUX oss.init 344 SHA256 28f72cd8208211e41f2bfa60556157a45f2bc685ce6c13568be3f20b0f5466f5 SHA512 a64bf71fa7bb654bef81cd2f4cfc7d5421ecc376c1befa2ed80a157140fd9e7ed6b581acfc8d3e809dfc82e0dee2375539acd3c9adfcad78ba35e8249b90e265 WHIRLPOOL 9d2c8019b6d4ec9e844befbd166aba56e5308b45dd6e011ce5a84d27afa78f1b6b84fac4068025cfd329be5c4946c9d2f3f3a74a1815230a144e1b6d862bce18
+DIST oss-v4.2-build2006-src-gpl.tar.bz2 1767324 SHA256 1d034bd0ab967d1d4e848b79171a36cf75656f87c542ea96ce4629ca69995391 SHA512 d1834055e446496bd215a520a18af8a86f0109eab19e3fa2a6a67a8cb0958d9ec7fe343a2515bfc84e9a697308fb93dc8d50bdd0dbe73f2aa9717ec0e3d6e4a6 WHIRLPOOL a5253d26bf72b104f01750a6115656ba237b1dafbe2ab096b66eb9837008af97b728c1df034ecda132b04d73b4e3707b542eb7d2a95474215da04b27d4cd3336
+EBUILD oss-4.2.2006.ebuild 2636 SHA256 33076dfc8e923cd18d44a6383560451236c5376db8ac1b60ef243e1b6bf289d6 SHA512 5bce5f491a0c95ae2724fcbc61fec07213aa45a250f47408d7a87f5c6c26927238657f376cf50a5f0945989766cc7cb7e070eaae968530db85a1dd0023c6bc94 WHIRLPOOL 6e841273d3cc87288babc10a99d0332eb732871d34309043d3ee4e69c05f9b5ee187f6ba8ad49b50a9debe2a2504883d735e76de71e4ccf00d85e18ab958669f
+MISC metadata.xml 205 SHA256 370b4bb14b4fa4b9e8d4eb74d51d653f12f1c7c3e210282a886ae871304f0769 SHA512 3ae6a16639d8ac011e7e2018190926eada9af76a7399fbd2e080941a932dc90f34880a566644abdc54d4ec581b807047dd551de8ecad541487963a84647cfeaa WHIRLPOOL b8deb16b47263b3a01963aef07d016253997bdae3cffddfaf73f832811c769e3550854460b4293cf176a365c7c40106dd13e30f764838f24c1046bad364718b8
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAk7t7OIACgkQmWq1bYTyC0MWaQEAq6GBwRjaDem3zl0p4B/Tl2xr
-xeIjdVkiP1HFrLYueEoA/2D4/u34CSJnoaNPxse2TuqIfgj50gM5u48qltx4AaT3
-=vIDy
+iF4EAREIAAYFAlAJQT0ACgkQmWq1bYTyC0PhBwEAqA/xwGJUSF8J/OMddF19NuDG
+N0Z2Pth93HKpJ0C8OwYA/0pl83+KglqJ53Pycu660nsBb66z4ZflAU5vKNv/5bO7
+=HhLo
-----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch b/media-sound/oss/files/oss-4.2.2006-as-needed-strip.patch
similarity index 85%
rename from media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch
rename to media-sound/oss/files/oss-4.2.2006-as-needed-strip.patch
index 211028c..afff068 100644
--- a/media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch
+++ b/media-sound/oss/files/oss-4.2.2006-as-needed-strip.patch
@@ -24,7 +24,7 @@ index 5f8216b..863ba7f 100644
install: libsalsa.la
$(LIBTOOL) cp libsalsa.la /usr/lib
diff --git a/setup/srcconf.c b/setup/srcconf.c
-index 241c590..85bac58 100644
+index 0d37a16..6e20d54 100644
--- a/setup/srcconf.c
+++ b/setup/srcconf.c
@@ -928,7 +928,7 @@ printf("Symlink %s -> %s\n", source, target);
@@ -40,8 +40,8 @@ index 241c590..85bac58 100644
fprintf (f, "$(BINDIR)/%s:\t$(OBJECTS)\n", name);
fprintf (f,
-- "\t$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(BINDIR)/%s $(OBJECTS) %s\n",
-+ "\t$(CC) $(CFLAGS) -o $(BINDIR)/%s $(OBJECTS) %s $(LIBRARIES) $(LDFLAGS)\n",
+- "\t$(CC) $(CFLAGS) -s -o $(BINDIR)/%s $(OBJECTS) $(LIBRARIES) $(LDFLAGS) %s\n",
++ "\t$(CC) $(CFLAGS) -o $(BINDIR)/%s $(OBJECTS) $(LIBRARIES) $(LDFLAGS) %s\n",
name, extra_libraries);
fprintf (f, "\n\n");
}
@@ -49,8 +49,8 @@ index 241c590..85bac58 100644
fprintf (f, "$(SBINDIR)/%s:\t$(OBJECTS)\n", name);
fprintf (f,
-- "\t$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(SBINDIR)/%s $(OBJECTS) %s\n",
-+ "\t$(CC) $(CFLAGS) -o $(SBINDIR)/%s $(OBJECTS) %s $(LIBRARIES) $(LDFLAGS)\n",
+- "\t$(CC) $(CFLAGS) -s -o $(SBINDIR)/%s $(OBJECTS) $(LIBRARIES) $(LDFLAGS) %s\n",
++ "\t$(CC) $(CFLAGS) -o $(SBINDIR)/%s $(OBJECTS) $(LIBRARIES) $(LDFLAGS) %s\n",
name, extra_libraries);
fprintf (f, "\n\n");
}
diff --git a/media-sound/oss/files/oss-4.2.2004-filesystem-layout.patch b/media-sound/oss/files/oss-4.2.2006-filesystem-layout.patch
similarity index 100%
rename from media-sound/oss/files/oss-4.2.2004-filesystem-layout.patch
rename to media-sound/oss/files/oss-4.2.2006-filesystem-layout.patch
diff --git a/media-sound/oss/files/oss-4.2.2004-txt2man.patch b/media-sound/oss/files/oss-4.2.2006-txt2man.patch
similarity index 100%
rename from media-sound/oss/files/oss-4.2.2004-txt2man.patch
rename to media-sound/oss/files/oss-4.2.2006-txt2man.patch
diff --git a/media-sound/oss/oss-4.2.2005.ebuild b/media-sound/oss/oss-4.2.2005.ebuild
deleted file mode 100644
index 9a05294..0000000
--- a/media-sound/oss/oss-4.2.2005.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(get_version_component_range 1-2)
-BUILD=$(get_version_component_range 3)
-MY_P=${PN}-v${MY_PV}-build${BUILD}-src-gpl
-
-DESCRIPTION="Open Sound System - applications and man pages"
-HOMEPAGE="http://developer.opensound.com/"
-SRC_URI="http://www.4front-tech.com/developer/sources/stable/gpl/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk salsa"
-
-RDEPEND="media-sound/oss-driver
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- app-text/txt2man"
-
-S=${WORKDIR}/${MY_P}
-BUILD_DIR=${WORKDIR}/${PN}-build
-
-### TODO ###
-# - fix linking order for --as-needed
-# - fix man pages (savemixer installed twice)
-
-src_prepare() {
- # the build system forces shadow builds
- mkdir "${BUILD_DIR}"
- epatch "${FILESDIR}"/${PN}-4.2.2004-filesystem-layout.patch \
- "${FILESDIR}"/${PN}-4.2.2004-txt2man.patch \
- "${FILESDIR}"/${PN}-4.2.2004-as-needed-strip.patch
- sed -e "s:GRC_MAX_QUALITY=3:GRC_MAX_QUALITY=6:" -i configure || die
-}
-
-src_configure() {
- cd "${BUILD_DIR}"
-
- local myconf=""
-
- use salsa || myconf="--enable-libsalsa=NO"
-
- HOSTCC=$(tc-getCC) \
- NO_WARNING_CHECKS=1 \
- "${S}"/configure \
- --config-midi=YES \
- ${myconf} || die
-}
-
-src_compile() {
- cd "${BUILD_DIR}"
-
- pushd lib
- einfo "Building libraries"
- emake CC=$(tc-getCC)
- popd
-
- pushd cmd
- if ! use gtk; then
- # remove ossxmix from SUBDIRS
- sed -e "s:ossxmix::" -i Makefile
- fi
-
- einfo "Building applications"
- emake CC=$(tc-getCC)
- popd
-
- pushd os_cmd/Linux
- einfo "Building ossdetect/ossvermagic"
- emake CC=$(tc-getCC)
- popd
-}
-
-src_install() {
- cd "${BUILD_DIR}"
- use salsa && dolib lib/libsalsa/.libs/libsalsa.so*
-
- dolib lib/libOSSlib/libOSSlib.so
-
- # linux-headers ships OSS3 API
- #insinto /usr/include/linux
- #doins include/soundcard.h
-
- # install man pages
- use gtk || rm cmd/ossxmix/ossxmix.man
- rename man 1 cmd/*/*.man
- doman cmd/*/*.1
- rename .man .7 misc/man7/*.man
- doman misc/man7/*.7
- rename man 7 kernel/drv/*/*.man
- doman kernel/drv/*/*.7
- newman os_cmd/Linux/ossdetect/ossdetect.man ossdetect.8
- newman noregparm/cmd/ossdevlinks/ossdevlinks.man ossdevlinks.8
- newman noregparm/cmd/savemixer/savemixer.man savemixer.8
- newman noregparm/cmd/vmixctl/vmixctl.man vmixctl.8
-
- insinto /etc/oss4
- doins devices.list
- newins .version version.dat
- cat > "${ED}"/etc/oss.conf << EOF
-OSSETCDIR=/etc/oss4
-OSSVARDIR=/var/lib/oss4
-EOF
-
- cd "target"
- dosbin sbin/*
- dobin bin/*
- dolib lib/*
-
- dodir /var/lib/oss4
-
- newinitd "${FILESDIR}"/${PN}.init ${PN}
- newconfd "${FILESDIR}"/${PN}.conf ${PN}
-}
diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.2.2006.ebuild
similarity index 98%
rename from media-sound/oss/oss-4.2.2004.ebuild
rename to media-sound/oss/oss-4.2.2006.ebuild
index 7c82307..a7c4d47 100644
--- a/media-sound/oss/oss-4.2.2004.ebuild
+++ b/media-sound/oss/oss-4.2.2006.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/angelos:master commit in: media-sound/oss/files/, media-sound/oss/
@ 2013-01-02 17:53 Christoph Mende
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2013-01-02 17:53 UTC (permalink / raw
To: gentoo-commits
commit: a805c83f3a83b3a01bb73e1148680d6760f69680
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 2 13:08:27 2013 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Wed Jan 2 13:08:27 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=a805c83f
Version bump
Package-Manager: portage-2.2.0_alpha149
Manifest-Sign-Key: 84F20B43
---
media-sound/oss/Manifest | 16 ++++++++--------
...ip.patch => oss-4.2.2007-as-needed-strip.patch} | 0
....patch => oss-4.2.2007-filesystem-layout.patch} | 0
...06-txt2man.patch => oss-4.2.2007-txt2man.patch} | 4 ++--
.../{oss-4.2.2006.ebuild => oss-4.2.2007.ebuild} | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index 5d38ba0..efdc40f 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -1,18 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX oss-4.2.2006-as-needed-strip.patch 2597 SHA256 5b344eddb32d08cd6aea7778cd0482c9a8b0244671c872265c69db5d1793af64 SHA512 f7ae55a65a1d52f6d1e2a8f36313bb0311481f57357faabc737342679dd60c3d25e4471e42e1f19c0e100735a7177a88ff89f6c18f2e226a88c2dd30e100d491 WHIRLPOOL 4a9ed230b0a2e9862b1ea3192938122c9383413d3bdf0b6b22722247443449523a3c8dc38fc40587ed75f88df948d5c0a9b9f8091f969434f2e974fd17ed7fa1
-AUX oss-4.2.2006-filesystem-layout.patch 6703 SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d SHA512 014dbb99f56361f88f6705ae885fc87faa59f6384b89cc045edf9e3c6c52203fc0d3e3a2fce1e89b4005d3c57a107f315c5aaf66fdba7fe13fdb18a8e2a0b1d7 WHIRLPOOL 8e2209635427b27f5ce6d15028ed85c35f402dbc1711d469ecf914b26b42849a75a9c51c4c5c8dd919002643a2e3fa19e2bf59e638269459605c7b5a4d3ed452
-AUX oss-4.2.2006-txt2man.patch 340 SHA256 66b3895c68a58d419c004240fb915539c32e73f199fc36dcbfd9aa71f4dde28f SHA512 540a9e75e3f6b7c60aa37468fe09111fdeb63f6d569878a02ead8c7ea468bfeae42c820c163e2585a860095fa2753c1f90dd5bf856b94d248449a90987fed577 WHIRLPOOL 546c1ab7f81a88bf7e910efc762b165638253de1fea708430b910508f68b6fee61ff6b6b5dd2ef1611caadd0d73ca17fa330f184abc9f39cda1b380ba9ec6196
+AUX oss-4.2.2007-as-needed-strip.patch 2597 SHA256 5b344eddb32d08cd6aea7778cd0482c9a8b0244671c872265c69db5d1793af64 SHA512 f7ae55a65a1d52f6d1e2a8f36313bb0311481f57357faabc737342679dd60c3d25e4471e42e1f19c0e100735a7177a88ff89f6c18f2e226a88c2dd30e100d491 WHIRLPOOL 4a9ed230b0a2e9862b1ea3192938122c9383413d3bdf0b6b22722247443449523a3c8dc38fc40587ed75f88df948d5c0a9b9f8091f969434f2e974fd17ed7fa1
+AUX oss-4.2.2007-filesystem-layout.patch 6703 SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d SHA512 014dbb99f56361f88f6705ae885fc87faa59f6384b89cc045edf9e3c6c52203fc0d3e3a2fce1e89b4005d3c57a107f315c5aaf66fdba7fe13fdb18a8e2a0b1d7 WHIRLPOOL 8e2209635427b27f5ce6d15028ed85c35f402dbc1711d469ecf914b26b42849a75a9c51c4c5c8dd919002643a2e3fa19e2bf59e638269459605c7b5a4d3ed452
+AUX oss-4.2.2007-txt2man.patch 345 SHA256 907c5ebb3f18b19a667b0e6d771a1906dd6d9626f2835a5be9db47a6379eed6a SHA512 cf2ee6615d6374d7cd05a93889f9bee856d73c2311f45dcbcc665eeea7356f50aa29172b46f2f86997f1204103cfea63fd5d162c3ff69c9a961628113451d65e WHIRLPOOL 30c8fd650e30cc78dc9117da12e376510cc589bd54173ea24518b7b9acce6df733378b3341011f5aa6c2ed3042cc9e16a15bd3e08057fe5117826c1bb5b94aaa
AUX oss.conf 103 SHA256 d135e1b36855e9c6ef1c110150b91df16cc1fe31e08ebec8bdaa5bb7dc95699f SHA512 0f65912d7a802a300182f635a6fc98f02045a4a776050980a01e887d88d01d37f4a325d7a314a01e4b8a8f14603e10f766c4716dcd4a7f090d0f3f2e5e3db6eb WHIRLPOOL 0da9282cde53f8356d35856b212e184fbe96465872c3b0de3ac2490419ed5da045c72dd640c2c6ba4cec72112e816b090ebbebefbe94aa67e9ea7896f706f4ca
AUX oss.init 344 SHA256 28f72cd8208211e41f2bfa60556157a45f2bc685ce6c13568be3f20b0f5466f5 SHA512 a64bf71fa7bb654bef81cd2f4cfc7d5421ecc376c1befa2ed80a157140fd9e7ed6b581acfc8d3e809dfc82e0dee2375539acd3c9adfcad78ba35e8249b90e265 WHIRLPOOL 9d2c8019b6d4ec9e844befbd166aba56e5308b45dd6e011ce5a84d27afa78f1b6b84fac4068025cfd329be5c4946c9d2f3f3a74a1815230a144e1b6d862bce18
-DIST oss-v4.2-build2006-src-gpl.tar.bz2 1767324 SHA256 1d034bd0ab967d1d4e848b79171a36cf75656f87c542ea96ce4629ca69995391 SHA512 d1834055e446496bd215a520a18af8a86f0109eab19e3fa2a6a67a8cb0958d9ec7fe343a2515bfc84e9a697308fb93dc8d50bdd0dbe73f2aa9717ec0e3d6e4a6 WHIRLPOOL a5253d26bf72b104f01750a6115656ba237b1dafbe2ab096b66eb9837008af97b728c1df034ecda132b04d73b4e3707b542eb7d2a95474215da04b27d4cd3336
-EBUILD oss-4.2.2006.ebuild 2636 SHA256 33076dfc8e923cd18d44a6383560451236c5376db8ac1b60ef243e1b6bf289d6 SHA512 5bce5f491a0c95ae2724fcbc61fec07213aa45a250f47408d7a87f5c6c26927238657f376cf50a5f0945989766cc7cb7e070eaae968530db85a1dd0023c6bc94 WHIRLPOOL 6e841273d3cc87288babc10a99d0332eb732871d34309043d3ee4e69c05f9b5ee187f6ba8ad49b50a9debe2a2504883d735e76de71e4ccf00d85e18ab958669f
+DIST oss-v4.2-build2007-src-gpl.tar.bz2 1772570 SHA256 6dafbf314fb11cd056f266b934f4f5aaa32504af6f07401b15e0f2391cf7119e SHA512 b74fb9acac157e7f28fbbf760be425269a5bbc30aaa2d1e18b714dabce084d4356dcc58051b0fa590f2d940d7858c6d4abe23f4e4457809f9fc9fac3f2001670 WHIRLPOOL 154dfae419eeb58704b2711f72087fc4dc45f6708852387e20a91a1698536c40f80d5fa599fd85790fcb899ccb04659f3ccd6c1b95fae310f1a19f17e9a4e0e8
+EBUILD oss-4.2.2007.ebuild 2636 SHA256 3f1c115e50b3cf1466278475cd062e79f64d27c0fa67c308004cf994394a8c45 SHA512 de830d614b268613b01090f736f361cdd0b3e40b91559f4e624db93deb7be240c416c39718a8e82f9cb3d3cd3ee833f68604f58c5f3df677a6baeb0ca355e50d WHIRLPOOL 940a40ffa3909c842cd63360973a0505bf6d3098a0ccce2108ebde64fa8567a258c81321ec423860230749f22f0afec0d5fea28d412f72e174787591439c3868
MISC metadata.xml 205 SHA256 370b4bb14b4fa4b9e8d4eb74d51d653f12f1c7c3e210282a886ae871304f0769 SHA512 3ae6a16639d8ac011e7e2018190926eada9af76a7399fbd2e080941a932dc90f34880a566644abdc54d4ec581b807047dd551de8ecad541487963a84647cfeaa WHIRLPOOL b8deb16b47263b3a01963aef07d016253997bdae3cffddfaf73f832811c769e3550854460b4293cf176a365c7c40106dd13e30f764838f24c1046bad364718b8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlAJQT0ACgkQmWq1bYTyC0PhBwEAqA/xwGJUSF8J/OMddF19NuDG
-N0Z2Pth93HKpJ0C8OwYA/0pl83+KglqJ53Pycu660nsBb66z4ZflAU5vKNv/5bO7
-=HhLo
+iF0EAREIAAYFAlDkMUsACgkQmWq1bYTyC0NQlgD4yRFTAbtf6R6qdfe54BXEO74S
+1Uzq8rc4XIbORNTsAAD9HQZ0T7zRTjnWZe6FXL2/pRh7leIQ4HdMmrtNYBlp3Qs=
+=c/79
-----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss-4.2.2006-as-needed-strip.patch b/media-sound/oss/files/oss-4.2.2007-as-needed-strip.patch
similarity index 100%
rename from media-sound/oss/files/oss-4.2.2006-as-needed-strip.patch
rename to media-sound/oss/files/oss-4.2.2007-as-needed-strip.patch
diff --git a/media-sound/oss/files/oss-4.2.2006-filesystem-layout.patch b/media-sound/oss/files/oss-4.2.2007-filesystem-layout.patch
similarity index 100%
rename from media-sound/oss/files/oss-4.2.2006-filesystem-layout.patch
rename to media-sound/oss/files/oss-4.2.2007-filesystem-layout.patch
diff --git a/media-sound/oss/files/oss-4.2.2006-txt2man.patch b/media-sound/oss/files/oss-4.2.2007-txt2man.patch
similarity index 84%
rename from media-sound/oss/files/oss-4.2.2006-txt2man.patch
rename to media-sound/oss/files/oss-4.2.2007-txt2man.patch
index cb4022c..8cf3541 100644
--- a/media-sound/oss/files/oss-4.2.2006-txt2man.patch
+++ b/media-sound/oss/files/oss-4.2.2007-txt2man.patch
@@ -1,5 +1,5 @@
diff --git a/setup/Linux/build.sh b/setup/Linux/build.sh
-index 4b7838c..4931e1f 100644
+index e889bfe..de23496 100644
--- a/setup/Linux/build.sh
+++ b/setup/Linux/build.sh
@@ -8,7 +8,7 @@ then
@@ -10,4 +10,4 @@ index 4b7838c..4931e1f 100644
+ TXT2MAN=/usr/bin/txt2man
fi
- rm -rf prototype
+ [ -z "$LD" ] && LD=ld
diff --git a/media-sound/oss/oss-4.2.2006.ebuild b/media-sound/oss/oss-4.2.2007.ebuild
similarity index 98%
rename from media-sound/oss/oss-4.2.2006.ebuild
rename to media-sound/oss/oss-4.2.2007.ebuild
index a7c4d47..9386421 100644
--- a/media-sound/oss/oss-4.2.2006.ebuild
+++ b/media-sound/oss/oss-4.2.2007.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-01-02 17:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-26 19:34 [gentoo-commits] dev/angelos:master commit in: media-sound/oss/files/, media-sound/oss/ Christoph Mende
-- strict thread matches above, loose matches on Subject: below --
2011-07-14 17:53 Christoph Mende
2011-07-14 19:15 Christoph Mende
2011-07-14 22:18 Christoph Mende
2011-07-17 11:37 Christoph Mende
2012-07-20 11:43 Christoph Mende
2013-01-02 17:53 Christoph Mende
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox