head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.1.0.6
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.4
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2010.03.14.23.07.30;	author tron;	state dead;
branches;
next	1.1;

1.1
date	2009.09.20.08.13.21;	author ahoka;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2009.09.20.08.13.21;	author spz;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2009.09.28.08.08.31;	author spz;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Make this build and work under Solaris 10 x86:
1.) Work around lack of support for Sun Studio C Compiler and bugs
    in this compiler (it crashes with "-O3", "-xO2" works fine).
2.) Use a hammer to disable MMX, AMD 3DNow and SSE support as Solaris
    refuses to load libraries which contain unsupported instructions.
@
text
@$NetBSD: patch-powerpc,v 1.1 2009/09/20 08:13:21 ahoka Exp $

Fixes pkg/42000, not necessary aftert the next upgrade.

--- libswscale/swscale.c.orig	2009-06-04 23:55:52.000000000 +0200
+++ libswscale/swscale.c
@@@@ -1307,7 +1307,9 @@@@ static inline void monoblack2Y(uint8_t *
 
 #if ARCH_PPC
 #if (HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL
+#if !CONFIG_RUNTIME_CPUDETECT
 #undef COMPILE_C
+#endif
 #define COMPILE_ALTIVEC
 #endif
 #endif //ARCH_PPC
@


1.1
log
@Add patch from pkg/42000 to fix cpu detection on powerpc.

Closes PR pkg/42000
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-powerpc was added on branch pkgsrc-2009Q2 on 2009-09-28 08:08:31 +0000
@
text
@d1 16
@


1.1.2.2
log
@Pullup ticket 2902 - requested by tron
security patch

Revisions pulled up:
- pkgsrc/multimedia/ffmpeg/Makefile			by patch
- pkgsrc/multimedia/ffmpeg/distinfo			by patch
- pkgsrc/multimedia/ffmpeg/options.mk			by patch
- pkgsrc/multimedia/ffmpeg/patches/patch-bktr		by patch
- pkgsrc/multimedia/ffmpeg/patches/patch-configure	by patch

Files added:
pkgsrc/multimedia/ffmpeg/patches/patch-aa		1.9
pkgsrc/multimedia/ffmpeg/patches/patch-ab		1.6
pkgsrc/multimedia/ffmpeg/patches/patch-powerpc		1.6

   -------------------------------------------------------------------------

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Fri Sep 25 11:10:21 UTC 2009

   Modified Files:
   	pkgsrc/multimedia/ffmpeg: Makefile distinfo
   Added Files:
   	pkgsrc/multimedia/ffmpeg/patches: patch-ab

   Log Message:
   Add patch from ffmpeg GIT repository to fix the vulnerability
   reported in SA36760.


   To generate a diff of this commit:
   cvs rdiff -u -r1.53 -r1.54 pkgsrc/multimedia/ffmpeg/Makefile
   cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/ffmpeg/distinfo
   cvs rdiff -u -r0 -r1.6 pkgsrc/multimedia/ffmpeg/patches/patch-ab
@
text
@a0 16
$NetBSD$

Fixes pkg/42000, not necessary aftert the next upgrade.

--- libswscale/swscale.c.orig	2009-06-04 23:55:52.000000000 +0200
+++ libswscale/swscale.c
@@@@ -1307,7 +1307,9 @@@@ static inline void monoblack2Y(uint8_t *
 
 #if ARCH_PPC
 #if (HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL
+#if !CONFIG_RUNTIME_CPUDETECT
 #undef COMPILE_C
+#endif
 #define COMPILE_ALTIVEC
 #endif
 #endif //ARCH_PPC
@