Fixed gcc-3.4 compile issues, bug #70381 and added to ~amd64, bug #72139

diff --git a/media-video/oxine/ChangeLog b/media-video/oxine/ChangeLog
index df9ae0e9734212f7331a5e719af720fe22b0bd1b..4314c753496019207dea99fa0a566891ed73866f 100644 (file)
--- 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/Manifest b/media-video/oxine/Manifest
index 5456a70969fd6298e9380c687ae5ac237ff02040..0e8dbe1cf95a096d406c343d1443ac6e1cea16db 100644 (file)
--- a/media-video/oxine/Manifest
+++ b/media-video/oxine/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 1c34db7343eb1c80190a58d13b5f4a12 oxine-0.1.ebuild 857
-MD5 590a8b8d3447726d5902bc88b0e2ff05 oxine-0.2.ebuild 859
-MD5 a421081cf7488dbc21e0520608c86c96 ChangeLog 675
+MD5 a5b085bf45ea88d233b7449f2a76745d oxine-0.2.ebuild 1000
+MD5 bf7c4275d1830066152ea0468926f337 ChangeLog 885
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
+MD5 9ab0e63d2e2f9d4695a1771a4def9e97 files/oxine-0.2-gcc34.patch 252
 MD5 f9b749ab60b5a8684925d6a457352b92 files/digest-oxine-0.1 61
 MD5 a8f4b0ba961236d5de5b57a6271cc333 files/digest-oxine-0.2 61
+MD5 e668a8d14c492a155a090b1d1723ea74 files/oxine-0.2-xtst.patch 406
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBpfZwZ/iYVBmujdURApLWAKD0VdNXRwS0xQMvggd8JrFzLUjvhQCgzwlG
+Cope7R+Zv0XPp1FkhkYBYus=
+=YFzk
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..23ab4d1
--- /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 (file)
index 0000000..737b14c
--- /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 44c1f2c15a848e36c8f381a89f7be5405d1edec2..586581141b4f50b21806d1dcbce56bdd56a1b24d 100644 (file)
--- 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