Wed Jan 7 10:52:12 2009 UTC ()
Update to 1.2.1:

New in 1.2.1:
   * Fix for 'nested function' potential compilation error

New in 1.2.0:
   * Complete AMD64/EM64T 64-bit support
   * Added support for WIN64 platform
   * Multi-threaded encoding support
   * SSE3/SSE4 optimizations
   * Faster and more precise mpeg intra quantization
   * Fixed bug in packed pixel format colorspace conversion
   * Noexec-stack security patch
   * Fix for bad resync marker length
   * Improved decoder robustness for broken streams containing B-frames
   * Fix for potential out-of-bound access to MV bits table
   * Added SSIM quality-metric plugin


(wiz)
diff -r1.30 -r1.31 pkgsrc/multimedia/xvidcore/Makefile
diff -r1.4 -r1.5 pkgsrc/multimedia/xvidcore/PLIST
diff -r1.18 -r1.19 pkgsrc/multimedia/xvidcore/distinfo
diff -r1.3 -r1.4 pkgsrc/multimedia/xvidcore/patches/patch-ab
cvs diff -r1.30 -r1.31 pkgsrc/multimedia/xvidcore/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xvidcore/Makefile 2007/12/17 22:13:42 1.30
+++ pkgsrc/multimedia/xvidcore/Makefile 2009/01/07 10:52:12 1.31
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.30 2007/12/17 22:13:42 tron Exp $ 1# $NetBSD: Makefile,v 1.31 2009/01/07 10:52:12 wiz Exp $
2 2
3DISTNAME= xvidcore-1.1.3 3DISTNAME= xvidcore-1.2.1
4CATEGORIES= multimedia 4CATEGORIES= multimedia
5MASTER_SITES= http://downloads.xvid.org/downloads/ 5MASTER_SITES= http://downloads.xvid.org/downloads/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.xvid.org/ 9HOMEPAGE= http://www.xvid.org/
10COMMENT= ISO MPEG-4 compliant video codec 10COMMENT= ISO MPEG-4 compliant video codec
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
15 15
16# the resulting objects from the asm don't link correctly on Solaris. 16# the resulting objects from the asm don't link correctly on Solaris.
@@ -18,25 +18,25 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -18,25 +18,25 @@ PKG_DESTDIR_SUPPORT= user-destdir
18# big patch available from Gentoo, if someone is interested: 18# big patch available from Gentoo, if someone is interested:
19# http://bugs.gentoo.org/show_bug.cgi?id=90287 19# http://bugs.gentoo.org/show_bug.cgi?id=90287
20.if ${OPSYS} == "SunOS" || ${MACHINE_ARCH} == "x86_64" || \ 20.if ${OPSYS} == "SunOS" || ${MACHINE_ARCH} == "x86_64" || \
21 !empty(MACHINE_PLATFORM:MDarwin-[9].*-i386) 21 !empty(MACHINE_PLATFORM:MDarwin-[9].*-i386)
22CONFIGURE_ARGS+= --disable-assembly 22CONFIGURE_ARGS+= --disable-assembly
23.elif ${MACHINE_ARCH} == "i386" 23.elif ${MACHINE_ARCH} == "i386"
24BUILD_DEPENDS+= nasm>=0.98.39nb3:../../devel/nasm 24BUILD_DEPENDS+= nasm>=0.98.39nb3:../../devel/nasm
25#.elif ${MACHINE_ARCH} == "x86_64" 25#.elif ${MACHINE_ARCH} == "x86_64"
26#BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm 26#BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm
27.endif 27.endif
28 28
29PKG_INSTALLATION_TYPES= overwrite pkgviews 29PKG_INSTALLATION_TYPES= overwrite pkgviews
30 30
31WRKSRC= ${WRKDIR}/${DISTNAME}/build/generic 31WRKSRC= ${WRKDIR}/xvidcore/build/generic
32GNU_CONFIGURE= YES 32GNU_CONFIGURE= YES
33 33
34MAKE_ENV+= MKDIR=${MKDIR:Q} 34MAKE_ENV+= MKDIR=${MKDIR:Q}
35 35
36.if ${OPSYS} == "Darwin" 36.if ${OPSYS} == "Darwin"
37post-install: 37post-install:
38 ${RM} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so.4 38 ${RM} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so.4
39 ${MV} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so ${DESTDIR}${PREFIX}/lib/libxvidcore.dylib 39 ${MV} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so ${DESTDIR}${PREFIX}/lib/libxvidcore.dylib
40.endif 40.endif
41 41
42.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/xvidcore/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/xvidcore/PLIST 2006/01/06 17:12:18 1.4
+++ pkgsrc/multimedia/xvidcore/PLIST 2009/01/07 10:52:12 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1@comment $NetBSD: PLIST,v 1.4 2006/01/06 17:12:18 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.5 2009/01/07 10:52:12 wiz Exp $
2include/xvid.h 2include/xvid.h
3lib/libxvidcore.a 3lib/libxvidcore.a
4lib/libxvidcore.so 4lib/libxvidcore.so
5lib/libxvidcore.so.4 5lib/libxvidcore.so.4
6lib/libxvidcore.so.4.1 6lib/libxvidcore.so.4.2
cvs diff -r1.18 -r1.19 pkgsrc/multimedia/xvidcore/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xvidcore/distinfo 2007/07/03 19:53:00 1.18
+++ pkgsrc/multimedia/xvidcore/distinfo 2009/01/07 10:52:12 1.19
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.18 2007/07/03 19:53:00 wiz Exp $ 1$NetBSD: distinfo,v 1.19 2009/01/07 10:52:12 wiz Exp $
2 2
3SHA1 (xvidcore-1.1.3.tar.bz2) = 7a945c245851e115bc107aa621f72d775a5d1adb 3SHA1 (xvidcore-1.2.1.tar.bz2) = 0e4fdbbf12914999095a5ea51d94adb4e9a0eca3
4RMD160 (xvidcore-1.1.3.tar.bz2) = f890a2ef58be5362aa1d2894e748ef11a0c7bba8 4RMD160 (xvidcore-1.2.1.tar.bz2) = fcb6a5a0410d1921d99361fe5d580f00128b9ba3
5Size (xvidcore-1.1.3.tar.bz2) = 625974 bytes 5Size (xvidcore-1.2.1.tar.bz2) = 641101 bytes
6SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3 6SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3
7SHA1 (patch-ab) = 19306e1db22eeb58e703b1b416b019c0d2c4a694 7SHA1 (patch-ab) = 45989eeed44af684df183fde91dcc3acb60f022c
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/xvidcore/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/multimedia/xvidcore/patches/patch-ab 2007/01/06 16:31:48 1.3
+++ pkgsrc/multimedia/xvidcore/patches/patch-ab 2009/01/07 10:52:12 1.4
@@ -1,61 +1,61 @@ @@ -1,61 +1,61 @@
1$NetBSD: patch-ab,v 1.3 2007/01/06 16:31:48 jmmv Exp $ 1$NetBSD: patch-ab,v 1.4 2009/01/07 10:52:12 wiz Exp $
2 2
3--- configure.orig 2006-11-01 11:39:36.000000000 +0100 3--- configure.orig 2008-12-03 12:01:54.000000000 +0100
4+++ configure 4+++ configure
5@@ -3782,7 +3782,7 @@ SHARED_EXTENSION="" 5@@ -3800,7 +3800,7 @@ SHARED_EXTENSION=""
6 STATIC_EXTENSION="" 6 STATIC_EXTENSION=""
7 OBJECT_EXTENSION="" 7 OBJECT_EXTENSION=""
8 case "$target_os" in 8 case "$target_os" in
9- *bsd*|linux*|beos|irix*|solaris*) 9- *bsd*|linux*|beos|irix*|solaris*)
10+ *bsd*|linux*|beos|irix*|solaris*|dragonfly*) 10+ *bsd*|linux*|beos|irix*|solaris*|dragonfly*)
11 echo "$as_me:$LINENO: result: .so .a .o" >&5 11 echo "$as_me:$LINENO: result: .so .a .o" >&5
12 echo "${ECHO_T}.so .a .o" >&6 12 echo "${ECHO_T}.so .a .o" >&6
13 STATIC_EXTENSION="a" 13 STATIC_EXTENSION="a"
14@@ -3833,7 +3833,7 @@ echo "${ECHO_T}ok" >&6 14@@ -3851,7 +3851,7 @@ echo "${ECHO_T}ok" >&6
15 SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm" 15 SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm"
16 SPECIFIC_CFLAGS="-fPIC" 16 SPECIFIC_CFLAGS="-fPIC"
17 ;; 17 ;;
18- *bsd*|irix*) 18- *bsd*|irix*)
19+ *bsd*|dragonfly*|irix*) 19+ *bsd*|dragonfly*|irix*)
20 echo "$as_me:$LINENO: result: ok" >&5 20 echo "$as_me:$LINENO: result: ok" >&5
21 echo "${ECHO_T}ok" >&6 21 echo "${ECHO_T}ok" >&6
22 STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" 22 STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
23@@ -3856,13 +3856,13 @@ echo "${ECHO_T}ok" >&6 23@@ -3874,13 +3874,13 @@ echo "${ECHO_T}ok" >&6
24 echo "$as_me:$LINENO: result: dylib options" >&5 24 echo "$as_me:$LINENO: result: dylib options" >&5
25 echo "${ECHO_T}dylib options" >&6 25 echo "${ECHO_T}dylib options" >&6
26 SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)" 26 SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"
27- SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)" 27- SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
28+ SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB) -Wl,-read_only_relocs -Wl,warning" 28+ SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB) -Wl,-read_only_relocs -Wl,warning"
29 else 29 else
30 echo "$as_me:$LINENO: result: module options" >&5 30 echo "$as_me:$LINENO: result: module options" >&5
31 echo "${ECHO_T}module options" >&6 31 echo "${ECHO_T}module options" >&6
32 PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o" 32 PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
33 SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)" 33 SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
34- SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(PRE_SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress" 34- SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(PRE_SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress"
35+ SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(PRE_SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress -Wl,-read_only_relocs -Wl,warning" 35+ SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(PRE_SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress -Wl,-read_only_relocs -Wl,warning"
36 fi 36 fi
37 ;; 37 ;;
38 beos) 38 beos)
39@@ -4038,7 +4038,7 @@ echo "$as_me: WARNING: nasm patch versio 39@@ -4001,7 +4001,7 @@ echo "$as_me: WARNING: nasm version is t
40 echo "$as_me:$LINENO: checking for asm object format" >&5 40 echo "$as_me:$LINENO: checking for asm object format" >&5
41 echo $ECHO_N "checking for asm object format... $ECHO_C" >&6 41 echo $ECHO_N "checking for asm object format... $ECHO_C" >&6
42 case "$target_os" in 42 case "$target_os" in
43- *bsd*|linux*|beos|irix*|solaris*) 43- *bsd*|linux*|beos|irix*|solaris*)
44+ *bsd*|linux*|beos|irix*|solaris*|dragonfly*) 44+ *bsd*|linux*|beos|irix*|solaris*|dragonfly*)
45 echo "$as_me:$LINENO: result: elf" >&5 45 if test "$ARCHITECTURE" = "X86_64" ; then
46 echo "${ECHO_T}elf" >&6 46 echo "$as_me:$LINENO: result: elf64" >&5
47 NASM_FORMAT="elf" 47 echo "${ECHO_T}elf64" >&6
48@@ -4052,6 +4052,13 @@ echo "${ECHO_T}win32" >&6 48@@ -4034,6 +4034,13 @@ echo "${ECHO_T}macho" >&6
49 PREFIX="-DPREFIX" 49 PREFIX="-DPREFIX"
50 MARK_FUNCS="" 50 MARK_FUNCS=""
51 ;; 51 ;;
52+ darwin*|rhapsody*) 52+ darwin*|rhapsody*)
53+ echo "$as_me:$LINENO: result: macho" >&5 53+ echo "$as_me:$LINENO: result: macho" >&5
54+echo "${ECHO_T}macho" >&6 54+echo "${ECHO_T}macho" >&6
55+ MARK_FUNCS="" 55+ MARK_FUNCS=""
56+ NASM_FORMAT="macho" 56+ NASM_FORMAT="macho"
57+ PREFIX="-DPREFIX" 57+ PREFIX="-DPREFIX"
58+ ;; 58+ ;;
59 esac 59 esac
60  60
61 AS="$chosen_asm_prog" 61 AS="$chosen_asm_prog"