[SCM] xvidcore/master: Merge commit 'upstream/1.3.0'

[fabian-guest at users.alioth.debian.org]

Imported Upstream version 1.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 30994e7acdd599e46dd7b22e4297d224bdcd5985
X-Git-Newrev: 3b45e35bac44f4af719ef22286063099bfde803d

The following commit has been merged in the master branch:
commit 1490c971865638c8f7698528fc0c63b15148cb06
Merge: 30994e7acdd599e46dd7b22e4297d224bdcd5985 6717e49e3e6d37e61b4192de2c50dcc5290a6aab
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Feb 24 13:48:40 2011 +0100

    Merge commit 'upstream/1.3.0'

diff --combined src/nasm.inc
index edb4024,28b240c..de06a94
--- a/src/nasm.inc
+++ b/src/nasm.inc
@@@ -19,12 -19,10 +19,12 @@@
  ; *  along with this program ; if not, write to the Free Software
  ; *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  ; *
- ; * $Id: nasm.inc,v 1.1.2.4 2009/05/28 15:04:35 Isibaar Exp $
+ ; * $Id: nasm.inc,v 1.7.2.1 2011/01/09 13:20:50 Isibaar Exp $
  ; *
  ; ***************************************************************************/
  
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +
  %ifdef ARCH_IS_X86_64
  
  BITS 64
@@@ -177,11 -175,15 +177,15 @@@ BITS 3
  %endmacro
  
  %macro TEXT 0
- %ifidn __OUTPUT_FORMAT__,macho
+ %ifidn __OUTPUT_FORMAT__,macho32
+       SECTION .text align=SECTION_ALIGN
+ %else
+ %ifidn __OUTPUT_FORMAT__,macho64
        SECTION .text align=SECTION_ALIGN
  %else
        SECTION .rotext align=SECTION_ALIGN
  %endif
+ %endif
  %endmacro
  
  %macro cglobal 1
@@@ -205,3 -207,12 +209,12 @@@
  		%endif
  	%endif
  %endmacro
+ 
+ %macro NON_EXEC_STACK 0
+ %ifidn __OUTPUT_FORMAT__,elf
+ section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+ %ifidn __OUTPUT_FORMAT__,elf64
+ section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+ %endmacro

-- 
xvidcore packaging