summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emulation/wine/wine-9999.ebuild17
-rw-r--r--dev-libs/ptlib/ptlib-2.6.3.ebuild (renamed from dev-libs/ptlib/ptlib-2.6.2.ebuild)0
-rw-r--r--media-libs/gegl/gegl-0.0.9999.ebuild2
-rw-r--r--net-libs/opal/files/gcc-4.4.patch23
-rw-r--r--net-libs/opal/opal-3.6.3.ebuild (renamed from net-libs/opal/opal-3.6.2.ebuild)2
-rw-r--r--sys-apps/hal/hal-0.5.9999.ebuild (renamed from sys-apps/hal/hal-9999.ebuild)0
6 files changed, 9 insertions, 35 deletions
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 4baba0a..48f017f 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -4,20 +4,17 @@
EAPI="2"
-inherit multilib
+inherit multilib git autotools
-IUSE="alsa cups dbus esd +gecko gnutls +hacks hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl +X xcomposite xinerama xml"
+IUSE="alsa cups dbus esd +gecko gnutls +hacks hal jack jpeg lcms ldap nas ncurses +opengl oss png pulseaudio samba scanner ssl +X xcomposite xinerama xml"
if use hacks ; then
EGIT_REPO_URI="git://repo.or.cz/wine/hacks.git"
-# EGIT_BRANCH="hacks"
- inherit git
SRC_URI=""
KEYWORDS=""
else
EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
- inherit git
SRC_URI=""
KEYWORDS=""
fi
@@ -79,14 +76,14 @@ DEPEND="${RDEPEND}
sys-devel/flex"
src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git_src_unpack
- else
- unpack ${MY_P}.tar.bz2
- fi
+ git_src_unpack
cd ${S}
# epatch ${FILESDIR}/bits.patch
# epatch ${FILESDIR}/wined3d.diff
+ useq pulseaudio && epatch ${FILESDIR}/adding-pulseaudio-to-winecfg.patch
+ useq pulseaudio && epatch ${FILESDIR}/winepulse-0.17-configure.ac.patch
+ useq pulseaudio && epatch ${FILESDIR}/winepulse-0.28.patch
+ eautoreconf
}
src_prepare() {
diff --git a/dev-libs/ptlib/ptlib-2.6.2.ebuild b/dev-libs/ptlib/ptlib-2.6.3.ebuild
index 91230ea..91230ea 100644
--- a/dev-libs/ptlib/ptlib-2.6.2.ebuild
+++ b/dev-libs/ptlib/ptlib-2.6.3.ebuild
diff --git a/media-libs/gegl/gegl-0.0.9999.ebuild b/media-libs/gegl/gegl-0.0.9999.ebuild
index bbb2a9d..a549f09 100644
--- a/media-libs/gegl/gegl-0.0.9999.ebuild
+++ b/media-libs/gegl/gegl-0.0.9999.ebuild
@@ -26,8 +26,8 @@ DEPEND=">=media-libs/babl-0.0.20
>=x11-libs/gtk+-2.14.0
x11-libs/pango
cairo? ( x11-libs/cairo )
+ dev-lang/ruby
doc? ( app-text/asciidoc
- dev-lang/ruby
>=dev-lang/lua-5.1.0
app-text/enscript
media-gfx/graphviz
diff --git a/net-libs/opal/files/gcc-4.4.patch b/net-libs/opal/files/gcc-4.4.patch
deleted file mode 100644
index 8514e67..0000000
--- a/net-libs/opal/files/gcc-4.4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN ../original/configure ./configure
---- ../original/configure 2009-05-19 12:52:57.000000000 +0300
-+++ ./configure 2009-06-21 04:19:51.687358162 +0300
-@@ -5080,7 +5080,6 @@
- opal_debug_flags="-g -D_DEBUG -DSOLARIS"
- ;;
- *)
-- opal_release_flags="-Os"
- opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG"
- ;;
- esac
-diff -ruN ../original/plugins/video/H.264/gpl/enc-ctx.cxx ./plugins/video/H.264/gpl/enc-ctx.cxx
---- ../original/plugins/video/H.264/gpl/enc-ctx.cxx 2009-05-19 12:52:39.000000000 +0300
-+++ ./plugins/video/H.264/gpl/enc-ctx.cxx 2009-06-21 04:19:37.890368559 +0300
-@@ -25,6 +25,8 @@
- #include "trace.h"
- #include "rtpframe.h"
-
-+#include <cstdio>
-+#include <cstring>
- #include <stdlib.h>
- #include <math.h>
- #if defined(_WIN32) || defined(_WIN32_WCE)
diff --git a/net-libs/opal/opal-3.6.2.ebuild b/net-libs/opal/opal-3.6.3.ebuild
index 28b5324..95f79e5 100644
--- a/net-libs/opal/opal-3.6.2.ebuild
+++ b/net-libs/opal/opal-3.6.3.ebuild
@@ -34,7 +34,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
- epatch ${FILESDIR}/gcc-4.4.patch
+# epatch ${FILESDIR}/gcc-4.4.patch
# epatch "${FILESDIR}"/${PN}-lpcini.patch
}
diff --git a/sys-apps/hal/hal-9999.ebuild b/sys-apps/hal/hal-0.5.9999.ebuild
index 7b34184..7b34184 100644
--- a/sys-apps/hal/hal-9999.ebuild
+++ b/sys-apps/hal/hal-0.5.9999.ebuild