diff options
| -rw-r--r-- | multimedia/xvidcore/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/xvidcore/PLIST | 4 | ||||
| -rw-r--r-- | multimedia/xvidcore/distinfo | 11 | ||||
| -rw-r--r-- | multimedia/xvidcore/patches/patch-ab | 28 | ||||
| -rw-r--r-- | multimedia/xvidcore/patches/patch-ac | 16 |
5 files changed, 25 insertions, 40 deletions
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile index 06b54087ef2..295d144e1a2 100644 --- a/multimedia/xvidcore/Makefile +++ b/multimedia/xvidcore/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.38 2011/06/24 13:04:43 tron Exp $ +# $NetBSD: Makefile,v 1.39 2011/07/19 18:56:46 drochner Exp $ -DISTNAME= xvidcore-1.2.2 +DISTNAME= xvidcore-1.3.2 CATEGORIES= multimedia MASTER_SITES= http://downloads.xvid.org/downloads/ EXTRACT_SUFX= .tar.bz2 @@ -8,8 +8,10 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.xvid.org/ COMMENT= ISO MPEG-4 compliant video codec +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir +USE_TOOLS+= gmake .include "../../mk/bsd.prefs.mk" diff --git a/multimedia/xvidcore/PLIST b/multimedia/xvidcore/PLIST index 757827ec09a..be47155bb80 100644 --- a/multimedia/xvidcore/PLIST +++ b/multimedia/xvidcore/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.5 2009/01/07 10:52:12 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2011/07/19 18:56:46 drochner Exp $ include/xvid.h lib/libxvidcore.a lib/libxvidcore.so lib/libxvidcore.so.4 -lib/libxvidcore.so.4.2 +lib/libxvidcore.so.4.3 diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo index 5ba54997d6b..675eac26f4f 100644 --- a/multimedia/xvidcore/distinfo +++ b/multimedia/xvidcore/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.25 2011/06/24 13:04:43 tron Exp $ +$NetBSD: distinfo,v 1.26 2011/07/19 18:56:46 drochner Exp $ -SHA1 (xvidcore-1.2.2.tar.bz2) = d03270c803592f7655e7aa4181de587be25ba97f -RMD160 (xvidcore-1.2.2.tar.bz2) = 5fbbc99a02d9eab7f2394220cec2c872957ff26f -Size (xvidcore-1.2.2.tar.bz2) = 643344 bytes +SHA1 (xvidcore-1.3.2.tar.bz2) = 74f9ce9c1bebcc9806bf21cb53274b8102700309 +RMD160 (xvidcore-1.3.2.tar.bz2) = 968493d5813cbc30630532a1a64011e5572a5017 +Size (xvidcore-1.3.2.tar.bz2) = 697038 bytes SHA1 (patch-aa) = 468884a8ab9dc528d9b51cbdb498bce2e08a02db -SHA1 (patch-ab) = d97c169e6d04dba4cc26448343f19a6d8b6af281 -SHA1 (patch-ac) = a04244714825effafbf0a6db9de38585413f794b +SHA1 (patch-ab) = 195e50e1dfbfc20b88b7275793cdb78270f818ae diff --git a/multimedia/xvidcore/patches/patch-ab b/multimedia/xvidcore/patches/patch-ab index 2e8cdd32efc..1551e52fb80 100644 --- a/multimedia/xvidcore/patches/patch-ab +++ b/multimedia/xvidcore/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.7 2011/06/24 13:04:43 tron Exp $ +$NetBSD: patch-ab,v 1.8 2011/07/19 18:56:46 drochner Exp $ --- build/generic/configure.orig 2009-05-28 17:13:31.000000000 +0000 +++ build/generic/configure @@ -8,20 +8,20 @@ $NetBSD: patch-ab,v 1.7 2011/06/24 13:04:43 tron Exp $ case "$target_os" in - *bsd*|linux*|beos|irix*|solaris*) + *bsd*|linux*|beos|irix*|solaris*|dragonfly*) - echo "$as_me:$LINENO: result: .so .a .o" >&5 - echo "${ECHO_T}.so .a .o" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: .so .a .o" >&5 + $as_echo ".so .a .o" >&6; } STATIC_EXTENSION="a" -@@ -3853,7 +3853,7 @@ echo "${ECHO_T}ok" >&6 +@@ -4312,7 +4312,7 @@ $as_echo "ok" >&6; } SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm" SPECIFIC_CFLAGS="-fPIC" ;; - *bsd*|irix*) + *bsd*|dragonfly*|irix*) - echo "$as_me:$LINENO: result: ok" >&5 - echo "${ECHO_T}ok" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" -@@ -3882,7 +3882,7 @@ echo "${ECHO_T}dylib options" >&6 - echo "${ECHO_T}module options" >&6 +@@ -4341,7 +4341,7 @@ $as_echo "dylib options" >&6; } + $as_echo "module options" >&6; } PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o" SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)" - SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(PRE_SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress" @@ -29,16 +29,16 @@ $NetBSD: patch-ab,v 1.7 2011/06/24 13:04:43 tron Exp $ fi ;; beos) -@@ -4075,7 +4075,7 @@ echo "$as_me: WARNING: nasm version is t - echo "$as_me:$LINENO: checking for asm object format" >&5 - echo $ECHO_N "checking for asm object format... $ECHO_C" >&6 +@@ -4538,7 +4538,7 @@ $as_echo "$as_me: WARNING: nasm version + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for asm object format" >&5 + $as_echo_n "checking for asm object format... " >&6; } case "$target_os" in - *bsd*|linux*|beos|irix*|solaris*) + *bsd*|linux*|beos|irix*|solaris*|dragonfly*) if test "$ARCHITECTURE" = "X86_64" ; then - echo "$as_me:$LINENO: result: elf64" >&5 - echo "${ECHO_T}elf64" >&6 -@@ -4108,6 +4108,13 @@ echo "${ECHO_T}macho" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: elf64" >&5 + $as_echo "elf64" >&6; } +@@ -4577,6 +4577,13 @@ $as_echo "macho32" >&6; } PREFIX="-DPREFIX" MARK_FUNCS="" ;; diff --git a/multimedia/xvidcore/patches/patch-ac b/multimedia/xvidcore/patches/patch-ac deleted file mode 100644 index 3a8d015628f..00000000000 --- a/multimedia/xvidcore/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$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 - |