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

4 files changed, 19 insertions, 23 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 3f78c2fed35..c10d69663cf 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2008/09/11 18:21:49 ahoka Exp $
+# $NetBSD: Makefile,v 1.49 2008/09/15 12:46:44 abs Exp $
 #
 
 DISTNAME=	transcode-1.0.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fromani.exit1.org/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index 07daeb0524c..800783ce88e 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.14 2008/08/26 13:21:59 drochner Exp $
+$NetBSD: distinfo,v 1.15 2008/09/15 12:46:44 abs Exp $
 
 SHA1 (transcode-1.0.6.tar.bz2) = 07905f6b0bd5eda881cbce2d8678c13beed47acb
 RMD160 (transcode-1.0.6.tar.bz2) = 46d53cdd2b60032ccd8dc8bb53007e3903f6e1bb
 Size (transcode-1.0.6.tar.bz2) = 1937157 bytes
 SHA1 (patch-aa) = 01c2093ff606b4a0744dd0b8e5422277d081b8f2
 SHA1 (patch-ab) = ce8477442d9e9bb5680fef2aacd6e496f95a5ff2
-SHA1 (patch-ac) = bf40057155e9955e6829c9e6eb9f0a4cc5c8c106
+SHA1 (patch-ac) = 392fe7c9b0c3361662de49ab13ea2f7c23f0fb0b
+SHA1 (patch-ad) = 3183822ac86a15a69b76db17d763a212c1a0a46d
 SHA1 (patch-ae) = 901c88fb1a47d9a4b084d2d3918390584cdf9c42
 SHA1 (patch-aj) = ff2d3ed5e82d4c669561ab041fb709ff3db91f75
 SHA1 (patch-ao) = 4ece2603c4d504911cb3669e10222cb5bfd95caa
diff --git a/multimedia/transcode/patches/patch-ac b/multimedia/transcode/patches/patch-ac
index 3dbe00f3681..1c463c23dd6 100644
--- a/multimedia/transcode/patches/patch-ac
+++ b/multimedia/transcode/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2008/08/07 18:43:42 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2008/09/15 12:46:44 abs Exp $
 
 --- configure.orig	2008-07-26 10:06:43.000000000 +0200
 +++ configure
@@ -20,21 +20,3 @@ $NetBSD: patch-ac,v 1.2 2008/08/07 18:43:42 drochner Exp $
  fi
  if test -n "$PTHREAD_CFLAGS" ; then
    pthread_cflags="$PTHREAD_CFLAGS"
-@@ -30886,7 +30886,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <libpostproc/postprocess.h>
-+#include <postprocess.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -30926,7 +30926,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <libpostproc/postprocess.h>
-+#include <postprocess.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in
diff --git a/multimedia/transcode/patches/patch-ad b/multimedia/transcode/patches/patch-ad
new file mode 100644
index 00000000000..25d7ac959cf
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.5 2008/09/15 12:47:04 abs Exp $
+
+--- filter/pp/filter_pp.c.orig	2005-07-04 08:23:01.000000000 +0100
++++ filter/pp/filter_pp.c
+@@ -35,7 +35,7 @@
+ #include <ctype.h>
+ #include <inttypes.h>
+ 
+-#include "postprocess.h"
++#include "libpostproc/postprocess.h"
+ 
+ static pp_mode_t *mode[MAX_FILTER];
+ static pp_context_t *context[MAX_FILTER];