From d2ad0039b6c470be6dfc7f999f3e11ecea661846 Mon Sep 17 00:00:00 2001 From: Zaheer Abbas Merali Date: Mon, 13 Mar 2006 10:45:27 +0000 Subject: [PATCH] fix deps and fix gst gnomevfs bug Package-Manager: portage-2.0.54 --- media-plugins/gst-plugins-gnomevfs/ChangeLog | 7 +- media-plugins/gst-plugins-gnomevfs/Manifest | 43 ++---------- .../files/digest-gst-plugins-gnomevfs-0.10.4 | 2 - .../gst-plugins-gnomevfs-0.10.4-fix.diff | 65 +++++++++++++++++++ .../gst-plugins-gnomevfs-0.10.4.ebuild | 14 +++- 5 files changed, 87 insertions(+), 44 deletions(-) create mode 100644 media-plugins/gst-plugins-gnomevfs/files/gst-plugins-gnomevfs-0.10.4-fix.diff diff --git a/media-plugins/gst-plugins-gnomevfs/ChangeLog b/media-plugins/gst-plugins-gnomevfs/ChangeLog index e0f350fc71a7..5a4e5c479275 100644 --- a/media-plugins/gst-plugins-gnomevfs/ChangeLog +++ b/media-plugins/gst-plugins-gnomevfs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/gst-plugins-gnomevfs # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gnomevfs/ChangeLog,v 1.78 2006/03/11 22:45:33 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gnomevfs/ChangeLog,v 1.79 2006/03/13 10:45:22 zaheerm Exp $ + + 13 Mar 2006; Zaheer Abbas Merali + +files/gst-plugins-gnomevfs-0.10.4-fix.diff, + gst-plugins-gnomevfs-0.10.4.ebuild: + fix deps and fix gst gnomevfs bug *gst-plugins-gnomevfs-0.10.4 (11 Mar 2006) diff --git a/media-plugins/gst-plugins-gnomevfs/Manifest b/media-plugins/gst-plugins-gnomevfs/Manifest index a940f0d0e8b4..5b64fc6d05f1 100644 --- a/media-plugins/gst-plugins-gnomevfs/Manifest +++ b/media-plugins/gst-plugins-gnomevfs/Manifest @@ -1,54 +1,19 @@ -MD5 cd3142ad2c19a12563c0eda6f8bd0f59 ChangeLog 9040 -RMD160 c034d5012aab77a7391c940b814a4c376494fc0d ChangeLog 9040 -SHA256 fca662d4c03caf4d10c09db080bbc0130546405f31666451e58b0772e686ef75 ChangeLog 9040 +MD5 43a9d2d9e7a2889cd484452d1a6cf9d8 ChangeLog 9217 MD5 da02faecf74602acd81e807174e8e89d files/digest-gst-plugins-gnomevfs-0.10.0 77 -RMD160 002939134d98d4c0cf79c6fc11212d2cd95b6544 files/digest-gst-plugins-gnomevfs-0.10.0 77 -SHA256 e75a88cb347541c450eae77cffbf5c5f42168d2076b9186554b7765ad5bcbefa files/digest-gst-plugins-gnomevfs-0.10.0 77 MD5 0558db8f3c6a0a66bc61b6a02f9aeb8d files/digest-gst-plugins-gnomevfs-0.10.1 77 -RMD160 6e2977a0b97a975056fa601b4fe3ea2acad8b2ee files/digest-gst-plugins-gnomevfs-0.10.1 77 -SHA256 84598b441cbc895d520dfebbd3a4661e3fdf4af6ccf0cf3193408af54cf245af files/digest-gst-plugins-gnomevfs-0.10.1 77 MD5 4d9a06718bb82db62ea71d1b2fc00ae3 files/digest-gst-plugins-gnomevfs-0.10.2 77 -RMD160 10413c5f1ef58ef250faba0fd8f821757d33794c files/digest-gst-plugins-gnomevfs-0.10.2 77 -SHA256 fc970518dbc39d0002049936f4849d8a81dc68b07599d7f856bf540a651f6299 files/digest-gst-plugins-gnomevfs-0.10.2 77 MD5 73770b61668a182a437ba54871c72cc1 files/digest-gst-plugins-gnomevfs-0.10.3 277 -RMD160 53fee61c0c0f4f5f560c0dbc4f958aa33a0da570 files/digest-gst-plugins-gnomevfs-0.10.3 277 -SHA256 f61f03734f890c5a33f3c26ce29474417bcc5b343b65c30ca3be7eeaff9e4e2e files/digest-gst-plugins-gnomevfs-0.10.3 277 -MD5 3477ec0d04649ccfcc545e28e0911bd3 files/digest-gst-plugins-gnomevfs-0.10.4 277 -RMD160 bee1889727ca635912779fbcac2958f0ceba48b0 files/digest-gst-plugins-gnomevfs-0.10.4 277 -SHA256 f47f4fd7829d14012ef690db4a45f568549f7a5015a00bd9ba03a41f3584e654 files/digest-gst-plugins-gnomevfs-0.10.4 277 +MD5 58ccc3b861a05d3e976d05df0ba51b97 files/digest-gst-plugins-gnomevfs-0.10.4 77 MD5 e5a6b80e2dfc0bf36559f4663fb90e25 files/digest-gst-plugins-gnomevfs-0.8.10 72 -RMD160 a62f001176838ce74072f94a1b7db75eccea58db files/digest-gst-plugins-gnomevfs-0.8.10 72 -SHA256 052afe5e12d0c26ff5292ba9fd8e884487c5afcc74c273e263b67df3e2ec5084 files/digest-gst-plugins-gnomevfs-0.8.10 72 MD5 875cb5640e2bc4b0162c08a6bc0fba6e files/digest-gst-plugins-gnomevfs-0.8.11 72 -RMD160 07cd6ccf43ed8faecb5ed4337eea60fbc6e3e3bb files/digest-gst-plugins-gnomevfs-0.8.11 72 -SHA256 a76335f344c7fb9dc3151468f9e4fab17f2112d74ba799a05906df748b74f5fd files/digest-gst-plugins-gnomevfs-0.8.11 72 MD5 41e1516e08a583a2f80f46dad873900c files/digest-gst-plugins-gnomevfs-0.8.12 72 -RMD160 8b2eba97f297dd77e2f30774b899c300bf6836d6 files/digest-gst-plugins-gnomevfs-0.8.12 72 -SHA256 13553c6cc65d4b9da823594715049ea6a89679f80d0f7e62aacef4bffef57cbf files/digest-gst-plugins-gnomevfs-0.8.12 72 +MD5 cadf70b870dbce1bc2812c599a30d5a6 files/gst-plugins-gnomevfs-0.10.4-fix.diff 2273 MD5 181ff489f1b0b4782017558c76e41612 gst-plugins-gnomevfs-0.10.0.ebuild 376 -RMD160 3c319d501bc934691f58cdaeb521e871a3951c17 gst-plugins-gnomevfs-0.10.0.ebuild 376 -SHA256 7bbed42c76e9492716f992a3fda00299b4b5b8e69a46c0d434242cdd5aff2463 gst-plugins-gnomevfs-0.10.0.ebuild 376 MD5 ba705d7a18851951bd671d91829746ff gst-plugins-gnomevfs-0.10.1.ebuild 377 -RMD160 0d9ab7606ef720aa04c540efe318d492f5b31604 gst-plugins-gnomevfs-0.10.1.ebuild 377 -SHA256 058cb1120a2925e9f5a76f15fa8ce0e421c59abe55de12b0e4e51a78c7be52ba gst-plugins-gnomevfs-0.10.1.ebuild 377 MD5 c94d24e19ef6a17ad8974a06e95a5071 gst-plugins-gnomevfs-0.10.2.ebuild 377 -RMD160 fcbd542719e4313a68a920a6bca9656801109ffa gst-plugins-gnomevfs-0.10.2.ebuild 377 -SHA256 6bcfafa1b8cb9ce91db3bb63dc44cd03edefc10abd2f8f5634ca12b27bbedf84 gst-plugins-gnomevfs-0.10.2.ebuild 377 MD5 0b9bcca00cdaa7a36e1f1b078e5f50d7 gst-plugins-gnomevfs-0.10.3.ebuild 377 -RMD160 f7d0465cff394410b234f2aa8a2487025c984b4b gst-plugins-gnomevfs-0.10.3.ebuild 377 -SHA256 e7ad638304a7a75cd633e64f7340b170e8884e603085a870f196da80228ec69a gst-plugins-gnomevfs-0.10.3.ebuild 377 -MD5 d1932151d24bc3826dbf7576444271ec gst-plugins-gnomevfs-0.10.4.ebuild 377 -RMD160 3507fdcc696b5042b8ec40cff0dc3b3e47b919ae gst-plugins-gnomevfs-0.10.4.ebuild 377 -SHA256 62184710a3793f01c97bef182f4948f721c242542e6b697ff00782906f776b02 gst-plugins-gnomevfs-0.10.4.ebuild 377 +MD5 44d5bde585a9898436ab168f41d80aec gst-plugins-gnomevfs-0.10.4.ebuild 565 MD5 3b69d2e3c742642e0e3fbc106af4f174 gst-plugins-gnomevfs-0.8.10.ebuild 411 -RMD160 2c9490d8e1efcbdad1a4c0b4cafb16c9f5c9c324 gst-plugins-gnomevfs-0.8.10.ebuild 411 -SHA256 0a4d65ac9826db944b342bb734ef24c5410b659e8625f06e43b471927d187728 gst-plugins-gnomevfs-0.8.10.ebuild 411 MD5 ac74ea93927c496532f79fb4bec9ee07 gst-plugins-gnomevfs-0.8.11.ebuild 413 -RMD160 69687cd0e5b1d4b92dfa80e801fc755e41ca989d gst-plugins-gnomevfs-0.8.11.ebuild 413 -SHA256 44f34ba06994c8a33545bb491a251e17c70eddd7cc265211aadb9f1a70d1a5b5 gst-plugins-gnomevfs-0.8.11.ebuild 413 MD5 dc7614bc9a916a0464755a9bf9b3f95b gst-plugins-gnomevfs-0.8.12.ebuild 420 -RMD160 8db1fe6f70e74b3934903a1bbea32cb252f2c365 gst-plugins-gnomevfs-0.8.12.ebuild 420 -SHA256 6650e336b3a5d45163db003c6adbdf8e379809927741f65210275df4ed6942d9 gst-plugins-gnomevfs-0.8.12.ebuild 420 MD5 6cf6f97e79b43eaf70fa938c431342a3 metadata.xml 181 -RMD160 51814fbdcf7f32cfe70018b3af7fc798e41ff90d metadata.xml 181 -SHA256 22c215902ccdc7fd8cdb765750fb23ea9d9b6c9d3edb1b45325c3469f8f6ffc5 metadata.xml 181 diff --git a/media-plugins/gst-plugins-gnomevfs/files/digest-gst-plugins-gnomevfs-0.10.4 b/media-plugins/gst-plugins-gnomevfs/files/digest-gst-plugins-gnomevfs-0.10.4 index cb035e6bf785..5ddb916d56cf 100644 --- a/media-plugins/gst-plugins-gnomevfs/files/digest-gst-plugins-gnomevfs-0.10.4 +++ b/media-plugins/gst-plugins-gnomevfs/files/digest-gst-plugins-gnomevfs-0.10.4 @@ -1,3 +1 @@ MD5 df2258ee6b2671a1d3f01685d999ac95 gst-plugins-base-0.10.4.tar.bz2 1097817 -RMD160 da837968b10a130dbeaa1953a3ad9f27586ba683 gst-plugins-base-0.10.4.tar.bz2 1097817 -SHA256 6c556051191364eacf05dcf01a9f3101240a6b6155e331e4cbcbfca55a91ca42 gst-plugins-base-0.10.4.tar.bz2 1097817 diff --git a/media-plugins/gst-plugins-gnomevfs/files/gst-plugins-gnomevfs-0.10.4-fix.diff b/media-plugins/gst-plugins-gnomevfs/files/gst-plugins-gnomevfs-0.10.4-fix.diff new file mode 100644 index 000000000000..aedd82e29d80 --- /dev/null +++ b/media-plugins/gst-plugins-gnomevfs/files/gst-plugins-gnomevfs-0.10.4-fix.diff @@ -0,0 +1,65 @@ +=================================================================== +RCS file: /srv/anoncvs.freedesktop.org/cvs/gstreamer/gst-plugins-base/ext/gnomevfs/gstgnomevfssrc.c,v +rcsdiff: /srv/anoncvs.freedesktop.org/cvs/gstreamer/gst-plugins-base/ext/gnomevfs/gstgnomevfssrc.c,v: warning: Unknown phrases like `commitid ...;' are present. +retrieving revision 1.82 +retrieving revision 1.83 +diff -u -r1.82 -r1.83 +--- gstgnomevfssrc.c 2006/03/09 17:50:59 1.82 ++++ gstgnomevfssrc.c 2006/03/11 16:40:20 1.83 +@@ -1075,26 +1075,45 @@ + gst_gnome_vfs_src_check_get_range (GstBaseSrc * basesrc) + { + GstGnomeVFSSrc *src; +- gboolean is_local; ++ const gchar *protocol; + + src = GST_GNOME_VFS_SRC (basesrc); + + if (src->uri == NULL) { + GST_WARNING_OBJECT (src, "no URI set yet"); +- /* don't know what to do, let the basesrc class decide for us */ +- if (GST_BASE_SRC_CLASS (parent_class)->check_get_range) +- return GST_BASE_SRC_CLASS (parent_class)->check_get_range (basesrc); +- else +- return FALSE; ++ return FALSE; ++ } ++ ++ if (gnome_vfs_uri_is_local (src->uri)) { ++ GST_LOG_OBJECT (src, "local URI (%s), assuming random access is possible", ++ GST_STR_NULL (src->uri_name)); ++ return TRUE; ++ } ++ ++ /* blacklist certain protocols we know won't work getrange-based */ ++ protocol = gnome_vfs_uri_get_scheme (src->uri); ++ if (protocol == NULL) ++ goto undecided; ++ ++ if (strcmp (protocol, "http") == 0) { ++ GST_LOG_OBJECT (src, "blacklisted protocol '%s', no random access possible" ++ " (URI=%s)", protocol, GST_STR_NULL (src->uri_name)); ++ return FALSE; + } + +- is_local = gnome_vfs_uri_is_local (src->uri); ++ /* fall through to undecided */ ++ ++undecided: ++ { ++ /* don't know what to do, let the basesrc class decide for us */ ++ GST_LOG_OBJECT (src, "undecided about URI '%s', let base class handle it", ++ GST_STR_NULL (src->uri_name)); + +- GST_LOG_OBJECT (src, "%s URI (%s), random access %spossible", +- (is_local) ? "local" : "remote", GST_STR_NULL (src->uri_name), +- (is_local) ? "" : "not "); ++ if (GST_BASE_SRC_CLASS (parent_class)->check_get_range) ++ return GST_BASE_SRC_CLASS (parent_class)->check_get_range (basesrc); + +- return is_local; ++ return FALSE; ++ } + } + + static gboolean diff --git a/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.4.ebuild b/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.4.ebuild index c0e41bb859fd..8ac111738da7 100644 --- a/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.4.ebuild +++ b/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.4.ebuild @@ -1,12 +1,22 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.4.ebuild,v 1.1 2006/03/11 22:45:34 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.4.ebuild,v 1.2 2006/03/13 10:45:27 zaheerm Exp $ inherit gst-plugins-base KEYWORDS="~x86 ~amd64" IUSE="" -DEPEND=">=gnome-base/gnome-vfs-2" +RDEPEND=">=media-libs/gst-plugins-base-0.10.4 + >=gnome-base/gnome-vfs-2" + +DEPEND="${RDEPEND}" GST_PLUGINS_BUILD="gnome_vfs" + +src_unpack() { + gst-plugins-base_src_unpack + + cd ${S}/ext/gnomevfs + epatch ${FILESDIR}/gst-plugins-gnomevfs-0.10.4-fix.diff +} -- 2.26.2