diff options
Diffstat (limited to 'media-libs')
5 files changed, 52 insertions, 3 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 6b87ff454347..ac886caf5743 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/xine-lib # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.114 2004/05/03 16:21:56 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.115 2004/05/05 22:51:18 squash Exp $ + + 05 May 2004; Josh Grebe <squash@gentoo.org> xine-lib-1_rc4.ebuild, + files/xine-lib-1-rc4-sparc_missing_include.patch, + files/xine-lib-1_rc4-configure-sparc.patch, + files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch: + Fixed up sparc: Added missing configure patch, add --build arg to force 32 + bit, fix missing vis.h, and fix broken local libtool 03 May 2004; Jon Portnoy <avenj@gentoo.org> xine-lib-1_rc4.ebuild : Temporarily mask on AMD64 until 32-bit asm issues can be fixed. diff --git a/media-libs/xine-lib/files/xine-lib-1-rc4-sparc_missing_include.patch b/media-libs/xine-lib/files/xine-lib-1-rc4-sparc_missing_include.patch new file mode 100644 index 000000000000..b72ec5eb31d9 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1-rc4-sparc_missing_include.patch @@ -0,0 +1,11 @@ +--- xine-lib-1-rc4/src/libmpeg2/Makefile.in 2004-05-04 16:06:46.000000000 -0500 ++++ xine-lib-1-rc4-patched/src/libmpeg2/Makefile.in 2004-05-05 11:23:49.000000000 -0500 +@@ -305,7 +305,7 @@ + $(am_xineplug_decode_mpeg2_la_OBJECTS) + + DEFS = @DEFS@ +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src/libffmpeg/libavcodec/sparc + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ diff --git a/media-libs/xine-lib/files/xine-lib-1_rc4-configure-sparc.patch b/media-libs/xine-lib/files/xine-lib-1_rc4-configure-sparc.patch new file mode 100644 index 000000000000..e9c943f7c980 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1_rc4-configure-sparc.patch @@ -0,0 +1,15 @@ +--- xine-lib-1-rc3/configure.ac.org 2003-12-29 14:44:22.000000000 +0100 ++++ xine-lib-1-rc3/configure.ac 2003-12-29 14:47:43.000000000 +0100 +@@ -1505,9 +1505,9 @@ + ;; + + sparc*-*-linux*) +- case $host_alias in +- sparc-*) cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;; +- sparc64-*) ++ case `uname -m` in ++ sparc) cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;; ++ sparc64) + cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc" + if test x$enable_vis = xyes; then + AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU]) diff --git a/media-libs/xine-lib/files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch b/media-libs/xine-lib/files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch new file mode 100644 index 000000000000..6bf20e0ce627 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch @@ -0,0 +1,11 @@ +--- xine-lib-1-rc4/ltmain.sh 2004-05-05 15:33:22.000000000 -0500 ++++ xine-lib-1-rc4/ltmain.sh 2004-05-05 15:33:54.000000000 -0500 +@@ -947,7 +947,7 @@ + thread_safe=no + vinfo= + vinfo_number=no +- ++ shrext_cmds=".so" + func_infer_tag $base_compile + + # We need to know -static, to get the right output filenames. diff --git a/media-libs/xine-lib/xine-lib-1_rc4.ebuild b/media-libs/xine-lib/xine-lib-1_rc4.ebuild index aac60717eed4..08d1efb3819c 100644 --- a/media-libs/xine-lib/xine-lib-1_rc4.ebuild +++ b/media-libs/xine-lib/xine-lib-1_rc4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc4.ebuild,v 1.6 2004/05/03 20:25:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc4.ebuild,v 1.7 2004/05/05 22:51:18 squash Exp $ inherit eutils flag-o-matic gcc libtool @@ -62,7 +62,12 @@ src_unpack() { epatch ${FILESDIR}/protect-CFLAGS.patch-${PV} # plasmaroo: Kernel 2.6 headers patch epatch ${FILESDIR}/${PN}-2.6.patch + # force 32 bit userland [ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch + # fix a missing header + [ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/xine-lib-1-rc4-sparc_missing_include.patch + # fix included libtool + [ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch # always_inline means inline-or-fail, so it's no suprise that xine-lib # fails to compile with gcc 3.4 when this one inline fails @@ -91,7 +96,7 @@ src_compile() { || myconf="${myconf} --disable-asf" use sparc \ - && myconf="${myconf} --enable-vis" + && myconf="${myconf} --enable-vis --build=${CHOST}" use amd64 \ && myconf="${myconf} --with-xv-path=/usr/X11R6/lib" |