[pkgsrc/pkgsrc-2008Q4]: pkgsrc/multimedia/gst-plugins0.10-bad Pullup ticket #...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c2f2d2ccca8b
branches:  pkgsrc-2008Q4
changeset: 552297:c2f2d2ccca8b
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Feb 02 15:13:12 2009 +0000

description:
Pullup ticket #2679 - requested by rafal
gst-plugins0.10-bad: build fix

Revisions pulled up:
- multimedia/gst-plugins0.10-bad/distinfo               1.10
- multimedia/gst-plugins0.10-bad/patches/patch-ab       1.4
---
Module Name:    pkgsrc
Committed By:   drochner
Date:           Fri Jan  9 16:43:42 UTC 2009

Modified Files:
        pkgsrc/multimedia/gst-plugins0.10-bad: distinfo
        pkgsrc/multimedia/gst-plugins0.10-bad/patches: patch-ab

Log Message:
pull in a patch from upstream CVS, to adapt to an API change in recent
x264 libs, see Gnome bugzilla#555238
should fix PR pkg/40351 by Robert Elz

diffstat:

 multimedia/gst-plugins0.10-bad/distinfo         |   4 ++--
 multimedia/gst-plugins0.10-bad/patches/patch-ab |  21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r 8a8e19b3c395 -r c2f2d2ccca8b multimedia/gst-plugins0.10-bad/distinfo
--- a/multimedia/gst-plugins0.10-bad/distinfo   Mon Feb 02 07:27:13 2009 +0000
+++ b/multimedia/gst-plugins0.10-bad/distinfo   Mon Feb 02 15:13:12 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2008/12/15 21:31:59 hasso Exp $
+$NetBSD: distinfo,v 1.9.2.1 2009/02/02 15:13:12 tron Exp $
 
 SHA1 (gst-plugins-bad-0.10.9.tar.bz2) = 67895310074f439f0504bea5bacc26d07be2cf5d
 RMD160 (gst-plugins-bad-0.10.9.tar.bz2) = 98a2f901474afa21209c4cfdf453cb41fbf4305a
 Size (gst-plugins-bad-0.10.9.tar.bz2) = 2323971 bytes
 SHA1 (patch-aa) = a8b1f65424b76ead54553de6158d51a1ae58a8c2
-SHA1 (patch-ab) = eb851091bdf3c262383474bbe52e270520380f60
+SHA1 (patch-ab) = c7597c14bc0d30241859b958395b5a48e8324d40
 SHA1 (patch-ac) = f83a2eb523f0af4f3b63df425123394354b92c64
diff -r 8a8e19b3c395 -r c2f2d2ccca8b multimedia/gst-plugins0.10-bad/patches/patch-ab
--- a/multimedia/gst-plugins0.10-bad/patches/patch-ab   Mon Feb 02 07:27:13 2009 +0000
+++ b/multimedia/gst-plugins0.10-bad/patches/patch-ab   Mon Feb 02 15:13:12 2009 +0000
@@ -1,8 +1,21 @@
-$NetBSD: patch-ab,v 1.3 2008/10/30 21:21:32 wiz Exp $
+$NetBSD: patch-ab,v 1.3.2.1 2009/02/02 15:13:12 tron Exp $
 
---- ext/x264/gstx264enc.c.orig 2008-10-10 23:13:43.000000000 +0000
+--- ext/x264/gstx264enc.c.orig 2008-12-21 21:54:04.000000000 +0100
 +++ ext/x264/gstx264enc.c
-@@ -661,8 +661,7 @@ gst_x264_enc_header_buf (GstX264Enc * en
+@@ -541,7 +541,12 @@ gst_x264_enc_init_encoder (GstX264Enc * 
+   encoder->x264param.i_frame_reference = encoder->ref;
+   encoder->x264param.i_bframe = encoder->bframes;
+   encoder->x264param.b_bframe_pyramid = encoder->b_pyramid;
++#if X264_BUILD < 63
+   encoder->x264param.b_bframe_adaptive = encoder->b_adapt;
++#else
++  encoder->x264param.i_bframe_adaptive =
++      encoder->b_adapt ? X264_B_ADAPT_FAST : X264_B_ADAPT_NONE;
++#endif
+   encoder->x264param.b_interlaced = encoder->interlaced;
+   encoder->x264param.b_deblocking_filter = 1;
+   encoder->x264param.i_deblocking_filter_alphac0 = 0;
+@@ -661,8 +666,7 @@ gst_x264_enc_header_buf (GstX264Enc * en
    /* x264 is expected to return an SEI (some identification info),
     * followed by an SPS and PPS */
    if (i_nal != 3 || nal[1].i_type != 7 || nal[2].i_type != 8) {
@@ -12,7 +25,7 @@
      return NULL;
    }
  
-@@ -935,8 +934,7 @@ gst_x264_enc_encode_frame (GstX264Enc * 
+@@ -935,8 +939,7 @@ gst_x264_enc_encode_frame (GstX264Enc * 
      duration = GST_BUFFER_DURATION (in_buf);
      gst_buffer_unref (in_buf);
    } else {