summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2004-04-29 03:41:06 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2004-04-29 03:41:06 +0000
commit5abc5b52cd66a4d0fb5fd0c169cdbe41cc7f3c47 (patch)
tree3c497dca3671e988e1efc81787b1d398513cd990
parentReinstate changes made during ports freeze, correcting "PORTREVESION" (diff)
multimedia/libxine is broken on non-i386 architectures, amd64 in
particular. This causes consumers like multimedia/xine and multimedia/kaffeine to also be broken. Try running xine or kaffeine on amd64. Watch it segfault on startup. tjr@ has supplied a patch for it. PR: ports/65885 Submitted by: Tim Robbins <tim@robbins.dropbear.id.au>
Notes
Notes: svn path=/head/; revision=107921
-rw-r--r--multimedia/kaffeine/Makefile8
-rw-r--r--multimedia/libxine/files/patch-src::xine-utils::memcpy.c12
2 files changed, 13 insertions, 7 deletions
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index f41149e9cb80..3004e99ef523 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -24,10 +24,4 @@ CONFIGURE_ENV= CXXFLAGS="${CFLAGS}"
CONFIGURE_TARGET=
CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "amd64"
-BROKEN= "crashes on start"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/libxine/files/patch-src::xine-utils::memcpy.c b/multimedia/libxine/files/patch-src::xine-utils::memcpy.c
new file mode 100644
index 000000000000..c124b89fdf91
--- /dev/null
+++ b/multimedia/libxine/files/patch-src::xine-utils::memcpy.c
@@ -0,0 +1,12 @@
+--- src/xine-utils/memcpy.c.orig Thu Apr 22 22:57:12 2004
++++ src/xine-utils/memcpy.c Thu Apr 22 22:57:55 2004
+@@ -428,7 +428,8 @@
+ /* FIXME: implement an equivalent for using optimized memcpy on other
+ architectures */
+ #ifndef _MSC_VER
+- return times(NULL);
++ struct tms xxx;
++ return times(&xxx);
+ #else
+ return ((uint64_t)0);
+ #endif /* _MSC_VER */