Drop old compat code that makes this break with libvpx-1.4, bug #545958 (from Fedora)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

diff --git a/media-plugins/gst-plugins-vp8/ChangeLog b/media-plugins/gst-plugins-vp8/ChangeLog
index 887dcb70ceb32396b430fc31788c6af8fe6458e3..ca20297a9785f86cff42257bbbcfcfb468ddf819 100644 (file)
--- a/media-plugins/gst-plugins-vp8/ChangeLog
+++ b/media-plugins/gst-plugins-vp8/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/gst-plugins-vp8
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vp8/ChangeLog,v 1.28 2014/08/07 20:04:10 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vp8/ChangeLog,v 1.29 2015/04/11 09:41:55 pacho Exp $
+
+*gst-plugins-vp8-0.10.23-r3 (11 Apr 2015)
+
+  11 Apr 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gst-plugins-vp8-0.10.23-drop-vpx-compat-defines.patch,
+  +gst-plugins-vp8-0.10.23-r3.ebuild, -gst-plugins-vp8-0.10.23-r1.ebuild:
+  Drop old compat code that makes this break with libvpx-1.4, bug #545958 (from
+  Fedora)
 
   07 Aug 2014; Jeroen Roovers <jer@gentoo.org>
   gst-plugins-vp8-0.10.23-r2.ebuild:

diff --git a/media-plugins/gst-plugins-vp8/Manifest b/media-plugins/gst-plugins-vp8/Manifest
index 8dc89f9d8bdf907fe9ccebceabb46574df6a96c3..21b0cc0dce4ba7be97b494c7dee89fcb03014924 100644 (file)
--- a/media-plugins/gst-plugins-vp8/Manifest
+++ b/media-plugins/gst-plugins-vp8/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gst-plugins-vp8-0.10.23-drop-vpx-compat-defines.patch 740 SHA256 65a5a2a23fd337d8781fc60310fbeeeeaba770346e02f991b1a615d8ccb89ef2 SHA512 10caf0c389717eec12636a6a848b4450b17c727bd05c835f6fe789c2f2c49056ea7cb17ed39818c935ce7dfbdf5ee4545cecd06b061d12ce8a9983a599c33eca WHIRLPOOL 3b314da88f874a71d51a8b99a48aa4ede9bae286835397cd22086cb36aeaf70ac3e51c74ee0b1c5a8196a74b3c6b5984d5b9d7608b171d9ae5ea81f806a759c3
 AUX gst-plugins-vp8-0.10.23-libvpx-1.1.patch 1590 SHA256 9ed46ba6135912426420c835f1b5f4c63d510518fad80776f96d396518661620 SHA512 3a3c7664202632526d5012955c839f1191042cb85572bf418ecdbf90c39647dfd8002d7e185c8c9e6a934c059ead29650df9557edf3645d0afaada73ebf5e26e WHIRLPOOL 9dd77d5f088e7a38781091b8b8dd09b32987dea416c5fc3b0fdb247d89236b344f1cb9b25cd3cb718f907a7ff67b463ceb755df16b49a75c83e4e39686045394
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-EBUILD gst-plugins-vp8-0.10.23-r1.ebuild 794 SHA256 2e524818ac2fbe88da18e9ba49683491f8365008e747430a7871c86348d1e625 SHA512 236741b5fe6aa0ce647c68dabbe59a0cb568070d9cfc07b18fa443b79644eb83c64155cd7f72c9be301c6e7223df372ad851f879a05f6669ecc3ff9176780276 WHIRLPOOL 67556e6f87e83c70536e4fad3ea132be21711e312ca1812230aaf8d7e2e32db1d9bac1d3d5462c946a79aa1418330bb8c8ba97f9af6d9f3f92a7f014c03bf601
 EBUILD gst-plugins-vp8-0.10.23-r2.ebuild 857 SHA256 962e81f2b9c46a44d67adf72e74fd1b9fd7330a03556ee779a0f96f0e6e15dae SHA512 9e44bdbe83ba88b4f7ff6b815c6872016bf0e5197f3ff198a882b6341bfeb34b9d0aa691908ff16f7e1813870f7584afbae9493a73dd6ee8588645ad4d2e69db WHIRLPOOL 248f9f13dcc47c935c22d7e0dd35dcee4c2f413993d9624ac157343b3011fd1379605906fef3581a8da7b6650adf0d555f7ae57d9b6a110cf3d0e0c3f1e8228f
