summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Wojtaszek <sekretarz@gentoo.org>2004-11-25 15:12:32 +0000
committerKarol Wojtaszek <sekretarz@gentoo.org>2004-11-25 15:12:32 +0000
commit505d20e57cb3593673d7760a0107c03e26e89057 (patch)
tree46fd5ce988834d22b82c2809bfa8014fa3ddf60f /media-video/oxine
parentStable on sparc (Manifest recommit) (diff)
downloadgentoo-2-505d20e57cb3593673d7760a0107c03e26e89057.tar.gz
gentoo-2-505d20e57cb3593673d7760a0107c03e26e89057.tar.bz2
gentoo-2-505d20e57cb3593673d7760a0107c03e26e89057.zip
Fixed gcc-3.4 compile issues, bug #70381 and added to ~amd64, bug #72139
Diffstat (limited to 'media-video/oxine')
-rw-r--r--media-video/oxine/ChangeLog7
-rw-r--r--media-video/oxine/files/oxine-0.2-gcc34.patch10
-rw-r--r--media-video/oxine/files/oxine-0.2-xtst.patch11
-rw-r--r--media-video/oxine/oxine-0.2.ebuild14
4 files changed, 39 insertions, 3 deletions
diff --git a/media-video/oxine/ChangeLog b/media-video/oxine/ChangeLog
index df9ae0e97342..4314c7534960 100644
--- a/media-video/oxine/ChangeLog
+++ b/media-video/oxine/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/oxine
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.5 2004/08/12 21:03:11 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.6 2004/11/25 15:12:32 sekretarz Exp $
+
+ 25 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+ +files/oxine-0.2-gcc34.patch, +files/oxine-0.2-xtst.patch,
+ oxine-0.2.ebuild:
+ Fixed gcc-3.4 compile issues, bug #70381 and added to ~amd64, bug #72139
13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
Adding missing metadata.xml. Taking over as maintainer.
diff --git a/media-video/oxine/files/oxine-0.2-gcc34.patch b/media-video/oxine/files/oxine-0.2-gcc34.patch
new file mode 100644
index 000000000000..23ab4d1cd7f6
--- /dev/null
+++ b/media-video/oxine/files/oxine-0.2-gcc34.patch
@@ -0,0 +1,10 @@
+--- src/oxine.c.org 2004-11-22 23:19:24.033988400 -0100
++++ src/oxine.c 2004-11-22 23:20:28.760148528 -0100
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <getopt.h>
+
+ #include <xine.h>
+ #include "oxine.h"
diff --git a/media-video/oxine/files/oxine-0.2-xtst.patch b/media-video/oxine/files/oxine-0.2-xtst.patch
new file mode 100644
index 000000000000..737b14c1ecc3
--- /dev/null
+++ b/media-video/oxine/files/oxine-0.2-xtst.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in.org 2004-11-22 23:35:03.963097456 -0100
++++ src/Makefile.in 2004-11-22 23:35:26.110730504 -0100
+@@ -148,7 +148,7 @@
+ x11.c nox.c fb.c lirc.c
+
+
+-oxine_LDADD = @XINE_LIBS@ $(LIRC_LIBS) $(XTEST_LIBS)
++oxine_LDADD = @XINE_LIBS@ $(LIRC_LIBS) $(X_LIBS) $(XTEST_LIBS)
+
+ noinst_HEADERS = oxine.h odk.h odk_plugin.h otk.h event.h \
+ utils.h list.h xmllexer.h xmlparser.h \
diff --git a/media-video/oxine/oxine-0.2.ebuild b/media-video/oxine/oxine-0.2.ebuild
index 44c1f2c15a84..586581141b4f 100644
--- a/media-video/oxine/oxine-0.2.ebuild
+++ b/media-video/oxine/oxine-0.2.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.2.ebuild,v 1.7 2004/08/03 11:58:29 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.2.ebuild,v 1.8 2004/11/25 15:12:32 sekretarz Exp $
+
+inherit eutils
DESCRIPTION="OSD frontend for xine"
HOMEPAGE="http://oxine.sourceforge.net/"
@@ -14,10 +16,18 @@ DEPEND=">=media-libs/xine-lib-1_beta8
IUSE="nls lirc"
SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
SRC_URI="mirror://sourceforge/oxine/${P}.tar.gz"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ epatch ${FILESDIR}/${P}-gcc34.patch
+ epatch ${FILESDIR}/${P}-xtst.patch
+}
+
src_compile() {
local myconf