Add some more checks to make sure yasm is sane before using it #163053.

Package-Manager: portage-2.1.2.2

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 18c1382480ae31654119d8d2edd619d1433e4c90..33f879e2f7d86da68a8e0e4cafc9a8a77c27e924 100644 (file)
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.124 2007/03/14 00:10:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.125 2007/03/20 02:50:26 vapier Exp $
+
+  20 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/libsdl-1.2.11-yasm-checks.patch, libsdl-1.2.11.ebuild,
+  libsdl-1.2.11-r1.ebuild:
+  Add some more checks to make sure yasm is sane before using it #163053.
 
   14 Mar 2007; Mike Frysinger <vapier@gentoo.org>
   files/libsdl-1.2.11-fbcon-page-header.patch:

diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index d249ace4ec5e18f3861a11ab737b751852c05b20..c6a23aabced3e1462cd59b60c34c9cf084c50f47 100644 (file)
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -29,19 +29,23 @@ AUX libsdl-1.2.11-xinerama-head-0.patch 882 RMD160 41cd75c0eaeff10484c363c829a7f
 MD5 28c2c921b567ca84a2df0ba29d8d0ba6 files/libsdl-1.2.11-xinerama-head-0.patch 882
 RMD160 41cd75c0eaeff10484c363c829a7f022c3dcc261 files/libsdl-1.2.11-xinerama-head-0.patch 882
 SHA256 612b6e5aeb0b155fa516124dce73a62a57ee5ab46b39c2ab67ae77de69ec0b8d files/libsdl-1.2.11-xinerama-head-0.patch 882
+AUX libsdl-1.2.11-yasm-checks.patch 3226 RMD160 17dc39bb8e73c2fe62ce8e2d602dc2d654caece1 SHA1 e84dd2e769712752b6a8190f2eacc6c3750ae78e SHA256 6b7ec4108f06c75a256edfdaa2542c95724c2e6ca45022eec465e432bcecdf91
+MD5 1017c51fb31a030a6782ad0cbe314807 files/libsdl-1.2.11-yasm-checks.patch 3226
+RMD160 17dc39bb8e73c2fe62ce8e2d602dc2d654caece1 files/libsdl-1.2.11-yasm-checks.patch 3226
+SHA256 6b7ec4108f06c75a256edfdaa2542c95724c2e6ca45022eec465e432bcecdf91 files/libsdl-1.2.11-yasm-checks.patch 3226
 DIST SDL-1.2.11.tar.gz 2796407 RMD160 91dc8877224415a4ba59e1de57c31861e550d644 SHA1 2259134d714e35ab1469d513674a3cd02510d198 SHA256 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
