root
12 years ago
parent
1129736778
commit
f188b40378
@ -1 +1 @@
|
||||
DIST ansible-0.7.tar.gz 120774 SHA256 2ca0dd70a23f5c111effe5ceffad0844107fa9fe7f0f2ab085437d1beb6de4fc SHA512 3fd0ab7f21e0aa112301f54bf96c7f5e93563e5cae247b8a7a8a4351bad37c7969af58bbd9614535a6a04c6fa2414455cc7d93b63d1301c8cf4644d746503dcc WHIRLPOOL 721e7da0586fd39e18e596e97ac2ddd28f04617212eadcea271c1a03fb6bfb0df410769e0c2771423a2cb74eb1d67b7366539cc0a833d0fab2aa698d805add6a
|
||||
DIST ansible-0.7.1.tar.gz 120826 SHA256 906ae866254095fa96d28212a9e9e4c80d6feb819c402e570005c1a18c00bd59 SHA512 6eefef520240a51926370ec0997350ab44dfe1c94414f8c04c7a45e9ea134fe7f23ae0bcf59f9278cec83fbba96bf6f6d1bf98beb397b35fdf106491231f8df4 WHIRLPOOL 15e6b03e2f6212ec0f0423943bb606b83d1dfa86ea24360e80c563bf432fd75dec82a9c5d669dd8725edd887c87556f20ca4d891d7b03f1b0aac22586b910fa8
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
http://bugs.gentoo.org/433096
|
||||
https://projects.archlinux.org/svntogit/packages.git/plain/trunk/usbview-1.1-missing-usbfs.patch?h=packages/usbview
|
||||
|
||||
--- usbtree.c
|
||||
+++ usbtree.c
|
||||
@@ -397,7 +397,7 @@
|
||||
|
||||
void initialize_stuff (void)
|
||||
{
|
||||
- strcpy (devicesFile, "/proc/bus/usb/devices");
|
||||
+ strcpy (devicesFile, "/sys/kernel/debug/usb/devices");
|
||||
memset (&previousDevicesFile[0], 0x00, sizeof(previousDevicesFile));
|
||||
previousChange = 0;
|
||||
@ -0,0 +1,32 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-1.1-r1.ebuild,v 1.1 2012/10/21 08:52:57 ssuominen Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Display the topology of devices on the USB bus"
|
||||
HOMEPAGE="http://www.kroah.com/linux-usb/"
|
||||
SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="x11-libs/gtk+:2"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
DOCS="AUTHORS ChangeLog NEWS README TODO"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-missing-usbfs.patch
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
doman ${PN}.8
|
||||
doicon usb_icon.xpm
|
||||
make_desktop_entry ${PN} 'USB Viewer' usb_icon
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST xfburn-0.4.3.tar.bz2 652080 SHA256 c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe SHA512 3b82d763f6ac542eeaac0d752faa487f9f5101b6e2d11080e4ec80141496a3c80edfeb0249b37d7bef49505b37c1dd60468253758bbedbd1258a8f3f0db99205 WHIRLPOOL a7d9f11a6e40b405d2b2e36c2ed9f569a4fe8a94ab3248dfd96a08b61c05f923ee3e9364a2526789a4fa8e2072c0aa8fc3d68aeee21b52336e0ac1e597268dd9
|
||||
DIST xfburn-0.4.3_p20120601.tar.xz 451252 SHA256 0e27c6cfccc1860d5cf84acfeaff4100eddbf563a2d6a4cf20dd0d781cc98824 SHA512 bf0cd41217b8ecf50b43b24f0b0bd8452a5bc12eb89debb2404a56d75d079e407ec9863dd368091fd34cb8a20604c1f80f7e2aeab500cd3d8473ee35eab1d0b3 WHIRLPOOL acdc2bfa506bc96a83a021d07026f236c96a81c590a22fbf5e5425026aa97256d737522bde116acba3c8387230c059ce226c00cf264698448dae162361797da5
|
||||
DIST xfburn_0.4.3-4.debian.tar.gz 25747 SHA256 d5d2de1bccf7e5e4083beada69385a3e5a1d0636534b87fbd0af84cf1a8e53e5 SHA512 2b149819650bb3de805a2df236413e6946547f8064a1759a85c0aa68efaba509b5d87a62c6497c94031769dc97b5c87269d16f3b1d7b903cb86dd1c2e7ecbc2b WHIRLPOOL bd652c7bf18e22bb951e30d5d0937b950287f67213cbd699b7bf655545241b801c64a7856ad8a6618a5dab98fb8831ba15685b3a1a444e97fb9c42d07c485363
|
||||
DIST xfburn-0.4.3_p20121021.tar.xz 464084 SHA256 3c3541765da9263e435562188ec2c137fb31d19591dd169b6fb2ef2fefa01bc9 SHA512 5c7cf0e14f632769bc0e249c104207dbf3f2bbd9b9836e9aa409b55f44df735a6ddcf4cb41ab71072ab020b1be51f81e2f2b68ed5b04b52907df216bb68acf7d WHIRLPOOL 75bc723699a862e1a243b3bf0ab1a99b49607c25862da412a74d65bede95170e42a3917ca211cabbaf24c2f30ea37540eb7578cbcbd5817180b720b65ee7d16b
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
http://bugs.gentoo.org/410565
|
||||
|
||||
Unknown type name errors with references to GObject, GObjectClass, GType and GTypeInfo
|
||||
|
||||
The errors started manifesting after upgrading to Xfce 4.10 pre1 libraries
|
||||
|
||||
--- xfburn/xfburn-settings.h
|
||||
+++ xfburn/xfburn-settings.h
|
||||
@@ -24,6 +24,7 @@
|
||||
#endif /* !HAVE_CONFIG_H */
|
||||
|
||||
#include <glib.h>
|
||||
+#include <glib-object.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
http://bugs.gentoo.org/388827
|
||||
http://bugzilla.xfce.org/show_bug.cgi?id=6691
|
||||
|
||||
--- xfburn.desktop.in
|
||||
+++ xfburn.desktop.in
|
||||
@@ -6,15 +6,15 @@
|
||||
Exec=xfburn
|
||||
TryExec=xfburn
|
||||
Icon=media-cdrom
|
||||
-MimeType=application/x-cd-image
|
||||
+MimeType=application/x-cd-image;
|
||||
Terminal=false
|
||||
-Categories=X-XFCE;GTK;DiscBurning;Archiving;AudioVideo;
|
||||
+Categories=X-XFCE;GTK;DiscBurning;Archiving;Utility;AudioVideo;
|
||||
StartupNotify=true
|
||||
|
||||
Actions=BurnImage;
|
||||
|
||||
[Desktop Action BurnImage]
|
||||
-MimeType=application/x-cd-image
|
||||
+MimeType=application/x-cd-image;
|
||||
Icon=media-cdrom
|
||||
Exec=xfburn -i %f
|
||||
_Name=Burn Image (xfburn)
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild,v 1.8 2012/05/31 03:09:08 zmedico Exp $
|
||||
|
||||
EAPI=4
|
||||
EAUTORECONF=yes
|
||||
inherit eutils xfconf
|
||||
|
||||
DESCRIPTION="GTK+ based CD and DVD burning application"
|
||||
HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
|
||||
SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2
|
||||
mirror://debian/pool/main/x/${PN}/${PN}_${PV}-4.debian.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86"
|
||||
IUSE="debug gstreamer udev"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.22
|
||||
>=dev-libs/libburn-0.4.2
|
||||
>=dev-libs/libisofs-0.6.2
|
||||
>=x11-libs/gtk+-2.10:2
|
||||
>=xfce-base/exo-0.6
|
||||
>=xfce-base/libxfce4ui-4.8
|
||||
gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 )
|
||||
udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
dev-util/intltool
|
||||
sys-devel/gettext"
|
||||
|
||||
pkg_setup() {
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-update_desktop_entry.patch
|
||||
"${FILESDIR}"/${P}-empty_directory_segmentation_fault-2.patch
|
||||
"${FILESDIR}"/${P}-gobject_h.patch
|
||||
)
|
||||
|
||||
XFCONF=(
|
||||
$(use_enable udev gudev)
|
||||
$(use_enable gstreamer)
|
||||
$(xfconf_use_debug)
|
||||
)
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README TODO )
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX=patch EPATCH_SOURCE="${WORKDIR}"/debian/patches epatch
|
||||
xfconf_src_prepare
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3_p20121021.ebuild,v 1.1 2012/10/21 09:26:14 ssuominen Exp $
|
||||
|
||||
EAPI=4
|
||||
#EAUTORECONF=yes
|
||||
inherit autotools xfconf
|
||||
|
||||
DESCRIPTION="GTK+ based CD and DVD burning application"
|
||||
HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
|
||||
SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="debug gstreamer udev"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.30
|
||||
>=dev-libs/libburn-0.4.2
|
||||
>=dev-libs/libisofs-0.6.2
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
>=xfce-base/exo-0.6
|
||||
>=xfce-base/libxfce4ui-4.10
|
||||
gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 )
|
||||
udev? ( || ( >=sys-fs/udev-171-r6[gudev] <sys-fs/udev-171[extras] ) )"
|
||||
# dev-libs/libxslt -> xsltproc -> --enable-maintainer-mode -> docs/Makefile.am
|
||||
DEPEND="${RDEPEND}
|
||||
dev-libs/libxslt
|
||||
dev-util/intltool
|
||||
>=dev-util/xfce4-dev-tools-4.10
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig"
|
||||
|
||||
pkg_setup() {
|
||||
XFCONF=(
|
||||
--enable-maintainer-mode
|
||||
$(use_enable udev gudev)
|
||||
$(use_enable gstreamer)
|
||||
$(xfconf_use_debug)
|
||||
)
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README TODO )
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# .in.in -> .in
|
||||
sed -i -e '/^exec.*xdt-autogen/d' autogen.sh || die
|
||||
./autogen.sh
|
||||
|
||||
# Prevent glib-gettextize from running wrt #420639
|
||||
intltoolize --automake --copy --force
|
||||
_elibtoolize --copy --force --install
|
||||
AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eaclocal
|
||||
eautoconf
|
||||
eautoheader
|
||||
eautomake
|
||||
|
||||
xfconf_src_prepare
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
--- qemu-0.11.0.orig/linux-user/main.c 2009-10-23 02:19:57.000000000 +0200
|
||||
+++ qemu-0.11.0/linux-user/main.c 2009-10-23 02:47:09.000000000 +0200
|
||||
@@ -1469,6 +1469,8 @@
|
||||
|
||||
#ifdef TARGET_MIPS
|
||||
|
||||
+#define TARGET_QEMU_ESIGRETURN 255
|
||||
+
|
||||
#define MIPS_SYS(name, args) args,
|
||||
|
||||
static const uint8_t mips_syscall_args[] = {
|
||||
@ -1,35 +0,0 @@
|
||||
Backported upstream patch:
|
||||
> From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001
|
||||
> From: Anthony Liguori <aliguori@us.ibm.com>
|
||||
> Date: Mon, 23 Jan 2012 07:30:43 -0600
|
||||
> Subject: [PATCH 26/26] e1000: bounds packet size against buffer size
|
||||
>
|
||||
> Otherwise we can write beyond the buffer and corrupt memory. This is tracked
|
||||
> as CVE-2012-0029.
|
||||
>
|
||||
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
||||
---
|
||||
hw/e1000.c | 3 +++
|
||||
1 files changed, 3 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/hw/e1000.c b/hw/e1000.c
|
||||
index b0542d7..54ade40 100644
|
||||
--- a/hw/e1000.c
|
||||
+++ b/hw/e1000.c
|
||||
@@ -447,6 +447,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
|
||||
bytes = split_size;
|
||||
if (tp->size + bytes > msh)
|
||||
bytes = msh - tp->size;
|
||||
+
|
||||
+ bytes = MIN(sizeof(tp->data) - tp->size, bytes);
|
||||
cpu_physical_memory_read(addr, tp->data + tp->size, bytes);
|
||||
if ((sz = tp->size + bytes) >= hdr && tp->size < hdr)
|
||||
memmove(tp->header, tp->data, hdr);
|
||||
@@ -462,6 +464,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
|
||||
// context descriptor TSE is not set, while data descriptor TSE is set
|
||||
DBGOUT(TXERR, "TCP segmentaion Error\n");
|
||||
} else {
|
||||
+ split_size = MIN(sizeof(tp->data) - tp->size, split_size);
|
||||
cpu_physical_memory_read(addr, tp->data + tp->size, split_size);
|
||||
tp->size += split_size;
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
From: Nathan Phillip Brink <binki@gentoo.org>
|
||||
|
||||
Fix detection of pulseaudio caused by not including the headers which
|
||||
define NULL.
|
||||
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1004,7 +1004,9 @@
|
||||
lib=$3
|
||||
exp=$4
|
||||
cfl=$5
|
||||
+ prologue=${6}
|
||||
cat > $TMPC << EOF
|
||||
+${prologue}
|
||||
#include <$hdr>
|
||||
int main(void) { $exp }
|
||||
EOF
|
||||
@@ -1044,7 +1046,8 @@
|
||||
|
||||
pa)
|
||||
audio_drv_probe $drv pulse/simple.h -lpulse-simple \
|
||||
- "pa_simple *s = NULL; pa_simple_free(s); return 0;"
|
||||
+ "pa_simple *s = NULL; pa_simple_free(s); return 0;" \
|
||||
+ '' '#include <stddef.h> /* NULL */'
|
||||
;;
|
||||
|
||||
oss|sdl|core|wav|dsound)
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
commit 5bc62e01cd22ea1f56bde94b0616c46f8af2676e
|
||||
Author: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Wed Feb 8 13:54:13 2012 +0100
|
||||
|
||||
build: allow turning off debuginfo
|
||||
|
||||
This patch adds --{enable,disable}-debug-info switches to configure
|
||||
which allows to include/exclude the '-g' switch on the gcc & ld
|
||||
command lines. Not building debug info reduces ressource usage
|
||||
(especially disk) alot and is quite useful for test builds.
|
||||
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index a1f4a6b..b22fcda 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -98,6 +98,7 @@ audio_pt_int=""
|
||||
audio_win_int=""
|
||||
cc_i386=i386-pc-linux-gnu-gcc
|
||||
libs_qga=""
|
||||
+debug_info="yes"
|
||||
|
||||
target_list=""
|
||||
|
||||
@@ -207,6 +208,10 @@ for opt do
|
||||
;;
|
||||
--extra-ldflags=*) LDFLAGS="$optarg $LDFLAGS"
|
||||
;;
|
||||
+ --enable-debug-info) debug_info="yes"
|
||||
+ ;;
|
||||
+ --disable-debug-info) debug_info="no"
|
||||
+ ;;
|
||||
--sparc_cpu=*)
|
||||
sparc_cpu="$optarg"
|
||||
case $sparc_cpu in
|
||||
@@ -244,13 +249,15 @@ sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"
|
||||
|
||||
# default flags for all hosts
|
||||
QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
|
||||
-CFLAGS="-g $CFLAGS"
|
||||
QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
|
||||
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
|
||||
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
|
||||
QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
|
||||
QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
|
||||
-LDFLAGS="-g $LDFLAGS"
|
||||
+if test "$debug_info" = "yes"; then
|
||||
+ CFLAGS="-g $CFLAGS"
|
||||
+ LDFLAGS="-g $LDFLAGS"
|
||||
+fi
|
||||
|
||||
# make source path absolute
|
||||
source_path=`cd "$source_path"; pwd`
|
||||
@@ -545,6 +552,10 @@ for opt do
|
||||
;;
|
||||
--extra-ldflags=*)
|
||||
;;
|
||||
+ --enable-debug-info)
|
||||
+ ;;
|
||||
+ --disable-debug-info)
|
||||
+ ;;
|
||||
--cpu=*)
|
||||
;;
|
||||
--target-list=*) target_list="$optarg"
|
||||
@ -1,24 +0,0 @@
|
||||
commit 8c84cf11660322489f839bc29db79bad31b4ecde
|
||||
Author: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Tue Jan 24 20:42:40 2012 +0300
|
||||
|
||||
./configure: export xfs config via --{enable, disable}-xfsctl
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 9d5175b..69fb239 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -766,6 +766,10 @@ for opt do
|
||||
;;
|
||||
--enable-rbd) rbd="yes"
|
||||
;;
|
||||
+ --disable-xfsctl) xfs="no"
|
||||
+ ;;
|
||||
+ --enable-xfsctl) xfs="yes"
|
||||
+ ;;
|
||||
--disable-smartcard) smartcard="no"
|
||||
;;
|
||||
--enable-smartcard) smartcard="yes"
|
||||
@ -1,72 +0,0 @@
|
||||
From 02d2bd5d57812154cfb978bc2098cf49d551583d Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Thu, 5 Jul 2012 03:32:44 +0000
|
||||
Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'.
|
||||
|
||||
glibc 2.16 will remove the undocumented definition of 'struct siginfo'
|
||||
from <bits/siginfo.h>.
|
||||
|
||||
This change is already present in glibc 2.15.90, so qemu compilation
|
||||
of certain targets (eg. cris-user) breaks.
|
||||
|
||||
This struct was always typedef'd to be the same as 'siginfo_t' which
|
||||
is what POSIX documents, so use that instead.
|
||||
|
||||
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
|
||||
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
||||
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
||||
---
|
||||
linux-user/signal.c | 8 ++++----
|
||||
user-exec.c | 2 +-
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/linux-user/signal.c b/linux-user/signal.c
|
||||
index 97f30d9..9be5ac0 100644
|
||||
--- a/linux-user/signal.c
|
||||
+++ b/linux-user/signal.c
|
||||
@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
|
||||
* Arguments to signal handler:
|
||||
*
|
||||
* a0 = signal number
|
||||
- * a1 = pointer to struct siginfo
|
||||
+ * a1 = pointer to siginfo_t
|
||||
* a2 = pointer to struct ucontext
|
||||
*
|
||||
* $25 and PC point to the signal handler, $29 points to the
|
||||
@@ -3255,7 +3255,7 @@ struct target_signal_frame {
|
||||
};
|
||||
|
||||
struct rt_signal_frame {
|
||||
- struct siginfo info;
|
||||
+ siginfo_t info;
|
||||
struct ucontext uc;
|
||||
uint32_t tramp[2];
|
||||
};
|
||||
@@ -3474,9 +3474,9 @@ struct target_signal_frame {
|
||||
};
|
||||
|
||||
struct rt_signal_frame {
|
||||
- struct siginfo *pinfo;
|
||||
+ siginfo_t *pinfo;
|
||||
void *puc;
|
||||
- struct siginfo info;
|
||||
+ siginfo_t info;
|
||||
struct ucontext uc;
|
||||
uint8_t retcode[8]; /* Trampoline code. */
|
||||
};
|
||||
diff --git a/user-exec.c b/user-exec.c
|
||||
index b2a4261..1a9c276 100644
|
||||
--- a/user-exec.c
|
||||
+++ b/user-exec.c
|
||||
@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
|
||||
int cpu_signal_handler(int host_signum, void *pinfo,
|
||||
void *puc)
|
||||
{
|
||||
- struct siginfo *info = pinfo;
|
||||
+ siginfo_t *info = pinfo;
|
||||
struct ucontext *uc = puc;
|
||||
unsigned long pc = uc->uc_mcontext.sc_iaoq[0];
|
||||
uint32_t insn = *(uint32_t *)pc;
|
||||
--
|
||||
1.7.9.7
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -x /sbin/brctl ]; then
|
||||
BRCTL="/sbin/brctl"
|
||||
elif [ -x /usr/sbin/brctl ]; then
|
||||
BRCTL="/usr/sbin/brctl"
|
||||
else
|
||||
echo "no bridge utils installed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -x /sbin/ip ]; then
|
||||
switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') )
|
||||
${BRCTL} delif ${switch} $1
|
||||
/sbin/ip link set $1 down
|
||||
else
|
||||
switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') )
|
||||
${BRCTL} delif ${switch} $1
|
||||
/sbin/ifconfig $1 down
|
||||
fi
|
||||
@ -1,22 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -x /sbin/brctl ]; then
|
||||
BRCTL="/sbin/brctl"
|
||||
elif [ -x /usr/sbin/brctl ]; then
|
||||
BRCTL="/usr/sbin/brctl"
|
||||
else
|
||||
echo "no bridge utils installed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -x /sbin/ip ]; then
|
||||
switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') )
|
||||
/sbin/ip link set $1 up
|
||||
else
|
||||
switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') )
|
||||
/sbin/ifconfig $1 0.0.0.0 up
|
||||
fi
|
||||
|
||||
[[ ${switch#} -ne "1" ]] && logger -t qemu "$0 found more than one bridge connecting $1 to ${switch}"
|
||||
${BRCTL} addif ${switch} $1
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001
|
||||
From: Anthony Liguori <aliguori@us.ibm.com>
|
||||
Date: Mon, 23 Jan 2012 07:30:43 -0600
|
||||
Subject: [PATCH 26/26] e1000: bounds packet size against buffer size
|
||||
|
||||
Otherwise we can write beyond the buffer and corrupt memory. This is tracked
|
||||
as CVE-2012-0029.
|
||||
|
||||
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
||||
---
|
||||
hw/e1000.c | 3 +++
|
||||
1 files changed, 3 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/hw/e1000.c b/hw/e1000.c
|
||||
index 986ed9c..e164d79 100644
|
||||
--- a/hw/e1000.c
|
||||
+++ b/hw/e1000.c
|
||||
@@ -466,6 +466,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
|
||||
bytes = split_size;
|
||||
if (tp->size + bytes > msh)
|
||||
bytes = msh - tp->size;
|
||||
+
|
||||
+ bytes = MIN(sizeof(tp->data) - tp->size, bytes);
|
||||
pci_dma_read(&s->dev, addr, tp->data + tp->size, bytes);
|
||||
if ((sz = tp->size + bytes) >= hdr && tp->size < hdr)
|
||||
memmove(tp->header, tp->data, hdr);
|
||||
@@ -481,6 +483,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
|
||||
// context descriptor TSE is not set, while data descriptor TSE is set
|
||||
DBGOUT(TXERR, "TCP segmentaion Error\n");
|
||||
} else {
|
||||
+ split_size = MIN(sizeof(tp->data) - tp->size, split_size);
|
||||
pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size);
|
||||
tp->size += split_size;
|
||||
}
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
@ -1,368 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.5 2012/10/10 19:29:27 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
MY_PN="qemu-kvm"
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
|
||||
#BACKPORTS=2
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
|
||||
${BACKPORTS:+
|
||||
http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.xz}"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
|
||||
HOMEPAGE="http://www.linux-kvm.org"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2 BSD-2"
|
||||
SLOT="0"
|
||||
IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
|
||||
kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl sdl \
|
||||
smartcard spice static systemtap tci +threads tls usbredir +uuid vde +vhost-net \
|
||||
virtfs +vnc xattr xen xfs"
|
||||
|
||||
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
|
||||
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
|
||||
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
|
||||
|
||||
# Setup the default SoftMMU targets, while using the loops
|
||||
# below to setup the other targets.
|
||||
IUSE="${IUSE}"
|
||||
REQUIRED_USE="|| ("
|
||||
|
||||
for target in ${IUSE_SOFTMMU_TARGETS}; do
|
||||
IUSE="${IUSE} qemu_softmmu_targets_${target}"
|
||||
REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
|
||||
done
|
||||
REQUIRED_USE="${REQUIRED_USE} )"
|
||||
|
||||
for target in ${IUSE_USER_TARGETS}; do
|
||||
IUSE="${IUSE} qemu_user_targets_${target}"
|
||||
done
|
||||
|
||||
REQUIRED_USE="${REQUIRED_USE}
|
||||
static? ( !alsa !pulseaudio )
|
||||
virtfs? ( xattr )"
|
||||
|
||||
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
|
||||
LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
|
||||
sys-apps/pciutils[static-libs(+)]
|
||||
sys-libs/zlib[static-libs(+)]
|
||||
aio? ( dev-libs/libaio[static-libs(+)] )
|
||||
caps? ( sys-libs/libcap-ng[static-libs(+)] )
|
||||
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
|
||||
fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
|
||||
jpeg? ( virtual/jpeg[static-libs(+)] )
|
||||
ncurses? ( sys-libs/ncurses[static-libs(+)] )
|
||||
png? ( media-libs/libpng[static-libs(+)] )
|
||||
rbd? ( sys-cluster/ceph[static-libs(+)] )
|
||||
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
|
||||
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
|
||||
spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
|
||||
tls? ( net-libs/gnutls[static-libs(+)] )
|
||||
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
|
||||
vde? ( net-misc/vde[static-libs(+)] )
|
||||
xattr? ( sys-apps/attr[static-libs(+)] )
|
||||
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
|
||||
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||
!app-emulation/kqemu
|
||||
!app-emulation/qemu
|
||||
!<app-emulation/qemu-1.0
|
||||
>=sys-firmware/seabios-1.7.0
|
||||
sys-firmware/sgabios
|
||||
sys-firmware/vgabios
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.13 )
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
brltty? ( app-accessibility/brltty )
|
||||
opengl? ( virtual/opengl )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
python? ( =dev-lang/python-2*[ncurses] )
|
||||
sdl? ( media-libs/libsdl[X] )
|
||||
smartcard? ( dev-libs/nss )
|
||||
spice? ( >=app-emulation/spice-protocol-0.8.1 )
|
||||
systemtap? ( dev-util/systemtap )
|
||||
usbredir? ( sys-apps/usbredir )
|
||||
virtfs? ( sys-libs/libcap )
|
||||
xen? ( app-emulation/xen-tools )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? ( app-text/texi2html )
|
||||
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
|
||||
static? ( ${LIB_DEPEND} )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
STRIP_MASK="/usr/share/qemu/palcode-clipper"
|
||||
|
||||
QA_PREBUILT="
|
||||
usr/share/qemu/openbios-ppc
|
||||
usr/share/qemu/openbios-sparc64
|
||||
usr/share/qemu/openbios-sparc32
|
||||
usr/share/qemu/palcode-clipper"
|
||||
|
||||
QA_WX_LOAD="${QA_PRESTRIPPED}
|
||||
usr/bin/qemu-i386
|
||||
usr/bin/qemu-x86_64
|
||||
usr/bin/qemu-alpha
|
||||
usr/bin/qemu-arm
|
||||
usr/bin/qemu-cris
|
||||
usr/bin/qemu-m68k
|
||||
usr/bin/qemu-microblaze
|
||||
usr/bin/qemu-mips
|
||||
usr/bin/qemu-mipsel
|
||||
usr/bin/qemu-ppc
|
||||
usr/bin/qemu-ppc64
|
||||
usr/bin/qemu-ppc64abi32
|
||||
usr/bin/qemu-sh4
|
||||
usr/bin/qemu-sh4eb
|
||||
usr/bin/qemu-sparc
|
||||
usr/bin/qemu-sparc64
|
||||
usr/bin/qemu-armeb
|
||||
usr/bin/qemu-sparc32plus"
|
||||
|
||||
pkg_pretend() {
|
||||
if use kernel_linux && kernel_is lt 2 6 25; then
|
||||
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
|
||||
elif use kernel_linux; then
|
||||
if ! linux_config_exists; then
|
||||
eerror "Unable to check your kernel for KVM support"
|
||||
else
|
||||
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
|
||||
ERROR_KVM="You must enable KVM in your kernel to continue"
|
||||
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
|
||||
ERROR_KVM_AMD+=" your kernel configuration."
|
||||
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
|
||||
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
|
||||
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
|
||||
ERROR_TUN+=" into your kernel or loaded as a module to use the"
|
||||
ERROR_TUN+=" virtual network device if using -net tap."
|
||||
ERROR_BRIDGE="You will also need support for 802.1d"
|
||||
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
|
||||
use vhost-net && CHECK_CHECK+=" ~VHOST_NET"
|
||||
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
|
||||
ERROR_VHOST_NET+=" support"
|
||||
|
||||
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
|
||||
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
|
||||
fi
|
||||
|
||||
use python && CONFIG_CHECK+=" ~DEBUG_FS"
|
||||
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
|
||||
|
||||
# Now do the actual checks setup above
|
||||
check_extra_config
|
||||
fi
|
||||
fi
|
||||
|
||||
if use static; then
|
||||
ewarn "USE=static is very much a moving target because of the packages"
|
||||
ewarn "we depend on will have their static libs ripped out or wrapped"
|
||||
ewarn "with USE=static-libs or USE=static due to continued dicsussion"
|
||||
ewarn "on the mailing list about USE=static's place in Gentoo. As a"
|
||||
ewarn "result what worked today may not work tomorrow."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
|
||||
enewgroup kvm 78
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Alter target makefiles to accept CFLAGS set via flag-o
|
||||
sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
|
||||
Makefile Makefile.target || die
|
||||
|
||||
python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
|
||||
|
||||
[[ -n ${BACKPORTS} ]] && \
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
||||
epatch
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local conf_opts audio_opts user_targets
|
||||
|
||||
for target in ${IUSE_SOFTMMU_TARGETS} ; do
|
||||
use "qemu_softmmu_targets_${target}" && \
|
||||
softmmu_targets="${softmmu_targets} ${target}-softmmu"
|
||||
done
|
||||
|
||||
for target in ${IUSE_USER_TARGETS} ; do
|
||||
use "qemu_user_targets_${target}" && \
|
||||
user_targets="${user_targets} ${target}-linux-user"
|
||||
done
|
||||
|
||||
einfo "Building the following softmmu targets: ${softmmu_targets}"
|
||||
|
||||
if [[ -n ${user_targets} ]]; then
|
||||
einfo "Building the following user targets: ${user_targets}"
|
||||
conf_opts="${conf_opts} --enable-linux-user"
|
||||
else
|
||||
conf_opts="${conf_opts} --disable-linux-user"
|
||||
fi
|
||||
|
||||
# Add support for SystemTAP
|
||||
use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
|
||||
|
||||
# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
|
||||
#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
|
||||
|
||||
# Add support for static builds
|
||||
use static && conf_opts="${conf_opts} --static --disable-pie"
|
||||
|
||||
# We always want to attempt to build with PIE support as it results
|
||||
# in a more secure binary. But it doesn't work with static or if
|
||||
# the current GCC doesn't have PIE support.
|
||||
if ! use static && gcc-specs-pie; then
|
||||
conf_opts="${conf_opts} --enable-pie"
|
||||
fi
|
||||
|
||||
# audio options
|
||||
audio_opts="oss"
|
||||
use alsa && audio_opts="alsa,${audio_opts}"
|
||||
use sdl && audio_opts="sdl,${audio_opts}"
|
||||
use pulseaudio && audio_opts="pa,${audio_opts}"
|
||||
use mixemu && conf_opts="${conf_opts} --enable-mixemu"
|
||||
|
||||
# --enable-vnc-thread will go away in 1.2
|
||||
# $(use_enable xen xen-pci-passthrough) for 1.2
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--disable-bsd-user \
|
||||
--disable-guest-agent \
|
||||
--disable-libiscsi \
|
||||
--disable-strip \
|
||||
--disable-werror \
|
||||
--python=python2 \
|
||||
$(use_enable aio linux-aio) \
|
||||
$(use_enable bluetooth bluez) \
|
||||
$(use_enable brltty brlapi) \
|
||||
$(use_enable caps cap-ng) \
|
||||
$(use_enable curl) \
|
||||
$(use_enable debug debug-info) \
|
||||
$(use_enable debug debug-mon) \
|
||||
$(use_enable debug debug-tcg) \
|
||||
$(use_enable doc docs) \
|
||||
$(use_enable fdt) \
|
||||
$(use_enable jpeg vnc-jpeg) \
|
||||
$(use_enable kernel_linux kvm) \
|
||||
$(use_enable kernel_linux kvm-device-assignment) \
|
||||
$(use_enable kernel_linux nptl) \
|
||||
$(use_enable ncurses curses) \
|
||||
$(use_enable opengl) \
|
||||
$(use_enable png vnc-png) \
|
||||
$(use_enable rbd) \
|
||||
$(use_enable sasl vnc-sasl) \
|
||||
$(use_enable sdl) \
|
||||
$(use_enable smartcard smartcard) \
|
||||
$(use_enable smartcard smartcard-nss) \
|
||||
$(use_enable spice) \
|
||||
$(use_enable tci tcg-interpreter) \
|
||||
$(use_enable threads vnc-thread) \
|
||||
$(use_enable tls vnc-tls) \
|
||||
$(use_enable usbredir usb-redir) \
|
||||
$(use_enable uuid) \
|
||||
$(use_enable vde) \
|
||||
$(use_enable vhost-net) \
|
||||
$(use_enable virtfs) \
|
||||
$(use_enable vnc) \
|
||||
$(use_enable xattr attr) \
|
||||
$(use_enable xen) \
|
||||
$(use_enable xfs xfsctl) \
|
||||
--audio-drv-list=${audio_opts} \
|
||||
--target-list="${softmmu_targets} ${user_targets}" \
|
||||
--cc="$(tc-getCC)" \
|
||||
--host-cc="$(tc-getBUILD_CC)" \
|
||||
${conf_opts} \
|
||||
|| die "configure failed"
|
||||
|
||||
# FreeBSD's kernel does not support QEMU assigning/grabbing
|
||||
# host USB devices yet
|
||||
use kernel_FreeBSD && \
|
||||
sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${ED}" install
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
if use kernel_linux; then
|
||||
insinto /lib/udev/rules.d/
|
||||
doins "${FILESDIR}"/65-kvm.rules
|
||||
fi
|
||||
|
||||
if use qemu_softmmu_targets_x86_64 ; then
|
||||
dobin "${FILESDIR}"/qemu-kvm
|
||||
ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
|
||||
ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
|
||||
ewarn "your libvirt configs or other wrappers for ${PN}"
|
||||
else
|
||||
elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
|
||||
elog "of /usr/bin/qemu-kvm"
|
||||
fi
|
||||
fi
|
||||
|
||||
dodoc Changelog MAINTAINERS TODO pci-ids.txt
|
||||
newdoc pc-bios/README README.pc-bios
|
||||
|
||||
if use doc; then
|
||||
dohtml qemu-doc.html qemu-tech.html || die
|
||||
fi
|
||||
|
||||
use python & dobin scripts/kvm/kvm_stat
|
||||
|
||||
# Remove SeaBIOS since we're using the SeaBIOS packaged one
|
||||
rm "${ED}/usr/share/qemu/bios.bin"
|
||||
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
|
||||
|
||||
# Remove vgabios since we're using the vgabios packaged one
|
||||
rm "${ED}/usr/share/qemu/vgabios.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
|
||||
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
|
||||
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
|
||||
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
|
||||
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
|
||||
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
|
||||
|
||||
# Remove sgabios since we're using the sgabios packaged one
|
||||
rm "${ED}/usr/share/qemu/sgabios.bin"
|
||||
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
elog "If you don't have kvm compiled into the kernel, make sure you have"
|
||||
elog "the kernel module loaded before running kvm. The easiest way to"
|
||||
elog "ensure that the kernel module is loaded is to load it on boot."
|
||||
elog "For AMD CPUs the module is called 'kvm-amd'"
|
||||
elog "For Intel CPUs the module is called 'kvm-intel'"
|
||||
elog "Please review /etc/conf.d/modules for how to load these"
|
||||
elog
|
||||
elog "Make sure your user is in the 'kvm' group"
|
||||
elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
|
||||
elog
|
||||
elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
|
||||
elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST empty-0.6.18b.tgz 16166 SHA256 8ea08afd6b637c49125b2fa6f0b571fd72b3aa8547a8834266fcbf0302d1efd3 SHA512 3f79ccefc884d541d3ba458839cefd7d979231350dc160020c4789deaf1e25645399258587b0a4b08eb1babe250870a3cc55e5edc135e44f2e6eeaf0e254cea1 WHIRLPOOL 6e282aee1fef96bfde69edb71fac8ada65029a0a21f79685fa6a85a7ef593e543f4242b16a4937721bf7c32a08f1789cda08cad002d8dd691bd87bc8a836a0ba
|
||||
DIST empty-0.6.19b.tgz 16075 SHA256 05b7cb361ef815774abda325c09c573f8c9039ccbb71eedc743439e4637c314a SHA512 7afb2b5d08f2d3ebe0819eccef39b2e35fa532b6cbdcef49d2dbb4a5aa57fe55b1765461de9691d6eaa3188a9ecd98c291de738c13c9c2158c4f53d704b83670 WHIRLPOOL ed003801da923de6b50e6b29313b5603c18b98851e7523971b7a1059c9d14bc9545726437c6c8c41427fe7fbac531469aa7500ffb324f3cd77682208da88088b
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/empty/empty-0.6.19b.ebuild,v 1.1 2012/10/21 15:07:39 pinkbyte Exp $
|
||||
|
||||
EAPI="4"
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Small shell utility, similar to expect(1)"
|
||||
HOMEPAGE="http://empty.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/empty/${P}.tgz"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="examples"
|
||||
DEPEND=""
|
||||
RDEPEND="virtual/logger"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/overflow-fixes.patch"
|
||||
epatch "${FILESDIR}/${PN}-respect-LDFLAGS.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC=$(tc-getCC)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin empty
|
||||
doman empty.1
|
||||
dodoc README
|
||||
use examples && dodoc -r examples
|
||||
}
|
||||
@ -0,0 +1,108 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.7.ebuild,v 1.1 2012/10/21 15:37:45 maksbotan Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
AUTOTOOLS_IN_SOURCE_BUILD=1
|
||||
|
||||
USE_RUBY="ruby18"
|
||||
RUBY_OPTIONAL=yes
|
||||
PYTHON_DEPEND="python? 2:2.6"
|
||||
SUPPORT_PYTHON_ABIS=1
|
||||
|
||||
inherit autotools-utils eutils perl-app python
|
||||
|
||||
DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
|
||||
HOMEPAGE="http://libguestfs.org"
|
||||
SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="ocaml readline +perl python test static-libs ruby"
|
||||
|
||||
RDEPEND="
|
||||
virtual/libiconv
|
||||
virtual/libintl
|
||||
dev-libs/libxml2:2
|
||||
ocaml? ( dev-lang/ocaml[ocamlopt]
|
||||
dev-ml/findlib[ocamlopt]
|
||||
)
|
||||
readline? ( sys-libs/readline )
|
||||
perl? ( dev-perl/IO-stringy )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl
|
||||
perl? (
|
||||
test? ( dev-perl/Pod-Coverage
|
||||
dev-perl/Test-Pod-Coverage )
|
||||
)
|
||||
ruby? ( dev-ruby/rake )
|
||||
"
|
||||
# Patches added to apstream
|
||||
|
||||
DOCS=(README)
|
||||
|
||||
pkg_setup() {
|
||||
if use python; then
|
||||
python_pkg_setup
|
||||
fi
|
||||
if use perl; then
|
||||
perl-module_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_with readline)
|
||||
$(use_enable ocaml)
|
||||
$(use_enable perl)
|
||||
--enable-nls
|
||||
$(use_enable python)
|
||||
$(use_enable ruby)
|
||||
--disable-rpath )
|
||||
|
||||
autotools-utils_src_configure
|
||||
|
||||
if use perl; then
|
||||
pushd perl
|
||||
perl-app_src_configure
|
||||
popd
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
autotools-utils_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if use perl;then
|
||||
pushd perl
|
||||
perl-app_src_install
|
||||
popd
|
||||
fi
|
||||
|
||||
autotools-utils_src_compile check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
strip-linguas -i po
|
||||
|
||||
autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
|
||||
|
||||
if use perl; then
|
||||
fixlocalpod
|
||||
fi
|
||||
if use python; then
|
||||
compile_and_install() {
|
||||
emake -C python clean
|
||||
emake -C python PYTHON_VERSION="${PYTHON_ABI}" \
|
||||
PYTHON_INCLUDEDIR="$(python_get_includedir)" \
|
||||
PYTHON_INSTALLDIR="$(python_get_sitedir)" \
|
||||
DESTDIR="${ED}" install
|
||||
}
|
||||
python_execute_function compile_and_install
|
||||
fi
|
||||
}
|
||||
@ -1,7 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>maksbotan@gentoo.org</email>
|
||||
</maintainer>
|
||||
<maintainer>
|
||||
<email>pinkbyte@gentoo.org</email>
|
||||
<name>Sergey Popov</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
DIST layman-1.4.1.tar.gz 59960 SHA256 6dfa2a99b6ec4ee2f7a0a9f1e293dbb1bf2a52e408098aebd5031d93f8c4f248 SHA512 8473439b7a7b51af4a35f1229a272438696028451a217195ee1c412cab02a7bd68499c4515cfb5fabc7704bf8afea3eb8809738434dc5978c3d1de131a62ad13 WHIRLPOOL 6cf8da63764ceddd44131022c3014f0a6892b84c093f01794fba1311031e695fbbc4f96c6a7fce5fef461b849ec67d07df830575ae01f33da2fecc842d5bfc22
|
||||
DIST layman-1.4.2.tar.gz 60655 SHA256 a10418aa33f4f849c190b5c15b37abac81058858be3cb107d084057cef56ccfd SHA512 b3e4c706873b594876dfe9664b6debd5e75332ea5016a4eb7a91dfdca116c217dba6fe9235ebfbed148e8f05bda44859a2c145ae59f4d45cf5e59fdb89a7370b WHIRLPOOL 05a0953555617f29213e920cf2449ecc281a23348255362701d32d1c6b46e5b770055c3e588a23d9e3344e6bcdcd126e876275599eb4b017b45ab8b07a98afc5
|
||||
DIST layman-2.0.0_rc3.tar.gz 74440 SHA256 fcbf59924f2fa62ef16ace2b4d66f9677c57396209b9c41a3548486f8d7453ab SHA512 5e18565f208ca18fbf14a9e3c255f26bf6b806fd809108ca05e2f2ebf46b1bd2557f3bacdef78df802832a5868e5533feb24103e7fb2d997302a961b01582a0d WHIRLPOOL 1a52406fad2fc42f8b8fba8545b33898696e8a05f4166815cd0c143328ffdd0b22eff04115d6541e038d605ff2a896521773709a41d1dc610929701831d9e62f
|
||||
DIST layman-2.0.0_rc4.tar.gz 81058 SHA256 b3a4a97c2c7abae0bf41968b373176cc2becbcfef18de33dda8a3fbef0d60eef SHA512 0726e2144008be087d340992f799899c2c7b2292c106d6214eb7194817ad319be3c292f7d81cd1b6756af367d3af8f4062f4f5d95c994804b55730028e2e198b WHIRLPOOL 6bf22e26ef509cfb026709423e93f3c3deb6b0c806ed637fbf61734ef6015035cf7ba4d05a93aa924b669244fe173378a61737fb15337035f5b32318ae049843
|
||||
|
||||
@ -0,0 +1,72 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc4.ebuild,v 1.1 2012/10/21 03:00:31 dolsen Exp $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.6"
|
||||
RESTRICT_PYTHON_ABIS="2.4 3.*"
|
||||
PYTHON_USE_WITH="xml"
|
||||
|
||||
inherit eutils distutils prefix
|
||||
|
||||
DESCRIPTION="Tool to manage Gentoo overlays"
|
||||
HOMEPAGE="http://layman.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="bazaar cvs darcs +git mercurial subversion test"
|
||||
|
||||
COMMON_DEPS="dev-lang/python"
|
||||
DEPEND="${COMMON_DEPS}
|
||||
test? ( dev-vcs/subversion )"
|
||||
RDEPEND="${COMMON_DEPS}
|
||||
bazaar? ( dev-vcs/bzr )
|
||||
cvs? ( dev-vcs/cvs )
|
||||
darcs? ( dev-vcs/darcs )
|
||||
git? ( dev-vcs/git )
|
||||
mercurial? ( dev-vcs/mercurial )
|
||||
subversion? (
|
||||
|| (
|
||||
>=dev-vcs/subversion-1.5.4[webdav-neon]
|
||||
>=dev-vcs/subversion-1.5.4[webdav-serf]
|
||||
)
|
||||
)"
|
||||
|
||||
src_prepare() {
|
||||
eprefixify etc/layman.cfg layman/config.py
|
||||
}
|
||||
|
||||
src_test() {
|
||||
testing() {
|
||||
for suite in layman/tests/{dtest,external}.py ; do
|
||||
PYTHONPATH="." "$(PYTHON)" ${suite} \
|
||||
|| die "test suite '${suite}' failed"
|
||||
done
|
||||
}
|
||||
python_execute_function testing
|
||||
}
|
||||
|
||||
src_install() {
|
||||
distutils_src_install
|
||||
|
||||
insinto /etc/layman
|
||||
doins etc/layman.cfg || die
|
||||
|
||||
doman doc/layman.8
|
||||
dohtml doc/layman.8.html
|
||||
|
||||
keepdir /var/lib/layman
|
||||
keepdir /etc/layman/overlays
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
distutils_pkg_postinst
|
||||
|
||||
# now run layman's update utility
|
||||
einfo "Running layman-updater..."
|
||||
"${EROOT}"/usr/bin/layman-updater
|
||||
einfo
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
--- haddock-2.10.0-orig/src/Haddock/Interface/Create.hs 2012-03-04 03:21:18.000000000 +1100
|
||||
+++ haddock-2.10.0/src/Haddock/Interface/Create.hs 2012-06-27 00:05:37.874840635 +1000
|
||||
@@ -35,6 +35,7 @@
|
||||
import Name
|
||||
import Bag
|
||||
import RdrName (GlobalRdrEnv)
|
||||
+import TcRnTypes
|
||||
|
||||
|
||||
-- | Use a 'TypecheckedModule' to produce an 'Interface'.
|
||||
@@ -50,6 +51,8 @@
|
||||
instances = modInfoInstances mi
|
||||
exportedNames = modInfoExports mi
|
||||
|
||||
+ (TcGblEnv {tcg_rdr_env = gre}, _) = tm_internals_ tm
|
||||
+
|
||||
-- The renamed source should always be available to us, but it's best
|
||||
-- to be on the safe side.
|
||||
(group_, mayExports, mayDocHeader) <-
|
||||
@@ -59,10 +62,6 @@
|
||||
return (emptyRnGroup, Nothing, Nothing)
|
||||
Just (x, _, y, z) -> return (x, y, z)
|
||||
|
||||
- -- The pattern-match should not fail, because createInterface is only
|
||||
- -- done on loaded modules.
|
||||
- Just gre <- liftGhcToErrMsgGhc $ lookupLoadedHomeModuleGRE (moduleName mdl)
|
||||
-
|
||||
opts0 <- liftErrMsg $ mkDocOpts (haddockOptions dflags) flags mdl
|
||||
let opts
|
||||
| Flag_IgnoreAllExports `elem` flags = OptIgnoreExports : opts0
|
||||
@ -0,0 +1,152 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild,v 1.2 2012/10/21 10:31:52 ago Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit java-vm-2 multilib prefix
|
||||
|
||||
dist="http://dev.gentoo.org/~caster/distfiles/"
|
||||
TARBALL_VERSION="${PV}"
|
||||
PLUGIN_VERSION="${PVR}"
|
||||
|
||||
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
|
||||
HOMEPAGE="http://icedtea.classpath.org"
|
||||
SRC_URI="
|
||||
amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
|
||||
x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
|
||||
doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
|
||||
examples? (
|
||||
amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
|
||||
x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
|
||||
)
|
||||
nsplugin? (
|
||||
amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
|
||||
x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
|
||||
)
|
||||
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
|
||||
|
||||
LICENSE="GPL-2-with-linking-exception"
|
||||
SLOT="6"
|
||||
KEYWORDS="-* amd64 ~x86"
|
||||
|
||||
IUSE="+X +alsa cjk +cups doc examples nsplugin source"
|
||||
REQUIRED_USE="nsplugin? ( X )"
|
||||
RESTRICT="strip"
|
||||
|
||||
# 423161
|
||||
QA_PREBUILT="opt/.*"
|
||||
|
||||
ALSA_COMMON_DEP="
|
||||
>=media-libs/alsa-lib-1.0.20"
|
||||
CUPS_COMMON_DEP="
|
||||
>=net-print/cups-1.4"
|
||||
X_COMMON_DEP="
|
||||
dev-libs/glib
|
||||
>=media-libs/freetype-2.3.9:2
|
||||
>=x11-libs/gtk+-2.20.1:2
|
||||
>=x11-libs/libX11-1.3
|
||||
>=x11-libs/libXext-1.1
|
||||
>=x11-libs/libXi-1.3
|
||||
>=x11-libs/libXtst-1.1"
|
||||
|
||||
COMMON_DEP="
|
||||
>=media-libs/giflib-4.1.6-r1
|
||||
>=media-libs/libpng-1.5
|
||||
>=sys-devel/gcc-4.3
|
||||
>=sys-libs/glibc-2.11.2
|
||||
>=sys-libs/zlib-1.2.3-r1
|
||||
virtual/jpeg
|
||||
nsplugin? (
|
||||
>=dev-libs/atk-1.30.0
|
||||
>=dev-libs/glib-2.20.5:2
|
||||
>=dev-libs/nspr-4.8
|
||||
>=x11-libs/cairo-1.8.8
|
||||
>=x11-libs/pango-1.24.5
|
||||
|
||||
)"
|
||||
|
||||
RDEPEND="${COMMON_DEP}
|
||||
X? (
|
||||
${X_COMMON_DEP}
|
||||
media-fonts/dejavu
|
||||
cjk? (
|
||||
media-fonts/arphicfonts
|
||||
media-fonts/baekmuk-fonts
|
||||
media-fonts/lklug
|
||||
media-fonts/lohit-fonts
|
||||
media-fonts/sazanami
|
||||
)
|
||||
)
|
||||
alsa? ( ${ALSA_COMMON_DEP} )
|
||||
cups? ( ${CUPS_COMMON_DEP} )"
|
||||
|
||||
src_install() {
|
||||
local dest="/opt/${P}"
|
||||
local ddest="${ED}/${dest}"
|
||||
dodir "${dest}"
|
||||
|
||||
# Ensures HeadlessGraphicsEnvironment is used.
|
||||
if ! use X; then
|
||||
rm -r jre/lib/$(get_system_arch)/xawt || die
|
||||
fi
|
||||
|
||||
# doins can't handle symlinks.
|
||||
cp -pRP bin include jre lib man "${ddest}" || die
|
||||
|
||||
# Remove on next bump as the needed marks are already set by icedtea ebuild.
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
|
||||
|
||||
if use doc; then
|
||||
dohtml -r ../doc/html/*
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
cp -pRP share/{demo,sample} "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use source; then
|
||||
cp src.zip "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use nsplugin; then
|
||||
cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
|
||||
install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
|
||||
docinto icedtea-web
|
||||
dodoc ../doc/icedtea-web/*
|
||||
fi
|
||||
|
||||
# Remove after next bump, handled by icedtea ebuild. Bug 390663
|
||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
|
||||
eprefixify "${T}"/fontconfig.Gentoo.properties
|
||||
insinto "${dest}"/jre/lib
|
||||
doins "${T}"/fontconfig.Gentoo.properties
|
||||
|
||||
set_java_env
|
||||
java-vm_revdep-mask "${dest}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
|
||||
# portage would preserve the symlink otherwise, related to bug #384397
|
||||
rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
|
||||
elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
|
||||
elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
|
||||
elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
|
||||
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
|
||||
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Set as default VM if none exists
|
||||
java-vm-2_pkg_postinst
|
||||
|
||||
if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
|
||||
elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
|
||||
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
|
||||
elog "such as Firefox 3.5+ and recent Chromium versions."
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,142 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild,v 1.1 2012/10/20 21:47:49 caster Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit java-vm-2 multilib prefix
|
||||
|
||||
dist="http://dev.gentoo.org/~caster/distfiles/"
|
||||
TARBALL_VERSION="${PV}"
|
||||
PLUGIN_VERSION="${PVR}"
|
||||
|
||||
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
|
||||
HOMEPAGE="http://icedtea.classpath.org"
|
||||
SRC_URI="
|
||||
amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
|
||||
x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
|
||||
doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
|
||||
examples? (
|
||||
amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
|
||||
x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
|
||||
)
|
||||
nsplugin? (
|
||||
amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
|
||||
x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
|
||||
)
|
||||
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
|
||||
|
||||
LICENSE="GPL-2-with-linking-exception"
|
||||
SLOT="7"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
|
||||
IUSE="+X +alsa cjk +cups doc examples nsplugin source"
|
||||
REQUIRED_USE="nsplugin? ( X )"
|
||||
RESTRICT="strip"
|
||||
|
||||
# 423161
|
||||
QA_PREBUILT="opt/.*"
|
||||
|
||||
ALSA_COMMON_DEP="
|
||||
>=media-libs/alsa-lib-1.0.20"
|
||||
CUPS_COMMON_DEP="
|
||||
>=net-print/cups-1.4"
|
||||
X_COMMON_DEP="
|
||||
>=dev-libs/atk-1.30.0
|
||||
>=dev-libs/glib-2.20.5:2
|
||||
>=media-libs/fontconfig-2.6.0-r2:1.0
|
||||
>=media-libs/freetype-2.3.9:2
|
||||
>=x11-libs/cairo-1.8.8
|
||||
x11-libs/gdk-pixbuf:2
|
||||
>=x11-libs/gtk+-2.20.1:2
|
||||
>=x11-libs/libX11-1.3
|
||||
>=x11-libs/libXext-1.1
|
||||
>=x11-libs/libXi-1.3
|
||||
x11-libs/libXrender
|
||||
>=x11-libs/libXtst-1.1
|
||||
>=x11-libs/pango-1.24.5"
|
||||
|
||||
COMMON_DEP="
|
||||
>=media-libs/giflib-4.1.6-r1
|
||||
media-libs/lcms:2
|
||||
>=media-libs/libpng-1.5
|
||||
>=sys-devel/gcc-4.3
|
||||
>=sys-libs/glibc-2.11.2
|
||||
>=sys-libs/zlib-1.2.3-r1
|
||||
virtual/jpeg"
|
||||
|
||||
# cups is needed for X. #390945 #390975
|
||||
RDEPEND="${COMMON_DEP}
|
||||
X? (
|
||||
${CUPS_COMMON_DEP}
|
||||
${X_COMMON_DEP}
|
||||
media-fonts/dejavu
|
||||
cjk? (
|
||||
media-fonts/arphicfonts
|
||||
media-fonts/baekmuk-fonts
|
||||
media-fonts/lklug
|
||||
media-fonts/lohit-fonts
|
||||
media-fonts/sazanami
|
||||
)
|
||||
)
|
||||
alsa? ( ${ALSA_COMMON_DEP} )
|
||||
cups? ( ${CUPS_COMMON_DEP} )"
|
||||
|
||||
src_install() {
|
||||
local dest="/opt/${P}"
|
||||
local ddest="${ED}/${dest}"
|
||||
dodir "${dest}"
|
||||
|
||||
# Ensures HeadlessGraphicsEnvironment is used.
|
||||
if ! use X; then
|
||||
rm -r jre/lib/$(get_system_arch)/xawt || die
|
||||
fi
|
||||
|
||||
# doins can't handle symlinks.
|
||||
cp -pRP bin include jre lib man "${ddest}" || die
|
||||
|
||||
# Remove on next bump as the needed marks are already set by icedtea ebuild.
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
|
||||
|
||||
if use doc; then
|
||||
dohtml -r ../doc/html/*
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
cp -pRP share/{demo,sample} "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use source; then
|
||||
cp src.zip "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use nsplugin; then
|
||||
cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
|
||||
install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
|
||||
docinto icedtea-web
|
||||
dodoc ../doc/icedtea-web/*
|
||||
fi
|
||||
|
||||
# Remove after next bump, handled by icedtea ebuild. Bug 390663
|
||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
|
||||
eprefixify "${T}"/fontconfig.Gentoo.properties
|
||||
insinto "${dest}"/jre/lib
|
||||
doins "${T}"/fontconfig.Gentoo.properties
|
||||
|
||||
set_java_env
|
||||
java-vm_revdep-mask "${dest}"
|
||||
java-vm_sandbox-predict /proc/self/coredump_filter
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Set as default VM if none exists
|
||||
java-vm-2_pkg_postinst
|
||||
|
||||
if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
|
||||
elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
|
||||
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
|
||||
elog "such as Firefox 3.5+ and recent Chromium versions."
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST keybinder-0.2.2.tar.gz 324264 SHA256 152846803f43bf5ad303809b15479fa5f2bc7a0c6e6e31353686c1429b81b363 SHA512 f67f36db6044823b59ddf8106e1b7315c4a504916ce12e29bf7b6c089436a447e57ec2ddbdd22b205a2fade96d1f3c32cb2773eac289bce0c511fafa37099e23 WHIRLPOOL d1c0ce27d84f19cf55d64761ffd88b1dd6b2627b9ddc911f0603b5418054bc501ed1386b2ac6da60efb68b137712af945d2b4498709bfd5cbdf7ebcf3f91ae79
|
||||
DIST keybinder-0.3.0.tar.gz 377765 SHA256 42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb SHA512 93ed88caa8246286907b9744383487391412b52be534cf085a6090c390bab181dc617721bb9216f29fd8314a40f65e27630d699ac6cb1657e0641a3d472eb22e WHIRLPOOL 5962e6a5cf96aeb7c4fdf920901f3ed461189fa9ce32bff427762a2f99b38fe4239b7129b5f669d46c256a4e7bf1fedf62ee966f05f65547e6921f364d8ff0d2
|
||||
DIST keybinder-3.0-0.3.0.tar.gz 346383 SHA256 982a6a5bc0fe1487862814b368e98211b9ec93fb5df3c9c0a88be526e0d2268e SHA512 6c5509b196fea848cda7e600edba2a59f7f65cbd7147e1d8ad2755aca8bb9b34ec68df1c90a456a7be800f049de0c2a4fc635adb60496a6aa32dea25f23dd86a WHIRLPOOL b378e7f2cc17cbe9bec9212df07e268377aea4979ab491d21092a6915fe219014686dbc188474daa2f21d1d48e016a657ae4d54d5c86407fc956c2c17d0398f0
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/keybinder/keybinder-0.2.2.ebuild,v 1.5 2012/05/04 18:35:55 jdhore Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
PYTHON_DEPEND="python? 2:2.5"
|
||||
|
||||
inherit python
|
||||
|
||||
DESCRIPTION="A library for registering global keyboard shortcuts"
|
||||
HOMEPAGE="http://kaizer.se/wiki/keybinder/"
|
||||
SRC_URI="http://kaizer.se/publicfiles/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="lua python"
|
||||
|
||||
RDEPEND=">=x11-libs/gtk+-2.20:2
|
||||
x11-libs/libXext
|
||||
x11-libs/libXrender
|
||||
x11-libs/libX11
|
||||
lua? ( >=dev-lang/lua-5.1 )
|
||||
python? ( >=dev-python/pygobject-2.15.3:2
|
||||
>=dev-python/pygtk-2.12 )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
pkg_setup() {
|
||||
if use python; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
rm -f py-compile
|
||||
ln -s $(type -P true) py-compile
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
use lua || myconf="--disable-lua"
|
||||
|
||||
econf \
|
||||
--disable-dependency-tracking \
|
||||
$(use_enable python) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc AUTHORS NEWS README
|
||||
|
||||
find "${D}" -name '*.la' -exec rm -f '{}' +
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use python && python_mod_optimize keybinder
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use python && python_mod_cleanup keybinder
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST sord-0.10.0.tar.bz2 272243 SHA256 d8233b3f1386d9ab6c7735a65f41cd75f7f97d68eeeb38985e77087acd81f1b5 SHA512 4550f3d0fb5f61582b59a708d0f556ae686e3a6c3e29c0ce1011b0543217943325905b00d2851ff485c1139863704134818baeeb71d530d0f1509f3167857d82 WHIRLPOOL b88b94746474f41becb54c8fcfaac67d706094160f6320405d29f6b4028a40e8ff302c55c29f26c562d34037d8d147f14a0e62aac62fe5c2d80c25c0d2c135a5
|
||||
DIST sord-0.10.4.tar.bz2 275574 SHA256 188b8b22c6aa05a36989093e771264676e8d4f3c43592e805bf26f8422d20f3f SHA512 7e4797631f8a16600eeaddd945418607de504c0c0c15a11f2124240095edcddbd314f96f06cc41045d9cf62b5a683b9759917de54ea96e1eaaf376141e3c1265 WHIRLPOOL 03c9f282a3d333d9c54332cfdc84ac4f2d8b01e38cc78ca3f799ee1c255fb666bf5416f9e3b4200486c58c2cf41233025922cdf7f54b53a4c4301c1a4334b54f
|
||||
DIST sord-0.5.0.tar.bz2 279917 SHA256 0f18879ed9d5c4d056cddb5af9057090d1de874d3f3996386cf716d8060625ef SHA512 620d6bab583f91c60fb635f2470bf73ab1e55912cbe1a8a97c6e51ea281e8dd78f3e480696fc7c0c5170594c75715b1778e94a11192fd8a3604bf16d1b192360 WHIRLPOOL 311aebae8f8540f0974571f6c0c455712b0c0042d55e62e10d39e9ab0ad56572704f7fd45a4149d1bffcdfd8795c281fccf981fdcf13f9c97c8d0fe1a1dbbde9
|
||||
DIST sord-0.8.0.tar.bz2 286325 SHA256 99df73a0a859fbfc6423a7d5930d019c8c0e17e04ed101114c54f1911dbd8a59 SHA512 d8b2110851c653806b27e052884f4d6260e24ffffba6f2fdf4164629f867eca50d3e28ee411f8fc6881a016e2277b9891700ccb6aa8895caeb3a3fcf457d2b41 WHIRLPOOL 7ed9f3f43d55f4416644bcc799a06b8e9438b002f71cec91c347c47c4a9e7bb255816d51f5df6e150b229b1c246cce0bc39c066d827d5ff6654a97e7a29eb09b
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/sord/sord-0.10.4.ebuild,v 1.1 2012/10/20 22:47:15 aballier Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit waf-utils
|
||||
|
||||
DESCRIPTION="Library for storing RDF data in memory"
|
||||
HOMEPAGE="http://drobilla.net/software/sord/"
|
||||
SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc static-libs test"
|
||||
|
||||
RDEPEND=">=dev-libs/serd-0.14.0"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-doc/doxygen )
|
||||
virtual/pkgconfig"
|
||||
|
||||
DOCS=( "AUTHORS" "NEWS" "README" )
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
waf-utils_src_configure \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
$(use test && echo "--test") \
|
||||
$(use doc && echo "--docs") \
|
||||
$(use static-libs && echo "--static")
|
||||
}
|
||||
|
||||
src_test() {
|
||||
./waf test || die
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST sympy-0.6.7.tar.gz 2939278 SHA256 802264fea36b9e3bd42df18422f1b26e6d4d962764bd2ab10f4b8b6a0b189791 SHA512 da37ce0475915f4498581cedd834a89a9f5d7b7f6fa75534e3e00c02cfaeea13692579a8f83c7e587745f7b299e920366ba71972633bd3d99f76cd2a8db19941 WHIRLPOOL 3d8c9ee086b4bf2f8b5fbc358c12d70f4066777781ea9cd43912dd6144c8bdc07dd0a2b722f4413b183ad26fdea456a43d2037a5516fbf4b1600dc36ab77e932
|
||||
DIST sympy-0.7.0.tar.gz 4126131 SHA256 d204407cfdbeeed476243625d836fe751bf134ca97820b70cd9972ad7589a63e SHA512 38e1bd36557543b42930cfb5e7d206757ce651203eb3ab89728a3224391b358f62e3faf3e557696c12c1b58b4785b0df42c4129bed7270ba4d0a7d00440ac064 WHIRLPOOL 004f5969de3abf8cc2d28152915ee184aee644951a1288302debcb538d08b137348730881a1914eaa654fb17e4c4d537ceb129754babf773cf01d4379f122dcb
|
||||
DIST sympy-0.7.1.tar.gz 3573079 SHA256 b4ad418d4301a8a26999f91eb816a0136ffae92007f6deb14eb329b6fbd7350b SHA512 3c6362e4aecefc6346c3089bb5fc3175068d643eacb2ba8e50a852fdc6ee8876e5fe69206f6daf646b5b62a580b24e35570076aa2d253e158d88a3d7d3604a53 WHIRLPOOL b17d0cd555c561d32cd292c30081c50f4b65b9985de895496bbd37592408b8bdc3b193b7ea83dbc1470c2e9229aedb36e751a78943d4bb238fd0a91c5fac421b
|
||||
DIST sympy-0.7.2.tar.gz 5487284 SHA256 2304aebd298d8bd467273a32b90fd66a24ee61cbea7e892a9ddc759d50a087fc SHA512 ffc602eb346717286b3d0a6770c60b03b578b3cf70ebd12f9e8b1c8c39cdb12ef219ddaa041d7929351a6b02dbb8caf1821b5452d95aae95034cbf4bc9904a7a WHIRLPOOL 7a5cbcc7d8f22a41fa3a78c9670d623bc13775b665a1a1a408f059642a9c600c0a8f283da5d314dacb527f8bbb56d6e5162d2e09d796a7ec4515993125fe355c
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
diff -r -U1 sympy-0.7.2.orig/setup.py sympy-0.7.2/setup.py
|
||||
--- sympy-0.7.2.orig/setup.py 2012-10-17 09:30:33.000000000 +0700
|
||||
+++ sympy-0.7.2/setup.py 2012-10-20 23:07:53.000000000 +0700
|
||||
@@ -67,7 +67,2 @@
|
||||
'sympy.matrices.expressions',
|
||||
- 'sympy.mpmath',
|
||||
- 'sympy.mpmath.calculus',
|
||||
- 'sympy.mpmath.functions',
|
||||
- 'sympy.mpmath.libmp',
|
||||
- 'sympy.mpmath.matrices',
|
||||
'sympy.ntheory',
|
||||
@@ -222,3 +217,2 @@
|
||||
'sympy.matrices.tests',
|
||||
- 'sympy.mpmath.tests',
|
||||
'sympy.ntheory.tests',
|
||||
@ -0,0 +1,153 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/sympy-0.7.2.ebuild,v 1.1 2012/10/20 18:17:24 grozin Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
PYTHON_DEPEND="2:2.5"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
RESTRICT_PYTHON_ABIS="2.4 3.* *-jython *-pypy-*"
|
||||
DISTUTILS_SRC_TEST="setup.py"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
DESCRIPTION="Computer algebra system (CAS) in Python"
|
||||
HOMEPAGE="http://code.google.com/p/sympy/"
|
||||
SRC_URI="http://sympy.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
|
||||
IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs"
|
||||
|
||||
RDEPEND="
|
||||
mathml? (
|
||||
dev-libs/libxml2:2[python]
|
||||
dev-libs/libxslt[python]
|
||||
gtk? ( x11-libs/gtkmathview[gtk] ) )
|
||||
latex? (
|
||||
virtual/latex-base
|
||||
dev-texlive/texlive-fontsextra
|
||||
png? ( app-text/dvipng )
|
||||
pdf? ( app-text/ghostscript-gpl ) )
|
||||
texmacs? ( app-office/texmacs )
|
||||
ipython? ( dev-python/ipython )
|
||||
opengl? ( dev-python/pyopengl )
|
||||
imaging? ( dev-python/imaging )
|
||||
pyglet? ( dev-python/pyglet )
|
||||
>=dev-python/pexpect-2.0
|
||||
~dev-python/mpmath-0.17"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( dev-python/sphinx )
|
||||
test? ( dev-python/pytest )"
|
||||
|
||||
pkg_setup() {
|
||||
python_pkg_setup
|
||||
export DOT_SAGE="${S}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Remove mpmath
|
||||
rm -rf sympy/mpmath/*
|
||||
sed -i \
|
||||
-e "s:sympy\.mpmath:mpmath:g" \
|
||||
-e "s:from sympy import mpmath:import mpmath:g" \
|
||||
sympy/combinatorics/permutations.py \
|
||||
sympy/core/containers.py \
|
||||
sympy/core/evalf.py \
|
||||
sympy/core/expr.py \
|
||||
sympy/core/function.py \
|
||||
sympy/core/numbers.py \
|
||||
sympy/core/power.py \
|
||||
sympy/core/sets.py \
|
||||
sympy/core/tests/test_evalf.py \
|
||||
sympy/core/tests/test_numbers.py \
|
||||
sympy/core/tests/test_sets.py \
|
||||
sympy/core/tests/test_sympify.py \
|
||||
sympy/external/tests/test_numpy.py \
|
||||
sympy/functions/combinatorial/numbers.py \
|
||||
sympy/functions/combinatorial/tests/test_comb_numbers.py \
|
||||
sympy/functions/special/bessel.py \
|
||||
sympy/functions/special/gamma_functions.py \
|
||||
sympy/functions/special/hyper.py \
|
||||
sympy/functions/special/tests/test_hyper.py \
|
||||
sympy/matrices/matrices.py \
|
||||
sympy/ntheory/partitions_.py \
|
||||
sympy/physics/quantum/constants.py \
|
||||
sympy/physics/quantum/qubit.py \
|
||||
sympy/plotting/experimental_lambdify.py \
|
||||
sympy/plotting/intervalmath/interval_arithmetic.py \
|
||||
sympy/polys/numberfields.py \
|
||||
sympy/polys/polytools.py \
|
||||
sympy/polys/rootoftools.py \
|
||||
sympy/polys/domains/__init__.py \
|
||||
sympy/polys/domains/algebraicfield.py \
|
||||
sympy/polys/domains/domain.py \
|
||||
sympy/polys/domains/expressiondomain.py \
|
||||
sympy/polys/domains/finitefield.py \
|
||||
sympy/polys/domains/fractionfield.py \
|
||||
sympy/polys/domains/gmpyintegerring.py \
|
||||
sympy/polys/domains/gmpyrationalfield.py \
|
||||
sympy/polys/domains/groundtypes.py \
|
||||
sympy/polys/domains/mpmathcomplexdomain.py \
|
||||
sympy/polys/domains/mpmathrealdomain.py \
|
||||
sympy/polys/domains/polynomialring.py \
|
||||
sympy/polys/domains/pythoncomplexdomain.py \
|
||||
sympy/polys/domains/pythonintegerring.py \
|
||||
sympy/polys/domains/pythonrationalfield.py \
|
||||
sympy/polys/domains/pythonrealdomain.py \
|
||||
sympy/polys/domains/quotientring.py \
|
||||
sympy/polys/domains/sympyintegerring.py \
|
||||
sympy/polys/domains/sympyrationalfield.py \
|
||||
sympy/polys/domains/sympyrealdomain.py \
|
||||
sympy/polys/tests/test_domains.py \
|
||||
sympy/printing/latex.py \
|
||||
sympy/printing/repr.py \
|
||||
sympy/printing/str.py \
|
||||
sympy/simplify/simplify.py \
|
||||
sympy/simplify/tests/test_hyperexpand.py \
|
||||
sympy/solvers/solvers.py \
|
||||
sympy/solvers/tests/test_numeric.py \
|
||||
sympy/statistics/distributions.py \
|
||||
sympy/statistics/tests/test_statistics.py \
|
||||
sympy/utilities/decorator.py \
|
||||
sympy/utilities/lambdify.py \
|
||||
sympy/utilities/runtests.py \
|
||||
sympy/utilities/tests/test_code_quality.py \
|
||||
sympy/utilities/tests/test_lambdify.py \
|
||||
examples/advanced/pidigits.py \
|
||||
examples/advanced/autowrap_ufuncify.py \
|
||||
|| die "failed to patch mpmath imports"
|
||||
epatch "${FILESDIR}"/${P}-mpmath.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
PYTHONPATH="." distutils_src_compile
|
||||
|
||||
if use doc; then
|
||||
cd doc
|
||||
emake html || die "emake html failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
PYTHONPATH="." distutils_src_install
|
||||
|
||||
rm -f "${ED}usr/bin/"{doctest,test} || die "rm doctest test failed"
|
||||
|
||||
if use doc; then
|
||||
dohtml -r doc/_build/html/*
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${P}
|
||||
doins -r examples
|
||||
fi
|
||||
|
||||
if use texmacs; then
|
||||
exeinto /usr/libexec/TeXmacs/bin/
|
||||
doexe data/TeXmacs/bin/tm_sympy
|
||||
insinto /usr/share/TeXmacs/plugins/sympy/
|
||||
doins -r data/TeXmacs/progs
|
||||
fi
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST d-feet-0.1.12.tar.bz2 34701 SHA256 11b247e39fd0b0077df8f5dffd9dadbe2becef2c0dfa0df50688d41bdcba5307 SHA512 199100b93ae2df82ddfbc71d7fcea67303ba9666c092d92e6f2132b38d5da9aeb3983de78eff7ab9a675eb418cae95008882b6e634dbadb200aa362e86d92009 WHIRLPOOL 55ba0784fedcbfdc3ffe7d2f9db17e312b3db4634e896221658e09a42a94ade598bad737d3f591ba2a076b5581e195da3910c28190f389fe2c882327650673a2
|
||||
DIST d-feet-0.1.14.tar.xz 107312 SHA256 3f289333f45928beb7d56d2a9d7b9a6fcf666fb2d8e557faf8b90230897cab82 SHA512 ef0b2ea9a996e8a04969cfd57527944b9521febe32d9403d607cfb9c5cd16debbc9f1b94640989728ad2a2bf20d5953fe057fc135ebe0adb36f27e1de9a2132c WHIRLPOOL 79288ce082401d7a9005adbcb6879efc7067dd7e2787c8de9f6c3073f25234b1c07738b662cbdd2a3eaae6a0a12ef96acb2aee073183879e514d1156355cf627
|
||||
DIST d-feet-0.1.15.tar.xz 98296 SHA256 1250d353ded2c2635fb97d26a7fb9e68aba0f851a7f2d5608de651fa14f8eb0a SHA512 2b13ad674d6899c95081af9a0dd00766aa7dc3266204f850f1c4e256a9afe0c29b6bd1b3063c110b2308b8185d3a80dc046fc06412300778020a4c0da1a7d339 WHIRLPOOL 2502b5a381a7730473aee6cd9d9930eea71c8c90fda5b3efd2c64d573708dfc146c42029b08a1b14bbebb82d1969bff4941e1dd917510b2227923cdc17581d0d
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/d-feet-0.1.15.ebuild,v 1.1 2012/10/21 11:32:51 eva Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="no"
|
||||
PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
|
||||
|
||||
inherit gnome2 distutils-r1
|
||||
|
||||
DESCRIPTION="D-Feet is a powerful D-Bus debugger"
|
||||
HOMEPAGE="http://live.gnome.org/DFeet"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="gnome"
|
||||
|
||||
RDEPEND="
|
||||
>=sys-apps/dbus-1.0
|
||||
>=dev-python/dbus-python-0.82.3
|
||||
dev-python/pygtk:2
|
||||
gnome? ( dev-python/libwnck-python )
|
||||
"
|
||||
DEPEND="
|
||||
dev-python/setuptools
|
||||
"
|
||||
|
||||
DOCS=( NEWS )
|
||||
|
||||
src_prepare() {
|
||||
# Do not run scrollkeeper tools, it is eclass job
|
||||
sed "s:scrollkeeper-\(preinstall\|update\):$(type -P true):" \
|
||||
-i setup.py || die "sed failed"
|
||||
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
@ -0,0 +1,92 @@
|
||||
From 0fa5fc43ca2004546864051a584367a50413f190 Mon Sep 17 00:00:00 2001
|
||||
From: Maynard Johnson <maynardj@us.ibm.com>
|
||||
Date: Fri, 15 Jun 2012 13:55:33 -0500
|
||||
Subject: [PATCH] Add #include "config.h" before bfd.h for perf-events branch
|
||||
|
||||
While building oprofile against a current CVS snapshot of binutils,
|
||||
I received the following error:
|
||||
|
||||
-----------------------------------------
|
||||
make[2]: Entering directory `/home/cseo/at5.0/at5.0-5/src/oprofile/libopagent'
|
||||
/bin/sh ../libtool --tag=CC --mode=compile /opt/at5.0-5-rc1/bin/gcc -DHAVE_CONFIG_H -I. -I.. -I/home/cseo/at5.0/at5.0-5/src/oprofile/libopagent -fPIC -I /home/cseo/at5.0/at5.0-5/src/oprofile/libop -I /home/cseo/at5.0/at5.0-5/src/oprofile/libutil -g -MT libopagent_la-opagent.lo -MD -MP -MF .deps/libopagent_la-opagent.Tpo -c -o libopagent_la-opagent.lo `test -f 'opagent.c' || echo '/home/cseo/at5.0/at5.0-5/src/oprofile/libopagent/'`opagent.c
|
||||
libtool: compile: /opt/at5.0-5-rc1/bin/gcc -DHAVE_CONFIG_H -I. -I.. -I/home/cseo/at5.0/at5.0-5/src/oprofile/libopagent -fPIC -I /home/cseo/at5.0/at5.0-5/src/oprofile/libop -I /home/cseo/at5.0/at5.0-5/src/oprofile/libutil -g -MT libopagent_la-opagent.lo -MD -MP -MF .deps/libopagent_la-opagent.Tpo -c opagent.c -fPIC -DPIC -o .libs/libopagent_la-opagent.o
|
||||
In file included from opagent.c:63:0:
|
||||
/opt/at5.0-5-rc1/include/bfd.h:37:2: error: #error config.h must be included before this header
|
||||
-----------------------------------------
|
||||
|
||||
I opened a bug against binutils for this (see http://sourceware.org/bugzilla/show_bug.cgi?id=14243),
|
||||
but the rationale for this error was explained to me thusly:
|
||||
|
||||
"This is a correctness issue. bfd.h and the headers that bfd.h #include test at
|
||||
least one HAVE_* macro. So you need to include the file that defines those
|
||||
HAVE_* macros before bfd.h. [sic] It is a really good idea to always include
|
||||
config.h (or sysdep.h or alloca-conf.h that include config.h) before any other
|
||||
files, including system headers."
|
||||
|
||||
This patch is a minimal patch that addresses the build failure with binutils,
|
||||
ensuring that our config.h is #include'd before bfd.h
|
||||
|
||||
Since my work on the perf-events branch has involved testing on newer
|
||||
binutils, I want to get this fix committed into the perf-events branch now
|
||||
so I don't need to be adding a private patch for those times when I build
|
||||
with new binutils.
|
||||
|
||||
Signed-off-by: Maynard Johnson <maynardj@us.ibm.com>
|
||||
---
|
||||
libopagent/opagent.c | 1 +
|
||||
libpp/symbol.h | 1 +
|
||||
opjitconv/debug_line.c | 1 +
|
||||
opjitconv/opjitconv.h | 1 +
|
||||
4 files changed, 4 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/libopagent/opagent.c b/libopagent/opagent.c
|
||||
index 2db1477..860413f 100644
|
||||
--- a/libopagent/opagent.c
|
||||
+++ b/libopagent/opagent.c
|
||||
@@ -50,6 +50,7 @@
|
||||
* See libopagent/Makefile.am for more information.
|
||||
*******************************************************************/
|
||||
|
||||
+#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
diff --git a/libpp/symbol.h b/libpp/symbol.h
|
||||
index ea2724d..8041cb9 100644
|
||||
--- a/libpp/symbol.h
|
||||
+++ b/libpp/symbol.h
|
||||
@@ -12,6 +12,7 @@
|
||||
#ifndef SYMBOL_H
|
||||
#define SYMBOL_H
|
||||
|
||||
+#include "config.h"
|
||||
#include "name_storage.h"
|
||||
#include "growable_vector.h"
|
||||
#include "sparse_array.h"
|
||||
diff --git a/opjitconv/debug_line.c b/opjitconv/debug_line.c
|
||||
index d7db8ec..babb943 100644
|
||||
--- a/opjitconv/debug_line.c
|
||||
+++ b/opjitconv/debug_line.c
|
||||
@@ -8,6 +8,7 @@
|
||||
* @author Philippe Elie
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
diff --git a/opjitconv/opjitconv.h b/opjitconv/opjitconv.h
|
||||
index 9562256..3f4919a 100644
|
||||
--- a/opjitconv/opjitconv.h
|
||||
+++ b/opjitconv/opjitconv.h
|
||||
@@ -26,6 +26,7 @@
|
||||
#define OP_JIT_CONV_ALREADY_DONE 5
|
||||
#define OP_JIT_CONV_TMPDIR_NOT_REMOVED 6
|
||||
|
||||
+#include "config.h"
|
||||
#include <bfd.h>
|
||||
#include <stddef.h>
|
||||
#include <sys/stat.h>
|
||||
--
|
||||
1.7.4.1
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From f0a6ef67e1b944e2032ce777994257075f6ba107 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Rosales <antonio.rosales@canonical.com>
|
||||
Date: Mon, 6 Aug 2012 09:21:07 -0500
|
||||
Subject: [PATCH] Fix compile error on Ubuntu 12.10
|
||||
|
||||
This is related to an earlier fix made under commit #
|
||||
0fa5fc43ca2004546864051a584367a50413f190. Apparently
|
||||
a newer compiler finds yet another file that required
|
||||
our config.h to be included prior to any system header
|
||||
files.
|
||||
|
||||
Signed-off-by: Maynard Johnson <maynardj@us.ibm.com>
|
||||
---
|
||||
libutil++/bfd_support.h | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/libutil++/bfd_support.h b/libutil++/bfd_support.h
|
||||
index 4f6a369..ab448d1 100644
|
||||
--- a/libutil++/bfd_support.h
|
||||
+++ b/libutil++/bfd_support.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef BFD_SUPPORT_H
|
||||
#define BFD_SUPPORT_H
|
||||
|
||||
+#include "config.h"
|
||||
#include "utility.h"
|
||||
#include "op_types.h"
|
||||
#include "locate_images.h"
|
||||
@ -1 +1 @@
|
||||
DIST moon-buggy-1.0.51.tar.gz 263572 RMD160 c04f2e12e3de515be15e49a8738b61f6af25d76b SHA1 7f1c5df99944acfe98eeb5f8d5ab6f28ef61ee7e SHA256 352dc16ccae4c66f1e87ab071e6a4ebeb94ff4e4f744ce1b12a769d02fe5d23f
|
||||
DIST moon-buggy-1.0.51.tar.gz 263572 SHA256 352dc16ccae4c66f1e87ab071e6a4ebeb94ff4e4f744ce1b12a769d02fe5d23f SHA512 34da2ca8b79d4f95a762cb7142586d176fd1b58ea6f4375de424d73d6046c2dc3dbae30dddb3a78c8c2563fbfec01d9eaafe27b79cc78ffa22121ad5a2e9dc77 WHIRLPOOL 52d0a375af71d345e3ec3464a1d862c1a03212fc189dac89f5410753d9ae1487085d1b72d2cbf778b749883a201c0b165fcb08c85e114851b20e282d493089ed
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST tomatoes-linux-1.5.tar.bz2 8807421 RMD160 454591162df5266a6ecb88b0b67914a5c0348a04 SHA1 8dc306617800f7ccc1e8610fb39e87d8181c482d SHA256 69a3af1994cb58409be9b469e1aa4bdb91c405d99071c7431526640ec53d1300
|
||||
DIST tomatoes-linux-src-1.55.tar.bz2 62947 RMD160 a57881902e3c917733058e3b9c936d2db5ca0e3a SHA1 aa123a5fa9c8c0223c602c0cffe8a5bb0ebad60c SHA256 126d001532ee5b81cc95e1a86a274d11669b8c8f65c8235ae2e9b8fbdfab4a60
|
||||
DIST tomatoes-linux-1.5.tar.bz2 8807421 SHA256 69a3af1994cb58409be9b469e1aa4bdb91c405d99071c7431526640ec53d1300 SHA512 517f592bb3c3fb43cb740c58011f06b7a71c96eaff74ce1088db8dbd4aafa3463bba516547cd010e9ef2ca947fd36962c3d13ece6e979cab8adf01ffa991c308 WHIRLPOOL 62fd7eca64cd4ddf41de8a02fb80c3f114ff69f3b322f7f904592dca6109fba3856df1cd6bbb9162a22f78dd98e7c353756f1b5682f2128e5cc4f64e7c239001
|
||||
DIST tomatoes-linux-src-1.55.tar.bz2 62947 SHA256 126d001532ee5b81cc95e1a86a274d11669b8c8f65c8235ae2e9b8fbdfab4a60 SHA512 b5a6287659746179f0418630c55d34dc34897b532687007386b0b540ec728cc2492813f0d454314994a26a3629a24c802630085f64b969d1e6ea9ec936f5fe35 WHIRLPOOL 845ad2e84ad035d2f678c8465360439f057a323a020e01cd20f19fc5fb643b7372a963afdbe0b717edd230e3d7eb5f922a7fcc16affe4ec7ccd3d3696a4955ae
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST gnono-1.9.1.tar.bz2 421461 RMD160 2e86cf671e409f5c96cd5df904b3ea795d363547 SHA1 367a73e70182c1b4f0807353d7ba1aae8d8943d7 SHA256 1fd8ddcd2da5333210046ae1d6e710b597193c6f550ae1c82f729a0473bde60c
|
||||
DIST gnono-1.9.1.tar.bz2 421461 SHA256 1fd8ddcd2da5333210046ae1d6e710b597193c6f550ae1c82f729a0473bde60c SHA512 de67453cab0177d633b674ab2cf99b606373dc01e6d821478e8aa6adf9f0f40b04538e5d564df990739a62fb47225f83eff13ab6c12af26fe05afba309632d62 WHIRLPOOL 8b950b96c16e7c6290b5f4f6156404d96521e124516234fdf561ba4f55c63bd93366676ad0184e6c43f10e7dceef85e076dd999cf6c3c03595c75f9eade3ff8b
|
||||
|
||||
@ -0,0 +1,151 @@
|
||||
Index: gnono-1.9.1/src/ai.c
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/ai.c
|
||||
+++ gnono-1.9.1/src/ai.c
|
||||
@@ -24,9 +24,7 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
-#include <glib/garray.h>
|
||||
-#include <glib/gmessages.h>
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "cards.h"
|
||||
#include "game.h"
|
||||
Index: gnono-1.9.1/src/ai.h
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/ai.h
|
||||
+++ gnono-1.9.1/src/ai.h
|
||||
@@ -23,7 +23,7 @@
|
||||
#ifndef __GN_AI_H__
|
||||
#define __GN_AI_H__
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
|
||||
void computer_play (gboolean pickup);
|
||||
|
||||
Index: gnono-1.9.1/src/cards.c
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/cards.c
|
||||
+++ gnono-1.9.1/src/cards.c
|
||||
@@ -25,9 +25,7 @@
|
||||
#endif
|
||||
|
||||
#include <stdlib.h> /* for rand() */
|
||||
-#include <glib/garray.h>
|
||||
-#include <glib/gmem.h>
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf-core.h>
|
||||
|
||||
#include "cards.h"
|
||||
Index: gnono-1.9.1/src/cards.h
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/cards.h
|
||||
+++ gnono-1.9.1/src/cards.h
|
||||
@@ -23,7 +23,7 @@
|
||||
#ifndef __GN_CARDS_H__
|
||||
#define __GN_CARDS_H__
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf-core.h>
|
||||
|
||||
static const gdouble GN_CARD_HEIGHT = 98.0;
|
||||
Index: gnono-1.9.1/src/game.c
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/game.c
|
||||
+++ gnono-1.9.1/src/game.c
|
||||
@@ -24,9 +24,7 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
-#include <glib/garray.h>
|
||||
-#include <glib/gmessages.h>
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <gtk/gtkmain.h>
|
||||
#include <libgnome/gnome-config.h>
|
||||
|
||||
Index: gnono-1.9.1/src/game.h
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/game.h
|
||||
+++ gnono-1.9.1/src/game.h
|
||||
@@ -23,7 +23,7 @@
|
||||
#ifndef __GN_GAME_H__
|
||||
#define __GN_GAME_H__
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
|
||||
/*#define GN_DEBUG*/
|
||||
|
||||
Index: gnono-1.9.1/src/interface.h
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/interface.h
|
||||
+++ gnono-1.9.1/src/interface.h
|
||||
@@ -23,7 +23,7 @@
|
||||
#ifndef __GN_INTERFACE_H__
|
||||
#define __GN_INTERFACE_H__
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <gtk/gtkwidget.h>
|
||||
#include <gtk/gtkwindow.h>
|
||||
|
||||
Index: gnono-1.9.1/src/main.c
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/main.c
|
||||
+++ gnono-1.9.1/src/main.c
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#include <unistd.h>
|
||||
#include <glib/gi18n.h>
|
||||
-#include <glib/gmain.h>
|
||||
+#include <glib.h>
|
||||
#include <gtk/gtkmain.h>
|
||||
|
||||
#include "interface.h"
|
||||
Index: gnono-1.9.1/src/players.c
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/players.c
|
||||
+++ gnono-1.9.1/src/players.c
|
||||
@@ -24,8 +24,7 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
-#include <glib/garray.h>
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <gtk/gtklabel.h>
|
||||
#include <gtk/gtkwidget.h>
|
||||
Index: gnono-1.9.1/src/players.h
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/players.h
|
||||
+++ gnono-1.9.1/src/players.h
|
||||
@@ -23,8 +23,7 @@
|
||||
#ifndef __GN_PLAYERS_H__
|
||||
#define __GN_PLAYERS_H__
|
||||
|
||||
-#include <glib/garray.h>
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "cards.h"
|
||||
|
||||
Index: gnono-1.9.1/src/preferences.h
|
||||
===================================================================
|
||||
--- gnono-1.9.1.orig/src/preferences.h
|
||||
+++ gnono-1.9.1/src/preferences.h
|
||||
@@ -23,7 +23,7 @@
|
||||
#ifndef __GN_PREFERENCES_H__
|
||||
#define __GN_PREFERENCES_H__
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <gtk/gtkwidget.h>
|
||||
|
||||
void dlg_preferences (GtkWidget *caller, gpointer data);
|
||||
@ -1 +1 @@
|
||||
DIST kcheckers-0.8.1.tar.gz 81431 RMD160 d5f60526913c35a4d3fc01cda87d1fa64b9dd0b4 SHA1 d2ea352469aa07b9549e6664f5d34dcc7e9bb772 SHA256 444080f0554a1d65db32231ee18f9a662bfa6148a15cb006eba838c2463e7a2f
|
||||
DIST kcheckers-0.8.1.tar.gz 81431 SHA256 444080f0554a1d65db32231ee18f9a662bfa6148a15cb006eba838c2463e7a2f SHA512 c5febbcc7f0362169879a29a159c86aa4f3d859ee3bebea243535ca07949366078406b87e5e5534586485601b92a79b621cef7ba96f2224acc5331e3624d1b73 WHIRLPOOL b040a382c6bfc09071c67cd89b0717f3287b3bc880b31988dec579f51cb716d67e7aaab7d640488152c570d6eb005d1e769e2dd300acc04919fd4365469ce3d9
|
||||
|
||||
@ -0,0 +1,546 @@
|
||||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Thu Oct 11 15:00:18 UTC 2012
|
||||
Subject: build system
|
||||
|
||||
a) respect flags/linker
|
||||
b) don't take ARCH from env (we set BASE_ARCH in the ebuild)
|
||||
c) split LDFLAGS and LDFLAGS_COMMON as per bug
|
||||
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650
|
||||
d) don't remove angel-lib (compilation fails, why is this?)
|
||||
e) make output verbose
|
||||
f) remove start-scripts
|
||||
g) address parallel make issues
|
||||
|
||||
--- source/Makefile
|
||||
+++ source/Makefile
|
||||
@@ -50,10 +50,10 @@
|
||||
else
|
||||
CC?=gcc
|
||||
CXX?=g++
|
||||
-LD=gcc
|
||||
-LXX?=g++
|
||||
-AR=ar
|
||||
-RANLIB=ranlib
|
||||
+LD=$(CC)
|
||||
+LXX=$(CXX)
|
||||
+AR?=ar
|
||||
+RANLIB?=ranlib
|
||||
|
||||
# this nice line comes from the linux kernel makefile
|
||||
BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
|
||||
@@ -62,7 +62,7 @@
|
||||
ifeq ($(OS),FreeBSD)
|
||||
ARCH?=freebsd_$(BASE_ARCH)
|
||||
else
|
||||
-ARCH?=$(BASE_ARCH)
|
||||
+ARCH=$(BASE_ARCH)
|
||||
endif
|
||||
|
||||
SHARED_LIBRARY_EXTENSION=so
|
||||
@@ -72,7 +72,7 @@
|
||||
|
||||
ifeq ($(DEBUG_BUILD), YES)
|
||||
BINDIR=debug
|
||||
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
|
||||
+CFLAGS_DEBUG=-D_DEBUG
|
||||
else
|
||||
BINDIR=release
|
||||
endif
|
||||
@@ -196,8 +196,8 @@
|
||||
X11BASE?=/usr/X11R6
|
||||
|
||||
CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden
|
||||
-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG -msse2
|
||||
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
|
||||
+CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
|
||||
+CFLAGS_DEBUG=-D_DEBUG
|
||||
ifeq ($(DEBUG_BUILD),YES)
|
||||
CFLAGS_COMMON+=$(CFLAGS_DEBUG)
|
||||
else
|
||||
@@ -209,18 +209,18 @@
|
||||
CFLAGS_MODULE=-DPIC -fPIC
|
||||
CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
|
||||
|
||||
-LDFLAGS_COMMON=$(LDFLAGS)
|
||||
-LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
|
||||
+LDFLAGS_COMMON=
|
||||
+LXXFLAGS_COMMON=-lstdc++ -lsupc++
|
||||
|
||||
ifeq ($(OS),FreeBSD)
|
||||
LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread
|
||||
else
|
||||
-LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -O1 -Wl,--as-needed
|
||||
+LDFLAGS_COMMON+= -ldl -lm
|
||||
endif
|
||||
|
||||
ifneq ($(DEBUG_BUILD),YES)
|
||||
-LDFLAGS_COMMON+= -s
|
||||
-LXXFLAGS_COMMON+= -s
|
||||
+LDFLAGS_COMMON+=
|
||||
+LXXFLAGS_COMMON+=
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),x86_64)
|
||||
@@ -298,12 +298,9 @@
|
||||
######################################################################################################
|
||||
# Helper functions
|
||||
######################################################################################################
|
||||
-DO_CC=echo " > Compiling $<" && \
|
||||
- $(CC) $(CFLAGS_COMMON) -c $< -o $@
|
||||
-DO_CXX=echo " > Compiling (c++) $<" && \
|
||||
- $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
|
||||
-DO_RES=echo " > Compiling resource $<" && \
|
||||
- $(RES) $(RESFLAGS_COMMON) -i $< -o $@
|
||||
+DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@
|
||||
+DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
|
||||
+DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@
|
||||
|
||||
DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
|
||||
DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
|
||||
@@ -505,17 +502,17 @@
|
||||
|
||||
all: client openal qf ded cgame game ui irc cin angelwrap tv_server
|
||||
|
||||
-client: $(BUILDDIRS) message-client compile-client link-client start-script-client
|
||||
+client: $(BUILDDIRS) message-client compile-client link-client
|
||||
openal: $(BUILDDIRS) message-openal compile-openal link-openal
|
||||
qf: $(BUILDDIRS) message-qf compile-qf link-qf
|
||||
-ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded
|
||||
+ded: $(BUILDDIRS) message-ded compile-ded link-ded
|
||||
cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
|
||||
game: $(BUILDDIRS) message-game compile-game link-game
|
||||
ui: $(BUILDDIRS) message-ui compile-ui link-ui
|
||||
irc: $(BUILDDIRS) message-irc compile-irc link-irc
|
||||
cin: $(BUILDDIRS) message-cin compile-cin link-cin
|
||||
angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap
|
||||
-tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server
|
||||
+tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server
|
||||
|
||||
clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-cgame clean-game clean-ui clean-librocket clean-irc clean-cin clean-angelwrap clean-tv_server
|
||||
|
||||
@@ -611,13 +608,14 @@
|
||||
@echo "> *********************************************************"
|
||||
compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
|
||||
link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
|
||||
+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
|
||||
clean-ui:
|
||||
@echo " > Removing ui objects" && \
|
||||
$(RM) $(OBJS_UI_ROCKET)
|
||||
|
||||
$(LIBROCKET_LIB):
|
||||
@echo "> * Building Rocket library"
|
||||
- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
|
||||
+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
|
||||
@echo "> * Done building RocketCore library."
|
||||
@echo "> *********************************************************"
|
||||
@echo "> * Continuing ui building..."
|
||||
@@ -656,7 +654,6 @@
|
||||
@echo "> *********************************************************"
|
||||
@echo "> * Building angelwrap"
|
||||
@echo "> *********************************************************"
|
||||
- -@rm $(ANGELSCRIPT_LIB)
|
||||
$(ANGELSCRIPT_INC)/angelscript.h:
|
||||
@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
||||
@echo "!!!"
|
||||
@@ -668,7 +665,7 @@
|
||||
|
||||
$(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
|
||||
@echo "> * Building Angelscript library first"
|
||||
- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
|
||||
+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
|
||||
@echo "> * Done building angelscript library."
|
||||
@echo "> *********************************************************"
|
||||
@echo "> * Continuing angelwrap building..."
|
||||
@@ -702,69 +699,57 @@
|
||||
# DED
|
||||
########
|
||||
$(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
|
||||
|
||||
#########
|
||||
# CLIENT
|
||||
#########
|
||||
ifeq ($(OS),Darwin)
|
||||
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
|
||||
else
|
||||
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
|
||||
endif
|
||||
|
||||
#########
|
||||
# OPENAL
|
||||
#########
|
||||
$(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
|
||||
|
||||
#########
|
||||
# QF
|
||||
#########
|
||||
$(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
|
||||
|
||||
########
|
||||
# .SO
|
||||
########
|
||||
$(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
|
||||
|
||||
$(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
|
||||
|
||||
$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
|
||||
+ $(LXX) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
|
||||
|
||||
$(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
|
||||
|
||||
$(BINDIR)/libs/cin_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CIN)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
|
||||
|
||||
$(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
|
||||
+ $(LXX) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
|
||||
|
||||
########
|
||||
# TV
|
||||
########
|
||||
$(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
|
||||
|
||||
######################################################################################################
|
||||
# Meta Rules
|
||||
@@ -776,49 +761,48 @@
|
||||
# CLIENT
|
||||
########
|
||||
$(BUILDDIR)/client/%.o: qcommon/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: server/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: client/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: ref_gl/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: null/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: matchmaker/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
|
||||
ifeq ($(USE_MINGW),YES)
|
||||
$(BUILDDIR)/client/%.o: win32/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: win32/%.rc
|
||||
- @$(DO_RES_CLIENT)
|
||||
+ $(DO_RES_CLIENT)
|
||||
else
|
||||
ifeq ($(OS),Darwin)
|
||||
$(BUILDDIR)/client/%.o: mac/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
$(BUILDDIR)/client/%.o: unix/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
else
|
||||
$(BUILDDIR)/client/%.o: unix/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
endif
|
||||
endif
|
||||
|
||||
$(BUILDDIR)/client/%.o: game/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: gameshared/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(DO_CC_DED)
|
||||
|
||||
$(BINDIR)/warsow: unix/start_script.sh
|
||||
- @echo " > Installing client start script" && \
|
||||
cp $< $@ && \
|
||||
chmod a+x $@
|
||||
|
||||
@@ -826,60 +810,59 @@
|
||||
# OPENAL
|
||||
########
|
||||
$(BUILDDIR)/openal/%.o: snd_openal/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_OPENAL)
|
||||
+ $(DO_CC_MODULE) $(CFLAGS_OPENAL)
|
||||
|
||||
$(BUILDDIR)/openal/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
########
|
||||
# QF
|
||||
########
|
||||
$(BUILDDIR)/qf/%.o: snd_qf/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_QF)
|
||||
+ $(DO_CC_MODULE) $(CFLAGS_QF)
|
||||
|
||||
ifeq ($(USE_MINGW),YES)
|
||||
$(BUILDDIR)/qf/win_snd.o: win32/win_snd.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_DSOUND)
|
||||
+ $(DO_CC_MODULE) $(CFLAGS_DSOUND)
|
||||
else
|
||||
$(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_SDL)
|
||||
+ $(DO_CC_MODULE) $(CFLAGS_SDL)
|
||||
endif
|
||||
|
||||
$(BUILDDIR)/qf/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
|
||||
########
|
||||
# DED
|
||||
########
|
||||
$(BUILDDIR)/ded/%.o: qcommon/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(DO_CC_DED)
|
||||
|
||||
$(BUILDDIR)/ded/%.o: server/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(DO_CC_DED)
|
||||
|
||||
ifeq ($(USE_MINGW),YES)
|
||||
$(BUILDDIR)/ded/%.o: win32/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(DO_CC_DED)
|
||||
else
|
||||
$(BUILDDIR)/ded/%.o: unix/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(DO_CC_DED)
|
||||
endif
|
||||
|
||||
$(BUILDDIR)/ded/%.o: null/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(DO_CC_DED)
|
||||
|
||||
$(BUILDDIR)/ded/%.o: game/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(DO_CC_DED)
|
||||
|
||||
$(BUILDDIR)/ded/%.o: gameshared/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(DO_CC_DED)
|
||||
|
||||
$(BUILDDIR)/ded/%.o: matchmaker/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(DO_CC_DED)
|
||||
|
||||
$(BINDIR)/wsw_server: unix/start_script.sh
|
||||
- @echo " > Installing dedicated server start script" && \
|
||||
cp $< $@ && \
|
||||
chmod a+x $@
|
||||
|
||||
@@ -887,117 +870,116 @@
|
||||
# CGAME
|
||||
########
|
||||
$(BUILDDIR)/cgame/%.o: cgame/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/cgame/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
########
|
||||
# GAME
|
||||
########
|
||||
$(BUILDDIR)/game/%.o: game/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/game/%.o: game/ai/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/game/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/game/%.o: matchmaker/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
########
|
||||
# UI.ROCKET
|
||||
########
|
||||
$(BUILDDIR)/ui/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/as/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
#$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
|
||||
-# @$(DO_CC_MODULE)
|
||||
+# $(DO_CC_MODULE)
|
||||
|
||||
########
|
||||
# IRC
|
||||
########
|
||||
$(BUILDDIR)/irc/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/irc/%.o: irc/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
########
|
||||
# CIN
|
||||
########
|
||||
$(BUILDDIR)/cin/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/cin/%.o: cin/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_CIN)
|
||||
+ $(DO_CC_MODULE) $(CFLAGS_CIN)
|
||||
|
||||
########
|
||||
# ANGELWRAP
|
||||
########
|
||||
$(BUILDDIR)/angelwrap/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
+ $(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
|
||||
$(BUILDDIR)/angelwrap/%.o: angelwrap/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
+ $(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
|
||||
$(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
+ $(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
|
||||
$(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
+ $(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
|
||||
########
|
||||
# TV SERVER
|
||||
########
|
||||
$(BUILDDIR)/tv_server/%.o: qcommon/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(DO_CC_TV_SERVER)
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: client/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(DO_CC_TV_SERVER)
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(DO_CC_TV_SERVER)
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: tv_server/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(DO_CC_TV_SERVER)
|
||||
|
||||
ifeq ($(USE_MINGW),YES)
|
||||
$(BUILDDIR)/tv_server/%.o: win32/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(DO_CC_TV_SERVER)
|
||||
else
|
||||
$(BUILDDIR)/tv_server/%.o: unix/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(DO_CC_TV_SERVER)
|
||||
endif
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: null/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(DO_CC_TV_SERVER)
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: gameshared/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(DO_CC_TV_SERVER)
|
||||
|
||||
$(BINDIR)/wswtv_server: unix/start_script.sh
|
||||
- @echo " > Installing TV server start script" && \
|
||||
cp $< $@ && \
|
||||
chmod a+x $@
|
||||
|
||||
--- libsrcs/libRocket/libRocket/Makefile.warsow
|
||||
+++ libsrcs/libRocket/libRocket/Makefile.warsow
|
||||
@@ -13,9 +13,9 @@
|
||||
endif
|
||||
|
||||
ifeq ($(DEBUG_BUILD),YES)
|
||||
- CXXFLAGS += -g -DROCKET_DEBUG
|
||||
+ CXXFLAGS += -DROCKET_DEBUG
|
||||
else
|
||||
- CXXFLAGS += -O2
|
||||
+ CXXFLAGS +=
|
||||
endif
|
||||
|
||||
BUILDDIR=Build/obj
|
||||
--- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
|
||||
+++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
|
||||
@@ -47,7 +47,7 @@
|
||||
CXX ?= gcc
|
||||
# On i686 architecture you may need to add -march=i686 if you get
|
||||
# an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
|
||||
- CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
|
||||
+ CXXFLAGS += -Wall -fPIC -fno-strict-aliasing
|
||||
endif
|
||||
|
||||
AR ?= ar
|
||||
@ -0,0 +1,176 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02.ebuild,v 1.1 2012/10/21 00:37:24 hasufell Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit eutils check-reqs gnome2-utils games
|
||||
|
||||
MY_P=${PN}_${PV}
|
||||
DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
|
||||
HOMEPAGE="http://www.warsow.net/"
|
||||
SRC_URI="http://funpark.warsow-esport.net/~${PN}/1.0/${PN}_1.0_unified.tar.gz
|
||||
http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_sdk.tar.gz
|
||||
http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_update.zip
|
||||
mirror://gentoo/${PN}.png"
|
||||
|
||||
LICENSE="GPL-2 warsow"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+angelscript debug dedicated irc openal server"
|
||||
|
||||
RDEPEND="media-libs/freetype
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
!dedicated? (
|
||||
media-libs/libpng:0
|
||||
media-libs/libsdl
|
||||
media-libs/libtheora
|
||||
media-libs/libvorbis
|
||||
x11-libs/libX11
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXxf86dga
|
||||
x11-libs/libXxf86vm
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
openal? ( media-libs/openal )
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip
|
||||
x11-misc/makedepend
|
||||
!dedicated? (
|
||||
x11-proto/xineramaproto
|
||||
x11-proto/xf86dgaproto
|
||||
x11-proto/xf86vidmodeproto
|
||||
)
|
||||
openal? ( virtual/pkgconfig )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}_sdk/source
|
||||
S_U=${WORKDIR}/${PN}_1.0
|
||||
S_UPDATE=${WORKDIR}/${MY_P}_update
|
||||
|
||||
CHECKREQS_DISK_BUILD="1G"
|
||||
CHECKREQS_DISK_USR="500M"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${PN}_1.0_unified.tar.gz ${MY_P}_sdk.tar.gz
|
||||
mkdir "${S_UPDATE}" || die
|
||||
cd "${S_UPDATE}" || die
|
||||
unpack ${MY_P}_update.zip
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i \
|
||||
-e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
|
||||
qcommon/files.c \
|
||||
|| die "sed files.c failed"
|
||||
|
||||
sed -i \
|
||||
-e "s:q_jpeg_mem_src:_&:" \
|
||||
ref_gl/r_image.c || die "sed r_image.c failed"
|
||||
|
||||
rm -r "${S_U}"/docs/old* || die
|
||||
|
||||
cd "${WORKDIR}"/${MY_P}_sdk || die
|
||||
epatch "${FILESDIR}"/${P}-build.patch \
|
||||
"${FILESDIR}"/${PN}-0.5-pic.patch
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
yesno() { use ${1} && echo YES || echo NO ; }
|
||||
|
||||
use angelscript &&
|
||||
emake -C ../libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc
|
||||
|
||||
local arch
|
||||
if use amd64 ; then
|
||||
arch=x86_64
|
||||
elif use x86 ; then
|
||||
arch=i386
|
||||
fi
|
||||
|
||||
local myconf
|
||||
if use dedicated ; then
|
||||
myconf=(
|
||||
BUILD_CLIENT=NO
|
||||
BUILD_IRC=NO
|
||||
BUILD_SND_OPENAL=NO
|
||||
BUILD_SND_QF=NO
|
||||
BUILD_CIN=NO
|
||||
BUILD_SERVER=YES
|
||||
BUILD_TV_SERVER=YES
|
||||
)
|
||||
else
|
||||
myconf=(
|
||||
BUILD_CLIENT=YES
|
||||
BUILD_IRC=$(yesno irc)
|
||||
BUILD_SND_OPENAL=$(yesno openal)
|
||||
BUILD_SND_QF=YES
|
||||
BUILD_CIN=YES
|
||||
BUILD_SERVER=$(yesno server)
|
||||
BUILD_TV_SERVER=$(yesno server)
|
||||
)
|
||||
fi
|
||||
|
||||
emake \
|
||||
BASE_ARCH=${arch} \
|
||||
BINDIR=lib \
|
||||
BUILD_ANGELWRAP=$(yesno angelscript) \
|
||||
DEBUG_BUILD=$(yesno debug) \
|
||||
${myconf[@]}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd lib
|
||||
|
||||
if ! use dedicated ; then
|
||||
newgamesbin ${PN}.* ${PN}
|
||||
doicon -s 48 "${DISTDIR}"/${PN}.png
|
||||
make_desktop_entry ${PN} Warsow
|
||||
fi
|
||||
|
||||
if use dedicated || use server ; then
|
||||
newgamesbin wsw_server.* ${PN}-ded
|
||||
newgamesbin wswtv_server.* ${PN}-tv
|
||||
fi
|
||||
|
||||
exeinto "$(games_get_libdir)"/${PN}
|
||||
doexe */*.so
|
||||
|
||||
insinto "${GAMES_DATADIR}"/${PN}
|
||||
doins -r "${S_U}"/basewsw
|
||||
doins -r "${S_UPDATE}"/basewsw
|
||||
|
||||
local so
|
||||
for so in basewsw/*.so ; do
|
||||
dosym "$(games_get_libdir)"/${PN}/${so##*/} \
|
||||
"${GAMES_DATADIR}"/${PN}/${so}
|
||||
done
|
||||
|
||||
if [[ -e libs ]] ; then
|
||||
dodir "${GAMES_DATADIR}"/${PN}/libs
|
||||
for so in libs/*.so ; do
|
||||
dosym "$(games_get_libdir)"/${PN}/${so##*/} \
|
||||
"${GAMES_DATADIR}"/${PN}/${so}
|
||||
done
|
||||
fi
|
||||
|
||||
dodoc "${S_U}"/docs/*
|
||||
dodoc "${S_UPDATE}"/docs/*
|
||||
prepgamesdirs
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
games_pkg_preinst
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST gentoo-ru-0.25.gz 74751 RMD160 feb0a871492db8d09476aa3bd605d97c4fe31db1 SHA1 3bfb061f81fc44a9b72303976c7546a6815efa8c SHA256 2c73ea65ca841fd35a38a8f9aa0d890f12865dd6ae79d24c2333501c54e52cdf
|
||||
DIST gentoo-ru-0.26.gz 77812 RMD160 86535954ad46107efae8717a2866965cc011d63a SHA1 682e6612dc2cd6829789817e3747eff612b3fd4f SHA256 1ce7e038c5a97ec226f38ded4070fa4bab363b6ff6649bf91daa3ce327cb68d9
|
||||
DIST gentoo-ru-0.25.gz 74751 SHA256 2c73ea65ca841fd35a38a8f9aa0d890f12865dd6ae79d24c2333501c54e52cdf
|
||||
DIST gentoo-ru-0.26.gz 77812 SHA256 1ce7e038c5a97ec226f38ded4070fa4bab363b6ff6649bf91daa3ce327cb68d9
|
||||
|
||||
@ -1 +1,2 @@
|
||||
DIST openra-20120630.tar.gz 10330304 SHA256 f95b9d41ea4b4094ea61519f6fb0185fa242af156e2ec26dc1f2d55197470a3c SHA512 ab5996a3f48d8be227edc029d3fa7948a80756a64bca65d1936c3f4480ef5258cb62365d079cc28ba2be59796db91326c4f8c8d500ea4d2bbf3a8439d783fceb WHIRLPOOL 390b5fa57ef322e6204a23006fc3a7755178d28e115fd52fa4ca5b46ecf58f8df61b44a90ba2fe143a7fadd0be42aaf3488c3b938eaea11171636b562dfe344d
|
||||
DIST openra-20121019.tar.gz 11338976 SHA256 016dd79f759c539889c290e7bd90b3faa92e88c35c6cd20789803b30135978e9 SHA512 199a88b2a34c05787e1d5ebced15975c76b2fb45d70c613db679e7faaa158942a7ddc842ff8e0f912e4e70beb3dab4f281e62dee76899fc67582ec8c067b3556 WHIRLPOOL bf694d4e94d35dd31343b127e7c4855b3bcf56cd6559d5f6a3c3f4ee9e40f627880e79ba599d5929d8c5b49643b93c09ee9d55f35c426d08526736190a9029a2
|
||||
|
||||
@ -0,0 +1,86 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/openra-20121019.ebuild,v 1.1 2012/10/21 00:09:36 hasufell Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils mono gnome2-utils vcs-snapshot games
|
||||
|
||||
DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
|
||||
HOMEPAGE="http://open-ra.org/"
|
||||
SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="cg"
|
||||
|
||||
DEPEND="dev-dotnet/libgdiplus
|
||||
dev-lang/mono
|
||||
media-libs/freetype:2[X]
|
||||
media-libs/libsdl[X,opengl,video]
|
||||
media-libs/openal
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
vcs-snapshot_src_unpack
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# register game-version
|
||||
sed \
|
||||
-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
|
||||
-i mods/{ra,cnc,d2k}/mod.yaml || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake \
|
||||
datadir="${GAMES_DATADIR}" \
|
||||
bindir="${GAMES_BINDIR}" \
|
||||
libdir="$(games_get_libdir)/${PN}" \
|
||||
DESTDIR="${D}" \
|
||||
install
|
||||
|
||||
# icons
|
||||
insinto /usr/share/icons/
|
||||
doins -r packaging/linux/hicolor
|
||||
|
||||
# desktop entries
|
||||
local myrenderer=$(usex cg Cg Gl)
|
||||
make_desktop_entry "${PN} Game.Mods=cnc Graphics.Renderer=${myrenderer}" \
|
||||
"OpenRA CNC" ${PN}
|
||||
make_desktop_entry "${PN} Game.Mods=ra Graphics.Renderer=${myrenderer}" \
|
||||
"OpenRA RA" ${PN}
|
||||
make_desktop_entry "${PN} Game.Mods=d2k Graphics.Renderer=${myrenderer}" \
|
||||
"OpenRA Dune2k" ${PN}
|
||||
make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
|
||||
|
||||
dodoc "${FILESDIR}"/README.gentoo README HACKING CHANGELOG
|
||||
|
||||
# file permissions
|
||||
prepgamesdirs
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
games_pkg_preinst
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
gnome2_icon_cache_update
|
||||
|
||||
if ! use cg ; then
|
||||
elog "If you have problems starting the game consider switching"
|
||||
elog "to Graphics.Renderer=Cg in openra*.desktop or manually"
|
||||
elog "run:"
|
||||
elog "${PN} Game.Mods=\$mod Graphics.Renderer=Cg"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST gnome-media-2.30.0.tar.bz2 2707711 RMD160 9ba6f6fdc25afa34072e80ca4102800d7d75e2bc SHA1 c077f1c0a4ef97908c7bb36e41477c77069fdcd0 SHA256 994cd9b88ff22e4815585629b14efc828a95284900809b0b4f8ebcde0c6e2926
|
||||
DIST gnome-media-2.32.0.tar.bz2 2814365 RMD160 c24ec7d76ca1c63610ca78f6291b2abb19f05a3c SHA1 63fd51515338e4a67d0bd2871ff4d554245bc57c SHA256 2b0ad4decd75406398f46e82a170e53bcbc6e1bdc3363f03a07b00f59c2fe5e6
|
||||
DIST gnome-media-2.32.0.tar.bz2 2814365 SHA256 2b0ad4decd75406398f46e82a170e53bcbc6e1bdc3363f03a07b00f59c2fe5e6 SHA512 c43aa3d88811dbd5e8f4aa0f44c6efbc5aa3576170280c27ed95a1f45cb5f18bf40b4c2cfcc27db1a97b7e216070255e74f15cf39d66af5a70c4065f4e609592 WHIRLPOOL 18fe0424a40b5692ae9925c3cb4d9e2ec0238f866a67d76f0484a605b6ff9236fbb2716d4a7e011722ffeb6a20bacc8e5d07ce4a6f2f9d74512bbcecc022a47a
|
||||
DIST gnome-media-3.4.0.tar.xz 1832200 SHA256 a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f SHA512 6466b7f451a6c6fb2dd3569bb3a83fb7b7826593cb09b6608daf8e99bee6afec628a547e63d1139d2a4358cf9ceb4891bb02b503ea04c88de874a16ea6a1babb WHIRLPOOL 5fd481f7d38ee67aa32c3eb9b4c473b86297b7b6f89d6605fda53a813da11d5ab0a133e5523d3dded3d3e2b567cc9de76fd693a51f18ebdd94f61d2585261b66
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue