Fix dlopen() for libmp4v2.so.2 from media-libs/libmp4v2 >= 1.9.1_p479.

Package-Manager: portage-2.2.0_alpha92/cvs/Linux x86_64

4 files changed, 123 insertions, 9 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 7bcfe5ac714b..a12a814f1443 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.95 2012/02/23 06:49:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.96 2012/03/21 09:10:21 ssuominen Exp $
+
+*gtkpod-2.1.1-r1 (21 Mar 2012)
+
+  21 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> +gtkpod-2.1.1-r1.ebuild,
+  +files/gtkpod-2.1.1-libmp4v2_so_2.patch:
+  Fix dlopen() for libmp4v2.so.2 from media-libs/libmp4v2 >= 1.9.1_p479.
 
 *gtkpod-2.1.1 (23 Feb 2012)
 
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index b2155e5ce6c7..fb141c9e8746 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gtkpod-2.1.1-libmp4v2_so_2.patch 511 RMD160 2e53de0276bc5a30cebbd0026093fadac031ffe1 SHA1 e0413bb836daf354a88b639c6faf861d05dbd923 SHA256 401daaac2fc81df23df3ba78bd62c71d8e1c0516176b6692f03f72f45aea185b
 DIST gtkpod-2.0.2.tar.gz 2982482 RMD160 0810947c013c137f57599a999f63d07d6710b6c7 SHA1 d93e7618653d00a8bc845fd070305c5b38eea1e8 SHA256 2c5dd3d193cd73ba107ccb158e48198768f1dd26724834f8f5ab804281ea4648
 DIST gtkpod-2.1.0.tar.gz 2988353 RMD160 238bb6155960045815f71c0ff0d5e087d369e2d2 SHA1 aede305a68bb49ee3ed76dcc3a90830124a064f8 SHA256 6f617d765028ec7929c96610dbbfddbd3cf7746730b48d1f2219f79e3de02f7a
 DIST gtkpod-2.1.1.tar.gz 3120542 RMD160 5f30795cf7cda5744181f56875c7648d430d76fc SHA1 aa0bd06395f878bdf9578f8e4350536216fcd2b6 SHA256 a474bb44ed42df554b02c2bd592485ee4fbe91cb9d0fe43576a63bb8b174c37a
 EBUILD gtkpod-2.0.2.ebuild 2145 RMD160 7eb1d34ceb7ff76434da36920a5822879e5d2e75 SHA1 76cdcbb79bc73ff232381ca3a28a5daad8b6d1f6 SHA256 f0b6bd61dc4ab1558d5d37db3398ef8795e8e645be888228b935ebb92e0e9e86
 EBUILD gtkpod-2.1.0.ebuild 2167 RMD160 f00fa71d8774072c3811349c995a1e5f49289223 SHA1 bdf8033fdd013f46461525389f3914918303973c SHA256 3a82690ceeb84925a24577da46f06f9a8e2b59a653f63e3ecf473855e56c9775
+EBUILD gtkpod-2.1.1-r1.ebuild 2110 RMD160 bfa35d906001d4c518fddd3e927f03fa9d531acb SHA1 86c7d7832f9a7ae8dc2ce0aaed43aaff3b00d947 SHA256 757be68c1be96987c155761fde5862cba3f3206216f433ec14aff1ccc05491f5
 EBUILD gtkpod-2.1.1.ebuild 2027 RMD160 7cf7d3f8474c84af40438a5a3183c154e0b6b4f6 SHA1 0888285acff6c88463c08638f8e8e21da0a66c04 SHA256 34fa9338292822811da361b67793b69114ae6c7b1db95151fc5c3cf394a2cb3f
-MISC ChangeLog 11832 RMD160 ac3276cb742e010aae0116fbd28c336ebaf52e98 SHA1 f7dc6eb9bb076ef020fe3eb86d70c9f2eab6f35d SHA256 16a52b916cbd5bc24161f8e1c2d8bc77ebd2aa8f110f4cff4f85e39dd5516c0d
+MISC ChangeLog 12060 RMD160 963919fc41bc007ed23da6b3842470786f857f6a SHA1 cefe7fe03a3053ade538705bc1ad55411f2ef476 SHA256 6b7ccfd64d85a7b896b59ced6fe4b57cf0725540e41893d6f868eba934602c1e
 MISC metadata.xml 428 RMD160 c40c3a378f712e2d05f3e9115c1f3c451bbfa361 SHA1 1c1bf125d989ce79c5cb34851bb164251c40ac9c SHA256 b181f09ad8688911dbcccc8a25e2043db62c7c5697d6ac70645f9c3d639f52d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPReFqAAoJEEdUh39IaPFNqJ0H/j3AvJCjX8TlcyCuNUqANDyt