-MISC ChangeLog 4354 SHA256 88c645dd24649b74e78e8d9cf180eba680550e3211540f909344c8ed4aef065d SHA512 df720003a2e89502c3164f2c00086d9dfcf2aa1db9598375b11a6216b135df00167585bef2ad958dcec334dc2731c102d8bf221fd94af990a3ad80c235f90b68 WHIRLPOOL 0a7af00abee1d8d6c9acf6e2cc91902f1019a6595dcfada41b9a84f10fa52467bf6c17172c72a60cc32c987ddb7bb6e1ff0216c2c4f6b57000cc587cd8e2c1cc
+EBUILD gst-plugins-vp8-0.10.23-r3.ebuild 1018 SHA256 56c21649fcfafa871233517fdf51a1b1d14e0ec8e8247f1269dcdab1037eea2b SHA512 90f9df78324d3e649da00d9f178550d41f86a1335628691aaf2e594d536214a74caa0b4f9e0d8ce098fb3c67979653c207e87f7814a70989ea46807e5bbfd9a2 WHIRLPOOL b7028f077d8345b30d6d0b3a118696113c591183197638e7a4ae1f4e210653b16c38357266068d43a0940d2c0a870fc04313be6dfc840e961128136b91d2225c
+MISC ChangeLog 4674 SHA256 e16b911abe5f3b578bb96aff77897b1da1a45d3b0da33e66e599e4f00486ead2 SHA512 e8780fe6a92d993337e4595672aaaf6017229b6fd216d5b551bde4d7ce786f8b00b6288e9b6c4b6d51fb4155505a844812b1ff2cf4531cdf09178eba9d692e50 WHIRLPOOL 90ff2eb780fc058114f373dd5a4fa4a4f90172592dfa105fd38e797255f2d04aeef5107ba8ab0f88f002a35b21752f24221fcb86b2297ac49d000e37791df632
 MISC metadata.xml 162 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1 SHA512 8b02f1dfc23c5609db66995b8b5f3b371d7c9ec232bd8117177af0522cd521f0217f5b49fb512213cb3db606c00df2511e0874ca0cac490ded306a8ddcfb5185 WHIRLPOOL b6621e0156545e7b124a3f55c2fe03a8878eb44d1b54fc3373adf9915dfe9c57a411741daf8863af74fdec93bacf929e905aa50954f906cec098bf0c4ddf2652
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPj27wACgkQVWmRsqeSphOa2gCfRwqYfxI3L2g0ComoluHxEunO
-pl4AnAvt2dBdNqLH9gMWt6TN/tL05zfv
-=TkG7
+iEYEAREIAAYFAlUo7FwACgkQCaWpQKGI+9S0iwCdEXqowNJ9kGiMHKTckNyY9nGd
+qqQAn0GI6vxBFv7VYWxwAHULc7TMytA0
+=SgMP
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/gst-plugins-vp8/files/gst-plugins-vp8-0.10.23-drop-vpx-compat-defines.patch b/media-plugins/gst-plugins-vp8/files/gst-plugins-vp8-0.10.23-drop-vpx-compat-defines.patch
new file mode 100644 (file)
index 0000000..599ec08
--- /dev/null
+++ b/media-plugins/gst-plugins-vp8/files/gst-plugins-vp8-0.10.23-drop-vpx-compat-defines.patch
@@ -0,0 +1,27 @@
+diff -up gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h.drop-compat-defines gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h
+--- gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h.drop-compat-defines  2015-04-07 09:28:01.637679239 -0400
++++ gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h      2015-04-07 09:28:10.397622550 -0400
+@@ -25,23 +25,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-/* Some compatibility defines for older libvpx versions */
+-#ifndef VPX_IMG_FMT_I420
+-#define VPX_IMG_FMT_I420 IMG_FMT_I420
+-#endif
+-
+-#ifndef VPX_PLANE_Y
+-#define VPX_PLANE_Y PLANE_Y
+-#endif
+-
+-#ifndef VPX_PLANE_U
+-#define VPX_PLANE_U PLANE_U
+-#endif
+-
+-#ifndef VPX_PLANE_V
+-#define VPX_PLANE_V PLANE_V
+-#endif
+-
+ const char * gst_vpx_error_name (vpx_codec_err_t status);
+ 
+ G_END_DECLS

diff --git a/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild b/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild
deleted file mode 100644 (file)
index db5cf1e..0000000
--- a/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild,v 1.9 2013/06/19 13:39:01 jer Exp $
-
-EAPI="5"
-
-inherit eutils gst-plugins-bad gst-plugins10
-
-DESCRIPTION="GStreamer decoder for vpx video format"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/libvpx"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-       # Fix zero-bitrate vp8 encoding with libvpx-1.1, bug #435282
-       epatch "${FILESDIR}/${PN}-0.10.23-libvpx-1.1.patch"
-
-       gst-plugins10_find_plugin_dir
-       # gstbasevideo has no .pc
-       sed -e "s:\$(top_builddir)/gst-libs/gst/video/.*\.la:-lgstbasevideo-${SLOT}:" \
-               -i Makefile.am Makefile.in || die
-}

diff --git a/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r3.ebuild b/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r3.ebuild
new file mode 100644 (file)
index 0000000..4187e23
--- /dev/null
+++ b/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r3.ebuild,v 1.1 2015/04/11 09:41:55 pacho Exp $
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-bad
+inherit eutils gstreamer
+
+DESCRIPTION="GStreamer decoder for vpx video format"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+       # Fix zero-bitrate vp8 encoding with libvpx-1.1, bug #435282
+       epatch "${FILESDIR}/${PN}-0.10.23-libvpx-1.1.patch"
+
+       # Drop old compat code that makes this break with libvpx-1.4, bug #545958 (from Fedora)
+       epatch "${FILESDIR}/${PN}-0.10.23-drop-vpx-compat-defines.patch"
+
+       local pdir=$(gstreamer_get_plugin_dir)
+       # gstbasevideo has no .pc
+       sed -e "s:\$(top_builddir)/gst-libs/gst/video/.*\.la:-lgstbasevideo-${SLOT}:" \
+               -i "${pdir}"/Makefile.{am,in} || die
+}