-EBUILD libsdl-1.2.11-r1.ebuild 4854 RMD160 551ab2619fee7605e71adb3b5707ac8682a89cb7 SHA1 c3d094f76957c413cc90f90e7ab86c2b0ca0e353 SHA256 42d7f41445917f4b9c590b5de84f0d5d7cdc781955c870eed24a4b9fffe27268
-MD5 42c41407f17482804e169ecf322f1ee9 libsdl-1.2.11-r1.ebuild 4854
-RMD160 551ab2619fee7605e71adb3b5707ac8682a89cb7 libsdl-1.2.11-r1.ebuild 4854
-SHA256 42d7f41445917f4b9c590b5de84f0d5d7cdc781955c870eed24a4b9fffe27268 libsdl-1.2.11-r1.ebuild 4854
-EBUILD libsdl-1.2.11.ebuild 4727 RMD160 a18528554133f449b2d164a36db8453bb33d2ab3 SHA1 8010bede62802c4421abcca6a2415cf24daeca3e SHA256 d6f3a7b31ad60c92a23fb2a3a9da6c500ff79284e111b4e9d1c42ec9cb92e83a
-MD5 e08031f25ce36ec7c2e2e0d6db92f0c4 libsdl-1.2.11.ebuild 4727
-RMD160 a18528554133f449b2d164a36db8453bb33d2ab3 libsdl-1.2.11.ebuild 4727
-SHA256 d6f3a7b31ad60c92a23fb2a3a9da6c500ff79284e111b4e9d1c42ec9cb92e83a libsdl-1.2.11.ebuild 4727
-MISC ChangeLog 19631 RMD160 ab3d13a23022ba54345ba29eb421b31f6bd51f68 SHA1 3ed6249ed16e776d91676bcf2312f5402a6c7ced SHA256 d8e6a0e70d6c4a31e8f20bc52c88c252f7da4ed2b750e92e6076e9e4ff6587dd
-MD5 c3691266e3e0085d48378c5abcdcddda ChangeLog 19631
-RMD160 ab3d13a23022ba54345ba29eb421b31f6bd51f68 ChangeLog 19631
-SHA256 d8e6a0e70d6c4a31e8f20bc52c88c252f7da4ed2b750e92e6076e9e4ff6587dd ChangeLog 19631
+EBUILD libsdl-1.2.11-r1.ebuild 4898 RMD160 cb224659e8f898ac175ad25a1067302390e79a80 SHA1 60c4b8959a8949ada07fe3d32d53bca7f0592e82 SHA256 3d26f99868ce209cb6d95dd18e3eae2aa4c29b4d99174d64068c37e1c0af8546
+MD5 81d59dd483faefb893722adf2aa77b33 libsdl-1.2.11-r1.ebuild 4898
+RMD160 cb224659e8f898ac175ad25a1067302390e79a80 libsdl-1.2.11-r1.ebuild 4898
+SHA256 3d26f99868ce209cb6d95dd18e3eae2aa4c29b4d99174d64068c37e1c0af8546 libsdl-1.2.11-r1.ebuild 4898
+EBUILD libsdl-1.2.11.ebuild 4777 RMD160 5e694b0b93b016010281dc116bc7786c691cdebf SHA1 788f6c6b377801d0c1596e14727a79d5650967b9 SHA256 f85c78f0e05989ac61a5129ad01cb2562046b83d00b38b00316983b40cfb119b
+MD5 f6e57388c8444f0c7d4a7800445a11bf libsdl-1.2.11.ebuild 4777
+RMD160 5e694b0b93b016010281dc116bc7786c691cdebf libsdl-1.2.11.ebuild 4777
+SHA256 f85c78f0e05989ac61a5129ad01cb2562046b83d00b38b00316983b40cfb119b libsdl-1.2.11.ebuild 4777
+MISC ChangeLog 19847 RMD160 42fa416ec3fa6cf7e92e071313156b3c2274e044 SHA1 925588d22988db7aaae7d74f340d433e173f336e SHA256 d4a73c489b4a36cee261f7cb5d1079920a57a8b5785cab0afc4e225839947fbb
+MD5 02a26189cd6ca81f0678b68cb2d36415 ChangeLog 19847
+RMD160 42fa416ec3fa6cf7e92e071313156b3c2274e044 ChangeLog 19847
+SHA256 d4a73c489b4a36cee261f7cb5d1079920a57a8b5785cab0afc4e225839947fbb ChangeLog 19847
 MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974
