[arch-commits] Commit in gstreamer0.10-bad-plugins/repos (3 files)

[Jan de Groot]

    Date: Sunday, March 8, 2009 @ 16:59:53
  Author: jgc
Revision: 29483

Merged revisions 27459,29467,29470 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gstreamer0.10-bad-plugins/trunk

........
  r27459 | eric | 2009-02-22 02:26:25 +0000 (Sun, 22 Feb 2009) | 2 lines
  
  upgpkg: gstreamer0.10-bad-plugins 0.10.9-4
      Rebuilt against faad2 2.7, Rebuilt against x264 20090216
........
  r29467 | jgc | 2009-03-08 19:38:14 +0000 (Sun, 08 Mar 2009) | 1 line
  
  upgpkg: gstreamer0.10-bad-plugins 0.10.10-1
........
  r29470 | jgc | 2009-03-08 19:48:59 +0000 (Sun, 08 Mar 2009) | 2 lines
  
  upgpkg: gstreamer0.10-bad-plugins 0.10.10-2
      Rebuild for x264/faad2
........

Modified:
  gstreamer0.10-bad-plugins/repos/extra-i686/	(properties)
  gstreamer0.10-bad-plugins/repos/extra-i686/PKGBUILD
Deleted:
  gstreamer0.10-bad-plugins/repos/extra-i686/gst-x264.patch

----------------+
 PKGBUILD       |   10 ++++------
 gst-x264.patch |   12 ------------
 2 files changed, 4 insertions(+), 18 deletions(-)


Property changes on: gstreamer0.10-bad-plugins/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gstreamer0.10-bad-plugins/trunk:1-24061
   + /gstreamer0.10-bad-plugins/trunk:1-29482

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-08 20:50:31 UTC (rev 29482)
+++ extra-i686/PKGBUILD	2009-03-08 20:59:53 UTC (rev 29483)
@@ -2,12 +2,12 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gstreamer0.10-bad-plugins
-pkgver=0.10.9
-pkgrel=3
+pkgver=0.10.10
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)"
 arch=(i686 x86_64)
 license=('LGPL' 'GPL')
-depends=("gstreamer0.10-bad>=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394>=2.0.1' 'exempi' 'jack-audio-connection-kit' 'neon>=0.27.2' 'faac>=1.26' 'libexif' 'musicbrainz>=2.1.5' 'faad2>=2.6.1' 'libmms' 'x264>=20090108' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav>=0.1.10')
+depends=("gstreamer0.10-bad>=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394>=2.0.1' 'exempi' 'jack-audio-connection-kit' 'neon>=0.27.2' 'faac>=1.26' 'libexif' 'musicbrainz>=2.1.5' 'faad2>=2.7' 'libmms' 'x264>=20090216' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav>=0.1.10')
 makedepends=('pkgconfig' 'ladspa')
 provides=("gstreamer0.10-cdaudio=${pkgver}" "gstreamer0.10-musicbrainz=${pkgver}" "gstreamer0.10-sndfile=${pkgver}" "gstreamer0.10-mpeg2enc=${pkgver}" "gstreamer0.10-bz2=${pkgver}" "gstreamer0.10-sdl=${pkgver}" "gstreamer0.10-faac=${pkgver}" "gstreamer0.10-alsaspdif=${pkgver}" "gstreamer0.10-xvid=${pkgver}" "gstreamer0.10-faad=${pkgver}" "gstreamer0.10-musepack=${pkgver}" "gstreamer0.10-mms=${pkgver}" "gstreamer0.10-x264=${pkgver}" "gstreamer0.10-neon=${pkgver}" "gstreamer0.10-ladspa=${pkgver}" "gstreamer0.10-dts=${pkgver}" "gstreamer0.10-jack=${pkgver}" "gstreamer0.10-metadata=${pkgver}" "gst-plugins-bad=${pkgver}")
 conflicts=('gstreamer0.10-cdaudio' 'gstreamer0.10-musicbrainz' 'gstreamer0.10-sndfile' 'gstreamer0.10-mpeg2enc' 'gstreamer0.10-bz2' 'gstreamer0.10-sdl' 'gstreamer0.10-faac' 'gstreamer0.10-alsaspdif' 'gstreamer0.10-xvid' 'gstreamer0.10-faad' 'gstreamer0.10-musepack' 'gstreamer0.10-mms' 'gstreamer0.10-x264' 'gstreamer0.10-neon' 'gstreamer0.10-ladspa' 'gstreamer0.10-dts' 'gstreamer0.10-jack' 'gstreamer0.10-metadata')
@@ -16,12 +16,10 @@
 options=(!libtool)
 _relname=gst-plugins-bad
 groups=('gstreamer0.10-plugins')
-source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2 gst-x264.patch)
-md5sums=('ff555a86e74a9249e56b43405c8df3e4' 'aa630a2f42d6fc5e43419d542c38f955')
+source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
 
 build() {
   cd "${srcdir}/${_relname}-${pkgver}"
-  patch -p1 < ../gst-x264.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
     --disable-docs-build --disable-plugin-docs \

Deleted: extra-i686/gst-x264.patch
===================================================================
--- extra-i686/gst-x264.patch	2009-03-08 20:50:31 UTC (rev 29482)
+++ extra-i686/gst-x264.patch	2009-03-08 20:59:53 UTC (rev 29483)
@@ -1,12 +0,0 @@
-diff -up gst-plugins-bad-0.10.9/ext/x264/gstx264enc.c.x264 gst-plugins-bad-0.10.9/ext/x264/gstx264enc.c
---- gst-plugins-bad-0.10.9/ext/x264/gstx264enc.c.x264	2008-10-11 01:13:43.000000000 +0200
-+++ gst-plugins-bad-0.10.9/ext/x264/gstx264enc.c	2008-12-14 22:26:13.000000000 +0100
-@@ -541,7 +541,7 @@ 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;
--  encoder->x264param.b_bframe_adaptive = encoder->b_adapt;
-+  encoder->x264param.i_bframe_adaptive = encoder->b_adapt;
-   encoder->x264param.b_interlaced = encoder->interlaced;
-   encoder->x264param.b_deblocking_filter = 1;
-   encoder->x264param.i_deblocking_filter_alphac0 = 0;