head	1.7;
access;
symbols
	pkgsrc-2013Q2:1.7.0.6
	pkgsrc-2013Q2-base:1.7
	pkgsrc-2012Q4:1.7.0.4
	pkgsrc-2012Q4-base:1.7
	pkgsrc-2011Q4:1.7.0.2
	pkgsrc-2011Q4-base:1.7
	pkgsrc-2011Q2:1.6.0.2
	pkgsrc-2011Q2-base:1.6
	pkgsrc-2011Q1:1.5.0.18
	pkgsrc-2011Q1-base:1.5
	pkgsrc-2010Q4:1.5.0.16
	pkgsrc-2010Q4-base:1.5
	pkgsrc-2010Q3:1.5.0.14
	pkgsrc-2010Q3-base:1.5
	pkgsrc-2010Q2:1.5.0.12
	pkgsrc-2010Q2-base:1.5
	pkgsrc-2010Q1:1.5.0.10
	pkgsrc-2010Q1-base:1.5
	pkgsrc-2009Q4:1.5.0.8
	pkgsrc-2009Q4-base:1.5
	pkgsrc-2009Q3:1.5.0.6
	pkgsrc-2009Q3-base:1.5
	pkgsrc-2009Q2:1.5.0.4
	pkgsrc-2009Q2-base:1.5
	pkgsrc-2009Q1:1.5.0.2
	pkgsrc-2009Q1-base:1.5
	pkgsrc-2008Q4:1.3.0.14
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.12
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.10
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.8
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.6
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.4
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.2
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.2.0.2
	pkgsrc-2007Q2-base:1.2;
locks; strict;
comment	@# @;


1.7
date	2011.07.19.18.56.46;	author drochner;	state dead;
branches;
next	1.6;

1.6
date	2011.06.24.09.03.32;	author tron;	state Exp;
branches;
next	1.5;

1.5
date	2009.01.24.17.20.14;	author jmcneill;	state Exp;
branches;
next	1.4;

1.4
date	2009.01.24.05.34.42;	author jmcneill;	state Exp;
branches;
next	1.3;

1.3
date	2007.07.03.19.53.00;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2007.06.26.15.31.34;	author tron;	state Exp;
branches;
next	1.1;

1.1
date	2007.06.26.11.45.17;	author lkundrak;	state Exp;
branches;
next	;


desc
@@


1.7
log
@update to 1.3.2
changes: misc fixes and improvements
pkgsrc change: add LICENSE
@
text
@$NetBSD: patch-ac,v 1.6 2011/06/24 09:03:32 tron Exp $

--- src/xvid.c.orig	2009-01-24 00:33:11.000000000 -0500
+++ src/xvid.c	2009-01-24 00:33:42.000000000 -0500
@@@@ -679,7 +679,11 @@@@ xvid_gbl_info(xvid_gbl_info_t * info)
 
 #else
 
+#if defined(_SC_NPROCESSORS_CONF)
   info->num_threads = sysconf(_SC_NPROCESSORS_CONF);	
+#else
+  info->num_threads = 1;
+#endif
 
 #endif
 
@


1.6
log
@Make this build with GNU patch 2.5.8 by avoiding patch files with ".."
in the filename.

XXX We need a generic solution for this.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.5 2009/01/24 17:20:14 jmcneill Exp $
@


1.5
log
@Fix path in patch-ac, kindly pointed out by Robert Elz.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.4 2009/01/24 05:34:42 jmcneill Exp $
d3 2
a4 2
--- ../../src/xvid.c.orig	2009-01-24 00:33:11.000000000 -0500
+++ ../../src/xvid.c	2009-01-24 00:33:42.000000000 -0500
@


1.4
log
@On systems where _SC_NPROCESSORS_CONF is not available, fallback to
single-threaded mode. Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- src/xvid.c.orig	2009-01-24 00:33:11.000000000 -0500
+++ src/xvid.c	2009-01-24 00:33:42.000000000 -0500
@


1.3
log
@Update to 1.1.3:

Changes since 1.1.2:

  xvidcore library

     * Fixed a potential vulnerability in mbcoding.c reported by Trixter Jack
       at Secunia

(was already in patch-ac)
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.2 2007/06/26 15:31:34 tron Exp $
d3 11
a13 36
This is believed to fix CVE-2007-3329.
Though there is no more information about the vulnerability apart from function names,
it seems that coeff is the only index that could point out of bounds causing harm
and only these three functions share this code.

--- ../../src/bitstream/mbcoding.c.orig	2007-06-26 13:38:17.000000000 +0200
+++ ../../src/bitstream/mbcoding.c
@@@@ -1073,12 +1073,10 @@@@ get_intra_block(Bitstream * bs,
 		}
 		coeff += run;
 		
-#ifdef _DEBUG
 		if(coeff>=64) {
 		  DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n");
 		  return;
 		}
-#endif
 
 		block[scan[coeff]] = level;
 
@@@@ -1121,12 +1119,10 @@@@ get_inter_block_h263(
 		}
 		p += run;
 
-#ifdef _DEBUG
 		if(p>=64)	{
 		  DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n");
 		  return;
 		}
-#endif
 
 		if (level < 0) {
 			level = level*quant_m_2 - quant_add;
@@@@ -1163,12 +1159,10 @@@@ get_inter_block_mpeg(
 		}
 		p += run;
d15 1
a15 6
-#ifdef _DEBUG
 		if(p>=64)	{
 		  DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n");
 		  return;
 		}
-#endif
a16 2
 		if (level < 0) {
 			level = ((2 * -level + 1) * matrix[scan[p]] * quant) >> 4;
@


1.2
log
@Correct pathname in patch to make it actually apply.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.1 2007/06/26 11:45:17 lkundrak Exp $
@


1.1
log
@Aims to fix CVE-2007-3329 security vulnerability.
@
text
@d1 1
a1 1
$NetBSD$
d8 2
a9 2
--- src/bitstream/mbcoding.c.orig	2007-06-26 13:38:17.000000000 +0200
+++ src/bitstream/mbcoding.c
@