@@ -55,7 +59,7 @@ SHA256 be7333b21a407831ab4861ba67e56d36c9759b78f3b42400981abf3e34f5fda8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF/0lz8bi6rjpTunYRAtLjAJoDX32MTEK4RwwyWnOcm2RvJukMggCgwPho
-28bVE9KxwJoyPELU1rWFEtc=
-=/cM2
+iD8DBQFF/0wA8bi6rjpTunYRAnp3AJ4+q4iX0sOqv2wBWLcxGn61G2Dq5QCcCV+X
+DnpUOgeTrBkSqVi6JFpPRd8=
+=ma0t
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libsdl/files/libsdl-1.2.11-yasm-checks.patch b/media-libs/libsdl/files/libsdl-1.2.11-yasm-checks.patch
new file mode 100644 (file)
index 0000000..f4a470c
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.11-yasm-checks.patch
@@ -0,0 +1,88 @@
+make sure the yasm we have supports all the required features
+
+http://bugs.gentoo.org/163053
+http://bugzilla.libsdl.org/show_bug.cgi?id=393
+
+Index: configure.in
+===================================================================
+--- configure.in       (revision 2987)
++++ configure.in       (working copy)
+@@ -640,38 +640,56 @@ CheckNASM()
+ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]),
+                   , enable_nasm=yes)
+     if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
++        CompileNASM()
++        {
++            # Usage: CompileNASM <filename>
++            AC_MSG_CHECKING(to see if $NASM supports $1)
++            if $NASM $NASMFLAGS $1 -o $1.o >&AS_MESSAGE_LOG_FD 2>&1; then
++                CompileNASM_ret="yes"
++            else
++                CompileNASM_ret="no"
++            fi
++            rm -f $1 $1.o
++            AC_MSG_RESULT($CompileNASM_ret)
++            test "$CompileNASM_ret" = "yes"
++        }
++
++        if test x"$NASMFLAGS" = x; then
++            case $ARCH in
++              win32)
++                  NASMFLAGS="-f win32"
++                  ;;
++              openbsd)
++                  NASMFLAGS="-f aoutb"
++                  ;;
++              macosx)
++                  NASMFLAGS="-f macho"
++                  ;;
++              *)
++                  NASMFLAGS="-f elf"
++                  ;;
++            esac
++        fi
++
+         AC_PATH_PROG(NASM, yasm)
++        echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections
++        echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections
++        echo "%endif" >> unquoted-sections
++        CompileNASM unquoted-sections || NASM=""
++
+         if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then
++            $as_unset ac_cv_path_NASM
+             AC_PATH_PROG(NASM, nasm)
+         fi
+         if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
+             AC_DEFINE(SDL_HERMES_BLITTERS)
+             SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
+-            if test x"$NASMFLAGS" = x; then
+-                case $ARCH in
+-                  win32)
+-                      NASMFLAGS="-f win32"
+-                      ;;
+-                  openbsd)
+-                      NASMFLAGS="-f aoutb"
+-                      ;;
+-                  macosx)
+-                      NASMFLAGS="-f macho"
+-                      ;;
+-                  *)
+-                      NASMFLAGS="-f elf"
+-                      ;;
+-                esac
+-            fi
+             NASMFLAGS="$NASMFLAGS -i $srcdir/src/hermes/"
+ 
+             dnl See if hidden visibility is supported
+-            echo "GLOBAL _bar:function hidden" > nasm_vis.asm
+-            echo "_bar:" >>nasm_vis.asm
+-            if $NASM $NASMFLAGS nasm_vis.asm -o nasm_vis.o >&AS_MESSAGE_LOG_FD 2>&1; then
+-                NASMFLAGS="$NASMFLAGS -DHIDDEN_VISIBILITY"
+-            fi
+-            rm -f nasm_vis.asm nasm_vis.o
++            echo "GLOBAL _bar:function hidden" > symbol-visibility
++            echo "_bar:" >> symbol-visibility
++            CompileNASM symbol-visibility && NASMFLAGS="$NASMFLAGS -DHIDDEN_VISIBILITY"
+ 
+             AC_SUBST(NASM)
+             AC_SUBST(NASMFLAGS)

diff --git a/media-libs/libsdl/libsdl-1.2.11-r1.ebuild b/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
index 517b12384a6edf7fcd2b9b9882b47100a31cb313..563289a71ec28eb092a6a4acdcf667f429b5976d 100644 (file)
--- a/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r1.ebuild,v 1.5 2007/03/05 16:47:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r1.ebuild,v 1.6 2007/03/20 02:50:26 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -77,6 +77,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${P}-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch #148186
        epatch "${FILESDIR}"/${P}-audioConv.patch #151991
        epatch "${FILESDIR}"/${P}-fbcon-page-header.patch #159923 #169388
+       epatch "${FILESDIR}"/${P}-yasm-checks.patch #163053
 
        # add yasm-compatible defines to nasm code (hopefully we
        # can get this killed soonish)
@@ -105,7 +106,7 @@ src_compile() {
        if [[ $(tc-arch) != "x86" ]] ; then
                myconf="${myconf} --disable-nasm"
        else
-               myconf="${myconf} $(use_enable x86 nasm)"
+               myconf="${myconf} --enable-nasm"
        fi
        use noflagstrip || strip-flags
        use noaudio && myconf="${myconf} --disable-audio"

diff --git a/media-libs/libsdl/libsdl-1.2.11.ebuild b/media-libs/libsdl/libsdl-1.2.11.ebuild
index 0b8db394429af8b8dc8b2b5d683072335e82b2d3..2fb23d31e25c0a9f92c02e4a8b0d5585d5d48878 100644 (file)
--- a/media-libs/libsdl/libsdl-1.2.11.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.21 2007/01/19 17:06:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.22 2007/03/20 02:50:26 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -75,6 +75,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${P}-sdl-config.patch
        epatch "${FILESDIR}"/${P}-xinerama-head-0.patch #145917
        epatch "${FILESDIR}"/${P}-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch #148186
+       epatch "${FILESDIR}"/${P}-yasm-checks.patch #163053
 
        # add yasm-compatible defines to nasm code (hopefully we
        # can get this killed soonish)