Moderators: hannu, dev, kodachi, cesium
hash wrote:Can any one apply attached patch to skype-oss in overlay.
It's to make skype-oss ebuild to accept installed oss-devel (not only oss as it is currently) and to make it create correct desktop file, it's currently set executable to skype-oss which isn't correct.
# Copyright 1999-20011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
inherit eutils versionator flag-o-matic
filter-ldflags "-Wl,-O1"
# For the news, see the commit messages.
DESCRIPTION="Open Sound System - portable, mixing-capable, high quality sound system for Unix."
HOMEPAGE="http://developer.opensound.com/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="sys-apps/gawk
>=x11-libs/gtk+-2
>=sys-kernel/linux-headers-2.6.11
!media-sound/oss"
RDEPEND="${DEPEND}"
RESTRICT="mirror"
MY_PV=$(get_version_component_range 1-2)
MY_BUILD=$(get_version_component_range 3)
MY_P="oss-v${MY_PV}-build${MY_BUILD}-src-gpl"
SRC_URI="http://www.4front-tech.com/developer/sources/stable/gpl/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
src_unpack() {
unpack "${A}"
mkdir "${WORKDIR}/build"
cd "${S}"
einfo "Replacing init script with gentoo friendly one..."
cp "${FILESDIR}/oss" "${S}/setup/Linux/oss/etc/S89oss"
}
src_compile() {
myconf="--enable-libsalsa=NO"
# Configure has to be run from build dir with full path.
cd "${WORKDIR}/build"
"${S}"/configure \
${myconf} || die "configure failed"
emake build || die "emake build failed"
}
src_install() {
newinitd "${FILESDIR}/oss" oss
cd "${WORKDIR}/build"
cp -R prototype/* "${D}"
}
pkg_postinst() {
elog "PLEASE NOTE:"
elog ""
elog "In order to use OSSv4.2 you must run"
elog "# /etc/init.d/oss start "
elog ""
elog "If you are upgrading from a previous build of OSSv4.2 you must run"
elog "# /etc/init.d/oss restart "
elog ""
elog "Enjoy OSSv4.2 !"
}
--- setup/srcconf.c 2009-11-13 23:23:24.000000000 +0800
+++ setup/srcconf.c.new 2009-12-16 11:15:33.705839223 +0800
@@ -962,7 +962,7 @@
#if defined(__SCO_VERSION__)
fprintf (f, "CFLAGS=-O -D_KERNEL -D_DDI=8\n");
#else
- fprintf (f, "CFLAGS += -D_KERNEL\n");
+ fprintf (f, "CFLAGS += -nopie -D_KERNEL\n");
#endif
#ifdef HAVE_KERNEL_FLAGS
add_kernel_flags (f);--- oss-v4.2-build2005-src-gpl.orig/setup/Linux/oss/build/osscore.c 2011-12-29 10:30:56.071144892 +0800
+++ oss-v4.2-build2005-src-gpl/setup/Linux/oss/build/osscore.c 2011-12-29 10:36:19.735147341 +0800
@@ -911,7 +911,7 @@
* are replaced by wrapper handles.
*/
-static struct file_operations *
+static file_operations_no_const *
alloc_fop (oss_device_t * osdev, struct oss_file_operation_handle *op)
{
/*
@@ -927,7 +927,7 @@
* and WRAPPER_VERSION must be incremented.
*/
- struct file_operations *fop;
+ file_operations_no_const *fop;
poll_t tmp_poll = (poll_t) op->poll;
read_t tmp_read = (read_t) op->read;
@@ -942,10 +942,10 @@
new_ioctl_t tmp_unlocked_ioctl = (new_ioctl_t) op->unlocked_ioctl;
new_ioctl_t tmp_compat_ioctl = (new_ioctl_t) op->compat_ioctl;
- fop = (struct file_operations *)
- oss_kmem_alloc (sizeof (struct file_operations));
+ fop = (file_operations_no_const *)
+ oss_kmem_alloc (sizeof (file_operations_no_const));
- memset ((char *) fop, 0, sizeof (struct file_operations));
+ memset ((char *) fop, 0, sizeof (file_operations_no_const));
/*
* Now the assignmentdiff -ur oss-v4.2-build2005-src-gpl.orig/setup/setupdir.sh oss-v4.2-build2005-src-gpl/setup/setupdir.sh
--- oss-v4.2-build2005-src-gpl.orig/setup/setupdir.sh 2012-01-02 04:12:29.353230228 +0800
+++ oss-v4.2-build2005-src-gpl/setup/setupdir.sh 2012-01-02 04:13:03.792230489 +0800
@@ -43,20 +43,6 @@
# pkg-config seems to crash in some systems so disable core dumps
ulimit -c 0 >/dev/null 2>&1
-if pkg-config gtk+-2.0 --cflags > /dev/null 2>&1
-then
- HAVE_GTK=y
- GTK2=1
- export HAVE_GTK GTK2
-else
- if gtk-config --cflags > /dev/null 2>&1
- then
- HAVE_GTK=y
- GTK1=1
- export HAVE_GTK GTK1
- fi
-fi
-
if test "`ls .` " != " " && test "`ls .` " != ".makefile "
then
echo Error: Current directory must be empty
Users browsing this forum: No registered users and 3 guests