summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2010-03-21 12:25:44 -0700
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2010-03-21 16:31:24 -0700
commit48cde1a4dacf194b52a80d807947fb9a2c5af9aa (patch)
treeafea82d121d036a37050bec3991eeca05860ac57
parentddd8705cd611e0db9aa5b8b21dbf9da5e7fb2f7f (diff)
downloadgstreamer-48cde1a4dacf194b52a80d807947fb9a2c5af9aa.tar.gz
gstreamer-48cde1a4dacf194b52a80d807947fb9a2c5af9aa.tar.xz
version bump for gst-plugins-ugly
-rw-r--r--packages/media-plugins/gst-plugins-ugly/files/gst-plugins-ugly-0.10.13-x264.patch19
-rw-r--r--packages/media-plugins/gst-plugins-ugly/gst-plugins-ugly-0.10.14.exheres-0 (renamed from packages/media-plugins/gst-plugins-ugly/gst-plugins-ugly-0.10.13.exheres-0)9
2 files changed, 2 insertions, 26 deletions
diff --git a/packages/media-plugins/gst-plugins-ugly/files/gst-plugins-ugly-0.10.13-x264.patch b/packages/media-plugins/gst-plugins-ugly/files/gst-plugins-ugly-0.10.13-x264.patch
deleted file mode 100644
index 9f327df..0000000
--- a/packages/media-plugins/gst-plugins-ugly/files/gst-plugins-ugly-0.10.13-x264.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2009-October/006408.html
-Upstream: yes, #599095
-Reason: Adapt to slightly modified x264 API
-
-diff -up gst-plugins-ugly-0.10.12/ext/x264/gstx264enc.c.x264 gst-plugins-ugly-0.10.12/ext/x264/gstx264enc.c
---- gst-plugins-ugly-0.10.12/ext/x264/gstx264enc.c.x264 2009-06-05 22:02:52.000000000 +0200
-+++ gst-plugins-ugly-0.10.12/ext/x264/gstx264enc.c 2009-10-26 16:44:43.000000000 +0100
-@@ -576,7 +576,11 @@ gst_x264_enc_init_encoder (GstX264Enc *
- encoder->x264param.analyse.i_noise_reduction = encoder->noise_reduction;
- encoder->x264param.i_frame_reference = encoder->ref;
- encoder->x264param.i_bframe = encoder->bframes;
-+#if X264_BUILD < 78
- encoder->x264param.b_bframe_pyramid = encoder->b_pyramid;
-+#else
-+ encoder->x264param.i_bframe_pyramid = encoder->b_pyramid;
-+#endif
- #if X264_BUILD < 63
- encoder->x264param.b_bframe_adaptive = encoder->b_adapt;
- #else
diff --git a/packages/media-plugins/gst-plugins-ugly/gst-plugins-ugly-0.10.13.exheres-0 b/packages/media-plugins/gst-plugins-ugly/gst-plugins-ugly-0.10.14.exheres-0
index 9387532..ea2d265 100644
--- a/packages/media-plugins/gst-plugins-ugly/gst-plugins-ugly-0.10.13.exheres-0
+++ b/packages/media-plugins/gst-plugins-ugly/gst-plugins-ugly-0.10.14.exheres-0
@@ -37,18 +37,13 @@ DEPENDENCIES="
gstreamer_plugins:dvdread? ( media-libs/libdvdread )
gstreamer_plugins:h264? ( media-libs/x264 )
gstreamer_plugins:lame? ( media-sound/lame )
- gstreamer_plugins:mad? (
- media-libs/libmad[>=0.15]
- media-libs/libid3tag[>=0.15]
- )
+ gstreamer_plugins:mad? ( media-libs/libmad[>=0.15]
+ media-libs/libid3tag[>=0.15] )
gstreamer_plugins:mp2? ( media-libs/twolame[>=0.3.10] )
gstreamer_plugins:mpeg2? ( media-libs/libmpeg2[>=0.4.0] )
"
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-x264.patch" )
-
DEFAULT_SRC_CONFIGURE_PARAMS=(
-'--disable-shave'
'--enable-experimental'
'--enable-asfdemux'