update to 1.1.7 changes: -bugfixes -speed improve,memt -new ffmpeg compatibilitydiff -r1.78 -r1.79 pkgsrc/multimedia/transcode/Makefile
(drochner)
@@ -1,69 +1,70 @@ | @@ -1,69 +1,70 @@ | |||
1 | # $NetBSD: Makefile,v 1.78 2012/10/08 09:21:13 asau Exp $ | 1 | # $NetBSD: Makefile,v 1.79 2012/10/10 13:37:25 drochner Exp $ | |
2 | 2 | |||
3 | DISTNAME= transcode-1.1.5 | 3 | DISTNAME= transcode-1.1.7 | |
4 | PKGREVISION= 15 | |||
5 | CATEGORIES= multimedia | 4 | CATEGORIES= multimedia | |
6 | MASTER_SITES= http://download.berlios.de/tcforge/ | 5 | #MASTER_SITES= http://download.berlios.de/tcforge/ | |
6 | MASTER_SITES= http://bitbucket.org/france/transcode-tcforge/downloads/ | |||
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | FETCH_USING= curl | |||
8 | 9 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://tcforge.berlios.de/ | 11 | HOMEPAGE= http://tcforge.berlios.de/ | |
11 | COMMENT= Command line video-stream processing tool | 12 | COMMENT= Command line video-stream processing tool | |
12 | 13 | |||
13 | USE_LANGUAGES= c c++ | 14 | USE_LANGUAGES= c c++ | |
14 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
15 | USE_TOOLS+= awk:run gmake pkg-config | 16 | USE_TOOLS+= awk:run gmake pkg-config | |
16 | GNU_CONFIGURE= yes | 17 | GNU_CONFIGURE= yes | |
17 | CONFIGURE_ARGS+= --disable-xio | 18 | CONFIGURE_ARGS+= --disable-xio | |
18 | CONFIGURE_ARGS+= --enable-libmpeg2 | 19 | CONFIGURE_ARGS+= --enable-libmpeg2 | |
19 | CONFIGURE_ARGS+= --enable-libmpeg2convert | 20 | CONFIGURE_ARGS+= --enable-libmpeg2convert | |
20 | CONFIGURE_ARGS+= --enable-libpostproc | 21 | CONFIGURE_ARGS+= --enable-libpostproc | |
21 | CONFIGURE_ARGS+= --enable-ogg | 22 | CONFIGURE_ARGS+= --enable-ogg | |
22 | CONFIGURE_ARGS+= --enable-theora | 23 | CONFIGURE_ARGS+= --enable-theora | |
23 | CONFIGURE_ARGS+= --enable-vorbis | 24 | CONFIGURE_ARGS+= --enable-vorbis | |
24 | CONFIGURE_ARGS+= --enable-xvid | 25 | CONFIGURE_ARGS+= --enable-xvid | |
25 | CONFIGURE_ARGS+= --with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg} | 26 | CONFIGURE_ARGS+= --with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg} | |
26 | CONFIGURE_ENV+= PATH_TO_AWK=${AWK:Q} | 27 | CONFIGURE_ENV+= PATH_TO_AWK=${AWK:Q} | |
27 | 28 | |||
28 | PTHREAD_AUTO_VARS= yes | 29 | PTHREAD_AUTO_VARS= yes | |
29 | PTHREAD_OPTS= require | 30 | PTHREAD_OPTS= require | |
30 | 31 | |||
31 | .include "../../mk/bsd.prefs.mk" | 32 | .include "../../mk/bsd.prefs.mk" | |
32 | 33 | |||
33 | .if ${MACHINE_ARCH} == "i386" | 34 | .if ${MACHINE_ARCH} == "i386" | |
34 | PLIST.i386= yes | 35 | PLIST.i386= yes | |
35 | .endif | 36 | .endif | |
36 | 37 | |||
37 | PLIST_VARS+= i386 oss x11 | 38 | PLIST_VARS+= i386 oss x11 | |
38 | 39 | |||
39 | .if ${OPSYS} != "Darwin" | 40 | .if ${OPSYS} != "Darwin" | |
40 | CONFIGURE_ARGS+= --enable-oss | 41 | CONFIGURE_ARGS+= --enable-oss | |
41 | PLIST.oss= yes | 42 | PLIST.oss= yes | |
42 | PLIST.x11= yes | 43 | PLIST.x11= yes | |
43 | LIBS+= ${LIBOSSAUDIO} | 44 | LIBS+= ${LIBOSSAUDIO} | |
44 | .endif | 45 | .endif | |
45 | 46 | |||
46 | .include "options.mk" | 47 | .include "options.mk" | |
47 | 48 | |||
48 | .include "../../audio/lame/buildlink3.mk" | 49 | .include "../../audio/lame/buildlink3.mk" | |
49 | .include "../../audio/libvorbis/buildlink3.mk" | 50 | .include "../../audio/libvorbis/buildlink3.mk" | |
50 | .include "../../converters/libiconv/buildlink3.mk" | 51 | .include "../../converters/libiconv/buildlink3.mk" | |
51 | .include "../../devel/zlib/buildlink3.mk" | 52 | .include "../../devel/zlib/buildlink3.mk" | |
52 | .include "../../graphics/freetype2/buildlink3.mk" | 53 | .include "../../graphics/freetype2/buildlink3.mk" | |
53 | .include "../../graphics/png/buildlink3.mk" | 54 | .include "../../graphics/png/buildlink3.mk" | |
54 | .include "../../multimedia/ffmpeg/buildlink3.mk" | 55 | .include "../../multimedia/ffmpeg/buildlink3.mk" | |
55 | .include "../../multimedia/libdvdread/buildlink3.mk" | 56 | .include "../../multimedia/libdvdread/buildlink3.mk" | |
56 | .include "../../multimedia/libmpeg2/buildlink3.mk" | 57 | .include "../../multimedia/libmpeg2/buildlink3.mk" | |
57 | .include "../../multimedia/libogg/buildlink3.mk" | 58 | .include "../../multimedia/libogg/buildlink3.mk" | |
58 | .include "../../multimedia/libtheora/buildlink3.mk" | 59 | .include "../../multimedia/libtheora/buildlink3.mk" | |
59 | .if ${OPSYS} != "Darwin" | 60 | .if ${OPSYS} != "Darwin" | |
60 | .include "../../x11/libXaw/buildlink3.mk" | 61 | .include "../../x11/libXaw/buildlink3.mk" | |
61 | .include "../../x11/libXext/buildlink3.mk" | 62 | .include "../../x11/libXext/buildlink3.mk" | |
62 | .include "../../x11/libXpm/buildlink3.mk" | 63 | .include "../../x11/libXpm/buildlink3.mk" | |
63 | .include "../../x11/libXv/buildlink3.mk" | 64 | .include "../../x11/libXv/buildlink3.mk" | |
64 | .include "../../x11/xextproto/buildlink3.mk" | 65 | .include "../../x11/xextproto/buildlink3.mk" | |
65 | .include "../../mk/oss.buildlink3.mk" | 66 | .include "../../mk/oss.buildlink3.mk" | |
66 | .endif | 67 | .endif | |
67 | .include "../../mk/jpeg.buildlink3.mk" | 68 | .include "../../mk/jpeg.buildlink3.mk" | |
68 | .include "../../mk/pthread.buildlink3.mk" | 69 | .include "../../mk/pthread.buildlink3.mk" | |
69 | .include "../../mk/bsd.pkg.mk" | 70 | .include "../../mk/bsd.pkg.mk" |
@@ -1,7 +1,9 @@ | @@ -1,7 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.20 2009/11/15 18:09:35 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.21 2012/10/10 13:37:25 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (transcode-1.1.5.tar.bz2) = 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26 | 3 | SHA1 (transcode-1.1.7.tar.bz2) = e35df68b960eb56ef0a59a4cdbed1491be56aee6 | |
4 | RMD160 (transcode-1.1.5.tar.bz2) = fdc441190110a4ae4a54a4e2abd307db7f0111aa | 4 | RMD160 (transcode-1.1.7.tar.bz2) = faa854acbbfd52faaa216505176f94d756d77841 | |
5 | Size (transcode-1.1.5.tar.bz2) = 2123207 bytes | 5 | Size (transcode-1.1.7.tar.bz2) = 2183627 bytes | |
6 | SHA1 (patch-ac) = 0640a062611c87d8666b7983594ab93b068c6580 | 6 | SHA1 (patch-ac) = 3a738bc76d427d28a1c03edfcef7dc227537bc3b | |
7 | SHA1 (patch-aw) = a2a118bad9e3783f98e8cbfa62cff8771118ac17 | 7 | SHA1 (patch-aw) = a2a118bad9e3783f98e8cbfa62cff8771118ac17 | |
8 | SHA1 (patch-ax) = 4e767e6ab77e49bb375de55457e3956e1531c7bb | |||
9 | SHA1 (patch-ba) = 92f31ca0d49cee2883d278b443b1d616381fee2d |
@@ -1,31 +1,31 @@ | @@ -1,31 +1,31 @@ | |||
1 | $NetBSD: patch-ac,v 1.5 2009/07/07 16:38:29 drochner Exp $ | 1 | $NetBSD: patch-ac,v 1.6 2012/10/10 13:37:25 drochner Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2009-03-28 10:13:11.000000000 +0100 | 3 | --- configure.orig 2011-11-19 16:50:37.000000000 +0000 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -4864,7 +4864,7 @@ cat >>confdefs.h <<\_ACEOF | 5 | @@ -5096,7 +5096,7 @@ case "${target_os}" in | |
6 | _ACEOF | 6 | $as_echo "#define OS_LINUX 1" >>confdefs.h | |
7 | 7 | |||
8 | ;; | 8 | ;; | |
9 | - freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*) | 9 | - freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*) | |
10 | + freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*|dragonfly*) | 10 | + freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*|dragonfly*) | |
11 | is_bsd=yes | 11 | is_bsd=yes | |
12 | 12 | |||
13 | cat >>confdefs.h <<\_ACEOF | 13 | $as_echo "#define OS_BSD 1" >>confdefs.h | |
14 | @@ -21959,7 +21959,7 @@ case "$host" in | 14 | @@ -19431,7 +19431,7 @@ case "$host" in | |
15 | esac | 15 | esac | |
16 | # let user override | 16 | # let user override | |
17 | if test -n "$PTHREAD_LIBS" ; then | 17 | if test -n "$PTHREAD_LIBS" ; then | |
18 | - pthread_libs="$PTHREAD_LIBS" | 18 | - pthread_libs="$PTHREAD_LIBS" | |
19 | + pthread_libs="$PTHREAD_LIBS $PTHREAD_LDFLAGS" | 19 | + pthread_libs="$PTHREAD_LIBS $PTHREAD_LDFLAGS" | |
20 | fi | 20 | fi | |
21 | if test -n "$PTHREAD_CFLAGS" ; then | 21 | if test -n "$PTHREAD_CFLAGS" ; then | |
22 | pthread_cflags="$PTHREAD_CFLAGS" | 22 | pthread_cflags="$PTHREAD_CFLAGS" | |
23 | @@ -42108,7 +42108,7 @@ if test "${enable_nuv+set}" = set; then | 23 | @@ -29507,7 +29507,7 @@ if test "${enable_nuv+set}" = set; then | |
24 | echo "$as_me: error: liblzo2 is required for NuppelVideo support, try --enable-lzo" >&2;} | 24 | yes) if test yes != "$have_lzo"; then | |
25 | { (exit 1); exit 1; }; } | 25 | as_fn_error $? "liblzo2 is required for NuppelVideo support, try --enable-lzo" "$LINENO" 5 | |
26 | fi | 26 | fi | |
27 | - if test true == "$have_x86_64cpu"; then | 27 | - if test true == "$have_x86_64cpu"; then | |
28 | + if test true = "$have_x86_64cpu"; then | 28 | + if test true = "$have_x86_64cpu"; then | |
29 | { echo "$as_me:$LINENO: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&5 | 29 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&5 | |
30 | echo "$as_me: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&2;} | 30 | $as_echo "$as_me: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&2;} | |
31 | elif test true != "$have_x86cpu"; then | 31 | elif test true != "$have_x86cpu"; then |
$NetBSD: patch-ax,v 1.4 2012/10/10 13:37:25 drochner Exp $
--- avilib/avidump.c.orig 2012-02-01 17:07:24.000000000 +0000
+++ avilib/avidump.c
@@ -320,7 +320,7 @@ static void dump_vals(int fd, int count,
{
uint32_t i,j,val32;
uint16_t val16;
- loff_t val64;
+ uint64_t val64;
char val8;
for (i = 0; names[i].type != EoLST; i++) {
@@ -605,7 +605,7 @@ static boolean ProcessChunk(int fd, off_
case indxtag: {
uint32_t chunks=*chunksize-sizeof(names_indx)/sizeof(char*);
- loff_t offset;
+ uint64_t offset;
uint32_t size, duration;
uint32_t u=0;
off_t indxend = datapos + chunks;
$NetBSD: patch-ba,v 1.4 2012/10/10 13:37:25 drochner Exp $
--- filter/filter_pp.c.orig 2011-11-19 16:50:27.000000000 +0000
+++ filter/filter_pp.c
@@ -38,8 +38,8 @@
/* FIXME: these use the filter ID as an index--the ID can grow
* arbitrarily large, so this needs to be fixed */
-static pp_mode_t *mode[100];
-static pp_context_t *context[100];
+static pp_mode *mode[100];
+static pp_context *context[100];
static int width[100], height[100];
static int pre[100];