-Q4yOq3s+NKivWydxXpgSaFUe7ZXOQZ/tn1h98klmFnQVRDTlb+EYyZj9+HKpa/mV
-mbVSPVCAwYXfWSuyvkb/RzRkZhqIWxr9KCGRJlRPWMd9oQELqrOsnKhRmjABSZFy
-mZRQJt8hWxThI+2ofLvp/AF3FZ8svWzkqTOsdJcqzMSuBdYJlZvbJcFbJjgMaOct
-iTlMqyNf3b0Wowxg/9X0/zKwsRaBrEqEHkBPbI4cvaGemKJyJUAqar6gUjUmGLPc
-XwiHGSEHiNOYo61j+ndeNgB8EpRlVDJA1BILVxUmzoURSaPab6qm2mPAcTS+AR0=
-=KyYI
+iQEcBAEBAgAGBQJPaZr/AAoJEEdUh39IaPFNlVQH/jtPHzbdeSu64u+R1YqB2Ng4
+Md0Z7YjfqOrAJB/bwJuAA9emR2O0mRxcQbQrMXgd42rTxV90FRC1XQyqP9o1BHH4
+HAeX4xMOnXKZY/SWZlwRYn8d9YYjEj0ISiR+XnJ9qDdNva+E+vDOWpJkopUXDxJ0
+vQZf2M8dG0u56D+ova1JQuBG3XB5M+JJGa82hWbgQ34NE2u3keyjwQD0wi5JV/tQ
+vXnRgiNf6Nk7uvLhD3t9ARruvRyyEg/XBerd63J1wcIPSMiA6jIX0PD+O5V3vaAS
+1kKELZFSe/9zYB9OFRsdD/F0qpEw5KmXLxEPE88HpkTxZaZ/dsgmF/Wjd+jdqww=
+=UR34
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/files/gtkpod-2.1.1-libmp4v2_so_2.patch b/app-pda/gtkpod/files/gtkpod-2.1.1-libmp4v2_so_2.patch
new file mode 100644
index 000000000000..130124b79192
--- /dev/null
+++ b/app-pda/gtkpod/files/gtkpod-2.1.1-libmp4v2_so_2.patch
@@ -0,0 +1,17 @@
+Fix loading of libmp4v2.so.2 from mp4v2-1.9.1_p497
+
+--- plugins/filetype_mp4/mp4file.c
++++ plugins/filetype_mp4/mp4file.c
+@@ -317,10 +317,10 @@
+ /* mp4v2 initialization code */
+ 
+ void mp4_init() {
+-    mp4v2_handle = dlopen("libmp4v2.so.1", RTLD_LAZY);
++    mp4v2_handle = dlopen("libmp4v2.so.2", RTLD_LAZY);
+ 
+     if (!mp4v2_handle) {
+-        mp4v2_handle = dlopen("libmp4v2.so.0", RTLD_LAZY);
++        mp4v2_handle = dlopen("libmp4v2.so.1", RTLD_LAZY);
+ 
+         if (!mp4v2_handle) {
+             return;
diff --git a/app-pda/gtkpod/gtkpod-2.1.1-r1.ebuild b/app-pda/gtkpod/gtkpod-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..51fee988a3e1
--- /dev/null
+++ b/app-pda/gtkpod/gtkpod-2.1.1-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.1-r1.ebuild,v 1.1 2012/03/21 09:10:21 ssuominen Exp $
+
+EAPI=4
+inherit eutils gnome2-utils
+
+DESCRIPTION="A graphical user interface to the Apple productline"
+HOMEPAGE="http://gtkpod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac clutter curl flac gstreamer mp3 vorbis webkit"
+
+COMMON_DEPEND="dev-libs/gdl:3
+	>=dev-libs/glib-2.28.5
+	>=dev-libs/libxml2-2.7.7
+	>=dev-util/anjuta-2.91
+	>=media-libs/libgpod-0.7.0
+	>=media-libs/libid3tag-0.15
+	>=x11-libs/gtk+-3.0.8:3
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2
+		)
+	clutter? ( media-libs/clutter-gtk:1.0 )
+	curl? ( >=net-misc/curl-7.10 )
+	flac? ( media-libs/flac )
+	gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 )
+	mp3? ( media-sound/lame )
+	vorbis? (
+		media-libs/libvorbis
+		media-sound/vorbis-tools
+		)
+	webkit? ( >=net-libs/webkit-gtk-1.3:3 )"
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? ( media-plugins/gst-plugins-meta:0.10 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/os-headers"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1.1-libmp4v2_so_2.patch
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable webkit plugin-coverweb) \
+		$(use_enable clutter plugin-clarity) \
+		$(use_enable gstreamer plugin-media-player) \
+		$(use_with curl) \
+		$(use_with vorbis ogg) \
+		$(use_with flac) \
+		$(use_with aac faad)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF}/html \
+		figuresdir=/usr/share/doc/${PF}/html/figures \
+		install
+
+	dodoc AUTHORS ChangeLog NEWS README TODO TROUBLESHOOTING
+
+	find "${D}" -name '*.la' -exec rm -f {} +
+	rm -f "${D}"/usr/share/gtkpod/data/{AUTHORS,COPYING}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}