1 |
commit: c819a214c2fe88e90acb63d87c065a8ed21514ca |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 2 23:42:07 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Fri Dec 2 23:42:07 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c819a214 |
7 |
|
8 |
media-libs/gmyth: fix building with modern curl (bug #386889) |
9 |
|
10 |
Add a patch to not use obsolete curl/types.h (bug #386889, thanks to |
11 |
alvinwu <wualvin <AT> eternalit.com> for reporting). |
12 |
Add a patch to fix building with --as-needed. |
13 |
Port to EAPI4. |
14 |
Add static-libs USE flag, and drop .la files when building non-static. |
15 |
|
16 |
--- |
17 |
media-libs/gmyth/files/gmyth-0.7.1-as-needed.patch | 22 ++++++++++++++++++++ |
18 |
media-libs/gmyth/files/gmyth-0.7.1-types.h.patch | 16 ++++++++++++++ |
19 |
.../{gmyth-0.7.1.ebuild => gmyth-0.7.1-r1.ebuild} | 20 ++++++++++++----- |
20 |
3 files changed, 52 insertions(+), 6 deletions(-) |
21 |
|
22 |
diff --git a/media-libs/gmyth/files/gmyth-0.7.1-as-needed.patch b/media-libs/gmyth/files/gmyth-0.7.1-as-needed.patch |
23 |
new file mode 100644 |
24 |
index 0000000..2fed1a8 |
25 |
--- /dev/null |
26 |
+++ b/media-libs/gmyth/files/gmyth-0.7.1-as-needed.patch |
27 |
@@ -0,0 +1,22 @@ |
28 |
+Patch author: Dominique Leuenberger (dimstar) |
29 |
+Fixes building with -Wl,--as-nneded |
30 |
+http://sourceforge.net/tracker/?func=detail&aid=3424823&group_id=177106&atid=879916 |
31 |
+ |
32 |
+Index: gmyth-0.7.1/samples/Makefile.am |
33 |
+=================================================================== |
34 |
+--- gmyth-0.7.1.orig/samples/Makefile.am |
35 |
++++ gmyth-0.7.1/samples/Makefile.am |
36 |
+@@ -6,12 +6,10 @@ gmyth_cat_SOURCES = \ |
37 |
+ gmyth_ls_SOURCES = \ |
38 |
+ gmyth_ls.c |
39 |
+ |
40 |
+-LDADD = \ |
41 |
+- $(top_builddir)/gmyth/libgmyth.la |
42 |
+- |
43 |
+ AM_CFLAGS = -g |
44 |
+ |
45 |
+ AM_LDFLAGS = \ |
46 |
++ $(top_builddir)/gmyth/libgmyth.la \ |
47 |
+ @GLIB_LIBS@ @GOBJECT_LIBS@ @GTHREAD_LIBS@ @LIBCURL_LIBS@ |
48 |
+ |
49 |
+ INCLUDES = \ |
50 |
|
51 |
diff --git a/media-libs/gmyth/files/gmyth-0.7.1-types.h.patch b/media-libs/gmyth/files/gmyth-0.7.1-types.h.patch |
52 |
new file mode 100644 |
53 |
index 0000000..0f66410 |
54 |
--- /dev/null |
55 |
+++ b/media-libs/gmyth/files/gmyth-0.7.1-types.h.patch |
56 |
@@ -0,0 +1,16 @@ |
57 |
+Patch author: Dominique Leuenberger (dimstar) |
58 |
+Fixes building with >=curl-7.21.7 |
59 |
+http://sourceforge.net/tracker/?func=detail&aid=3424822&group_id=177106&atid=879916 |
60 |
+ |
61 |
+Index: gmyth-0.7.1/gmyth/gmyth_http.h |
62 |
+=================================================================== |
63 |
+--- gmyth-0.7.1.orig/gmyth/gmyth_http.h |
64 |
++++ gmyth-0.7.1/gmyth/gmyth_http.h |
65 |
+@@ -42,7 +42,6 @@ |
66 |
+ #include "gmyth_recprofile.h" |
67 |
+ |
68 |
+ #include <curl/curl.h> |
69 |
+-#include <curl/types.h> |
70 |
+ #include <curl/easy.h> |
71 |
+ |
72 |
+ G_BEGIN_DECLS |
73 |
|
74 |
diff --git a/media-libs/gmyth/gmyth-0.7.1.ebuild b/media-libs/gmyth/gmyth-0.7.1-r1.ebuild |
75 |
similarity index 53% |
76 |
rename from media-libs/gmyth/gmyth-0.7.1.ebuild |
77 |
rename to media-libs/gmyth/gmyth-0.7.1-r1.ebuild |
78 |
index 66823de..871fb94 100644 |
79 |
--- a/media-libs/gmyth/gmyth-0.7.1.ebuild |
80 |
+++ b/media-libs/gmyth/gmyth-0.7.1-r1.ebuild |
81 |
@@ -1,11 +1,11 @@ |
82 |
# Copyright 1999-2008 Gentoo Foundation |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/gmyth/gmyth-0.7.ebuild,v 1.4 2008/08/08 19:29:34 maekke Exp $ |
85 |
-EAPI=2 |
86 |
+EAPI=4 |
87 |
|
88 |
-inherit libtool |
89 |
+inherit autotools eutils libtool |
90 |
|
91 |
-IUSE="debug" |
92 |
+IUSE="debug static-libs" |
93 |
LICENSE="LGPL-2" |
94 |
DESCRIPTION="GObject based library to access mythtv backends" |
95 |
HOMEPAGE="http://gmyth.sourceforge.net/" |
96 |
@@ -19,11 +19,19 @@ RDEPEND="net-misc/curl |
97 |
DEPEND="${RDEPEND} |
98 |
dev-util/pkgconfig" |
99 |
|
100 |
+src_prepare() { |
101 |
+ # bug #386889; http://sourceforge.net/tracker/?func=detail&aid=3424822&group_id=177106&atid=879916 |
102 |
+ epatch "${FILESDIR}/${PN}-0.7.1-types.h.patch" |
103 |
+ # http://sourceforge.net/tracker/?func=detail&aid=3424823&group_id=177106&atid=879916 |
104 |
+ epatch "${FILESDIR}/${PN}-0.7.1-as-needed.patch" |
105 |
+ eautoreconf |
106 |
+} |
107 |
+ |
108 |
src_configure() { |
109 |
- econf $(use_enable debug) |
110 |
+ econf $(use_enable debug) $(use_enable static-libs static) |
111 |
} |
112 |
|
113 |
src_install() { |
114 |
- emake DESTDIR="${D}" install || die "emake install failed." |
115 |
- dodoc AUTHORS ChangeLog NEWS README |
116 |
+ default |
117 |
+ use static-libs || find "${D}" -name '*.la' -exec rm -f {} + |
118 |
} |