diff options
author | Josh Grebe <squash@gentoo.org> | 2004-05-05 22:51:18 +0000 |
---|---|---|
committer | Josh Grebe <squash@gentoo.org> | 2004-05-05 22:51:18 +0000 |
commit | 564439f0092424253e114f0029966803834d4ff1 (patch) | |
tree | f75ca35fb6c53eb9396686f06b959ac73698cfe4 /media-libs | |
parent | mask new netcat for testing (diff) | |
download | historical-564439f0092424253e114f0029966803834d4ff1.tar.gz historical-564439f0092424253e114f0029966803834d4ff1.tar.bz2 historical-564439f0092424253e114f0029966803834d4ff1.zip |
Sparc fixes
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/xine-lib/ChangeLog | 9 | ||||
-rw-r--r-- | media-libs/xine-lib/Manifest | 27 | ||||
-rw-r--r-- | media-libs/xine-lib/files/xine-lib-1-rc4-sparc_missing_include.patch | 11 | ||||
-rw-r--r-- | media-libs/xine-lib/files/xine-lib-1_rc4-configure-sparc.patch | 15 | ||||
-rw-r--r-- | media-libs/xine-lib/files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch | 11 | ||||
-rw-r--r-- | media-libs/xine-lib/xine-lib-1_rc4.ebuild | 9 |
6 files changed, 67 insertions, 15 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/Manifest b/media-libs/xine-lib/Manifest index 6b86ec9758a6..f54f83f6e2dc 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -1,25 +1,28 @@ -MD5 c143a67569c570572a80952e25ea6622 ChangeLog 19972 +MD5 14aab0ab53e41b10d1fef32c568f7be9 ChangeLog 20327 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160 MD5 74eefa329c52e465c889ab8d509843bc xine-lib-0.9.13-r3.ebuild 3461 -MD5 911e8ac9be7bb59a1d410a07758bf3fd xine-lib-1_rc3-r2.ebuild 3952 +MD5 2d8af992b607144689ef99e1482005cd xine-lib-1_rc2.ebuild 4038 MD5 0b7f856fae11d36f4bffbf8bfe005761 xine-lib-1_rc3-r1.ebuild 4070 +MD5 911e8ac9be7bb59a1d410a07758bf3fd xine-lib-1_rc3-r2.ebuild 3952 MD5 b304642fe1b9924c69805348043989d2 xine-lib-1_rc3-r3.ebuild 4192 -MD5 2d8af992b607144689ef99e1482005cd xine-lib-1_rc2.ebuild 4038 -MD5 72370461c7ad2c87d7de2bc954c636e8 xine-lib-1_rc4.ebuild 4188 +MD5 fb48d303857718456704b056ffe901a4 xine-lib-1_rc4.ebuild 4492 MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68 +MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67 +MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68 MD5 3824a3bb0c207c34e9bec101cac52a91 files/digest-xine-lib-1_rc3-r2 68 MD5 d24969404b35f029bf203da4b53a3c3d files/digest-xine-lib-1_rc3-r3 68 -MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68 -MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594 -MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67 -MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597 -MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423 +MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67 MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597 +MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597 +MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597 MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746 MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041 -MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67 +MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587 +MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342 MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169 -MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597 +MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601 -MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587 +MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc4-configure-sparc.patch 587 +MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331 +MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464 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" |