Sat Jan 24 05:34:42 2009 UTC ()
On systems where _SC_NPROCESSORS_CONF is not available, fallback to
single-threaded mode. Bump PKGREVISION.


(jmcneill)
diff -r1.32 -r1.33 pkgsrc/multimedia/xvidcore/Makefile
diff -r1.19 -r1.20 pkgsrc/multimedia/xvidcore/distinfo
diff -r0 -r1.4 pkgsrc/multimedia/xvidcore/patches/patch-ac
cvs diff -r1.32 -r1.33 pkgsrc/multimedia/xvidcore/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xvidcore/Makefile 2009/01/20 23:25:55 1.32
+++ pkgsrc/multimedia/xvidcore/Makefile 2009/01/24 05:34:42 1.33
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.32 2009/01/20 23:25:55 sketch Exp $ 1# $NetBSD: Makefile,v 1.33 2009/01/24 05:34:42 jmcneill Exp $
2 2
3DISTNAME= xvidcore-1.2.1 3DISTNAME= xvidcore-1.2.1
 4PKGREVISION= 1
4CATEGORIES= multimedia 5CATEGORIES= multimedia
5MASTER_SITES= http://downloads.xvid.org/downloads/ 6MASTER_SITES= http://downloads.xvid.org/downloads/
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.xvid.org/ 10HOMEPAGE= http://www.xvid.org/
10COMMENT= ISO MPEG-4 compliant video codec 11COMMENT= ISO MPEG-4 compliant video codec
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
15 16
16# the resulting objects from the asm don't link correctly on Solaris. 17# the resulting objects from the asm don't link correctly on Solaris.
cvs diff -r1.19 -r1.20 pkgsrc/multimedia/xvidcore/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xvidcore/distinfo 2009/01/07 10:52:12 1.19
+++ pkgsrc/multimedia/xvidcore/distinfo 2009/01/24 05:34:42 1.20
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.19 2009/01/07 10:52:12 wiz Exp $ 1$NetBSD: distinfo,v 1.20 2009/01/24 05:34:42 jmcneill Exp $
2 2
3SHA1 (xvidcore-1.2.1.tar.bz2) = 0e4fdbbf12914999095a5ea51d94adb4e9a0eca3 3SHA1 (xvidcore-1.2.1.tar.bz2) = 0e4fdbbf12914999095a5ea51d94adb4e9a0eca3
4RMD160 (xvidcore-1.2.1.tar.bz2) = fcb6a5a0410d1921d99361fe5d580f00128b9ba3 4RMD160 (xvidcore-1.2.1.tar.bz2) = fcb6a5a0410d1921d99361fe5d580f00128b9ba3
5Size (xvidcore-1.2.1.tar.bz2) = 641101 bytes 5Size (xvidcore-1.2.1.tar.bz2) = 641101 bytes
6SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3 6SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3
7SHA1 (patch-ab) = 45989eeed44af684df183fde91dcc3acb60f022c 7SHA1 (patch-ab) = 45989eeed44af684df183fde91dcc3acb60f022c
 8SHA1 (patch-ac) = a04244714825effafbf0a6db9de38585413f794b
File Added: pkgsrc/multimedia/xvidcore/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.4 2009/01/24 05:34:42 jmcneill 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