Mon Sep 15 12:46:44 2008 UTC ()
Remove patch which changed configure test for
    #include <libpostproc/postprocess.h> to
    #include <postprocess.h>

As is no longer needed (and breaks configure) with latest ffmpeg,
and instead patch filter_pp.c to include "libpostproc/postprocess.h"
instead of "postprocess.h"

Bump PKGREVISION


(abs)
diff -r1.48 -r1.49 pkgsrc/multimedia/transcode/Makefile
diff -r1.14 -r1.15 pkgsrc/multimedia/transcode/distinfo
diff -r1.2 -r1.3 pkgsrc/multimedia/transcode/patches/patch-ac

cvs diff -r1.48 -r1.49 pkgsrc/multimedia/transcode/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/transcode/Makefile 2008/09/11 18:21:49 1.48
+++ pkgsrc/multimedia/transcode/Makefile 2008/09/15 12:46:44 1.49
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.48 2008/09/11 18:21:49 ahoka Exp $ 1# $NetBSD: Makefile,v 1.49 2008/09/15 12:46:44 abs Exp $
2# 2#
3 3
4DISTNAME= transcode-1.0.6 4DISTNAME= transcode-1.0.6
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://fromani.exit1.org/ 7MASTER_SITES= http://fromani.exit1.org/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.transcoding.org/ 11HOMEPAGE= http://www.transcoding.org/
12COMMENT= Command line video-stream processing tool 12COMMENT= Command line video-stream processing tool
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= awk:run gmake pkg-config 16USE_TOOLS+= awk:run gmake pkg-config
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18 18

cvs diff -r1.14 -r1.15 pkgsrc/multimedia/transcode/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/transcode/distinfo 2008/08/26 13:21:59 1.14
+++ pkgsrc/multimedia/transcode/distinfo 2008/09/15 12:46:44 1.15
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.14 2008/08/26 13:21:59 drochner Exp $ 1$NetBSD: distinfo,v 1.15 2008/09/15 12:46:44 abs Exp $
2 2
3SHA1 (transcode-1.0.6.tar.bz2) = 07905f6b0bd5eda881cbce2d8678c13beed47acb 3SHA1 (transcode-1.0.6.tar.bz2) = 07905f6b0bd5eda881cbce2d8678c13beed47acb
4RMD160 (transcode-1.0.6.tar.bz2) = 46d53cdd2b60032ccd8dc8bb53007e3903f6e1bb 4RMD160 (transcode-1.0.6.tar.bz2) = 46d53cdd2b60032ccd8dc8bb53007e3903f6e1bb
5Size (transcode-1.0.6.tar.bz2) = 1937157 bytes 5Size (transcode-1.0.6.tar.bz2) = 1937157 bytes
6SHA1 (patch-aa) = 01c2093ff606b4a0744dd0b8e5422277d081b8f2 6SHA1 (patch-aa) = 01c2093ff606b4a0744dd0b8e5422277d081b8f2
7SHA1 (patch-ab) = ce8477442d9e9bb5680fef2aacd6e496f95a5ff2 7SHA1 (patch-ab) = ce8477442d9e9bb5680fef2aacd6e496f95a5ff2
8SHA1 (patch-ac) = bf40057155e9955e6829c9e6eb9f0a4cc5c8c106 8SHA1 (patch-ac) = 392fe7c9b0c3361662de49ab13ea2f7c23f0fb0b
 9SHA1 (patch-ad) = 3183822ac86a15a69b76db17d763a212c1a0a46d
9SHA1 (patch-ae) = 901c88fb1a47d9a4b084d2d3918390584cdf9c42 10SHA1 (patch-ae) = 901c88fb1a47d9a4b084d2d3918390584cdf9c42
10SHA1 (patch-aj) = ff2d3ed5e82d4c669561ab041fb709ff3db91f75 11SHA1 (patch-aj) = ff2d3ed5e82d4c669561ab041fb709ff3db91f75
11SHA1 (patch-ao) = 4ece2603c4d504911cb3669e10222cb5bfd95caa 12SHA1 (patch-ao) = 4ece2603c4d504911cb3669e10222cb5bfd95caa
12SHA1 (patch-ar) = 8e13af23fb6d5c3a3140a43387955a922f88a48b 13SHA1 (patch-ar) = 8e13af23fb6d5c3a3140a43387955a922f88a48b
13SHA1 (patch-as) = f52658ae005ad3d68134a33878eb634e949a269a 14SHA1 (patch-as) = f52658ae005ad3d68134a33878eb634e949a269a
14SHA1 (patch-at) = 60e6c507049e3fd1723440859b90e828aac968ad 15SHA1 (patch-at) = 60e6c507049e3fd1723440859b90e828aac968ad
15SHA1 (patch-au) = 3d06c68c60cda13d235a440b13a07d11b8de7877 16SHA1 (patch-au) = 3d06c68c60cda13d235a440b13a07d11b8de7877
16SHA1 (patch-av) = 40f3a47adedce2a9286d4b3e1204266f46e3e4f7 17SHA1 (patch-av) = 40f3a47adedce2a9286d4b3e1204266f46e3e4f7
17SHA1 (patch-aw) = 8af9050101faf78fe82145400677d0a398aa7fec 18SHA1 (patch-aw) = 8af9050101faf78fe82145400677d0a398aa7fec

cvs diff -r1.2 -r1.3 pkgsrc/multimedia/transcode/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/multimedia/transcode/patches/Attic/patch-ac 2008/08/07 18:43:42 1.2
+++ pkgsrc/multimedia/transcode/patches/Attic/patch-ac 2008/09/15 12:46:44 1.3
@@ -1,40 +1,22 @@ @@ -1,40 +1,22 @@
1$NetBSD: patch-ac,v 1.2 2008/08/07 18:43:42 drochner Exp $ 1$NetBSD: patch-ac,v 1.3 2008/09/15 12:46:44 abs Exp $
2 2
3--- configure.orig 2008-07-26 10:06:43.000000000 +0200 3--- configure.orig 2008-07-26 10:06:43.000000000 +0200
4+++ configure 4+++ configure
5@@ -9833,7 +9833,7 @@ fi 5@@ -9833,7 +9833,7 @@ fi
6  6
7  7
8 case "$host_os" in 8 case "$host_os" in
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  11
12 cat >>confdefs.h <<\_ACEOF 12 cat >>confdefs.h <<\_ACEOF
13 #define SYS_BSD 1 13 #define SYS_BSD 1
14@@ -9865,7 +9865,7 @@ case "$host" in 14@@ -9865,7 +9865,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@@ -30886,7 +30886,7 @@ cat confdefs.h >>conftest.$ac_ext 
24 cat >>conftest.$ac_ext <<_ACEOF 
25 /* end confdefs.h. */ 
26 $ac_includes_default 
27-#include <libpostproc/postprocess.h> 
28+#include <postprocess.h> 
29 _ACEOF 
30 rm -f conftest.$ac_objext 
31 if { (ac_try="$ac_compile" 
32@@ -30926,7 +30926,7 @@ _ACEOF 
33 cat confdefs.h >>conftest.$ac_ext 
34 cat >>conftest.$ac_ext <<_ACEOF 
35 /* end confdefs.h. */ 
36-#include <libpostproc/postprocess.h> 
37+#include <postprocess.h> 
38 _ACEOF 
39 if { (ac_try="$ac_cpp conftest.$ac_ext" 
40 case "(($ac_try" in